diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index a8883c85..f1526105 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -46,6 +46,7 @@ public class AvvisoUtil { put(StatoPraticaConstants.CONFORME, "label.admingeniocivile.avviso.tipoDocumento.conforme"); put(StatoPraticaConstants.NON_CONFORME, "label.admingeniocivile.avviso.tipoDocumento.nonconforme"); put(StatoPraticaConstants.AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.autorizzata"); + put(StatoPraticaConstants.VINCOLI, "conf.geniocivile.avviso.template.id.vincoli"); put(StatoPraticaConstants.NON_AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.nonautorizzata"); put(StatoPraticaConstants.INTEGRAZIONE, "label.admingeniocivile.avviso.tipoDocumento.integrazione"); put(StatoPraticaConstants.PREAVVISO_CONTRARIO, @@ -110,6 +111,7 @@ public class AvvisoUtil { put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "conf.geniocivile.avviso.template.id.integrazioneaccettata"); put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.template.id.cambioistruttore"); + put(StatoPraticaConstants.VINCOLI, "conf.geniocivile.avviso.template.id.vincoli"); put("AS", "conf.geniocivile.avviso.template.id.doc_asseverazione"); put("AIF", "conf.geniocivile.avviso.template.id.doc_annullamento"); put("PG", "conf.geniocivile.avviso.template.id.doc_pagamento"); @@ -158,19 +160,30 @@ public class AvvisoUtil { String label = statoPratica; switch (tipoProcedura) { - // VIArch - case Constants.PROCEDURA_P3: - case Constants.PROCEDURA_Q3: - switch (statoPratica) { - case StatoPraticaConstants.AUTORIZZATA: - case StatoPraticaConstants.CONFORME: - label = "VIARCH1"; - break; - case StatoPraticaConstants.NON_AUTORIZZATA: - case StatoPraticaConstants.NON_CONFORME: - label = "VIARCH2"; - break; - } + // VIArch + case Constants.PROCEDURA_P3: + case Constants.PROCEDURA_Q3: + switch (statoPratica) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + label = "VIARCH1"; + break; + case StatoPraticaConstants.NON_AUTORIZZATA: + case StatoPraticaConstants.NON_CONFORME: + label = "VIARCH2"; + break; + + } + break; + case Constants.PROCEDURA_P10: + case Constants.PROCEDURA_Q10: + switch (statoPratica) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + label = StatoPraticaConstants.VINCOLI; + break; + } + break; } switch (statoPratica) { case StatoPraticaConstants.VIDIMATA: diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java index b24a352c..9049a2bf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java @@ -63,7 +63,9 @@ public class PraticaUtil { public static String getStatoPraticaLabel(String statoPratica, String tipoProcedura) throws PortalException, SystemException { - if (Constants.PROCEDURA_P3.equalsIgnoreCase(tipoProcedura) || Constants.PROCEDURA_Q3.equalsIgnoreCase(tipoProcedura)) { + switch (tipoProcedura) { + case Constants.PROCEDURA_P3: + case Constants.PROCEDURA_Q3: switch (statoPratica) { case StatoPraticaConstants.AUTORIZZATA: case StatoPraticaConstants.CONFORME: @@ -72,6 +74,14 @@ public class PraticaUtil { case StatoPraticaConstants.NON_CONFORME: return StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.VIARCH_CHIUSO); } + break; + case Constants.PROCEDURA_P10: + case Constants.PROCEDURA_Q10: + switch (statoPratica) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + return StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.VINCOLI); + } } String statoPraticaLabel = StringPool.BLANK; switch (statoPratica) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties index f177631a..a9857e07 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties @@ -157,6 +157,7 @@ conf.geniocivile.avviso.template.id.vidimata.finelavori = Template Avviso Vidima conf.geniocivile.avviso.template.id.vidimata.collaudo = Template Avviso Vidimazione Collaudo conf.geniocivile.avviso.template.id.autorizzata = Template Avviso Autorizzazione conf.geniocivile.avviso.template.id.non_autorizzata = Template Avviso Autorizzazione Negata +conf.geniocivile.avviso.template.id.vincoli = Template Avviso Attestazione Vincoli conf.geniocivile.avviso.template.id.integrazione = Template Avviso Integrazione conf.geniocivile.avviso.template.id.preavvisocontrario = Template Preavviso Parere Contrario conf.geniocivile.avviso.template.id.noparere = Template Avviso Non Competenza 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 5b3f4c35..9463f45e 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 @@ -19,6 +19,7 @@ tipo-pratica-03 = Sanatoria stato-pratica-AL = Annullata stato-pratica-AU = Autorizzata +stato-pratica-AV = Attestazione vincoli stato-pratica-CL = Collaudo stato-pratica-CP = Collaudo parziale stato-pratica-CO = Conforme @@ -1071,6 +1072,7 @@ no-collaudi-parziali = Nessun Collaudo Parziale presentato al momento # Label COSTANTS # label.admingeniocivile.statopratica.sottopostaaparere = Sottoposta a parere label.admingeniocivile.statopratica.vidimata = Vidimata +label.admingeniocivile.statopratica.vincoli = Attestazione vincoli label.admingeniocivile.statopratica.conforme = Conforme label.admingeniocivile.statopratica.nonconforme = Non Conforme label.admingeniocivile.statopratica.autorizzazione = Autorizzata diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java index 66e72733..af9007f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java @@ -152,7 +152,6 @@ public class SchedulerGeneraDocumento implements MessageListener { reportDto.setParameters(parameters); reportDto.setShowNumberOfPage(true); reportDto.setType(ReportConstants.ReportType.JRXML_TO_PDF.toString()); - _log.info("generaDocumento: generateReport: " + fileEntryIdTemplate); ReportResultDto result = ReportUtil.generateReport(companyId, userId, reportDto, bean); idFileEntry = result.getFileEntryIds()[0]; if (Validator.isNotNull(idFileEntry)) { @@ -165,6 +164,7 @@ public class SchedulerGeneraDocumento implements MessageListener { AvvisoLocalServiceUtil.updateAvvisoDlFileEntryIdBase(avviso.getAvvisoId(), idFileEntry); } } + _log.info("generaDocumento: generateReport: " + fileEntryIdTemplate + ", id: " + idFileEntry); } catch (Exception e) { _log.error("Error on AvvisoId = " + avviso.getAvvisoId(), e); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java index 93f48f5b..b748330b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java @@ -208,39 +208,39 @@ public class ControlloPraticaLocalServiceClpInvoker { _methodParameterTypes215 = new String[] { "long", "java.util.Map" }; - _methodName223 = "addPraticheAlControllo"; + _methodName224 = "addPraticheAlControllo"; - _methodParameterTypes223 = new String[] { "long", "long" }; + _methodParameterTypes224 = new String[] { "long", "long" }; - _methodName224 = "addPraticheAlControlloVarianti"; + _methodName225 = "addPraticheAlControlloVarianti"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes225 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName225 = "getReturnValueScriptIniziale"; - - _methodParameterTypes225 = new String[] { "long" }; - - _methodName226 = "getTipoEsito"; + _methodName226 = "getReturnValueScriptIniziale"; _methodParameterTypes226 = new String[] { "long" }; - _methodName227 = "findByIntPratica"; + _methodName227 = "getTipoEsito"; _methodParameterTypes227 = new String[] { "long" }; - _methodName228 = "calculateDateAvvioProcedimento"; + _methodName228 = "findByIntPratica"; _methodParameterTypes228 = new String[] { "long" }; - _methodName229 = "getOrganizationByControlloPraticaId"; + _methodName229 = "calculateDateAvvioProcedimento"; _methodParameterTypes229 = new String[] { "long" }; - _methodName230 = "getCarichiLavoro"; + _methodName230 = "getOrganizationByControlloPraticaId"; + + _methodParameterTypes230 = new String[] { "long" }; + + _methodName231 = "getCarichiLavoro"; - _methodParameterTypes230 = new String[] { "long", "int" }; + _methodParameterTypes231 = new String[] { "long", "int" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -476,46 +476,46 @@ public class ControlloPraticaLocalServiceClpInvoker { (java.util.Map)arguments[1]); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControllo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue()); - } - if (_methodName226.equals(name) && Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue()); } if (_methodName227.equals(name) && Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); } if (_methodName228.equals(name) && Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } if (_methodName229.equals(name) && Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.getOrganizationByControlloPraticaId(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); } if (_methodName230.equals(name) && Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + return ControlloPraticaLocalServiceUtil.getOrganizationByControlloPraticaId(((Long)arguments[0]).longValue()); + } + + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { return ControlloPraticaLocalServiceUtil.getCarichiLavoro(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); } @@ -597,8 +597,6 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes214; private String _methodName215; private String[] _methodParameterTypes215; - private String _methodName223; - private String[] _methodParameterTypes223; private String _methodName224; private String[] _methodParameterTypes224; private String _methodName225; @@ -613,4 +611,6 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes229; private String _methodName230; private String[] _methodParameterTypes230; + private String _methodName231; + private String[] _methodParameterTypes231; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index a1c5b816..03f32640 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -474,23 +474,21 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); IntPratica intPratica = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId()); - if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) { - return jsonDeposito; - } - - if(intPratica.getTipoRichiesta() == Constants.SANATORIE){ - return jsonSanatoria; - }else if(intPratica.getTipoRichiesta() == Constants.VIARCH){ - return jsonViarch; - }else{ - return jsonAutorizzazione; + switch (intPratica.getTipoRichiesta()) { + case Constants.SANATORIE: + return JSON_SANATORIA; + case Constants.VIARCH: + return JSON_VIARCH; + case Constants.VINCOLI: + return JSON_VINCOLI; } + return JSON_AUTORIZZAZIONE; } - private static final String jsonDeposito = StringPool.BLANK; - private static final String jsonAutorizzazione = getJsonAutorizzazione(); - private static final String jsonSanatoria = getJsonSanatoria(); - private static final String jsonViarch = getJsonViarch(); + private static final String JSON_AUTORIZZAZIONE = getJsonAutorizzazione(); + private static final String JSON_SANATORIA = getJsonSanatoria(); + private static final String JSON_VIARCH = getJsonViarch(); + private static final String JSON_VINCOLI = getJsonVincoli(); private static String getJsonAutorizzazione() { @@ -530,6 +528,19 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi return ret.toString(); } + private static String getJsonVincoli() { + + JSONArray esito = JSONFactoryUtil.createJSONArray(); + esito.put(etichetta("Attestazione", StatoPraticaConstants.CONFORME)); + esito.put(etichetta(StatoPraticaConstants.NON_CONFORME)); + esito.put(etichetta(StatoPraticaConstants.INTEGRAZIONE)); + esito.put(etichetta(StatoPraticaConstants.PREAVVISO_CONTRARIO)); + esito.put(etichetta(StatoPraticaConstants.NO_PARERE)); + JSONObject ret = JSONFactoryUtil.createJSONObject(); + ret.put("esito", esito); + return ret.toString(); + } + private static JSONObject etichetta(String value) { return etichetta(StatoPraticaConstants.getEsitoAutorizzazione(value), value, false, false); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index 73a46094..3e5128f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index 8f8bd310..d73613ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 0b546e1a..02dcaba3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b0b64b21..4a23bffd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index 0b7f9ee2..f5b8166f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66507dd0..32809343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 48cf51eb..a4fa6f91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index 402cecd0..8c56fb32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index bef23f56..36e82c84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 689264dd..3adff95b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index f4a4b84a..13bd7b4f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 41c1b2be..15f0504f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index ad50d7ea..f80406ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 35a1b793..b2d8fab5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 12fb36d2..863e32df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index 9a0ac9b3..c0aa0a79 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 35a48fdf..90251acb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index da5af496..26f13dda 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 90d5b692..de92727b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index 6e60848d..030778b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; 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 c0f131e7..3f6e6ba7 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=3250 - build.date=1628081375354 + build.number=3251 + build.date=1628156859254 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp index e8a96564..d4171e5d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp @@ -1,4 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%> <%@page import="com.liferay.portal.kernel.util.MapUtil"%> <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> @@ -123,11 +125,29 @@ List nascosti = Arrays.asList(new String[] { "base64" }); boolean base64 = MapUtil.getBoolean(parametri, "base64", false); for (Entry entry : parametri.entrySet()) { String key = entry.getKey(); + String value = entry.getValue().toString(); + if (key.equals("esito")) { + switch (intPratica.getTipoRichiesta()) { + case Constants.VIARCH: + if ((value.equals(StatoPraticaConstants.AUTORIZZATA)) + || (value.equals(StatoPraticaConstants.CONFORME))) { + value = StatoPraticaConstants.VIARCH_APERTO; + } else if ((value.equals(StatoPraticaConstants.NON_AUTORIZZATA)) + || (value.equals(StatoPraticaConstants.NON_CONFORME))) { + value = StatoPraticaConstants.VIARCH_CHIUSO; + } + break; + case Constants.VINCOLI: + if ((value.equals(StatoPraticaConstants.AUTORIZZATA)) + || (value.equals(StatoPraticaConstants.CONFORME))) { + value = StatoPraticaConstants.VINCOLI; + } + break; + } + } if (key.equals("ingloba_variante")) { - String value = entry.getValue().toString(); out.print("
  • " + value + "
    • "); } else if (!nascosti.contains(key)) { - String value = entry.getValue().toString(); if (base64 && key.equalsIgnoreCase("testo_del_documento")) { value = "File allegato"; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp index 70bf3e49..2c3999e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp @@ -103,20 +103,10 @@ request.setAttribute("tabs1", "Tab_TaskMieiRuoli"); searchContainer.setTotal(hits.getLength()); %> - - - - - + + <%@ include file="/html/gestioneattivita/view_columns.jspf" %> - - - - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar deleted file mode 100644 index 1d7417c4..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar deleted file mode 100644 index 43a9413b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi.jar deleted file mode 100644 index 353ce765..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-asm.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-asm.jar deleted file mode 100644 index f0a1261a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-asm.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-beans.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-beans.jar deleted file mode 100644 index 5639dd47..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-beans.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-context.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-context.jar deleted file mode 100644 index 6b23efa8..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-context.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-core.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-core.jar deleted file mode 100644 index b8e928c2..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/spring-core.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties index cc25fe86..e805dd30 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_report - build.number=22 - build.date=1618410383961 + build.number=23 + build.date=1628168439416 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties index 2baf9c4f..bc787f05 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_rep - build.number=27 - build.date=1618480427939 + build.number=29 + build.date=1628168500846 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java index 964b2cca..f6c0fe2d 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java @@ -35,6 +35,7 @@ public class StatoPraticaConstants { public static final String VIARCH_CHIUSO = "V2"; public static final String SANZIONE_DOC1 = "S1"; public static final String SANZIONE_DOC2 = "S2"; + public static final String VINCOLI = "AV"; /* * Probabilmente non è il posto più corretto, però si usa dovunque lo stato della pratica per impostare tipo avviso, @@ -61,6 +62,7 @@ public class StatoPraticaConstants { put(RIFIUTATA, "label.admingeniocivile.statopratica.rifiutata"); put(SOTTOPOSTA_A_PARERE, "label.admingeniocivile.statopratica.sottopostaaparere"); put(VIDIMATA, "label.admingeniocivile.statopratica.vidimata"); + put(VINCOLI, "label.admingeniocivile.statopratica.vincoli"); put(VIARCH_APERTO, "label.admingeniocivile.statopratica.viarch1"); put(VIARCH_CHIUSO, "label.admingeniocivile.statopratica.viarch2"); put(SANZIONE_DOC1, "label.admingeniocivile.statopratica.sanzione.doc1"); diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java index a477c781..7ebe8bbb 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java @@ -26,32 +26,24 @@ public class ReportUtil { private static final Log _log = LogFactoryUtil.getLog(ReportUtil.class); /* - * Considerazioni per report generati con modalità asincrona. Il - * risultato finale sarà inviato tramite message bus su una destinazione - * passata in input. La chiave di legame tra l'ack iniziale e il messaggio - * di esito è il reportTaskId.
    LIMITAZIONI Il - * campo parameters non può contenetere Array[] ma - * solo List che saranno gestite dall'engine come - * ArrayList che chiaramente non potranno essere tipati come - * List<Array[]> ma List<List<>> - * nel caso di matrici. All'interno di template Velocity si dovrà rifare - * rimento al bean direttamente al campo e non con metodi get (es: - * $user.firstName e non $user.getFirstName()). In - * generale parametri "semplici" (come background task). + * Considerazioni per report generati con modalità asincrona. Il risultato finale sarà inviato tramite + * message bus su una destinazione passata in input. La chiave di legame tra l'ack iniziale e il messaggio di esito + * è il reportTaskId.
    LIMITAZIONI Il campo parameters non può contenetere + * Array[] ma solo List che saranno gestite dall'engine come ArrayList che + * chiaramente non potranno essere tipati come List<Array[]> ma + * List<List<>> nel caso di matrici. All'interno di template Velocity si dovrà rifare + * rimento al bean direttamente al campo e non con metodi get (es: $user.firstName e non + * $user.getFirstName()). In generale parametri "semplici" (come background task). */ - public static ReportResultDto generateReport(long companyId, long userId, ReportDto reportDto, - Object dataSource) throws ReportGenerationException { + public static ReportResultDto generateReport(long companyId, long userId, ReportDto reportDto, Object dataSource) + throws ReportGenerationException { try { - Message message = new Message(); - - setMessage(message, companyId, userId, ReportProcessMode.SYNC, - Collections.singletonList(reportDto), dataSource, null); - - String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, - message, 1); + setMessage(message, companyId, userId, ReportProcessMode.SYNC, Collections.singletonList(reportDto), + dataSource, null); + String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, message, 1); return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class); } catch (Exception e) { _log.error(e); @@ -63,33 +55,24 @@ public class ReportUtil { Object dataSource) throws ReportGenerationException { try { - Message message = new Message(); - setMessage(message, companyId, userId, ReportProcessMode.SYNC, reportDtos, dataSource, null); - - String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, - message, 1); - + String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, message, 1); return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class); } catch (Exception e) { throw new ReportGenerationException(e); } } - public static ReportResultDto generateReport(long companyId, long userId, ReportDto reportDto, - Object dataSource, String responseDestinationName) throws ReportGenerationException { + public static ReportResultDto generateReport(long companyId, long userId, ReportDto reportDto, Object dataSource, + String responseDestinationName) throws ReportGenerationException { try { - Message message = new Message(); - - setMessage(message, companyId, userId, ReportProcessMode.ASYNC, - Collections.singletonList(reportDto), dataSource, responseDestinationName); - - String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SERIAL, - message, TimeUnit.SECONDS.toMillis(60)); - + setMessage(message, companyId, userId, ReportProcessMode.ASYNC, Collections.singletonList(reportDto), + dataSource, responseDestinationName); + String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SERIAL, message, + TimeUnit.SECONDS.toMillis(60)); return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class); } catch (Exception e) { throw new ReportGenerationException(e); @@ -100,15 +83,11 @@ public class ReportUtil { Object dataSource, String responseDestinationName) throws ReportGenerationException { try { - Message message = new Message(); - setMessage(message, companyId, userId, ReportProcessMode.ASYNC, reportDtos, dataSource, responseDestinationName); - - String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SERIAL, - message, TimeUnit.SECONDS.toMillis(60)); - + String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SERIAL, message, + TimeUnit.SECONDS.toMillis(60)); return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class); } catch (Exception e) { throw new ReportGenerationException(e); @@ -119,40 +98,29 @@ public class ReportUtil { throws ReportGenerationException { try { - Message message = new Message(); - - setMessage(message, companyId, userId, ReportProcessMode.SYNC, - Collections.singletonList(reportDto), null, ReportDestinationNames.SYNC_PROTOCOLLO); - - String json = (String) MessageBusUtil.sendSynchronousMessage( - ReportDestinationNames.SYNC_PROTOCOLLO, message, 1); - + setMessage(message, companyId, userId, ReportProcessMode.SYNC, Collections.singletonList(reportDto), null, + ReportDestinationNames.SYNC_PROTOCOLLO); + String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC_PROTOCOLLO, + message, 1); return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class); } catch (Exception e) { throw new ReportGenerationException(e); } } - private static void setMessage(Message message, long companyId, long userId, - ReportProcessMode processMode, List reportDtos, Object dataSource, - String responseDestinationName) throws Exception { + private static void setMessage(Message message, long companyId, long userId, ReportProcessMode processMode, + List reportDtos, Object dataSource, String responseDestinationName) throws Exception { message.put(ReportConstants.COMPANY_ID, companyId); message.put(ReportConstants.USER_ID, userId); - Map map = new HashMap(); - JSONArray reportJsonArray = JSONFactoryUtil.createJSONArray(); - for (ReportDto reportDto : reportDtos) { - String json = JSONFactoryUtil.looseSerializeDeep(reportDto); JSONObject jsonObject = JSONFactoryUtil.createJSONObject(json); - reportJsonArray.put(jsonObject); } - map.put(ReportConstants.PARAM_REPORTS, reportJsonArray.toString()); map.put(ReportConstants.PARAM_RESPONSE_DESTINATION_NAME, responseDestinationName); map.put(ReportConstants.PARAM_PROCESS_MODE, processMode.toString()); diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp index 0839d88f..e28a9aad 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp @@ -170,7 +170,7 @@ request.setAttribute(WebKeys.WORKFLOW_ASSET_PREVIEW, Boolean.TRUE); - + <%