From 2a6cfb0d074baf407e99845fa2b58b25f9c37513 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 10 May 2021 10:02:50 +0200 Subject: [PATCH] allegati geologia sistemati --- .../bo/util/ValidazionePraticaUtil.java | 31 ++++++++++++------- .../WEB-INF/src/content/Portal.properties | 2 +- .../docroot/WEB-INF/src/service.properties | 4 +-- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 765eb20a..b3fa2c5b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -750,24 +750,31 @@ public class ValidazionePraticaUtil { + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A22")); } } - if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), "A23", - QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { - if ((Validator.isNotNull(pericolositaGeomorfologicaPai) && !pericolositaGeomorfologicaPai + + if ((Validator.isNotNull(pericolositaGeomorfologicaPai) && !pericolositaGeomorfologicaPai + .equalsIgnoreCase("NA")) + || (Validator.isNotNull(rischioGeomorfologicoPai) && !rischioGeomorfologicoPai .equalsIgnoreCase("NA")) - || (Validator.isNotNull(rischioGeomorfologicoPai) && !rischioGeomorfologicoPai - .equalsIgnoreCase("NA")) - || (Validator.isNotNull(pericolositaIdraulicaPai) && !pericolositaIdraulicaPai - .equalsIgnoreCase("NA")) - || (Validator.isNotNull(rischioIdraulicoPai) && !rischioIdraulicoPai.equalsIgnoreCase("NA"))) { - notCompleted.add("Nessun allegato per " - + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A23")); + || (Validator.isNotNull(pericolositaIdraulicaPai) && !pericolositaIdraulicaPai + .equalsIgnoreCase("NA")) + || (Validator.isNotNull(rischioIdraulicoPai) && !rischioIdraulicoPai.equalsIgnoreCase("NA"))) { + + if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), "A23", + QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { + notCompleted.add("Nessun allegato per " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A23")); + } + + if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), "A22", + QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { + notCompleted.add("Nessun allegato per " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A22")); } } - int indaginiGeologiche = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie( + + /*int indaginiGeologiche = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie( dettPratica.getIntPraticaId(), DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0])); if (indaginiGeologiche == 0) { notCompleted.add("Indagini Geologiche non presenti"); - } + }*/ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); notCompleted.addAll(firmeMancanti(intPratica, dettPratica, DocumentiPraticaUtil.getDocGeologo())); return notCompleted; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 83047858..b67c73e5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -834,7 +834,7 @@ label-documenti-tipologia-G14=Altre tipologie indagini eseguite label-documenti-tipologia-G15=Indagini di archivio label-documenti-tipologia-G16=Altri -label-documenti-tipologia-A01 = A1 - Planimetria generale +label-documenti-tipologia-A01 = A1 - Inquadramento territoriale label-documenti-tipologia-A02 = A2 - Progetto label-documenti-tipologia-A03 = A3 - Relazione tecnica generale label-documenti-tipologia-A04 = A4 - Relazione materiali impiegati diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index aae7c8a6..0ced86b6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=3056 - build.date=1620632167966 + build.number=3058 + build.date=1620633585986 build.auto.upgrade=true ##