TSK-1411 Доработка фильтров с датами (#3151)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
hcengineering · May 8, 2023 · 16da75f · 16da75f
1 parent b0e68ed
commit 16da75f
Show file tree

Hide file tree

Showing 17 changed files with 959 additions and 477 deletions.
diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
@@ -914,10 +914,6 @@ export function createModel (builder: Builder): void {
     component: view.component.ValueFilter
   })
 
-  builder.mixin(core.class.TypeDate, core.class.Class, view.mixin.AttributeFilter, {
-    component: view.component.DateFilter
-  })
-
   builder.mixin(tracker.class.TypeIssuePriority, core.class.Class, view.mixin.AttributePresenter, {
     presenter: tracker.component.PriorityRefPresenter
   })

diff --git a/models/view/src/index.ts b/models/view/src/index.ts
@@ -669,7 +669,7 @@ export function createModel (builder: Builder): void {
   })
 
   builder.mixin(core.class.TypeDate, core.class.Class, view.mixin.AttributeFilter, {
-    component: view.component.ValueFilter
+    component: view.component.DateFilter
   })
 
   builder.mixin(core.class.EnumOf, core.class.Class, view.mixin.AttributeFilter, {
@@ -681,7 +681,7 @@ export function createModel (builder: Builder): void {
   })
 
   builder.mixin(core.class.TypeTimestamp, core.class.Class, view.mixin.AttributeFilter, {
-    component: view.component.TimestampFilter
+    component: view.component.DateFilter
   })
 
   builder.createDoc(
@@ -764,6 +764,93 @@ export function createModel (builder: Builder): void {
     view.filter.FilterNestedDontMatch
   )
 
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.Overdue,
+      result: view.function.FilterDateOutdated,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateOutdated
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.Today,
+      result: view.function.FilterDateToday,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateToday
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.ThisWeek,
+      result: view.function.FilterDateWeek,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateWeek
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.NextWeek,
+      result: view.function.FilterDateNextWeek,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateNextW
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.ThisMonth,
+      result: view.function.FilterDateMonth,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateM
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.NextMonth,
+      result: view.function.FilterDateNextMonth,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateNextM
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.CustomDate,
+      result: view.function.FilterDateCustom
+    },
+    view.filter.FilterDateCustom
+  )
+
+  builder.createDoc(
+    view.class.FilterMode,
+    core.space.Model,
+    {
+      label: view.string.NotSpecified,
+      result: view.function.FilterDateNotSpecified,
+      disableValueSelector: true
+    },
+    view.filter.FilterDateNotSpecified
+  )
+
   classPresenter(builder, core.class.EnumOf, view.component.EnumPresenter, view.component.EnumEditor)
 
   // createAction(

diff --git a/models/view/src/plugin.ts b/models/view/src/plugin.ts
@@ -104,6 +104,14 @@ export default mergeIds(viewId, view, {
     FilterAfterResult: '' as FilterFunction,
     FilterNestedMatchResult: '' as FilterFunction,
     FilterNestedDontMatchResult: '' as FilterFunction,
+    FilterDateOutdated: '' as FilterFunction,
+    FilterDateToday: '' as FilterFunction,
+    FilterDateWeek: '' as FilterFunction,
+    FilterDateNextWeek: '' as FilterFunction,
+    FilterDateMonth: '' as FilterFunction,
+    FilterDateNextMonth: '' as FilterFunction,
+    FilterDateNotSpecified: '' as FilterFunction,
+    FilterDateCustom: '' as FilterFunction,
     ShowEmptyGroups: '' as ViewCategoryAction
   }
 })