diff --git a/backend/src/main/java/ru/micord/ervu/component/field/BaseFieldLoadComponent.java b/backend/src/main/java/ru/micord/ervu/component/field/BaseFieldLoadComponent.java deleted file mode 100644 index c0ed2f4..0000000 --- a/backend/src/main/java/ru/micord/ervu/component/field/BaseFieldLoadComponent.java +++ /dev/null @@ -1,16 +0,0 @@ -package ru.micord.ervu.component.field; - -import model.FieldData; - -import ru.cg.webbpm.modules.webkit.beans.Behavior; - -/** - * @author gulnaz - */ -public abstract class BaseFieldLoadComponent extends Behavior { - - public BaseFieldLoadComponent() { - } - - public abstract FieldData loadFrom(T dto); -} diff --git a/backend/src/main/java/ru/micord/ervu/component/field/SubpoenaFieldLoadComponent.java b/backend/src/main/java/ru/micord/ervu/component/field/SubpoenaFieldLoadComponent.java deleted file mode 100644 index 1f8dc52..0000000 --- a/backend/src/main/java/ru/micord/ervu/component/field/SubpoenaFieldLoadComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.micord.ervu.component.field; - -import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; - -import ru.micord.ervu.component.formatter.FieldFormatter; -import model.FieldData; - -import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; - -/** - * @author gulnaz - */ -public class SubpoenaFieldLoadComponent extends BaseFieldLoadComponent> { - - @NotNull - public String fieldId; - - public FieldFormatter[] formatters; - - @Override - public FieldData loadFrom(Map dto) { - AtomicReference valueRef = new AtomicReference<>(dto.get(fieldId)); - - if (formatters != null) { - Arrays.stream(formatters).forEach(formatter -> { - valueRef.set(formatter.format(valueRef.get())); - }); - } - return new FieldData(getObjectId(), valueRef.get()); - } -} diff --git a/backend/src/main/java/ru/micord/ervu/component/formatter/FieldFormatter.java b/backend/src/main/java/ru/micord/ervu/component/formatter/FieldFormatter.java deleted file mode 100644 index 1e6ca41..0000000 --- a/backend/src/main/java/ru/micord/ervu/component/formatter/FieldFormatter.java +++ /dev/null @@ -1,9 +0,0 @@ -package ru.micord.ervu.component.formatter; - -/** - * @author gulnaz - */ -public interface FieldFormatter { - - T format(R value); -} diff --git a/backend/src/main/java/ru/micord/ervu/component/formatter/LocalDateFormatter.java b/backend/src/main/java/ru/micord/ervu/component/formatter/LocalDateFormatter.java deleted file mode 100644 index 1744619..0000000 --- a/backend/src/main/java/ru/micord/ervu/component/formatter/LocalDateFormatter.java +++ /dev/null @@ -1,22 +0,0 @@ -package ru.micord.ervu.component.formatter; - -import java.time.format.DateTimeFormatter; - -import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; - -import static ru.micord.ervu.util.DateUtil.convertToLocalDate; -import static ru.micord.ervu.util.DateUtil.convertToString; - -/** - * @author gulnaz - */ -public class LocalDateFormatter implements FieldFormatter { - - @NotNull - public String format; - - @Override - public String format(String value) { - return convertToString(convertToLocalDate(value), DateTimeFormatter.ofPattern(format)); - } -} diff --git a/backend/src/main/java/ru/micord/ervu/service/form/LoadFormService.java b/backend/src/main/java/ru/micord/ervu/service/form/LoadFormService.java deleted file mode 100644 index 72e0d40..0000000 --- a/backend/src/main/java/ru/micord/ervu/service/form/LoadFormService.java +++ /dev/null @@ -1,67 +0,0 @@ -package ru.micord.ervu.service.form; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import ru.micord.ervu.component.field.BaseFieldLoadComponent; -import model.BpmnVariableForSave; -import model.FieldData; -import service.container.AbstractFormService; -import utils.FormUtils; - -import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; - -/** - * @author gulnaz - */ -public class LoadFormService extends AbstractFormService { - - @Override - protected Object saveDataById(Object o, List list) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map getValuesForSave(Object o, List list) { - throw new UnsupportedOperationException(); - } - - @Override - protected List loadData(Object dto, List loadableComponentIds) { - List fieldData = new ArrayList<>(); - FormUtils.getFormComponents(this, BaseFieldLoadComponent.class) - .forEach(component -> { - FieldData data = component.loadFrom(dto); - fieldData.add(data); - }); - - return fieldData; - } - - @Override - public Object saveData(String s, List list, Boolean aBoolean, - List list1) throws Exception { - throw new UnsupportedOperationException(); - } - - @Override - public List loadData() { - throw new UnsupportedOperationException(); - } - - @Override - public Object deleteData(Object o) { - throw new UnsupportedOperationException(); - } - - @Override - public Object deleteData(String s, List list) { - throw new UnsupportedOperationException(); - } - - @Override - public Object parseId(String s) { - return null; - } -} diff --git a/backend/src/main/java/ru/micord/ervu/service/rpc/LoadFormRpcService.java b/backend/src/main/java/ru/micord/ervu/service/rpc/LoadFormRpcService.java deleted file mode 100644 index 58a97f3..0000000 --- a/backend/src/main/java/ru/micord/ervu/service/rpc/LoadFormRpcService.java +++ /dev/null @@ -1,34 +0,0 @@ -package ru.micord.ervu.service.rpc; - -import java.util.List; - -import model.FieldData; -import org.springframework.beans.factory.annotation.Autowired; -import ru.micord.ervu.dto.SubpoenaResponseDto; -import ru.micord.ervu.service.SubpoenaService; -import service.container.FormService; - -import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; -import ru.cg.webbpm.modules.webkit.annotations.RpcCall; -import ru.cg.webbpm.modules.webkit.annotations.RpcService; -import ru.cg.webbpm.modules.webkit.beans.Behavior; - -/** - * @author gulnaz - */ -@RpcService -public class LoadFormRpcService extends Behavior { - - @NotNull - public FormService formService; - - //todo: Remove this shit - @Autowired - public SubpoenaService subpoenaService; - - @RpcCall - public List loadData() { - SubpoenaResponseDto subpoenaData = subpoenaService.getSubpoenaData(); - return formService.loadData(subpoenaData); - } -} diff --git a/frontend/src/ts/ervu/component/container/LoadForm.ts b/frontend/src/ts/ervu/component/container/LoadForm.ts index 06f3018..dec75f9 100644 --- a/frontend/src/ts/ervu/component/container/LoadForm.ts +++ b/frontend/src/ts/ervu/component/container/LoadForm.ts @@ -1,7 +1,8 @@ -import {Form} from "@webbpm/base-package"; +import {FieldData, Form} from "@webbpm/base-package"; import {ChangeDetectionStrategy, Component} from "@angular/core"; import {ErvuDataService} from "../../../modules/app/service/ervu-data.service"; -import {LoadFormRpcService} from "../../../generated/ru/micord/ervu/service/rpc/LoadFormRpcService"; +import {LoadFormField} from "../field/LoadFormField"; +import {Subscription} from "rxjs"; @Component({ moduleId: module.id, @@ -11,22 +12,30 @@ import {LoadFormRpcService} from "../../../generated/ru/micord/ervu/service/rpc/ }) export class LoadForm extends Form { - private formRpcService: LoadFormRpcService; private ervuDataService: ErvuDataService; + private subscription: Subscription; + private fields: any[]; + private fieldDataList: FieldData[] = []; initialize() { super.initialize(); - this.formRpcService = this.getScript(LoadFormRpcService); + this.fields = this.getScriptsInChildren(LoadFormField); this.ervuDataService = this.injector.get(ErvuDataService); + this.subscription = this.ervuDataService.message.subscribe(value => { + if (value) { + this.fields.forEach(field => { + let fieldData: FieldData = new FieldData(); + fieldData.componentGuid = field.objectId; + fieldData.value = value[field.id]; + this.fieldDataList.push(fieldData); + }); + this.loadData(); + } + }); } loadData(): Promise { - return this.formRpcService - .loadData() - .then(fieldDataList => this.setData(fieldDataList)) - .catch(reason => { - throw new Error(reason); - }); + return Promise.resolve().then(() => this.setData(this.fieldDataList)); } saveData(): Promise { @@ -39,5 +48,6 @@ export class LoadForm extends Form { ngOnDestroy() { super.ngOnDestroy(); + this.subscription.unsubscribe(); } } diff --git a/frontend/src/ts/ervu/component/field/LoadFormField.ts b/frontend/src/ts/ervu/component/field/LoadFormField.ts new file mode 100644 index 0000000..37f9cb4 --- /dev/null +++ b/frontend/src/ts/ervu/component/field/LoadFormField.ts @@ -0,0 +1,8 @@ +import {AnalyticalScope, Behavior, Control} from "@webbpm/base-package"; + +@AnalyticalScope(Control) +export class LoadFormField extends Behavior { + + public id: string; + +} diff --git a/frontend/src/ts/ervu/component/text/DateTextFormatter.ts b/frontend/src/ts/ervu/component/text/DateTextFormatter.ts new file mode 100644 index 0000000..99edda2 --- /dev/null +++ b/frontend/src/ts/ervu/component/text/DateTextFormatter.ts @@ -0,0 +1,12 @@ +import {TextFormatter} from "@webbpm/base-package"; + +export class DateTextFormatter implements TextFormatter { + + public prefix: string; + + format(value: string): string { + return value + ? (this.prefix ? this.prefix + ' ' : '') + new Date(value).toLocaleDateString() + : value; + } +} diff --git a/resources/src/main/resources/business-model/LK RP FL/mydata.page b/resources/src/main/resources/business-model/LK RP FL/mydata.page index c568298..9f91d51 100644 --- a/resources/src/main/resources/business-model/LK RP FL/mydata.page +++ b/resources/src/main/resources/business-model/LK RP FL/mydata.page @@ -323,14 +323,6 @@ - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - 133ca212-09a6-413a-ac66-e2f6ce188f1f @@ -384,14 +376,6 @@ - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -507,14 +491,6 @@ false - - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true @@ -561,14 +537,6 @@ - - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true @@ -614,14 +582,6 @@ - - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true @@ -694,14 +654,6 @@ - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - 133ca212-09a6-413a-ac66-e2f6ce188f1f @@ -776,14 +728,6 @@ - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - diff --git a/resources/src/main/resources/business-model/LK RP FL/restriction.page b/resources/src/main/resources/business-model/LK RP FL/restriction.page index 8dc69e6..8c593f0 100644 --- a/resources/src/main/resources/business-model/LK RP FL/restriction.page +++ b/resources/src/main/resources/business-model/LK RP FL/restriction.page @@ -200,19 +200,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 9bb748d6-97ad-4b9d-a466-666ba9bcd102 @@ -238,6 +225,7 @@ a674ce01-eadd-4297-b782-53e45e059310 HB - (сценарий) в связи с неявкой в военкомат без уважительной причины в течение 20 календарных true + false false @@ -637,6 +625,7 @@ 040fa808-ccbf-4844-b179-d63f54dc220a HB - запрет на выезд из России true +false false @@ -695,13 +684,6 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 @@ -747,13 +729,6 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - c6a4e38d-d0b3-46dd-960b-36c7e8beba36 @@ -782,6 +757,7 @@ 7dd0d142-e1fd-4603-902f-b445f03c4ddf HB - запрет на регистрацию в качестве индивидуального предпринимателя true +false false @@ -895,6 +871,7 @@ 573a720b-91f7-4e25-a441-7fd3133fdf31 HB - запрет на постановку в налоговом органе физического лица в качестве налогоплательщика, применяющего спец true +false false @@ -1602,16 +1579,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissariatName" @@ -1653,16 +1630,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissariatAddress" diff --git a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page index df9e931..ab415f9 100644 --- a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page +++ b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page @@ -117,14 +117,6 @@ - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - e8095a58-164a-46b5-b477-fe2ce685dad5 @@ -242,19 +234,6 @@ visible false - - - - - - - -formService - - - LoadFormService - ru.micord.ervu.service.form - @@ -287,16 +266,16 @@ false - - -SubpoenaFieldLoadComponent -ru.micord.ervu.component.field + + +LoadFormField +ervu.component.field true true - fieldId + id "otherRestrictionCount" @@ -304,9 +283,9 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - e7e75c3f-5840-4475-b052-e8dac1ec12a1 + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + 79415482-d867-4bdc-8c3e-2875e18d2aaa номер повестки false false @@ -317,25 +296,32 @@ false + + + visible + + false + - - - - + + + + false - - -SubpoenaFieldLoadComponent -ru.micord.ervu.component.field + + + +LoadFormField +ervu.component.field true true - fieldId + id "seriesAndNumber" @@ -371,16 +357,16 @@ false - - -SubpoenaFieldLoadComponent -ru.micord.ervu.component.field + + +LoadFormField +ervu.component.field true true - fieldId + id "recruitmentStatusCode" @@ -416,16 +402,16 @@ false - - -SubpoenaFieldLoadComponent -ru.micord.ervu.component.field + + +LoadFormField +ervu.component.field true true - fieldId + id "firstRestrictionName" @@ -433,9 +419,9 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8ef93ac5-46d8-456e-950f-2d2949d21a53 + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + a28b93c3-fbbc-43d2-ab0c-9b0abcae5106 personName false false @@ -455,29 +441,23 @@ - - - - + + + + false - + + -PersonData -esia - - true - - - -SubpoenaFieldLoadComponent -ru.micord.ervu.component.field +LoadFormField +ervu.component.field true true - fieldId + id "personName" @@ -498,7 +478,6 @@ cefc3626-d99a-434e-983e-224ac0c15a4c FS - 1.1.1 (Повестки) true - false false @@ -536,6 +515,7 @@ 4e247261-22c9-4b75-bc42-1214d6478193 HB заголовок - Повестки true + false false @@ -826,7 +806,6 @@ ebd0d39d-1246-45d5-947b-a9386c8913b5 HB - строка текста "На дата на Ваше имя нет сформированных повесток" true - false false @@ -942,6 +921,7 @@ ae6bbd9c-b3f6-458a-9c19-07e06a4716da VB - 1.1.1.1 (в реестре нет информации о сформированных повестках) сценарий true + false false @@ -1130,7 +1110,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -1175,7 +1155,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -1202,6 +1182,7 @@ + @@ -1275,13 +1256,13 @@ behavior - {"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} propertyName - "formLoaded" + "valueChangeEvent" @@ -1321,7 +1302,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -1348,74 +1329,7 @@ - - - - - _isGroupSelected - - false - - - - one - - - - conditionFirstPart - - - - objectValue - - - - behavior - - {"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"} - - - - method - - "isLoaded" - - - - - - - - - - conditionSecondPart - - - - staticValue - - - boolean - - -true - - - - - - - operation - - "EQUALS" - - - - - - - - + @@ -2230,19 +2144,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 8e3867a3-27d7-4086-bd11-681d69c37977 @@ -2329,26 +2230,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "firstRestrictionName" - - formatters - - - - @@ -2403,27 +2298,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "firstRestrictionStartDate" - - formatters - - - - - @@ -2543,19 +2431,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 2d8ab40f-d985-4f9b-8ec0-1f30463d8ea5 @@ -2661,16 +2536,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "firstRestrictionName" @@ -2735,27 +2610,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "firstRestrictionStartDate" - - formatters - - - - - @@ -2853,28 +2721,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "otherRestrictionCount" - - formatters - - - - false - - @@ -3127,19 +2987,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d 9ea293b4-c9b1-403d-b318-1317006359ae @@ -3202,42 +3049,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "estimatedDateSummons" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - - @@ -3445,6 +3270,7 @@ 755d6815-7ff5-4dd7-a95a-92dfcb59bcd5 AC - 0 мер false + false false @@ -3570,7 +3396,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -4042,7 +3868,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -4087,7 +3913,7 @@ behavior - {"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"} + {"objectId":"79415482-d867-4bdc-8c3e-2875e18d2aaa","packageName":"component.field","className":"TextField","type":"TS"} @@ -4219,6 +4045,7 @@ 304824d5-9f9f-4af9-9b08-6232f7536774 FS - 1.1.3 (Воинский учёт) true + false false @@ -4308,7 +4135,6 @@ 8ae57bdb-4acb-4f34-9641-9b5031b408d3 VB - 1.1.3.1 (вы состоите на учете) сценаций true - false false @@ -4333,19 +4159,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d 35a5afea-7a37-42fb-8cbe-55c1e4d6f170 @@ -4391,16 +4204,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissariatName" @@ -4454,16 +4267,16 @@ null + + label + + null + + textFormatter - - hasPrefix - -true - - prefix @@ -4472,7 +4285,7 @@ - PrefixSuffixTextFormatter + DateTextFormatter ervu.component.text @@ -4485,42 +4298,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "recruitmentStartDate" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - - @@ -4592,19 +4383,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d 016549a2-3b8a-4775-b63a-78e1bad1345e @@ -4679,41 +4457,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "recruitmentStartDate" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - @@ -6456,24 +6213,10 @@ 88bbb9f9-8047-4188-b4b4-5c1de57cb4a1 LoadForm true - false false - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d 792a904b-ae7a-45a2-80ba-b2fd5d94d10d @@ -6564,28 +6307,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "daysToAppearance" - - formatters - - - - false - - @@ -6685,6 +6420,7 @@ a01ac5a5-1b5c-4fc8-9404-341ce04cb76c FS - 1.2.1 (если вы не можете явиться по уважительной причине) true + false false @@ -7394,13 +7130,13 @@ behavior - {"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"} + {"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"} propertyName - "formLoaded" + "valueChangeEvent" @@ -7439,7 +7175,7 @@ behavior -{"objectId":"8ef93ac5-46d8-456e-950f-2d2949d21a53","packageName":"component","className":"Text","type":"TS"} +{"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"} @@ -7483,74 +7219,7 @@ - - - - - _isGroupSelected - - false - - - - one - - - - conditionFirstPart - - - - objectValue - - - - behavior - -{"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"} - - - - method - -"isLoaded" - - - - - - - - - - conditionSecondPart - - - - staticValue - - - boolean - - - true - - - - - - - operation - - "EQUALS" - - - - - - - - + @@ -7758,7 +7427,6 @@ f88a6360-1760-436e-9459-6af705752f54 Диалоговые окна (информационные) true - false false diff --git a/resources/src/main/resources/business-model/LK RP FL/subpoena.page b/resources/src/main/resources/business-model/LK RP FL/subpoena.page index 06f4e0f..9278355 100644 --- a/resources/src/main/resources/business-model/LK RP FL/subpoena.page +++ b/resources/src/main/resources/business-model/LK RP FL/subpoena.page @@ -172,19 +172,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 8af68fe7-5aeb-4e79-97af-9abc0bb6da17 @@ -240,7 +227,6 @@ 805e05e6-5c7f-42e4-8770-a742f50f45b0 VB true - false false @@ -453,16 +439,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "seriesAndNumber" @@ -529,16 +515,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "visitDateTime" @@ -587,16 +573,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissariatName" @@ -645,16 +631,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissariatAddress" @@ -703,16 +689,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "militaryCommissar" @@ -836,6 +822,15 @@ "Дата размещения в реестре" + + textFormatter + + + DateTextFormatter + ervu.component.text + + + @@ -844,41 +839,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "placementDateSummons" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - @@ -923,16 +897,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "reasonName" @@ -1206,16 +1180,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "summonsStatusName" @@ -1264,16 +1238,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "deliveryTypeSummonsName" @@ -1314,6 +1288,15 @@ "Дата вручения" + + textFormatter + + + DateTextFormatter + ervu.component.text + + + @@ -1322,41 +1305,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "estimatedDateSummons" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - @@ -1460,22 +1422,6 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field - - true - true - - - fieldId - - "personName" - - - - 133ca212-09a6-413a-ac66-e2f6ce188f1f @@ -1510,6 +1456,15 @@ "Дата рождения" + + textFormatter + + + DateTextFormatter + ervu.component.text + + + @@ -1518,41 +1473,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "birthDate" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - -LocalDateFormatter -ru.micord.ervu.component.formatter - - - - - @@ -1626,16 +1560,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "docType" @@ -1677,16 +1611,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "docNumber" @@ -1735,16 +1669,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "issueOrg" @@ -1810,6 +1744,15 @@ "Дата выдачи" + + textFormatter + + + DateTextFormatter + ervu.component.text + + + @@ -1818,41 +1761,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "issueDate" - - formatters - - - - - - format - - "dd.MM.yyyy" - - - - - LocalDateFormatter - ru.micord.ervu.component.formatter - - - - - @@ -1890,16 +1812,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "issueIdCode" @@ -2006,16 +1928,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "residenceAddress" @@ -2064,16 +1986,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "actualAddress" @@ -2122,16 +2044,16 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "stayAddress" @@ -2163,7 +2085,6 @@ 713e58f9-9106-4e75-bf08-23761e541e51 VB - правый true - false false @@ -2188,7 +2109,6 @@ ea155284-88df-41be-90cd-6cb73e9ce1c7 FS - (количество дней до явки в военкомат) true - false false @@ -2225,19 +2145,6 @@ - - - - formService - - - LoadFormService - ru.micord.ervu.service.form - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d 3edae35a-d7fd-4f22-b50f-71b549f55999 @@ -2249,6 +2156,58 @@ + +133ca212-09a6-413a-ac66-e2f6ce188f1f +744c8002-bc05-4681-a2ca-f2cde731ee03 +Количество дней - hidden +false +true + + +312c9663-86b4-4672-97bd-67d313585c00 +12596b81-3756-4578-981b-f922bad7ecc4 +Количество дней - hidden +false +false + + + + collectible + + false + + + + visible + + false + + + + + + + + + false + + + + LoadFormField + ervu.component.field + + true + true + + + id + + "daysToAppearance" + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 0357da99-f689-4bfb-b00e-443e31f4ab59 @@ -2328,28 +2287,20 @@ false - - - SubpoenaFieldLoadComponent - ru.micord.ervu.component.field + + + LoadFormField + ervu.component.field true true - fieldId + id "daysToAppearance" - - formatters - - - - false - - @@ -4213,7 +4164,7 @@ behavior - {"objectId":"0357da99-f689-4bfb-b00e-443e31f4ab59","packageName":"component","className":"Text","type":"TS"} + {"objectId":"12596b81-3756-4578-981b-f922bad7ecc4","packageName":"component.field","className":"NumberField","type":"TS"} diff --git a/resources/src/main/resources/components/LoadForm.component b/resources/src/main/resources/components/LoadForm.component index b76b22d..a678de5 100644 --- a/resources/src/main/resources/components/LoadForm.component +++ b/resources/src/main/resources/components/LoadForm.component @@ -58,13 +58,5 @@ - - - LoadFormRpcService - ru.micord.ervu.service.rpc - - true - true -