From 63314419d4a3063fc82ca9f64e350ac33a68c59f Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Fri, 27 Nov 2020 17:39:19 +0100 Subject: [PATCH 1/3] modifica pagamenti e frontend --- .../org.eclipse.core.resources.prefs | 2 + jasper/Modello_autorizzazione_4.jrxml | 429 +++++++++++++++++ jasper/Modello_autorizzazione_567.jrxml | 453 ++++++++++++++++++ .../docroot/WEB-INF/.gitignore | 1 + .../bo/util/ValidazionePraticaUtil.java | 4 +- .../AllegatoManualePersistenceImpl.java | 1 - .../AsseverazionePersistenceImpl.java | 1 - .../persistence/AvvisoPersistenceImpl.java | 1 - .../persistence/CollaudoPersistenceImpl.java | 1 - .../persistence/ComunePersistenceImpl.java | 1 - .../ComunicazionePersistenceImpl.java | 1 - .../ConfigurazionePersistenceImpl.java | 1 - .../ControlloPraticaPersistenceImpl.java | 1 - .../persistence/DelegaPersistenceImpl.java | 1 - .../DettPraticaPersistenceImpl.java | 1 - .../DocAggiuntivaPersistenceImpl.java | 1 - .../DocPraticaPersistenceImpl.java | 1 - .../FineLavoriPersistenceImpl.java | 1 - .../HistoryWorkflowActionPersistenceImpl.java | 1 - .../persistence/IUVPersistenceImpl.java | 1 - .../InfoFascicoloPersistenceImpl.java | 1 - .../IntPraticaPersistenceImpl.java | 1 - .../persistence/PagamentoPersistenceImpl.java | 1 - .../ParereGeologoPersistenceImpl.java | 1 - .../persistence/ProvinciaPersistenceImpl.java | 1 - .../persistence/SoggettoPersistenceImpl.java | 1 - .../persistence/SorteggioPersistenceImpl.java | 1 - ...StoricoSoggettoPraticaPersistenceImpl.java | 1 - .../TempisticaPersistenceImpl.java | 1 - .../TerritorioPersistenceImpl.java | 1 - .../docroot/WEB-INF/src/service.properties | 4 +- .../navigator/page_dettagli_principali.jsp | 2 +- .../pagamenti/view_panel_pagamenti_spese.jsp | 83 +++- .../docroot/WEB-INF/.gitignore | 1 + .../docroot/WEB-INF/.gitignore | 1 + .../EmailAttachmentPersistenceImpl.java | 1 - .../persistence/EmailPersistenceImpl.java | 1 - .../EmailTemplatePersistenceImpl.java | 1 - .../docroot/WEB-INF/src/service.properties | 4 +- .../docroot/WEB-INF/.gitignore | 1 + .../docroot/WEB-INF/.gitignore | 1 + 41 files changed, 961 insertions(+), 53 deletions(-) create mode 100644 jasper/Modello_autorizzazione_4.jrxml create mode 100644 jasper/Modello_autorizzazione_567.jrxml create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/.gitignore create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/.gitignore create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/.gitignore diff --git a/jasper/.settings/org.eclipse.core.resources.prefs b/jasper/.settings/org.eclipse.core.resources.prefs index 6173bace..ea94ede8 100644 --- a/jasper/.settings/org.eclipse.core.resources.prefs +++ b/jasper/.settings/org.eclipse.core.resources.prefs @@ -3,6 +3,8 @@ encoding/Modello_A.jrxml=UTF-8 encoding/Modello_A1.jrxml=UTF-8 encoding/Modello_C.jrxml=UTF-8 encoding/Modello_Sorteggio.jrxml=UTF-8 +encoding/Modello_autorizzazione_4.jrxml=UTF-8 +encoding/Modello_autorizzazione_567.jrxml=UTF-8 encoding/Modello_deposito.jrxml=UTF-8 encoding/Modello_vidimazione.jrxml=UTF-8 encoding/annullamento.jrxml=UTF-8 diff --git a/jasper/Modello_autorizzazione_4.jrxml b/jasper/Modello_autorizzazione_4.jrxml new file mode 100644 index 00000000..1330e0a6 --- /dev/null +++ b/jasper/Modello_autorizzazione_4.jrxml @@ -0,0 +1,429 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jasper/Modello_autorizzazione_567.jrxml b/jasper/Modello_autorizzazione_567.jrxml new file mode 100644 index 00000000..e82973a9 --- /dev/null +++ b/jasper/Modello_autorizzazione_567.jrxml @@ -0,0 +1,453 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ 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 fb0f08aa..98ecd7e4 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 @@ -558,9 +558,9 @@ public class ValidazionePraticaUtil { List soggettiRichiesti = new ArrayList<>(); List notCompleted = new ArrayList<>(); - if (!SoggettiUtil.isTitolareInSoggetti(intPraticaId)) { + /*if (!SoggettiUtil.isTitolareInSoggetti(intPraticaId)) { notCompleted.add("gc-soggetto-00-not-present"); - } + }*/ switch (intPratica.getTipoProcedura()) { case Constants.PROCEDURA_P1: case Constants.PROCEDURA_P2: 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 5c96356f..b040f227 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,7 +45,6 @@ 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 15633d6f..63caa01d 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,7 +46,6 @@ 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 38e33edc..b95c271d 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,7 +46,6 @@ 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 4ce032ca..a0e6a43b 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,7 +45,6 @@ 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 4a23bffd..b0b64b21 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,7 +46,6 @@ 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 f5b8166f..0b7f9ee2 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,7 +45,6 @@ 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 32809343..66507dd0 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,7 +45,6 @@ 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 a4fa6f91..48cf51eb 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,7 +45,6 @@ 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 8c56fb32..402cecd0 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,7 +46,6 @@ 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 7f53be18..e8ae1737 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,7 +45,6 @@ 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 c25ae1dc..649a5476 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,7 +45,6 @@ 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 255330f7..42630357 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,7 +46,6 @@ 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 7ba24480..a5f79405 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,7 +45,6 @@ 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 f80406ab..ad50d7ea 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,7 +42,6 @@ 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/IUVPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java index 6f469f0e..a6ba54ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchIUVException; import it.tref.liferay.portos.bo.model.IUV; import it.tref.liferay.portos.bo.model.impl.IUVImpl; import it.tref.liferay.portos.bo.model.impl.IUVModelImpl; -import it.tref.liferay.portos.bo.service.persistence.IUVPersistence; 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/InfoFascicoloPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java index b85535de..12f22a0a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchInfoFascicoloException; import it.tref.liferay.portos.bo.model.InfoFascicolo; import it.tref.liferay.portos.bo.model.impl.InfoFascicoloImpl; import it.tref.liferay.portos.bo.model.impl.InfoFascicoloModelImpl; -import it.tref.liferay.portos.bo.service.persistence.InfoFascicoloPersistence; 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 ee52c9b7..307036e1 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,7 +48,6 @@ 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 6fe6e3c8..627905df 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,7 +46,6 @@ 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 e4133c60..c6ce3907 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,7 +45,6 @@ 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 2c7a846f..daa33e1b 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,7 +43,6 @@ 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 c8c09bbf..f17aaf4b 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,7 +45,6 @@ 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/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index fc566b28..ec8a983f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; -import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; 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 0c095d3d..78333501 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,7 +42,6 @@ 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 252fc452..720078c4 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,7 +45,6 @@ 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 c8e0dee9..a9c7f7d5 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,7 +44,6 @@ 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 a495700a..724fec6b 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=2753 - build.date=1606474724182 + build.number=2755 + build.date=1606484378631 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp index 17ec21d8..11405853 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp @@ -346,7 +346,7 @@
- <%=LanguageUtil.get(pageContext, "tc-viarch ") %> + <%=LanguageUtil.get(pageContext, "tc-viarch") %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp index 96a69398..dbf4c7b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp @@ -54,7 +54,7 @@
-
+
  1. @@ -72,39 +72,86 @@ <% } %>
+
+ <%=LanguageUtil.get(pageContext, "label-interventi-beni-culturali")%>

+
+
  1. - <%= LanguageUtil.get(pageContext, "label-pagamenti-nuove-costruzioni") %>: - Mc <%=BeanPropertiesUtil.getString(dettPratica, "pagNuovaCostruzione") %> + + <%=LanguageUtil.get(pageContext, "label-pagSoggettiAdAutorizzazione") %> +
    2. +
  2. + + <%=LanguageUtil.get(pageContext, "label-pagInterventiRestauroManufatti") %> +
    3. +
  3. + + <%=LanguageUtil.get(pageContext, "label-pagAltriCasiCulturali") %> +
    4. +
+ +
+ <%=LanguageUtil.get(pageContext, "label-interventi-beni-paesaggistici")%>

+
+
    +
  1. + + <%=LanguageUtil.get(pageContext, "label-pagLottizzazioni") %> +
    2. +
  2. + + <%=LanguageUtil.get(pageContext, "label-pagGrandiStrutture") %> +
    3. +
  3. + + <%=LanguageUtil.get(pageContext, "label-pagCondotte") %> +
    4. +
  4. + + <%=LanguageUtil.get(pageContext, "label-pagPalificazioni") %> +
    5. +
  5. + + <%=LanguageUtil.get(pageContext, "label-pagImpiantiEolici") %> +
    6. +
  6. + + <%=LanguageUtil.get(pageContext, "label-pagNuoveRealizzazioni") %> +
    7. +
  7. + + <%=LanguageUtil.get(pageContext, "label-pagImmobiliPreesistenti") %> +
    8. +
  8. + + <%=LanguageUtil.get(pageContext, "label-pagManifestiPubblicitari") %>
  9. - <%= LanguageUtil.get(pageContext, "label-pagamenti-adeguamento-sismico") %>: - Mc <%=BeanPropertiesUtil.getString(dettPratica, "pagAdeguamentoSismico") %> + + <%=LanguageUtil.get(pageContext, "label-pagPareriDiMassima") %>
  10. - <%= LanguageUtil.get(pageContext, "label-pagamenti-miglioramento-sismico") %>: - Mc <%=BeanPropertiesUtil.getString(dettPratica, "pagMiglioramentoSismico") %> + + <%=LanguageUtil.get(pageContext, "label-pagAltriCasiPaesaggistici") %>
  11. - - <%=LanguageUtil.get(pageContext, "label-pagamenti-riparazione-locale") %> + + <%= LanguageUtil.get(pageContext, "label-pagVariantiPareriResi") %>: + <%=BeanPropertiesUtil.getString(dettPratica, "pagVariantiPareriResi") %>
  12. - - <%=LanguageUtil.get(pageContext, "label-pagamenti-nuove-costruzioni-esenti") %> + + <%=LanguageUtil.get(pageContext, "label-pagRilascioAttestazioni") %>
  13. - - <%=LanguageUtil.get(pageContext, "label-pagamenti-varianti") %> -
    14. -
  14. - <%= LanguageUtil.get(pageContext, "label-pagamenti-altro") %>: - <%=BeanPropertiesUtil.getString(dettPratica, "pagAltro") %> + + <%=LanguageUtil.get(pageContext, "label-pagConsultazioniArchivio") %>
-
+
Importo totale <%= pagamentoOneri.getImportoString() %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java index 6931e006..967ba906 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException; import it.tref.liferay.portos.mailmanager.model.EmailAttachment; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java index 6b806a45..12f7c61e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java @@ -44,7 +44,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailException; import it.tref.liferay.portos.mailmanager.model.Email; import it.tref.liferay.portos.mailmanager.model.impl.EmailImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java index b4583674..c7944800 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailTemplateException; import it.tref.liferay.portos.mailmanager.model.EmailTemplate; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailTemplatePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index 47458fb6..648d7e60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=79 - build.date=1606474474656 + build.number=80 + build.date=1606482952219 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ From caa685c569decd05ca5f443527f8734d990ea8cd Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 30 Nov 2020 10:02:24 +0100 Subject: [PATCH 2/3] pagamenti e tab --- .../docroot/html/fascicolo/view_fascicolo.jsp | 27 +++++++++++++--- .../pagamenti/view_panel_pagamenti_spese.jsp | 32 +++++++++---------- .../portos-mail-manager-shared/.gitignore | 1 + .../shared/portos-report-shared/.gitignore | 1 + 4 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gitignore create mode 100644 liferay-plugins-sdk-6.2/shared/portos-report-shared/.gitignore diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp index da88d6f3..dcea7630 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp @@ -3,20 +3,16 @@ <%@ include file="/html/fascicolo/init.jsp" %> <% - +/* String[] pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"}; - -//String[] pageIntegrazioni = new String[] { "page_in_dettagli","page_in_allegati","page_in_soggetti","page_in_pagamenti"}; String[] pageIntegrazioni = new String[] { "page_in_dettagli","page_in_allegati","page_in_soggetti"}; String[] pageVarianti = new String[] { "page_va_dettagli","page_va_allegati","page_va_soggetti"}; String[] pageFineLavori = new String[] { "page_fl_dati","page_fl_allegati","page_fl_pagamenti"}; String[] pageCollaudi = new String[] { "page_co_dati","page_co_allegati","page_co_pagamenti"}; String[] pageComunicazioni = new String[] { "page_bo_fe","page_doc_aggiuntiva","page_allegati_manuali"}; - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); -//ADT BUG FE ID = 9 if(intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)){ pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_allegati_annullamento","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"}; @@ -30,6 +26,27 @@ DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedBy request.setAttribute("bean.intPratica", intPratica); request.setAttribute("bean.dettPratica.last", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId())); request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));////TODO utilizzare getLastdByIntPraticaAndTipoPratica +*/ + +String[] pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"}; +String[] pageIntegrazioni = new String[] { "page_in_dettagli","page_in_allegati","page_in_soggetti"}; +String[] pageVarianti = new String[] { "page_va_dettagli","page_va_allegati","page_va_soggetti"}; +String[] pageComunicazioni = new String[] { "page_bo_fe","page_doc_aggiuntiva","page_allegati_manuali"}; + +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +if(intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)){ + pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_allegati_annullamento","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"}; +} +String[][] categorySections = { pageRiepilogo,pageIntegrazioni,pageVarianti,pageComunicazioni}; + +String[] _CATEGORY_NAMES = { "cat_riepilogo","cat_integrazioni","cat_varianti","cat_comunicazioni"}; +DettPratica dettPraticaLast = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); +DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); + +request.setAttribute("bean.intPratica", intPratica); +request.setAttribute("bean.dettPratica.last", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId())); +request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId())); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp index dbf4c7b4..3da01bcf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp @@ -78,15 +78,15 @@
  1. - + <%=LanguageUtil.get(pageContext, "label-pagSoggettiAdAutorizzazione") %>
  2. - + <%=LanguageUtil.get(pageContext, "label-pagInterventiRestauroManufatti") %>
  3. - + <%=LanguageUtil.get(pageContext, "label-pagAltriCasiCulturali") %>
@@ -96,56 +96,56 @@
  1. - + <%=LanguageUtil.get(pageContext, "label-pagLottizzazioni") %>
  2. - + <%=LanguageUtil.get(pageContext, "label-pagGrandiStrutture") %>
  3. - + <%=LanguageUtil.get(pageContext, "label-pagCondotte") %>
  4. - + <%=LanguageUtil.get(pageContext, "label-pagPalificazioni") %>
  5. - + <%=LanguageUtil.get(pageContext, "label-pagImpiantiEolici") %>
  6. - + <%=LanguageUtil.get(pageContext, "label-pagNuoveRealizzazioni") %>
  7. - + <%=LanguageUtil.get(pageContext, "label-pagImmobiliPreesistenti") %>
  8. - + <%=LanguageUtil.get(pageContext, "label-pagManifestiPubblicitari") %>
  9. - + <%=LanguageUtil.get(pageContext, "label-pagPareriDiMassima") %>
  10. - + <%=LanguageUtil.get(pageContext, "label-pagAltriCasiPaesaggistici") %>
  11. - + <%= LanguageUtil.get(pageContext, "label-pagVariantiPareriResi") %>: <%=BeanPropertiesUtil.getString(dettPratica, "pagVariantiPareriResi") %>
  12. - + <%=LanguageUtil.get(pageContext, "label-pagRilascioAttestazioni") %>
  13. - + <%=LanguageUtil.get(pageContext, "label-pagConsultazioniArchivio") %>
diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.gitignore @@ -0,0 +1 @@ +/classes/ From 2d086e2c29a99240efb0c6ab0a17397071c9d55b Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 30 Nov 2020 10:24:17 +0100 Subject: [PATCH 3/3] modello autorizzazione --- .../org.eclipse.core.resources.prefs | 3 +- ...567.jrxml => Modello_autorizzazione.jrxml} | 146 +++--- jasper/Modello_autorizzazione_4.jrxml | 429 ------------------ 3 files changed, 69 insertions(+), 509 deletions(-) rename jasper/{Modello_autorizzazione_567.jrxml => Modello_autorizzazione.jrxml} (84%) delete mode 100644 jasper/Modello_autorizzazione_4.jrxml diff --git a/jasper/.settings/org.eclipse.core.resources.prefs b/jasper/.settings/org.eclipse.core.resources.prefs index ea94ede8..3aec87af 100644 --- a/jasper/.settings/org.eclipse.core.resources.prefs +++ b/jasper/.settings/org.eclipse.core.resources.prefs @@ -3,8 +3,7 @@ encoding/Modello_A.jrxml=UTF-8 encoding/Modello_A1.jrxml=UTF-8 encoding/Modello_C.jrxml=UTF-8 encoding/Modello_Sorteggio.jrxml=UTF-8 -encoding/Modello_autorizzazione_4.jrxml=UTF-8 -encoding/Modello_autorizzazione_567.jrxml=UTF-8 +encoding/Modello_autorizzazione.jrxml=UTF-8 encoding/Modello_deposito.jrxml=UTF-8 encoding/Modello_vidimazione.jrxml=UTF-8 encoding/annullamento.jrxml=UTF-8 diff --git a/jasper/Modello_autorizzazione_567.jrxml b/jasper/Modello_autorizzazione.jrxml similarity index 84% rename from jasper/Modello_autorizzazione_567.jrxml rename to jasper/Modello_autorizzazione.jrxml index e82973a9..7b545c18 100644 --- a/jasper/Modello_autorizzazione_567.jrxml +++ b/jasper/Modello_autorizzazione.jrxml @@ -30,6 +30,7 @@ + @@ -76,7 +77,7 @@ e dell'identità siciliana]]> - + @@ -103,7 +104,7 @@ e dell'identità siciliana]]> - + @@ -113,7 +114,7 @@ e dell'identità siciliana]]> - + @@ -123,7 +124,7 @@ e dell'identità siciliana]]> - + @@ -133,7 +134,7 @@ e dell'identità siciliana]]> - + @@ -143,7 +144,7 @@ e dell'identità siciliana]]> - + @@ -153,7 +154,7 @@ e dell'identità siciliana]]> - + @@ -163,17 +164,17 @@ e dell'identità siciliana]]> - + - + - + @@ -183,7 +184,27 @@ e dell'identità siciliana]]> - + + + + + + + + + + + + + + + + + + + + + @@ -193,7 +214,7 @@ e dell'identità siciliana]]> - + @@ -256,25 +277,12 @@ e dell'identità siciliana]]> - + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - 0]]> - + - + - - - - - - - - - - - @@ -371,26 +342,36 @@ $F(nomeDirigente)]]> - + - + - - + + - - + + + + + + + + + + + + @@ -400,16 +381,25 @@ L’eventuale ricorso gerarchico, debitamente sottoscritto e regolarizzato in bo + + - + - - + + - + diff --git a/jasper/Modello_autorizzazione_4.jrxml b/jasper/Modello_autorizzazione_4.jrxml deleted file mode 100644 index 1330e0a6..00000000 --- a/jasper/Modello_autorizzazione_4.jrxml +++ /dev/null @@ -1,429 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -