From edd57fb85fe1587d7370fe2c2d9c22fae98774ef Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Wed, 21 Oct 2020 15:46:33 +0200 Subject: [PATCH] risolto a14 --- .../bo/util/ValidazionePraticaUtil.java | 24 +++++++++++-------- .../docroot/WEB-INF/src/service.properties | 4 ++-- 2 files changed, 16 insertions(+), 12 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 4ae8a722..96302a1b 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 @@ -1372,7 +1372,10 @@ public class ValidazionePraticaUtil { QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); if (a14.isEmpty() && delegheGeologo.isEmpty()) { - notCompleted.add("A14 non presente"); + notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), + "label-documenti-tipologia-" + + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) + + " non presente"); } else { for (DocPratica doc : a14) { @@ -1605,15 +1608,16 @@ public class ValidazionePraticaUtil { // + " non presente"); // } - // int a14 = - // DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), - // DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14); - // if (a14 == 0) { - // notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), - // "label-documenti-tipologia-" - // + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) - // + " non presente"); - // } + int a14 = DocPraticaLocalServiceUtil + .countValidTmpByIntPratica_Tipologia( + dettPratica.getIntPraticaId(), + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14); + if (a14 == 0) { + notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), + "label-documenti-tipologia-" + + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) + + " non presente"); + } int indaginiGeologiche = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie( dettPratica.getIntPraticaId(), 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 74cb4a6e..6e0752cf 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=2504 - build.date=1603198556143 + build.number=2507 + build.date=1603287933832 build.auto.upgrade=true ##