fix(all): Fix in DATE filter.

GeneralBots · Jul 23, 2023 · ad47305 · ad47305
1 parent 661a9c0
commit ad47305
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
@@ -154,22 +154,22 @@ export class SystemKeywords {
     if (date) {
       return array
         ? array.sort((a, b) => {
-            const c = new Date(a[memberName]);
-            const d = new Date(b[memberName]);
-            return c.getTime() - d.getTime();
-          })
+          const c = new Date(a[memberName]);
+          const d = new Date(b[memberName]);
+          return c.getTime() - d.getTime();
+        })
         : null;
     } else {
       return array
         ? array.sort((a, b) => {
-            if (a[memberName] < b[memberName]) {
-              return -1;
-            }
-            if (a[memberName] > b[memberName]) {
-              return 1;
-            }
-            return 0;
-          })
+          if (a[memberName] < b[memberName]) {
+            return -1;
+          }
+          if (a[memberName] > b[memberName]) {
+            return 1;
+          }
+          return 0;
+        })
         : array;
     }
   }
@@ -662,7 +662,7 @@ export class SystemKeywords {
           `${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='${addressId}')`
         )
         .patch(body);
-      body.values[0][0] = undefined   ;
+      body.values[0][0] = undefined;
 
       // FINDs the filtered row to be updated.
 
@@ -1066,10 +1066,10 @@ export class SystemKeywords {
               result = result.substr(1);
             }
             const resultDate = SystemKeywords.getDateFromLocaleString(pid, result, contentLocale);
-            if (filter.value['dateOnly']) {
-              resultDate.setHours(0, 0, 0, 0);
-            }
             if (resultDate) {
+              if (filter.value['dateOnly']) {
+                resultDate.setHours(0, 0, 0, 0);
+              }
               switch (filter.operator) {
                 case '=':
                   if (resultDate.getTime() == filter.value.getTime()) filterAcceptCount++;