From fdf71a3122b727f4bef6cef5fb2e3d1216706a62 Mon Sep 17 00:00:00 2001 From: Mattia MWG Date: Fri, 31 Jul 2020 17:26:16 +0200 Subject: [PATCH] fix --- .../bo/util/ValidazionePraticaUtil.java | 37 ++++++++---------- .../docroot/WEB-INF/src/service.properties | 4 +- .../docroot/images/logo-rs.png | Bin 0 -> 4229 bytes 3 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/logo-rs.png 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 b9c16b4b..4b8956b7 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 @@ -506,21 +506,21 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - boolean ag = true; - if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4")) { + //boolean ag = true; + /*if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4")) { ag = Validator.isNotNull(dettPratica.getAg()); - } + }*/ - boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica + /*boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica .getNormDpr01Dep() || dettPratica.getNormDpr02Dep()) : (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); boolean nelRispetto = dettPratica.getNormDm01() || dettPratica.getNormDm02() - || dettPratica.getNormDm2018(); + || dettPratica.getNormDm2018();*/ - boolean sismaBonus = !dettPratica.getNormSismaBonus() + /*boolean sismaBonus = !dettPratica.getNormSismaBonus() || (Validator.isNotNull(dettPratica.getClRischioPreInt()) || Validator.isNotNull(dettPratica - .getClRischioPostInt())); + .getClRischioPostInt()));*/ // ADT BUG ID = 17 boolean tipologiaCostruttiva = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C) @@ -528,19 +528,15 @@ public class ValidazionePraticaUtil { || dettPratica.getTcInLegno() || dettPratica.getTcAltro(); boolean intervFinPub = !dettPratica.getIntervFinPub() || Validator.isNotNull(dettPratica.getIntervFinPubDesc()); - boolean controllo = ag - && aiSensi - && nelRispetto - && sismaBonus - && tipologiaCostruttiva + boolean controllo = tipologiaCostruttiva && intervFinPub && Validator.isNotNull(dettPratica.getDescLongIntervento()) && Validator.isNotNull(dettPratica.getDestinazione()) - && (dettPratica.getTcNuovaCostruzione() || dettPratica.getTcMiglioramentoSismico() + /*&& (dettPratica.getTcNuovaCostruzione() || dettPratica.getTcMiglioramentoSismico() || dettPratica.getTcAdeguamentoSismico() || dettPratica .getTcRiparazioneInterventoLocale() - ) + )*/ // && Validator.isNotNull(dettPratica.getDestinazione()) // && Validator.isNotNull(dettPratica.getLocalita()) && Validator.isNotNull(dettPratica.getVia()) @@ -579,7 +575,7 @@ public class ValidazionePraticaUtil { notCompleted.add("ag"); } - boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica + /*boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica .getNormDpr01Dep() || dettPratica.getNormDpr02Dep()) : (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); if (!aiSensi) { @@ -590,7 +586,7 @@ public class ValidazionePraticaUtil { || dettPratica.getNormDm2018(); if (!nelRispetto) { notCompleted.add("at-least-nelRispetto"); - } + }*/ if (dettPratica.getNormSismaBonus() && Validator.isNull(dettPratica.getClRischioPreInt()) && Validator.isNull(dettPratica.getClRischioPostInt())) { @@ -955,7 +951,7 @@ public class ValidazionePraticaUtil { return controllo; } - boolean fondazioni = Validator.isNotNull(dettPratica.getDccFondazioni()); + //boolean fondazioni = Validator.isNotNull(dettPratica.getDccFondazioni()); boolean elevazioni = (Validator.isNotNull(dettPratica.getDccStruttureEleMuraturePietrame()) || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureLaterizio()) || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureMisto()) || Validator @@ -1008,7 +1004,7 @@ public class ValidazionePraticaUtil { || (Validator.isNotNull(dettPratica.getDccOpereDiRinforzoAltro()) && Validator .isNotNull(dettPratica.getDccOpereDiRinforzoAltroDescrizione())); - return controllo && fondazioni && elevazioni && orizzontamenti && coperture && non_strutturali + return controllo && elevazioni && orizzontamenti && coperture && non_strutturali && rinforzo; } @@ -1077,9 +1073,10 @@ public class ValidazionePraticaUtil { return notCompleted; } - if (Validator.isNull(dettPratica.getDccFondazioni())) { + /*if (Validator.isNull(dettPratica.getDccFondazioni())) { notCompleted.add("dcc-fondazioni"); - } + }*/ + boolean elevazioni = (Validator.isNotNull(dettPratica.getDccStruttureEleMuraturePietrame()) || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureLaterizio()) 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 32172159..457ba07f 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=2436 - build.date=1596116006117 + build.number=2439 + build.date=1596204199242 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/logo-rs.png b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/logo-rs.png new file mode 100644 index 0000000000000000000000000000000000000000..999b32737367dd3c8baefdcfb837ef985fd0ad6e GIT binary patch literal 4229 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 bEHD2Lv_A$7*jip@00000NkvXXu0mjf5Xs)2 literal 0 HcmV?d00001