diff --git a/frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts b/frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts index 954de38e..fc207a74 100644 --- a/frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts +++ b/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 }; } } diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index eb8f7f58..476ea7e8 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -221,7 +221,6 @@ 3e78f422-3db3-45b9-b531-f4aec5314dab Группа полей true - false false @@ -1131,24 +1130,13 @@ method - "setVisible" + "reset" value - - - staticValue - - - boolean - - - true - - - + null