Fixed #9879 - New Date Filters for Table

primefaces · Feb 10, 2021 · 7656b77 · 7656b77
1 parent 8bff653
commit 7656b77
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 5 deletions.
diff --git a/src/app/components/api/filtermatchmode.ts b/src/app/components/api/filtermatchmode.ts
@@ -15,4 +15,8 @@ export class FilterMatchMode {
     public static readonly IS_NOT = 'isNot';
     public static readonly BEFORE = 'before';
     public static readonly AFTER = 'after';
+    public static readonly DATE_IS = 'dateIs';
+    public static readonly DATE_IS_NOT = 'dateIsNot';
+    public static readonly DATE_BEFORE = 'dateBefore';
+    public static readonly DATE_AFTER = 'dateAfter';
 }
diff --git a/src/app/components/api/filterservice.ts b/src/app/components/api/filterservice.ts
@@ -217,6 +217,54 @@ export class FilterService {
 
         after: (value, filter, filterLocale?): boolean => {
             return this.filters.gt(value, filter, filterLocale);
+        },
+
+        dateIs: (value, filter): boolean => {
+            if (filter === undefined || filter === null) {
+                return true;
+            }
+
+            if (value === undefined || value === null) {
+                return false;
+            }
+
+            return value.toDateString() === filter.toDateString();
+        },
+
+        dateIsNot: (value, filter): boolean => {
+            if (filter === undefined || filter === null) {
+                return true;
+            }
+
+            if (value === undefined || value === null) {
+                return false;
+            }
+
+            return value.toDateString() !== filter.toDateString();
+        },
+
+        dateBefore: (value, filter): boolean =>  {
+            if (filter === undefined || filter === null) {
+                return true;
+            }
+
+            if (value === undefined || value === null) {
+                return false;
+            }
+
+            return value.getTime() < filter.getTime();
+        },
+
+        dateAfter: (value, filter): boolean =>  {
+            if (filter === undefined || filter === null) {
+                return true;
+            }
+
+            if (value === undefined || value === null) {
+                return false;
+            }
+
+            return value.getTime() > filter.getTime();
         }
 
     }

diff --git a/src/app/components/api/primengconfig.ts b/src/app/components/api/primengconfig.ts
@@ -26,10 +26,10 @@ export class PrimeNGConfig {
             FilterMatchMode.GREATER_THAN_OR_EQUAL_TO
         ],
         date: [
-            FilterMatchMode.IS,
-            FilterMatchMode.IS_NOT,
-            FilterMatchMode.BEFORE,
-            FilterMatchMode.AFTER
+            FilterMatchMode.DATE_IS,
+            FilterMatchMode.DATE_IS_NOT,
+            FilterMatchMode.DATE_BEFORE,
+            FilterMatchMode.DATE_AFTER
         ]
     };
 
@@ -49,6 +49,10 @@ export class PrimeNGConfig {
         isNot: 'Is not',
         before: 'Before',
         after: 'After',
+        dateIs: 'Date is',
+        dateIsNot: 'Date is not',
+        dateBefore: 'Date is before',
+        dateAfter: 'Date is after',
         clear: 'Clear',
         apply: 'Apply',
         matchAll: 'Match All',

diff --git a/src/app/components/api/translation.ts b/src/app/components/api/translation.ts
@@ -14,6 +14,10 @@ export interface Translation {
     isNot?: string;
     before?: string;
     after?: string;
+    dateIs?: string;
+    dateIsNot?: string;
+    dateBefore?: string;
+    dateAfter?: string;
     clear?: string;
     apply?: string;
     matchAll?: string;

diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -4378,7 +4378,7 @@ export class ColumnFilter implements AfterContentInit {
             else if (this.type === 'numeric')
                 return FilterMatchMode.EQUALS;
             else if (this.type === 'date')
-                return FilterMatchMode.EQUALS;
+                return FilterMatchMode.DATE_IS;
             else
                 return FilterMatchMode.CONTAINS;
         }