SUPPORT-9484: Fix

frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts

@@ -14,7 +14,6 @@ import {
   GridValueRendererUtils,
   PinnedType
 } from "@webbpm/base-package";
-import {Moment} from "moment";
 import * as moment from "moment-timezone";
 import {StaticGridColumn} from "../../../generated/ru/micord/ervu/property/grid/StaticGridColumn";
 import {CustomGridColumnFilterUtils} from "./filter/CustomGridColumnFilterUtils";
@@ -72,24 +71,28 @@ export class StaticColumnInitializer {
               if (!cellValue) {
                 return -1;
               }
+              const cellMoment = moment(cellValue, 'DD.MM.YYYY HH:mm:ss (Z)');
 
-              let filterMoment: Moment = moment.utc(filterLocalDateAtMidnight)
-                  .add(-filterLocalDateAtMidnight.getTimezoneOffset(), 'm');
-              let cellMoment: Moment = DateTimeUtil.parseToMidnightUTC(cellValue);
+              if (!cellMoment.isValid()) {
+                return -1;
+              }
+              const cellDateOnly = cellMoment.startOf('day');
+              const filterDateOnly = moment(filterLocalDateAtMidnight).startOf('day');
 
-              if (filterMoment.isSame(cellMoment)) {
+              if (filterDateOnly.isSame(cellDateOnly)) {
                 return 0;
               }
 
-              if (cellMoment.isBefore(filterMoment)) {
+              if (cellDateOnly.isBefore(filterDateOnly)) {
                 return -1;
               }
 
-              if (cellMoment.isAfter(filterMoment)) {
+              if (cellDateOnly.isAfter(filterDateOnly)) {
                 return 1;
               }
             },
             browserDatePicker: true,
+            inRangeInclusive: true
           };
         }
       }

resources/src/main/resources/business-model/Личный кабинет юр лица.page

@@ -221,7 +221,6 @@
                 <componentRootId>3e78f422-3db3-45b9-b531-f4aec5314dab</componentRootId>
                 <name>Группа полей</name>
                 <container>true</container>
-                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
                     <properties>
@@ -1131,24 +1130,13 @@
                     <entry>
                         <key>method</key>
                         <value>
-                            <simple>"setVisible"</simple>
+                            <simple>"reset"</simple>
                         </value>
                     </entry>
                     <entry>
                         <key>value</key>
                         <value>
-                            <complex>
-<entry>
-    <key>staticValue</key>
-    <value>
-        <implRef type="TS">
-            <className>boolean</className>
-            <packageName></packageName>
-        </implRef>
-        <simple>true</simple>
-    </value>
-</entry>
-                            </complex>
+                            <simple>null</simple>
                         </value>
                     </entry>
                 </complex>