From ca2a7214ada34905daaaf0fb3a82e49f510e3e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BA=B7ng=20Kh=C3=A1nh=20Trung?= Date: Tue, 2 Jul 2019 11:05:37 +0700 Subject: [PATCH 1/2] Update import newFormScript and API dossier template --- .../impl/DossierTemplateManagementImpl.java | 6 ++-- .../impl/ImportDataManagementImpl.java | 2 +- .../controller/util/DossierTemplateUtils.java | 5 ++- .../controller/util/ProcessUpdateDBUtils.java | 4 ++- .../model/DossierTemplateDataModel.java | 28 ++++++++++++++- .../model/DossierTemplateDetailModel.java | 27 ++++++++++++++ .../model/DossierTemplateInputModel.java | 31 ++++++++++++++-- .../api/v21/model/ActionConfigList.java | 2 +- .../org/opencps/api/v21/model/Actions.java | 2 +- .../opencps/api/v21/model/ApplicantList.java | 2 +- .../opencps/api/v21/model/BusinessList.java | 2 +- .../opencps/api/v21/model/CitizenList.java | 2 +- .../org/opencps/api/v21/model/Configs.java | 2 +- .../api/v21/model/DeliverableTypeList.java | 2 +- .../opencps/api/v21/model/DictCollection.java | 2 +- .../api/v21/model/DocumentTypeList.java | 2 +- .../api/v21/model/DossierTemplate.java | 36 ++++++++++++++++++- .../api/v21/model/DynamicReportList.java | 2 +- .../opencps/api/v21/model/FileTemplates.java | 2 +- .../org/opencps/api/v21/model/Groups.java | 2 +- .../opencps/api/v21/model/HolidayList.java | 2 +- .../java/org/opencps/api/v21/model/Items.java | 2 +- .../opencps/api/v21/model/MenuConfigList.java | 2 +- .../v21/model/NotificationTemplateList.java | 2 +- .../opencps/api/v21/model/ObjectFactory.java | 2 +- .../java/org/opencps/api/v21/model/Parts.java | 2 +- .../api/v21/model/PaymentConfigList.java | 2 +- .../org/opencps/api/v21/model/Processes.java | 2 +- .../org/opencps/api/v21/model/Sequences.java | 2 +- .../api/v21/model/ServerConfigList.java | 2 +- .../opencps/api/v21/model/ServiceInfo.java | 2 +- .../opencps/api/v21/model/ServiceProcess.java | 2 +- .../opencps/api/v21/model/StepConfigList.java | 2 +- .../java/org/opencps/api/v21/model/Steps.java | 2 +- .../opencps/api/v21/model/UserManagement.java | 2 +- .../api/v21/model/WorkingTimeList.java | 2 +- .../main/resources/opencps_import_schema.xsd | 7 ++++ .../constants/DossierTemplateTerm.java | 1 + .../service/DossierTemplateLocalService.java | 6 ++-- .../DossierTemplateLocalServiceUtil.java | 8 ++--- .../DossierTemplateLocalServiceWrapper.java | 10 +++--- .../action/DossierTemplateActions.java | 3 +- .../impl/DossierTemplateActionsImpl.java | 8 ++--- .../impl/DossierTemplateLocalServiceImpl.java | 16 ++++++--- .../indexer/DossierTemplateIndexer.java | 1 + .../src/main/resources/service.properties | 4 +-- 46 files changed, 201 insertions(+), 58 deletions(-) diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierTemplateManagementImpl.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierTemplateManagementImpl.java index 49bf101ba7..a8ff55fb21 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierTemplateManagementImpl.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierTemplateManagementImpl.java @@ -112,13 +112,14 @@ public Response addDossierTemplate(HttpServletRequest request, HttpHeaders heade String templateName = HtmlUtil.escape(input.getTemplateName()); String templateNo = HtmlUtil.escape(input.getTemplateNo()); String description = HtmlUtil.escape(input.getDescription()); + String newFormScript = input.getNewFormScript(); // if (!auth.hasResource(serviceContext, DossierTemplate.class.getName(), ActionKeys.ADD_ENTRY)) { // throw new UnauthorizationException(); // } DossierTemplate dossierTemplate = actions.updateDossierTemplate(groupId, 0l, templateName, - templateNo, description, serviceContext); + templateNo, description, newFormScript, serviceContext); DossierTemplateInputModel result = DossierTemplateUtils.mappingForTemplatePOST(dossierTemplate); @@ -190,13 +191,14 @@ public Response updateDossierTemplateDetail(HttpServletRequest request, HttpHead String templateName = HtmlUtil.escape(input.getTemplateName()); String templateNo = HtmlUtil.escape(input.getTemplateNo()); String description = HtmlUtil.escape(input.getDescription()); + String newFormScript = input.getNewFormScript(); // if (!auth.hasResource(serviceContext, DossierTemplate.class.getName(), ActionKeys.ADD_ENTRY)) { // throw new UnauthorizationException(); // } DossierTemplate dossierTemplate = actions.updateDossierTemplate(groupId, id, templateName, - templateNo, description, serviceContext); + templateNo, description, newFormScript, serviceContext); DossierTemplateDetailModel result = DossierTemplateUtils.mappingForTemplateGetDetail(dossierTemplate); diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/ImportDataManagementImpl.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/ImportDataManagementImpl.java index cbedd0017a..64337402dd 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/ImportDataManagementImpl.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/ImportDataManagementImpl.java @@ -256,7 +256,7 @@ public Response addDossierImportData(HttpServletRequest request, HttpHeaders hea DossierTemplateLocalServiceUtil.updateDossierTemplateDB(user.getUserId(), groupId, "TT130_BVHTTDL", "Cấp phép nhập khẩu văn hóa phẩm không nhằm mục đích kinh doanh thuộc thẩm quyền của Bộ Văn hóa, Thể thao và Du lịch", - "", serviceContext); + "", StringPool.BLANK, serviceContext); } DossierPart part1 = DossierPartLocalServiceUtil.fetchByTemplatePartNo(groupId, dossierTemplateNo, "TP1"); diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierTemplateUtils.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierTemplateUtils.java index 58e8dca174..35199abebb 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierTemplateUtils.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierTemplateUtils.java @@ -36,6 +36,7 @@ public static List mappingToDossierTemplateList(List inputs = new ArrayList(); try { diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/ProcessUpdateDBUtils.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/ProcessUpdateDBUtils.java index ca139e5857..a29bbf26b7 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/ProcessUpdateDBUtils.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/ProcessUpdateDBUtils.java @@ -765,9 +765,11 @@ public static boolean processUpdateDossierTemplate(DossierTemplate template, Str String templateNo = template.getTemplateNo(); String templateName = template.getTemplateName(); String description = template.getDescription(); + String newFormScript = template.getNewFormScript(); + // Update serviceInfo DossierTemplateActions actionTemp = new DossierTemplateActionsImpl(); - actionTemp.updateDossierTemplateDB(userId, groupId, templateNo, templateName, description, serviceContext); + actionTemp.updateDossierTemplateDB(userId, groupId, templateNo, templateName, description, newFormScript, serviceContext); // Update fileName Parts parts = template.getParts(); if (parts != null) { diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDataModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDataModel.java index 2b020e77ae..aa3af89949 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDataModel.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDataModel.java @@ -29,6 +29,7 @@ * <element name="templateName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="templateNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="newFormScript" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -44,7 +45,8 @@ "modifiedDate", "templateName", "description", - "templateNo" + "templateNo", + "newFormScript" }) public class DossierTemplateDataModel { @@ -54,6 +56,7 @@ public class DossierTemplateDataModel { protected String templateName; protected String description; protected String templateNo; + protected String newFormScript; /** * Gets the value of the dossierTemplateId property. @@ -199,4 +202,27 @@ public void setTemplateNo(String value) { this.templateNo = value; } + /** + * Gets the value of the newFormScript property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewFormScript() { + return newFormScript; + } + + /** + * Sets the value of the newFormScript property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewFormScript(String value) { + this.templateNo = value; + } } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDetailModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDetailModel.java index 0277198c81..53ca24579f 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDetailModel.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateDetailModel.java @@ -32,6 +32,7 @@ * <element name="templateName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="templateNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="newFormScript" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="dossierParts" type="{}DossierTemplatePartDataModel" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> @@ -49,6 +50,7 @@ "templateName", "description", "templateNo", + "newFormScript", "dossierParts" }) @XmlRootElement(name = "DossierTemplateDetailModel") @@ -60,6 +62,7 @@ public class DossierTemplateDetailModel { protected String templateName; protected String description; protected String templateNo; + protected String newFormScript; protected List dossierParts; /** @@ -206,6 +209,30 @@ public void setTemplateNo(String value) { this.templateNo = value; } + /** + * Gets the value of the newFormScript property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewFormScript() { + return newFormScript; + } + + /** + * Sets the value of the newFormScript property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewFormScript(String value) { + this.templateNo = value; + } + /** * Gets the value of the dossierParts property. * diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateInputModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateInputModel.java index a496be1e94..893b26da08 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateInputModel.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/dossiertemplate/model/DossierTemplateInputModel.java @@ -29,6 +29,7 @@ * <element name="templateName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="templateNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="newFormScript" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -42,7 +43,8 @@ "dossierTemplateId", "templateName", "description", - "templateNo" + "templateNo", + "newFormScript" }) @XmlRootElement(name = "DossierTemplateInputModel") public class DossierTemplateInputModel { @@ -54,7 +56,9 @@ public class DossierTemplateInputModel { protected String description; @FormParam(value = "templateNo") protected String templateNo; - + @FormParam(value = "newFormScript") + protected String newFormScript; + /** * Gets the value of the dossierTemplateId property. * @@ -151,4 +155,27 @@ public void setTemplateNo(String value) { this.templateNo = value; } + /** + * Gets the value of the newFormScript property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewFormScript() { + return newFormScript; + } + + /** + * Sets the value of the newFormScript property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewFormScript(String value) { + this.newFormScript = value; + } } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ActionConfigList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ActionConfigList.java index 59e95c8cc3..256244682e 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ActionConfigList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ActionConfigList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Actions.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Actions.java index 01b4fa6b88..af6644da3b 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Actions.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Actions.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ApplicantList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ApplicantList.java index 8ee92aa829..74d20ef027 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ApplicantList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ApplicantList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/BusinessList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/BusinessList.java index 41d1663741..125358a732 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/BusinessList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/BusinessList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/CitizenList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/CitizenList.java index e9ab11f1c1..23179721fc 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/CitizenList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/CitizenList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Configs.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Configs.java index 650b95118b..1da95df97f 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Configs.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Configs.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DeliverableTypeList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DeliverableTypeList.java index 9512191dc5..f6bf099a87 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DeliverableTypeList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DeliverableTypeList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DictCollection.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DictCollection.java index cf6daf5646..e7b4f37b51 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DictCollection.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DictCollection.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DocumentTypeList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DocumentTypeList.java index b299c685dd..a31774a504 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DocumentTypeList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DocumentTypeList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DossierTemplate.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DossierTemplate.java index 0cf9f706b1..e89286adc6 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DossierTemplate.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DossierTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // @@ -46,6 +46,13 @@ * </restriction> * </simpleType> * </element> + * <element name="newFormScript"> + * <simpleType> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <maxLength value="65535"/> + * </restriction> + * </simpleType> + * </element> * <element ref="{}parts"/> * </sequence> * </restriction> @@ -60,6 +67,7 @@ "templateNo", "templateName", "description", + "newFormScript", "parts" }) @XmlRootElement(name = "DossierTemplate") @@ -72,6 +80,8 @@ public class DossierTemplate { @XmlElement(required = true) protected String description; @XmlElement(required = true) + protected String newFormScript; + @XmlElement(required = true) protected Parts parts; /** @@ -146,6 +156,30 @@ public void setDescription(String value) { this.description = value; } + /** + * Gets the value of the newFormScript property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewFormScript() { + return newFormScript; + } + + /** + * Sets the value of the newFormScript property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewFormScript(String value) { + this.newFormScript = value; + } + /** * Gets the value of the parts property. * diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DynamicReportList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DynamicReportList.java index f948093a3a..0cfc7c0091 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DynamicReportList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/DynamicReportList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/FileTemplates.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/FileTemplates.java index 9a858a7ff3..6c7dbc6d18 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/FileTemplates.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/FileTemplates.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Groups.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Groups.java index 6281e95a58..611e052b8a 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Groups.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Groups.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/HolidayList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/HolidayList.java index 659e6bf07d..dc7b48282a 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/HolidayList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/HolidayList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Items.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Items.java index 9421d24114..aa72b8cd27 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Items.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Items.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/MenuConfigList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/MenuConfigList.java index c936c5632f..741aa312e8 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/MenuConfigList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/MenuConfigList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/NotificationTemplateList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/NotificationTemplateList.java index c1ec183f60..adce1900d4 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/NotificationTemplateList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/NotificationTemplateList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ObjectFactory.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ObjectFactory.java index a4928b7006..e89844bc54 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ObjectFactory.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Parts.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Parts.java index 0f04b577ef..3a8e3327a7 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Parts.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Parts.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/PaymentConfigList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/PaymentConfigList.java index 49d1304543..0ca2c13dae 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/PaymentConfigList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/PaymentConfigList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Processes.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Processes.java index 7680edbc74..a94106dd0e 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Processes.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Processes.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Sequences.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Sequences.java index 027f6c851b..af4b2a4d44 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Sequences.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Sequences.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServerConfigList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServerConfigList.java index 0b1c1e66d1..4a6f9d07bd 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServerConfigList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServerConfigList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceInfo.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceInfo.java index 604c5355dc..af279686c8 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceInfo.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceInfo.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceProcess.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceProcess.java index c5e1be0a09..30d8425aea 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceProcess.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/ServiceProcess.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/StepConfigList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/StepConfigList.java index f1144ba84a..f5058871a3 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/StepConfigList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/StepConfigList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Steps.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Steps.java index 0a23ec3f02..e332b8c335 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Steps.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/Steps.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/UserManagement.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/UserManagement.java index 92e7f8e382..dd91881bf6 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/UserManagement.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/UserManagement.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/WorkingTimeList.java b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/WorkingTimeList.java index 2420a2d90e..257bd98985 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/WorkingTimeList.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/v21/model/WorkingTimeList.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2019.06.21 at 04:27:41 PM ICT +// Generated on: 2019.07.02 at 10:50:30 AM ICT // diff --git a/modules/backend-api-rest/src/main/resources/opencps_import_schema.xsd b/modules/backend-api-rest/src/main/resources/opencps_import_schema.xsd index b99ad2bcd0..afbd139cde 100644 --- a/modules/backend-api-rest/src/main/resources/opencps_import_schema.xsd +++ b/modules/backend-api-rest/src/main/resources/opencps_import_schema.xsd @@ -697,6 +697,13 @@ + + + + + + + diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTemplateTerm.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTemplateTerm.java index bcccb90bc0..fb5776dd79 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTemplateTerm.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTemplateTerm.java @@ -8,5 +8,6 @@ public class DossierTemplateTerm { public static final String TEMPLATE_NAME = "templateName"; public static final String DESCRIPTION = "description"; public static final String TEMPLATE_NO = "templateNo"; + public static final String NEWFORM_SCRIPT = "newFormScript"; } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalService.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalService.java index 53ffeecb84..c29a5f6dd9 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalService.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalService.java @@ -333,10 +333,12 @@ public DossierTemplate updateDossierTemplate( @Indexable(type = IndexableType.REINDEX) public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateId, String templateName, String templateNo, - String description, ServiceContext context) throws PortalException; + String description, String newFormScript, ServiceContext context) + throws PortalException; @Indexable(type = IndexableType.REINDEX) public DossierTemplate updateDossierTemplateDB(long userId, long groupId, String templateNo, String templateName, String description, - ServiceContext serviceContext) throws PortalException; + String newFormScript, ServiceContext serviceContext) + throws PortalException; } \ No newline at end of file diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceUtil.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceUtil.java index 83e93143d0..f76b7c9d90 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceUtil.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceUtil.java @@ -373,22 +373,22 @@ public static org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplate public static org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplate( long groupId, long dossierTemplateId, String templateName, - String templateNo, String description, + String templateNo, String description, String newFormScript, com.liferay.portal.kernel.service.ServiceContext context) throws com.liferay.portal.kernel.exception.PortalException { return getService() .updateDossierTemplate(groupId, dossierTemplateId, - templateName, templateNo, description, context); + templateName, templateNo, description, newFormScript, context); } public static org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplateDB( long userId, long groupId, String templateNo, String templateName, - String description, + String description, String newFormScript, com.liferay.portal.kernel.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException { return getService() .updateDossierTemplateDB(userId, groupId, templateNo, - templateName, description, serviceContext); + templateName, description, newFormScript, serviceContext); } public static DossierTemplateLocalService getService() { diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceWrapper.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceWrapper.java index 4ac5144ffd..2dbf4621e5 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceWrapper.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierTemplateLocalServiceWrapper.java @@ -399,21 +399,23 @@ public org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplate( @Override public org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplate( long groupId, long dossierTemplateId, String templateName, - String templateNo, String description, + String templateNo, String description, String newFormScript, com.liferay.portal.kernel.service.ServiceContext context) throws com.liferay.portal.kernel.exception.PortalException { return _dossierTemplateLocalService.updateDossierTemplate(groupId, - dossierTemplateId, templateName, templateNo, description, context); + dossierTemplateId, templateName, templateNo, description, + newFormScript, context); } @Override public org.opencps.dossiermgt.model.DossierTemplate updateDossierTemplateDB( long userId, long groupId, String templateNo, String templateName, - String description, + String description, String newFormScript, com.liferay.portal.kernel.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException { return _dossierTemplateLocalService.updateDossierTemplateDB(userId, - groupId, templateNo, templateName, description, serviceContext); + groupId, templateNo, templateName, description, newFormScript, + serviceContext); } @Override diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierTemplateActions.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierTemplateActions.java index edbe1d641e..8717f38b05 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierTemplateActions.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierTemplateActions.java @@ -17,7 +17,7 @@ public JSONObject getDossierTemplates(long userId, long companyId, long groupId, throws PortalException; public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateId, String templateName, - String templateNo, String description, ServiceContext context) throws PortalException; + String templateNo, String description, String newFormScript, ServiceContext context) throws PortalException; public DossierTemplate getDossierTemplate(long dossierTemplateId) throws PortalException; @@ -59,6 +59,7 @@ public String updateSample(long groupId, long dossierTemplateId, String partNo, public String getSample(long groupId, long dossierTemplateId, String partNo) throws PortalException; public void updateDossierTemplateDB(long userId, long groupId, String templateNo, String templateName, String description, + String newFormScript, ServiceContext serviceContext) throws PortalException; public void updateDossierPartDB(long userId, long groupId, String templateNo, String partNo, String partName, diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierTemplateActionsImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierTemplateActionsImpl.java index 240868c8d1..2553edea9d 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierTemplateActionsImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierTemplateActionsImpl.java @@ -54,10 +54,10 @@ public JSONObject getDossierTemplates(long userId, long companyId, long groupId, @Override public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateId, String templateName, - String templateNo, String description, ServiceContext context) throws PortalException { + String templateNo, String description, String newFormScript, ServiceContext context) throws PortalException { return DossierTemplateLocalServiceUtil.updateDossierTemplate(groupId, dossierTemplateId, templateName, - templateNo, description, context); + templateNo, description, newFormScript, context); } @Override @@ -218,9 +218,9 @@ public DossierPart updateDossierPart(long groupId, long dossierPartId, String te @Override public void updateDossierTemplateDB(long userId, long groupId, String templateNo, String templateName, - String description, ServiceContext serviceContext) throws PortalException { + String description, String newFormScript, ServiceContext serviceContext) throws PortalException { - DossierTemplateLocalServiceUtil.updateDossierTemplateDB(userId, groupId, templateNo, templateName, description, + DossierTemplateLocalServiceUtil.updateDossierTemplateDB(userId, groupId, templateNo, templateName, description, newFormScript, serviceContext); } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierTemplateLocalServiceImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierTemplateLocalServiceImpl.java index 3092ac5b0f..5441b15b3e 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierTemplateLocalServiceImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierTemplateLocalServiceImpl.java @@ -89,7 +89,7 @@ public DossierTemplate getByTemplateNo(long groupId, String templateNo) throws P @Indexable(type = IndexableType.REINDEX) public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateId, String templateName, - String templateNo, String description, ServiceContext context) throws PortalException { + String templateNo, String description, String newFormScript, ServiceContext context) throws PortalException { DossierTemplate dossierTemplate = null; @@ -114,6 +114,7 @@ public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateI dossierTemplate.setTemplateName(templateName); dossierTemplate.setTemplateNo(templateNo); dossierTemplate.setDescription(description); + dossierTemplate.setNewFormScript(newFormScript); } else { dossierTemplate = dossierTemplatePersistence.fetchByPrimaryKey(dossierTemplateId); @@ -137,7 +138,9 @@ public DossierTemplate updateDossierTemplate(long groupId, long dossierTemplateI if (Validator.isNotNull(description)) dossierTemplate.setDescription(description); - + if (Validator.isNotNull(newFormScript)) { + dossierTemplate.setNewFormScript(newFormScript); + } } dossierTemplatePersistence.update(dossierTemplate); @@ -320,7 +323,7 @@ private void validateUpdate(long groupId, long dossierTemplateId, String templat // LamTV_ Process output DossierTemplate to DB @Indexable(type = IndexableType.REINDEX) public DossierTemplate updateDossierTemplateDB(long userId, long groupId, String templateNo, String templateName, - String description, ServiceContext serviceContext) throws PortalException { + String description, String newFormScript, ServiceContext serviceContext) throws PortalException { Date now = new Date(); User userAction = userLocalService.getUser(userId); @@ -341,6 +344,7 @@ public DossierTemplate updateDossierTemplateDB(long userId, long groupId, String dossierTemplate.setTemplateName(templateName); dossierTemplate.setTemplateNo(templateNo); dossierTemplate.setDescription(description); + dossierTemplate.setNewFormScript(newFormScript); } else { dossierTemplate.setModifiedDate(now); dossierTemplate.setUserId(userAction.getUserId()); @@ -352,6 +356,9 @@ public DossierTemplate updateDossierTemplateDB(long userId, long groupId, String dossierTemplate.setTemplateNo(templateNo); if (Validator.isNotNull(description)) dossierTemplate.setDescription(description); + if (Validator.isNotNull(newFormScript)) { + dossierTemplate.setNewFormScript(newFormScript); + } } return dossierTemplatePersistence.update(dossierTemplate); @@ -419,7 +426,8 @@ public DossierTemplate adminProcessData(JSONObject objectData) { object.setTemplateName(objectData.getString("templateName")); object.setDescription(objectData.getString("description")); object.setTemplateNo(objectData.getString("templateNo")); - + object.setNewFormScript(objectData.getString("newFormScript")); + dossierTemplatePersistence.update(object); return object; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierTemplateIndexer.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierTemplateIndexer.java index be06503f14..29e54db0e6 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierTemplateIndexer.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierTemplateIndexer.java @@ -59,6 +59,7 @@ protected Document doGetDocument(DossierTemplate object) throws Exception { document.addTextSortable(DossierTemplateTerm.TEMPLATE_NAME, object.getTemplateName()); document.addTextSortable(DossierTemplateTerm.TEMPLATE_NO, object.getTemplateNo()); document.addTextSortable(DossierTemplateTerm.DESCRIPTION, object.getDescription()); + document.addTextSortable(DossierTemplateTerm.NEWFORM_SCRIPT, object.getNewFormScript()); return document; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties index 9d40ca3c88..039b74653f 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties @@ -13,5 +13,5 @@ ## build.namespace=dossiermgt - build.number=1273 - build.date=1562038100512 \ No newline at end of file + build.number=1274 + build.date=1562038890284 \ No newline at end of file From 864982cfb1efcac8e64d85cf0ab3b5b3e7c184db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BA=B7ng=20Kh=C3=A1nh=20Trung?= Date: Tue, 2 Jul 2019 11:16:02 +0700 Subject: [PATCH 2/2] Update communication hints --- .../META-INF/portlet-model-hints.xml | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/modules/backend-communication/backend-communication-service/src/main/resources/META-INF/portlet-model-hints.xml b/modules/backend-communication/backend-communication-service/src/main/resources/META-INF/portlet-model-hints.xml index f5dab47796..2e9dd0c50d 100644 --- a/modules/backend-communication/backend-communication-service/src/main/resources/META-INF/portlet-model-hints.xml +++ b/modules/backend-communication/backend-communication-service/src/main/resources/META-INF/portlet-model-hints.xml @@ -12,11 +12,17 @@ - + + 255 + - - + + 255 + + + 512 + @@ -24,8 +30,12 @@ - - + + 255 + + + 255 + @@ -37,7 +47,9 @@ - + + 255 + @@ -54,9 +66,15 @@ - - - + + 1024 + + + 1024 + + + 255 + @@ -80,10 +98,18 @@ - - - - + + 255 + + + 255 + + + 4096 + + + 255 +