From 8066d47a1376638cab37750a48b21081287e977f Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 7 Jun 2021 10:39:00 +0200 Subject: [PATCH 1/7] new service --- .../impl/AsseverazioneLocalServiceImpl.java | 26 +++++++++++++------ .../docroot/WEB-INF/src/service.properties | 4 +-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java index 3010a221..18e929a4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java @@ -54,6 +54,8 @@ import org.apache.commons.lang.StringUtils; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.MimeTypesUtil; @@ -90,6 +92,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase */ private static final String CHECKED = "X"; + Log _log = LogFactoryUtil.getLog(AsseverazioneLocalServiceImpl.class); @Override public String anteprimaAsseverazione(String tipo, User user, DettPratica dettPratica, String relazioni) @@ -123,25 +126,29 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase private String testoAsseverazione(String tipo, String codiceFiscale, DettPratica dettPratica, String relazioni, boolean anteprima) throws SystemException, PortalException, IOException { - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale( - dettPratica.getIntPraticaId(), codiceFiscale, 0L); - if (soggetti.size() > 0) { - Soggetto soggetto = soggetti.get(0); + Soggetto soggetto = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(dettPratica.getIntPraticaId(), codiceFiscale, tipo); + if (Validator.isNotNull(soggetto)) { String nome = Validator.isNull(soggetto.getCognome()) ? soggetto.getLegaleRap() : soggetto.getNome(); String cognome = Validator.isNull(soggetto.getCognome()) ? StringPool.BLANK : soggetto.getCognome(); + String albo = soggetto.getAlbo(); + String albon = soggetto.getNumIscrAlbo(); + String albop = soggetto.getProvinciaAlbo(); + return testoAsseverazione(tipo, nome, cognome, codiceFiscale, soggetto.getAmbitoProfessione(), dettPratica, - relazioni, false); + relazioni, false, albo, albon, albop); } User user = UserLocalServiceUtil.fetchUserByScreenName(dettPratica.getCompanyId(), codiceFiscale); if (Validator.isNotNull(user)) { return testoAsseverazione(tipo, user.getFirstName(), user.getLastName(), user.getScreenName(), - StringPool.BLANK, dettPratica, relazioni, anteprima); + StringPool.BLANK, dettPratica, relazioni, anteprima, StringPool.BLANK, StringPool.BLANK, + StringPool.BLANK); } return null; } private String testoAsseverazione(String tipo, String nome, String cognome, String codiceFiscale, - String ambitoProfessione, DettPratica dettPratica, String relazioni, boolean anteprima) throws IOException, + String ambitoProfessione, DettPratica dettPratica, String relazioni, boolean anteprima, String albo, + String albon, String albop) throws IOException, SystemException, PortalException { IntPratica intpratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); @@ -237,7 +244,10 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase .replace("{{riparazioni}}", riparazioni ? CHECKED : StringPool.SPACE) .replace("{{rischio}}", rischio ? CHECKED : StringPool.SPACE) .replace("{{!rischio}}", rischio ? StringPool.SPACE : CHECKED) - .replace("{{strategico}}", strategico ? CHECKED : StringPool.SPACE); + .replace("{{strategico}}", strategico ? CHECKED : StringPool.SPACE) + .replace("{{albo}}", albo) + .replace("{{albop}}", albop) + .replace("{{albon}}", albon); if (null == relazioni) { html = html.replace("{{coniugio}}", StringPool.SPACE).replace("{{!coniugio}}", StringPool.SPACE) .replace("{{relazioni}}", StringPool.BLANK); 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 f6a7f98d..97451860 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=2643 - build.date=1622015040932 + build.number=2649 + build.date=1622812779924 build.auto.upgrade=true ## From 34971aeb75946f3755c1baca39616d3c27b0d454 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Tue, 15 Jun 2021 17:56:23 +0200 Subject: [PATCH 2/7] vidimazione cl --- .../org.eclipse.core.resources.prefs | 1 + jasper/vidimazione_cl.jrxml | 397 ++++++++++++++++++ 2 files changed, 398 insertions(+) create mode 100644 jasper/vidimazione_cl.jrxml diff --git a/jasper/.settings/org.eclipse.core.resources.prefs b/jasper/.settings/org.eclipse.core.resources.prefs index a81f31af..936858c5 100644 --- a/jasper/.settings/org.eclipse.core.resources.prefs +++ b/jasper/.settings/org.eclipse.core.resources.prefs @@ -4,3 +4,4 @@ encoding/Modello_C.jrxml=UTF-8 encoding/Modello_Sorteggio.jrxml=UTF-8 encoding/Modello_deposito.jrxml=UTF-8 encoding/Modello_vidimazione.jrxml=UTF-8 +encoding/vidimazione_cl.jrxml=UTF-8 diff --git a/jasper/vidimazione_cl.jrxml b/jasper/vidimazione_cl.jrxml new file mode 100644 index 00000000..77fc8ee7 --- /dev/null +++ b/jasper/vidimazione_cl.jrxml @@ -0,0 +1,397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ac4ecf8bc99e9cf45a2eb1dbc74835f2ad8ff325 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 21 Jun 2021 17:29:34 +0200 Subject: [PATCH 3/7] modifica portal properties per nuovi nomi allegati --- .../bo/util/ValidazionePraticaUtil.java | 12 +++---- .../WEB-INF/src/content/Portal.properties | 32 +++++++++---------- .../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 - .../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 +-- .../fascicolo/navigator/page_allegati.jsp | 3 +- .../fascicolo/navigator/page_versioning.jsp | 5 ++- .../portos/fe/util/ReportFascicoloUtil.java | 12 +++---- .../html/allegatipratica/edit_allegato.jsp | 3 +- .../docroot/html/allegatipratica/view.jsp | 3 +- .../html/allegatipratica/view_accordion.jsp | 3 +- .../html/fascicolofe/verify_collaudo.jsp | 3 +- .../html/fascicolofe/verify_fascicolo.jsp | 3 +- .../html/fascicolofe/verify_fine-lavori.jsp | 3 +- 35 files changed, 48 insertions(+), 61 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 81f5dddd..2a963fc2 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 @@ -1136,7 +1136,7 @@ public class ValidazionePraticaUtil { DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); if (a14.isEmpty() && delegheGeologo.isEmpty()) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) + " non presente"); } else { @@ -1205,7 +1205,7 @@ public class ValidazionePraticaUtil { List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); if (signaturesPerSubject.isEmpty()) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), + notCompleted.add(doc.getTipologia() + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + doc.getTipologia()) + " non firmato dal Geologo"); } @@ -1295,7 +1295,7 @@ public class ValidazionePraticaUtil { int a05 = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05); if (a05 == 0) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05) + " non presente"); } @@ -1303,7 +1303,7 @@ public class ValidazionePraticaUtil { int a14 = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14); if (a14 == 0) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + notCompleted.add(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14 + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14) + " non presente"); } @@ -1326,7 +1326,7 @@ public class ValidazionePraticaUtil { TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); // ADT : BUG FE ID=14 : CONTROLLO firma geologo A6 disabilitato if (signaturesPerSubject.isEmpty() && (!checkA06)) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), + notCompleted.add(doc.getTipologia() + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + doc.getTipologia()) + " non firmato dal Geologo"); } @@ -1461,7 +1461,7 @@ public class ValidazionePraticaUtil { codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docs.isEmpty()) { // Ci dev'essere almeno un allegato per ogni tipologia obbligatoria - notCompleted.add("Nessun Allegato per " + notCompleted.add("Nessun Allegato per " + codiceDoc + " - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + codiceDoc)); } for (DocPratica doc : docs) { 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 11fe3b8b..b68c6e7b 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 @@ -808,22 +808,22 @@ label-documenti-tipologia-G14=Altre tipologie indagini eseguite label-documenti-tipologia-G15=Indagini di archivio label-documenti-tipologia-G16=Altri -label-documenti-tipologia-A00 = A0 - Schema Grafico Calcolo dei Contributi -label-documenti-tipologia-A01 = A1 - Planimetria generale -label-documenti-tipologia-A02 = A2 - Progetto Architettonico -label-documenti-tipologia-A03 = A3 - Relazione tecnica generale -label-documenti-tipologia-A04 = A4 - Relazione materiali impiegati -label-documenti-tipologia-A05 = A5 - Relazione geologica -label-documenti-tipologia-A06 = A6 - Relazione geotecnica -label-documenti-tipologia-A07 = A7 - Relazione sulle fondazioni -label-documenti-tipologia-A08 = A8 - Relazione di calcolo -label-documenti-tipologia-A09 = A9 - Fascicolo dei calcoli -label-documenti-tipologia-A10 = A10 - Disegni esecutivi delle strutture e particolari costruttivi -label-documenti-tipologia-A11 = A11 - Copia del certificato previsto dall art. 9 della L. 1086/71 (art. 58 D.P.R. 380/01) e dall art. 7 della L. 64/74 (art. 56 D.P.R. 380/01) per le strutture prefabbricate -label-documenti-tipologia-A12 = A12 - Dichiarazione rilasciata dalla competente Amministrazione per edificio di speciale importanza artistica - art. 16 L. 64/74 (art. 92 D.P.R. 380/01) -label-documenti-tipologia-A13 = A13 - Piano di Manutenzione -label-documenti-tipologia-A14 = A14 - Scheda sintetica a firma del geologo -label-documenti-tipologia-A15 = A15 - Relazione Modellazione Sismica +label-documenti-tipologia-A00 = Schema Grafico Calcolo dei Contributi +label-documenti-tipologia-A01 = Planimetria generale +label-documenti-tipologia-A02 = Progetto Architettonico +label-documenti-tipologia-A03 = Relazione tecnica generale +label-documenti-tipologia-A04 = Relazione materiali impiegati +label-documenti-tipologia-A05 = Relazione geologica +label-documenti-tipologia-A06 = Relazione geotecnica +label-documenti-tipologia-A07 = Relazione sulle fondazioni +label-documenti-tipologia-A08 = Relazione di calcolo +label-documenti-tipologia-A09 = Fascicolo dei calcoli +label-documenti-tipologia-A10 = Disegni esecutivi delle strutture e particolari costruttivi +label-documenti-tipologia-A11 = Copia del certificato previsto dall art. 9 della L. 1086/71 (art. 58 D.P.R. 380/01) e dall art. 7 della L. 64/74 (art. 56 D.P.R. 380/01) per le strutture prefabbricate +label-documenti-tipologia-A12 = Dichiarazione rilasciata dalla competente Amministrazione per edificio di speciale importanza artistica - art. 16 L. 64/74 (art. 92 D.P.R. 380/01) +label-documenti-tipologia-A13 = Piano di Manutenzione +label-documenti-tipologia-A14 = Scheda sintetica a firma del geologo +label-documenti-tipologia-A15 = Relazione Modellazione Sismica label-documenti-tipologia-A15-old = Certificazione del rispetto delle norme tecniche (in bollo) redatta dal tecnico rilevatore (solo per opere conformi) label-documenti-tipologia-A16-old = Certificato di collaudo statico in bollo (se dovuto) label-documenti-tipologia-A17 = Terna Collaudatori 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 02dcaba3..0b546e1a 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 f35bff1b..bf34f897 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 15f0504f..41c1b2be 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/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 bb4019f2..97842225 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 ee3b3b9b..8dbf29df 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 ef2db5f2..29c4a390 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 a8b07b9f..09876a12 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=2651 - build.date=1623069175552 + build.number=2653 + build.date=1624288952080 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp index 3dec2308..d68680c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp @@ -68,6 +68,7 @@ List tipologiaAllegati = DocumentiPraticaUtil.getDocDomanda(); for(String codiceDoc:tipologiaAllegati){ List docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(dettPratica.getIntPraticaId(), codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>
@@ -75,7 +76,7 @@

- +

<%=docPraticas.size()%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp index af247a96..933849eb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp @@ -91,10 +91,13 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); nDocs++; } } + + String nomeAllegato = codice + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-" + codice); + if (nDocs > 0) { %> - <%= LanguageUtil.get(pageContext, "label-documenti-tipologia-" + codice) %> + <%= nomeAllegato %> <% for (DettPratica dp : dps) { List lista = liste.get(dp.getDettPraticaId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java index 59fbb7f0..9f375a3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java @@ -492,7 +492,7 @@ public class ReportFascicoloUtil { lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean("- " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB + " - num. documenti presentati: " + docPraticas.size()); listaAllegatiGeo.add(bean1); @@ -513,7 +513,7 @@ public class ReportFascicoloUtil { lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean("- " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB + " - num. documenti presentati: " + docPraticas.size()); listaAllegatiDomanda.add(bean1); @@ -956,7 +956,7 @@ public class ReportFascicoloUtil { lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean("- " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB + " - num. documenti presentati: " + docPraticas.size()); listaAllegatiGeo.add(bean1); @@ -977,7 +977,7 @@ public class ReportFascicoloUtil { lastDettPratica.getDettPraticaId(), stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean("- " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB + " - num. documenti presentati: " + docPraticas.size()); listaAllegatiDomanda.add(bean1); @@ -1219,7 +1219,7 @@ public class ReportFascicoloUtil { .findByIntPratica_ClassPk_TipologiaNew(intPraticaId, fineLavoriId, stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean(" - " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + " - documenti presentati: "); listaAllegatiDomanda.add(bean1); @@ -1477,7 +1477,7 @@ public class ReportFascicoloUtil { .findByIntPratica_ClassPk_Tipologia(intPraticaId, collaudoId, stringa, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docPraticas != null && !docPraticas.isEmpty()) { - ReportFascicoloBean bean1 = new ReportFascicoloBean("- " + ReportFascicoloBean bean1 = new ReportFascicoloBean(stringa + " - " + LanguageUtil.get(locale, "label-documenti-tipologia-" + stringa) + StringPool.TAB + " - num. documenti presentati: " + docPraticas.size()); listaAllegatiDomanda.add(bean1); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp index 3fb288b3..f23ff005 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp @@ -71,11 +71,12 @@ int dimensioneMassimaAllegati = (int) ((Short) company.getExpandoBridge() for(String codiceDoc:tipologiaAllegati){ //TODO come per il portlet potrebbe non andar bene per integrazioni e varianti + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); boolean isUnivoco = DocumentiPraticaUtil.getDocUnivoci().contains(codiceDoc); if (!isUnivoco || DocPraticaServiceUtil.countByClassPk_Tipologia(classPk, codiceDoc) == 0) { %> - + <% } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 1e8388b5..47fd2e79 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -235,11 +235,12 @@ for (String codiceDoc : tipologiaAllegati) { } else { docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId, classPk, codiceDoc, QueryUtil.ALL_POS,QueryUtil.ALL_POS); } + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>
<%=docPraticas.size()%> <% if (docPraticas.isEmpty()) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp index 0cab8ab1..d4b9cd7b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp @@ -115,13 +115,14 @@ } else { docPraticas = DocPraticaServiceUtil.getValidUntilClassPkByIntPratica(intPraticaId, classPk, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); } + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>

- +

<%=docPraticas.size()%>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp index 1c94c414..250fa5fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp @@ -140,10 +140,11 @@ <% for(String codiceDoc:tipologiaAllegati){ + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>
- +
<% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp index 4eafc1af..6139263c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp @@ -335,10 +335,11 @@ if (dettPratica == null) {
<% for (String codiceDoc:tipologiaAllegati) { + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>
- +
<% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp index 8fbdfb81..7c5164df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp @@ -142,10 +142,11 @@ <% for(String codiceDoc:tipologiaAllegati){ + String nomeAllegato = codiceDoc + " - " + LanguageUtil.get(pageContext, "label-documenti-tipologia-"+codiceDoc); %>
- +
<% From 95174b8cbf95ad78c0408cf6719a492a181c06d1 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Tue, 22 Jun 2021 14:19:30 +0200 Subject: [PATCH 4/7] colonna per import pratiche da SUE --- .../docroot/WEB-INF/service.xml | 3 ++ .../portos/bo/model/IntPraticaClp.java | 48 ++++++++++++++++++- .../portos/bo/model/IntPraticaModel.java | 21 ++++++++ .../portos/bo/model/IntPraticaSoap.java | 14 ++++++ .../portos/bo/model/IntPraticaWrapper.java | 37 ++++++++++++++ .../bo/search/IntPraticaAdvancedSearch.java | 6 +++ .../portos/bo/util/PortosIndexField.java | 3 ++ .../docroot/WEB-INF/sql/tables.sql | 3 +- .../WEB-INF/src/META-INF/portlet-hbm.xml | 1 + .../src/META-INF/portlet-model-hints.xml | 1 + .../WEB-INF/src/META-INF/portlet-orm.xml | 1 + .../bo/startup/DatabaseUpdateAction.java | 6 +++ .../portos/bo/indexer/IntPraticaIndexer.java | 1 + .../bo/model/impl/IntPraticaCacheModel.java | 8 +++- .../bo/model/impl/IntPraticaModelImpl.java | 43 +++++++++++++++-- .../IntPraticaPersistenceImpl.java | 1 + .../docroot/WEB-INF/src/service.properties | 4 +- 17 files changed, 191 insertions(+), 10 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index fc4ddca0..1fe643f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -966,6 +966,9 @@ mapping-key="intPraticaId" /> + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java index 0bf19e5d..4a154806 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java @@ -109,6 +109,7 @@ public class IntPraticaClp extends BaseModelImpl attributes.put("collaudoParziale", getCollaudoParziale()); attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); + attributes.put("inLavorazioneSue", getInLavorazioneSue()); return attributes; } @@ -305,6 +306,12 @@ public class IntPraticaClp extends BaseModelImpl if (controlloObbligatorio != null) { setControlloObbligatorio(controlloObbligatorio); } + + Boolean inLavorazioneSue = (Boolean)attributes.get("inLavorazioneSue"); + + if (inLavorazioneSue != null) { + setInLavorazioneSue(inLavorazioneSue); + } } @Override @@ -1089,6 +1096,35 @@ public class IntPraticaClp extends BaseModelImpl } } + @Override + public boolean getInLavorazioneSue() { + return _inLavorazioneSue; + } + + @Override + public boolean isInLavorazioneSue() { + return _inLavorazioneSue; + } + + @Override + public void setInLavorazioneSue(boolean inLavorazioneSue) { + _inLavorazioneSue = inLavorazioneSue; + + if (_intPraticaRemoteModel != null) { + try { + Class clazz = _intPraticaRemoteModel.getClass(); + + Method method = clazz.getMethod("setInLavorazioneSue", + boolean.class); + + method.invoke(_intPraticaRemoteModel, inLavorazioneSue); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + @Override public java.lang.String getTitle(java.util.Locale locale, boolean completed) { try { @@ -1273,6 +1309,7 @@ public class IntPraticaClp extends BaseModelImpl clone.setCollaudoParziale(getCollaudoParziale()); clone.setCollaudoTotale(getCollaudoTotale()); clone.setControlloObbligatorio(getControlloObbligatorio()); + clone.setInLavorazioneSue(getInLavorazioneSue()); return clone; } @@ -1325,7 +1362,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(65); sb.append("{uuid="); sb.append(getUuid()); @@ -1389,6 +1426,8 @@ public class IntPraticaClp extends BaseModelImpl sb.append(getCollaudoTotale()); sb.append(", controlloObbligatorio="); sb.append(getControlloObbligatorio()); + sb.append(", inLavorazioneSue="); + sb.append(getInLavorazioneSue()); sb.append("}"); return sb.toString(); @@ -1396,7 +1435,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(97); + StringBundler sb = new StringBundler(100); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -1526,6 +1565,10 @@ public class IntPraticaClp extends BaseModelImpl "controlloObbligatorio"); + sb.append( + "inLavorazioneSue"); sb.append(""); @@ -1565,6 +1608,7 @@ public class IntPraticaClp extends BaseModelImpl private boolean _collaudoParziale; private boolean _collaudoTotale; private boolean _controlloObbligatorio; + private boolean _inLavorazioneSue; private BaseModel _intPraticaRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java index 725b8e55..d2aef338 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java @@ -601,6 +601,27 @@ public interface IntPraticaModel extends BaseModel, */ public void setControlloObbligatorio(boolean controlloObbligatorio); + /** + * Returns the in lavorazione sue of this int pratica. + * + * @return the in lavorazione sue of this int pratica + */ + public boolean getInLavorazioneSue(); + + /** + * Returns true if this int pratica is in lavorazione sue. + * + * @return true if this int pratica is in lavorazione sue; false otherwise + */ + public boolean isInLavorazioneSue(); + + /** + * Sets whether this int pratica is in lavorazione sue. + * + * @param inLavorazioneSue the in lavorazione sue of this int pratica + */ + public void setInLavorazioneSue(boolean inLavorazioneSue); + @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java index 10ac7aa4..8328cd2d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java @@ -62,6 +62,7 @@ public class IntPraticaSoap implements Serializable { soapModel.setCollaudoParziale(model.getCollaudoParziale()); soapModel.setCollaudoTotale(model.getCollaudoTotale()); soapModel.setControlloObbligatorio(model.getControlloObbligatorio()); + soapModel.setInLavorazioneSue(model.getInLavorazioneSue()); return soapModel; } @@ -392,6 +393,18 @@ public class IntPraticaSoap implements Serializable { _controlloObbligatorio = controlloObbligatorio; } + public boolean getInLavorazioneSue() { + return _inLavorazioneSue; + } + + public boolean isInLavorazioneSue() { + return _inLavorazioneSue; + } + + public void setInLavorazioneSue(boolean inLavorazioneSue) { + _inLavorazioneSue = inLavorazioneSue; + } + private String _uuid; private long _intPraticaId; private long _companyId; @@ -423,4 +436,5 @@ public class IntPraticaSoap implements Serializable { private boolean _collaudoParziale; private boolean _collaudoTotale; private boolean _controlloObbligatorio; + private boolean _inLavorazioneSue; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java index f835c96d..edfa2f0c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java @@ -83,6 +83,7 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { attributes.put("collaudoParziale", getCollaudoParziale()); attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); + attributes.put("inLavorazioneSue", getInLavorazioneSue()); return attributes; } @@ -279,6 +280,12 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { if (controlloObbligatorio != null) { setControlloObbligatorio(controlloObbligatorio); } + + Boolean inLavorazioneSue = (Boolean)attributes.get("inLavorazioneSue"); + + if (inLavorazioneSue != null) { + setInLavorazioneSue(inLavorazioneSue); + } } /** @@ -1037,6 +1044,36 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { _intPratica.setControlloObbligatorio(controlloObbligatorio); } + /** + * Returns the in lavorazione sue of this int pratica. + * + * @return the in lavorazione sue of this int pratica + */ + @Override + public boolean getInLavorazioneSue() { + return _intPratica.getInLavorazioneSue(); + } + + /** + * Returns true if this int pratica is in lavorazione sue. + * + * @return true if this int pratica is in lavorazione sue; false otherwise + */ + @Override + public boolean isInLavorazioneSue() { + return _intPratica.isInLavorazioneSue(); + } + + /** + * Sets whether this int pratica is in lavorazione sue. + * + * @param inLavorazioneSue the in lavorazione sue of this int pratica + */ + @Override + public void setInLavorazioneSue(boolean inLavorazioneSue) { + _intPratica.setInLavorazioneSue(inLavorazioneSue); + } + @Override public boolean isNew() { return _intPratica.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java index aa40d107..3294a66f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java @@ -87,6 +87,9 @@ public class IntPraticaAdvancedSearch { termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "true"); booleanQuery.add(termQuery, BooleanClauseOccur.MUST); + + termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.IN_LAVORAZIONE_SUE, "false"); + booleanQuery.add(termQuery, BooleanClauseOccur.MUST); // Condizioni aggiuntive query(request, user, booleanQuery, searchContext); @@ -178,6 +181,9 @@ public class IntPraticaAdvancedSearch { termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.PRATICA_APERTA, "false"); booleanQuery.add(termQuery, BooleanClauseOccur.MUST); + + termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.IN_LAVORAZIONE_SUE, "false"); + booleanQuery.add(termQuery, BooleanClauseOccur.MUST); booleanQuery.add(altriProgettiBooleanQuery, BooleanClauseOccur.MUST); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java index c7aee5b6..3305c955 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java @@ -128,4 +128,7 @@ public class PortosIndexField implements Serializable { public static final String COMUNE = "comune"; public static final String TIPO_PROCEDURA = "tipoProcedura"; + + public static final String IN_LAVORAZIONE_SUE = "inLavorazioneSue"; + } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index ad93643e..af293b51 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -581,7 +581,8 @@ create table portos_bo_IntPratica ( fineLavoriTotale BOOLEAN, collaudoParziale BOOLEAN, collaudoTotale BOOLEAN, - controlloObbligatorio BOOLEAN + controlloObbligatorio BOOLEAN, + inLavorazioneSue BOOLEAN ); create table portos_bo_Pagamento ( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index 31ff78fe..efea0ee5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -611,6 +611,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index d7f1a324..402aef15 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -657,6 +657,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 7de4b8f4..f86e57b1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -786,6 +786,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java index 389a7ca7..56fe0880 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java @@ -128,6 +128,12 @@ public class DatabaseUpdateAction extends SimpleAction { s.executeUpdate("ALTER TABLE " + DelegaImpl.TABLE_NAME + " ADD COLUMN dichiarazioni TEXT NULL"); } + + if (!hasColumn(IntPraticaImpl.TABLE_NAME, "inLavorazioneSue")) { + _log.info("Aggiornamento a v4 di " + IntPraticaImpl.TABLE_NAME); + s.executeUpdate("ALTER TABLE " + IntPraticaImpl.TABLE_NAME + " ADD COLUMN inLavorazioneSue BOOL"); + } + } catch (SQLException e) { _log.error("Errore di accesso al database: ", e); throw new ActionException(e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java index 81eafb6f..940b9d85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java @@ -140,6 +140,7 @@ public class IntPraticaIndexer extends BaseIndexer { document.addNumberSortable(PortosIndexField.NUMERO_PROGETTO, Integer.valueOf(intPraticaFromDB.getNumeroProgetto())); } + document.addKeyword(PortosIndexField.IN_LAVORAZIONE_SUE, intPraticaFromDB.getInLavorazioneSue()); if (lastDettPratica != null) { document.addKeyword("nuovaCostruzione", lastDettPratica.getTcNuovaCostruzione()); document.addKeyword("adeguamentoSismico", lastDettPratica.getTcAdeguamentoSismico()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java index e10838b0..dc399fa9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java @@ -38,7 +38,7 @@ public class IntPraticaCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(65); sb.append("{uuid="); sb.append(uuid); @@ -102,6 +102,8 @@ public class IntPraticaCacheModel implements CacheModel, sb.append(collaudoTotale); sb.append(", controlloObbligatorio="); sb.append(controlloObbligatorio); + sb.append(", inLavorazioneSue="); + sb.append(inLavorazioneSue); sb.append("}"); return sb.toString(); @@ -239,6 +241,7 @@ public class IntPraticaCacheModel implements CacheModel, intPraticaImpl.setCollaudoParziale(collaudoParziale); intPraticaImpl.setCollaudoTotale(collaudoTotale); intPraticaImpl.setControlloObbligatorio(controlloObbligatorio); + intPraticaImpl.setInLavorazioneSue(inLavorazioneSue); intPraticaImpl.resetOriginalValues(); @@ -278,6 +281,7 @@ public class IntPraticaCacheModel implements CacheModel, collaudoParziale = objectInput.readBoolean(); collaudoTotale = objectInput.readBoolean(); controlloObbligatorio = objectInput.readBoolean(); + inLavorazioneSue = objectInput.readBoolean(); } @Override @@ -367,6 +371,7 @@ public class IntPraticaCacheModel implements CacheModel, objectOutput.writeBoolean(collaudoParziale); objectOutput.writeBoolean(collaudoTotale); objectOutput.writeBoolean(controlloObbligatorio); + objectOutput.writeBoolean(inLavorazioneSue); } public String uuid; @@ -400,4 +405,5 @@ public class IntPraticaCacheModel implements CacheModel, public boolean collaudoParziale; public boolean collaudoTotale; public boolean controlloObbligatorio; + public boolean inLavorazioneSue; } \ 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/model/impl/IntPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java index 930d5e0b..c7e77bf8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java @@ -97,9 +97,10 @@ public class IntPraticaModelImpl extends BaseModelImpl { "fineLavoriTotale", Types.BOOLEAN }, { "collaudoParziale", Types.BOOLEAN }, { "collaudoTotale", Types.BOOLEAN }, - { "controlloObbligatorio", Types.BOOLEAN } + { "controlloObbligatorio", Types.BOOLEAN }, + { "inLavorazioneSue", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,dtSorteggio DATE null,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,sospesa BOOLEAN,dtSospensione DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,dtSorteggio DATE null,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,sospesa BOOLEAN,dtSospensione DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN,inLavorazioneSue BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_IntPratica"; public static final String ORDER_BY_JPQL = " ORDER BY intPratica.intPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_IntPratica.intPraticaId ASC"; @@ -168,6 +169,7 @@ public class IntPraticaModelImpl extends BaseModelImpl model.setCollaudoParziale(soapModel.getCollaudoParziale()); model.setCollaudoTotale(soapModel.getCollaudoTotale()); model.setControlloObbligatorio(soapModel.getControlloObbligatorio()); + model.setInLavorazioneSue(soapModel.getInLavorazioneSue()); return model; } @@ -265,6 +267,7 @@ public class IntPraticaModelImpl extends BaseModelImpl attributes.put("collaudoParziale", getCollaudoParziale()); attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); + attributes.put("inLavorazioneSue", getInLavorazioneSue()); return attributes; } @@ -461,6 +464,12 @@ public class IntPraticaModelImpl extends BaseModelImpl if (controlloObbligatorio != null) { setControlloObbligatorio(controlloObbligatorio); } + + Boolean inLavorazioneSue = (Boolean)attributes.get("inLavorazioneSue"); + + if (inLavorazioneSue != null) { + setInLavorazioneSue(inLavorazioneSue); + } } @JSON @@ -980,6 +989,22 @@ public class IntPraticaModelImpl extends BaseModelImpl _controlloObbligatorio = controlloObbligatorio; } + @JSON + @Override + public boolean getInLavorazioneSue() { + return _inLavorazioneSue; + } + + @Override + public boolean isInLavorazioneSue() { + return _inLavorazioneSue; + } + + @Override + public void setInLavorazioneSue(boolean inLavorazioneSue) { + _inLavorazioneSue = inLavorazioneSue; + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -1048,6 +1073,7 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaImpl.setCollaudoParziale(getCollaudoParziale()); intPraticaImpl.setCollaudoTotale(getCollaudoTotale()); intPraticaImpl.setControlloObbligatorio(getControlloObbligatorio()); + intPraticaImpl.setInLavorazioneSue(getInLavorazioneSue()); intPraticaImpl.resetOriginalValues(); @@ -1292,12 +1318,14 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaCacheModel.controlloObbligatorio = getControlloObbligatorio(); + intPraticaCacheModel.inLavorazioneSue = getInLavorazioneSue(); + return intPraticaCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(65); sb.append("{uuid="); sb.append(getUuid()); @@ -1361,6 +1389,8 @@ public class IntPraticaModelImpl extends BaseModelImpl sb.append(getCollaudoTotale()); sb.append(", controlloObbligatorio="); sb.append(getControlloObbligatorio()); + sb.append(", inLavorazioneSue="); + sb.append(getInLavorazioneSue()); sb.append("}"); return sb.toString(); @@ -1368,7 +1398,7 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(97); + StringBundler sb = new StringBundler(100); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -1498,6 +1528,10 @@ public class IntPraticaModelImpl extends BaseModelImpl "controlloObbligatorio"); + sb.append( + "inLavorazioneSue"); sb.append(""); @@ -1553,6 +1587,7 @@ public class IntPraticaModelImpl extends BaseModelImpl private boolean _collaudoParziale; private boolean _collaudoTotale; private boolean _controlloObbligatorio; + private boolean _inLavorazioneSue; private long _columnBitmask; private IntPratica _escapedModel; } \ 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/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 97842225..0105606e 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 @@ -4417,6 +4417,7 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl intPraticaImpl.setCollaudoParziale(intPratica.isCollaudoParziale()); intPraticaImpl.setCollaudoTotale(intPratica.isCollaudoTotale()); intPraticaImpl.setControlloObbligatorio(intPratica.isControlloObbligatorio()); + intPraticaImpl.setInLavorazioneSue(intPratica.isInLavorazioneSue()); return intPraticaImpl; } 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 09876a12..bf192cf4 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=2653 - build.date=1624288952080 + build.number=2658 + build.date=1624364186440 build.auto.upgrade=true ## From 7aa77bc614a4ff8078415f8b32e053b25b29d384 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Wed, 23 Jun 2021 16:00:50 +0200 Subject: [PATCH 5/7] get itpi procedura --- .../bo/service/IntPraticaLocalService.java | 3 + .../bo/service/IntPraticaLocalServiceClp.java | 521 +++++++++-------- .../service/IntPraticaLocalServiceUtil.java | 4 + .../IntPraticaLocalServiceWrapper.java | 5 + .../WEB-INF/src/content/Portal.properties | 8 +- .../IntPraticaLocalServiceClpInvoker.java | 551 +++++++++--------- .../impl/IntPraticaLocalServiceImpl.java | 18 + .../docroot/WEB-INF/src/service.properties | 4 +- .../html/fascicolofe/edit_modal_fascicolo.jsp | 16 +- 9 files changed, 605 insertions(+), 525 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index e760256b..9604d96a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -317,6 +317,9 @@ public interface IntPraticaLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.util.Map getTipiProcedure(); + /** * Restituisce la lista di pratiche da sottoporre a sorteggio suddivisa per codice provincia. Modificata secondo il * D.D.G. 334/2020 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index fd178d6f..c239b9ee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -131,319 +131,323 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { _methodParameterTypes21 = new String[] { "java.lang.String" }; - _methodName23 = "findSorteggiabiliNew"; + _methodName23 = "getTipiProcedure"; - _methodParameterTypes23 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes23 = new String[] { }; - _methodName24 = "findSorteggiabili"; + _methodName24 = "findSorteggiabiliNew"; _methodParameterTypes24 = new String[] { "long", "java.util.Date" }; - _methodName25 = "addIntPratica"; + _methodName25 = "findSorteggiabili"; - _methodParameterTypes25 = new String[] { + _methodParameterTypes25 = new String[] { "long", "java.util.Date" }; + + _methodName26 = "addIntPratica"; + + _methodParameterTypes26 = new String[] { "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName26 = "addIntPratica"; + _methodName27 = "addIntPratica"; - _methodParameterTypes26 = new String[] { + _methodParameterTypes27 = new String[] { "long", "java.lang.String", "java.lang.String", "long", "java.lang.String", "java.util.Date", "java.lang.String", "java.lang.String", "boolean", "int", "java.util.Date", "com.liferay.portal.service.ServiceContext" }; - _methodName27 = "deleteIntPratica"; + _methodName28 = "deleteIntPratica"; - _methodParameterTypes27 = new String[] { + _methodParameterTypes28 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName28 = "cloneIntPratica"; + _methodName29 = "cloneIntPratica"; - _methodParameterTypes28 = new String[] { + _methodParameterTypes29 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName29 = "updateDelegati"; + _methodName30 = "updateDelegati"; - _methodParameterTypes29 = new String[] { + _methodParameterTypes30 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName30 = "findFascicoliNotProgetto"; + _methodName31 = "findFascicoliNotProgetto"; - _methodParameterTypes30 = new String[] { "int", "int" }; + _methodParameterTypes31 = new String[] { "int", "int" }; - _methodName31 = "countFascicoliNotProgetto"; + _methodName32 = "countFascicoliNotProgetto"; - _methodParameterTypes31 = new String[] { }; + _methodParameterTypes32 = new String[] { }; - _methodName32 = "addNumeroProgetto"; + _methodName33 = "addNumeroProgetto"; - _methodParameterTypes32 = new String[] { "long" }; + _methodParameterTypes33 = new String[] { "long" }; - _methodName33 = "sospendiPratica"; + _methodName34 = "sospendiPratica"; - _methodParameterTypes33 = new String[] { "long", "boolean" }; + _methodParameterTypes34 = new String[] { "long", "boolean" }; - _methodName34 = "cambiaTitolare"; + _methodName35 = "cambiaTitolare"; - _methodParameterTypes34 = new String[] { + _methodParameterTypes35 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName35 = "updateStatoPratica"; + _methodName36 = "updateStatoPratica"; - _methodParameterTypes35 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes36 = new String[] { "long", "java.lang.String" }; - _methodName36 = "updateIntPraticaSorteggio"; + _methodName37 = "updateIntPraticaSorteggio"; - _methodParameterTypes36 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes37 = new String[] { "long", "java.util.Date" }; - _methodName37 = "updateIntPraticaSorteggio"; + _methodName38 = "updateIntPraticaSorteggio"; - _methodParameterTypes37 = new String[] { + _methodParameterTypes38 = new String[] { "long", "java.util.Date", "java.lang.String" }; - _methodName38 = "findByC_UserId"; - - _methodParameterTypes38 = new String[] { "long", "long", "int", "int" }; + _methodName39 = "findByC_UserId"; - _methodName39 = "countByC_UserId"; + _methodParameterTypes39 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes39 = new String[] { "long", "long" }; + _methodName40 = "countByC_UserId"; - _methodName40 = "updateStatus"; + _methodParameterTypes40 = new String[] { "long", "long" }; - _methodParameterTypes40 = new String[] { "long", "int" }; + _methodName41 = "updateStatus"; - _methodName41 = "findByCompanyIdSoggettoProgetti"; + _methodParameterTypes41 = new String[] { "long", "int" }; - _methodParameterTypes41 = new String[] { "long", "long" }; - - _methodName42 = "countByCompanyIdSoggettoProgetti"; + _methodName42 = "findByCompanyIdSoggettoProgetti"; _methodParameterTypes42 = new String[] { "long", "long" }; - _methodName43 = "findByCompanyIdSoggettoArchivio"; + _methodName43 = "countByCompanyIdSoggettoProgetti"; _methodParameterTypes43 = new String[] { "long", "long" }; - _methodName44 = "countByCompanyIdSoggettoArchivio"; + _methodName44 = "findByCompanyIdSoggettoArchivio"; _methodParameterTypes44 = new String[] { "long", "long" }; - _methodName45 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName45 = "countByCompanyIdSoggettoArchivio"; + + _methodParameterTypes45 = new String[] { "long", "long" }; - _methodParameterTypes45 = new String[] { "long", "long", "int", "int" }; + _methodName46 = "findByCompanyIdSoggettoAltriProgetti"; - _methodName46 = "countByCompanyIdSoggettoAltriProgetti"; + _methodParameterTypes46 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes46 = new String[] { "long", "long" }; + _methodName47 = "countByCompanyIdSoggettoAltriProgetti"; - _methodName47 = "findByCanAddFineLavori"; + _methodParameterTypes47 = new String[] { "long", "long" }; - _methodParameterTypes47 = new String[] { + _methodName48 = "findByCanAddFineLavori"; + + _methodParameterTypes48 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName48 = "countByCanAddFineLavori"; + _methodName49 = "countByCanAddFineLavori"; - _methodParameterTypes48 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes49 = new String[] { "long", "java.lang.String" }; - _methodName49 = "findByCanAddCollaudo"; + _methodName50 = "findByCanAddCollaudo"; - _methodParameterTypes49 = new String[] { + _methodParameterTypes50 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName50 = "countByCanAddCollaudo"; + _methodName51 = "countByCanAddCollaudo"; - _methodParameterTypes50 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes51 = new String[] { "long", "java.lang.String" }; - _methodName51 = "search"; + _methodName52 = "search"; - _methodParameterTypes51 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes52 = new String[] { "java.util.List", "int", "int" }; - _methodName52 = "countSearch"; + _methodName53 = "countSearch"; - _methodParameterTypes52 = new String[] { "java.util.List" }; + _methodParameterTypes53 = new String[] { "java.util.List" }; - _methodName53 = "searchWithIntPraticaId"; + _methodName54 = "searchWithIntPraticaId"; - _methodParameterTypes53 = new String[] { + _methodParameterTypes54 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName54 = "countSearchWithIntPraticaId"; + _methodName55 = "countSearchWithIntPraticaId"; - _methodParameterTypes54 = new String[] { "java.util.List", "long" }; + _methodParameterTypes55 = new String[] { "java.util.List", "long" }; - _methodName55 = "allegaFileAnnullamento"; + _methodName56 = "allegaFileAnnullamento"; - _methodParameterTypes55 = new String[] { + _methodParameterTypes56 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName56 = "generateFileAnnullamento"; + _methodName57 = "generateFileAnnullamento"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes57 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName57 = "deleteFileAnnullamento"; + _methodName58 = "deleteFileAnnullamento"; - _methodParameterTypes57 = new String[] { "long" }; + _methodParameterTypes58 = new String[] { "long" }; - _methodName58 = "completeAnnullamento"; + _methodName59 = "completeAnnullamento"; - _methodParameterTypes58 = new String[] { "long" }; + _methodParameterTypes59 = new String[] { "long" }; - _methodName59 = "cambiaIstruttore"; + _methodName60 = "cambiaIstruttore"; - _methodParameterTypes59 = new String[] { "long", "long", "long" }; + _methodParameterTypes60 = new String[] { "long", "long", "long" }; - _methodName60 = "countCaricoLavoroCF"; + _methodName61 = "countCaricoLavoroCF"; - _methodParameterTypes60 = new String[] { + _methodParameterTypes61 = new String[] { "long", "java.lang.String", "java.lang.Boolean", "java.lang.Long[][]" }; - _methodName61 = "countCaricoLavoroIstruttore"; + _methodName62 = "countCaricoLavoroIstruttore"; - _methodParameterTypes61 = new String[] { + _methodParameterTypes62 = new String[] { "long", "java.lang.String", "java.lang.Boolean" }; - _methodName62 = "generateReportPratica"; + _methodName63 = "generateReportPratica"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes63 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName63 = "updateModifiedDate"; + _methodName64 = "updateModifiedDate"; - _methodParameterTypes63 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes64 = new String[] { "long", "java.util.Date" }; - _methodName64 = "countAutorizzazione"; + _methodName65 = "countAutorizzazione"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes65 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName65 = "countSanatorie"; + _methodName66 = "countSanatorie"; - _methodParameterTypes65 = new String[] { + _methodParameterTypes66 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName66 = "countOpereMinoreImportanza"; + _methodName67 = "countOpereMinoreImportanza"; - _methodParameterTypes66 = new String[] { + _methodParameterTypes67 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName67 = "countDeposito"; + _methodName68 = "countDeposito"; - _methodParameterTypes67 = new String[] { + _methodParameterTypes68 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName68 = "countVidimate"; + _methodName69 = "countVidimate"; - _methodParameterTypes68 = new String[] { + _methodParameterTypes69 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName69 = "countControllo"; + _methodName70 = "countControllo"; - _methodParameterTypes69 = new String[] { + _methodParameterTypes70 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName70 = "findIntPraticaNotExist"; + _methodName71 = "findIntPraticaNotExist"; - _methodParameterTypes70 = new String[] { }; + _methodParameterTypes71 = new String[] { }; - _methodName71 = "riparaWorkflow"; + _methodName72 = "riparaWorkflow"; - _methodParameterTypes71 = new String[] { }; + _methodParameterTypes72 = new String[] { }; - _methodName72 = "reIndexFascicolo"; + _methodName73 = "reIndexFascicolo"; - _methodParameterTypes72 = new String[] { + _methodParameterTypes73 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName73 = "reIndexFasciolo"; - - _methodParameterTypes73 = new String[] { "java.lang.String", "long" }; - _methodName74 = "reIndexFasciolo"; - _methodParameterTypes74 = new String[] { "long", "long" }; + _methodParameterTypes74 = new String[] { "java.lang.String", "long" }; - _methodName75 = "trovaDoppioni"; + _methodName75 = "reIndexFasciolo"; - _methodParameterTypes75 = new String[] { }; + _methodParameterTypes75 = new String[] { "long", "long" }; - _methodName76 = "findByNumeroProgetto"; + _methodName76 = "trovaDoppioni"; - _methodParameterTypes76 = new String[] { "java.lang.String" }; + _methodParameterTypes76 = new String[] { }; - _methodName77 = "findByTerritorioId"; + _methodName77 = "findByNumeroProgetto"; - _methodParameterTypes77 = new String[] { "long" }; + _methodParameterTypes77 = new String[] { "java.lang.String" }; - _methodName78 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName78 = "findByTerritorioId"; - _methodParameterTypes78 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" - }; + _methodParameterTypes78 = new String[] { "long" }; - _methodName79 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; + _methodName79 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; _methodParameterTypes79 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName80 = "reportPraticheVidimate"; + _methodName80 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; _methodParameterTypes80 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" + "java.util.Date", "java.util.Date", "long" }; - _methodName81 = "reportPraticheVidimateCalcolaDataSorteggio"; + _methodName81 = "reportPraticheVidimate"; _methodParameterTypes81 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName82 = "countIngressiAutorizzazioni"; + _methodName82 = "reportPraticheVidimateCalcolaDataSorteggio"; _methodParameterTypes82 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName83 = "countIngressiDepositi"; + _methodName83 = "countIngressiAutorizzazioni"; _methodParameterTypes83 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName84 = "countIngressiCO"; + _methodName84 = "countIngressiDepositi"; _methodParameterTypes84 = new String[] { "java.util.Date", "java.util.Date", "long" }; + + _methodName85 = "countIngressiCO"; + + _methodParameterTypes85 = new String[] { + "java.util.Date", "java.util.Date", "long" + }; } @Override @@ -1146,6 +1150,29 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throw new UnsupportedOperationException(); } + @Override + public java.util.Map getTipiProcedure() { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName23, + _methodParameterTypes23, new Object[] { }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.Map)ClpSerializer.translateOutput(returnObj); + } + @Override public java.util.Map> findSorteggiabiliNew( long companyId, java.util.Date dtSorteggio) @@ -1154,8 +1181,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName23, - _methodParameterTypes23, + returnObj = _invokableLocalService.invokeMethod(_methodName24, + _methodParameterTypes24, new Object[] { companyId, @@ -1193,8 +1220,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName24, - _methodParameterTypes24, + returnObj = _invokableLocalService.invokeMethod(_methodName25, + _methodParameterTypes25, new Object[] { companyId, @@ -1233,8 +1260,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName25, - _methodParameterTypes25, + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, new Object[] { territorioId, @@ -1279,8 +1306,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { userId, @@ -1338,8 +1365,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, new Object[] { ClpSerializer.translateInput(intPratica), @@ -1378,8 +1405,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { intPraticaId, @@ -1419,8 +1446,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { intPraticaId, @@ -1462,8 +1489,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1490,8 +1517,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1520,8 +1547,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1554,8 +1581,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { intPraticaId, sospesa }); } catch (Throwable t) { @@ -1590,8 +1617,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { intPraticaId, @@ -1631,8 +1658,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { intPraticaId, @@ -1669,8 +1696,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { intPraticaId, @@ -1704,8 +1731,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { intPraticaId, @@ -1740,8 +1767,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { companyId, userId, start, end }); } catch (Throwable t) { @@ -1769,8 +1796,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, new Object[] { companyId, userId }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { companyId, userId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1796,8 +1823,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, new Object[] { intPraticaId, status }); + _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { intPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1828,8 +1855,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1862,8 +1889,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1897,8 +1924,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1931,8 +1958,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1966,8 +1993,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { companyId, soggettoId, start, end }); } catch (Throwable t) { @@ -2001,8 +2028,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2036,8 +2063,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { companyId, @@ -2079,8 +2106,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { companyId, @@ -2118,8 +2145,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { companyId, @@ -2161,8 +2188,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { companyId, @@ -2199,8 +2226,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2234,8 +2261,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2264,8 +2291,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2302,8 +2329,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2340,8 +2367,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { intPraticaId, @@ -2391,8 +2418,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { intPraticaId, @@ -2431,8 +2458,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2461,8 +2488,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2491,8 +2518,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2525,8 +2552,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, + returnObj = _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { ispettoreId, @@ -2567,8 +2594,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { ispettoreId, @@ -2604,8 +2631,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2643,8 +2670,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { intPraticaId, @@ -2681,8 +2708,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2717,8 +2744,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2753,8 +2780,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2789,8 +2816,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2827,8 +2854,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2868,8 +2895,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2907,8 +2934,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2935,8 +2962,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2961,8 +2988,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica intPratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { ClpSerializer.translateInput(intPratica), companyId }); } catch (Throwable t) { @@ -2982,8 +3009,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFasciolo(java.lang.String numeroProgetto, long companyId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -3012,8 +3039,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, + _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -3043,8 +3070,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3072,8 +3099,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, + returnObj = _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -3102,8 +3129,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3132,8 +3159,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, + returnObj = _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3170,8 +3197,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName79, - _methodParameterTypes79, + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3207,8 +3234,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3245,8 +3272,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName81, - _methodParameterTypes81, + returnObj = _invokableLocalService.invokeMethod(_methodName82, + _methodParameterTypes82, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3281,8 +3308,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName82, - _methodParameterTypes82, + returnObj = _invokableLocalService.invokeMethod(_methodName83, + _methodParameterTypes83, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3317,8 +3344,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName83, - _methodParameterTypes83, + returnObj = _invokableLocalService.invokeMethod(_methodName84, + _methodParameterTypes84, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3353,8 +3380,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName84, - _methodParameterTypes84, + returnObj = _invokableLocalService.invokeMethod(_methodName85, + _methodParameterTypes85, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3551,4 +3578,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes83; private String _methodName84; private String[] _methodParameterTypes84; + private String _methodName85; + private String[] _methodParameterTypes85; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index 1dfdb9d9..980bf520 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -342,6 +342,10 @@ public class IntPraticaLocalServiceUtil { return getService().invokeMethod(name, parameterTypes, arguments); } + public static java.util.Map getTipiProcedure() { + return getService().getTipiProcedure(); + } + /** * Restituisce la lista di pratiche da sottoporre a sorteggio suddivisa per codice provincia. Modificata secondo il * D.D.G. 334/2020 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 75af5d7b..64046bab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -362,6 +362,11 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, arguments); } + @Override + public java.util.Map getTipiProcedure() { + return _intPraticaLocalService.getTipiProcedure(); + } + /** * Restituisce la lista di pratiche da sottoporre a sorteggio suddivisa per codice provincia. Modificata secondo il * D.D.G. 334/2020 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 b68c6e7b..daa5c245 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 @@ -1210,8 +1210,8 @@ stampa-fine-lavori=Stampa Fine Lavori stampa-collaudo=Stampa Collaudo tipo-procedura = Tipo di procedura -tipo-procedura-a = A - Interventi “rilevanti” da realizzare previo rilascio di autorizzazione ai sensi dell'art. 94 D.P.R. 380/01 D.D.G. 344/20 all. A - lettera A
A - varianti da realizzare su autorizzazione, per pratiche cartacee già acquisite dagli Uffici del Genio Civile -tipo-procedura-b = B - Interventi di “minore rilevanza” D.D.G. 344/20 all. A - lettera B -tipo-procedura-b1 = B1 - Interventi di “minore rilevanza” zone 1-2 ed interventi in abitati da consolidare, art.61 (zone 3-4) -tipo-procedura-c = C - Interventi “privi di rilevanza“ D.D.G. 344/20 all. A - lett. C +tipo-procedura-A = A - Interventi “rilevanti” da realizzare previo rilascio di autorizzazione ai sensi dell'art. 94 D.P.R. 380/01 D.D.G. 344/20 all. A - lettera A
A - varianti da realizzare su autorizzazione, per pratiche cartacee già acquisite dagli Uffici del Genio Civile +tipo-procedura-B = B - Interventi di “minore rilevanza” D.D.G. 344/20 all. A - lettera B +tipo-procedura-B1 = B1 - Interventi di “minore rilevanza” zone 1-2 ed interventi in abitati da consolidare, art.61 (zone 3-4) +tipo-procedura-C = C - Interventi “privi di rilevanza“ D.D.G. 344/20 all. A - lett. C diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java index d3e17876..1a21cc2c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java @@ -130,327 +130,331 @@ public class IntPraticaLocalServiceClpInvoker { _methodParameterTypes181 = new String[] { "java.lang.String" }; - _methodName186 = "findSorteggiabiliNew"; + _methodName187 = "getTipiProcedure"; - _methodParameterTypes186 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes187 = new String[] { }; - _methodName187 = "findSorteggiabili"; + _methodName188 = "findSorteggiabiliNew"; - _methodParameterTypes187 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes188 = new String[] { "long", "java.util.Date" }; - _methodName188 = "addIntPratica"; + _methodName189 = "findSorteggiabili"; - _methodParameterTypes188 = new String[] { + _methodParameterTypes189 = new String[] { "long", "java.util.Date" }; + + _methodName190 = "addIntPratica"; + + _methodParameterTypes190 = new String[] { "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName189 = "addIntPratica"; + _methodName191 = "addIntPratica"; - _methodParameterTypes189 = new String[] { + _methodParameterTypes191 = new String[] { "long", "java.lang.String", "java.lang.String", "long", "java.lang.String", "java.util.Date", "java.lang.String", "java.lang.String", "boolean", "int", "java.util.Date", "com.liferay.portal.service.ServiceContext" }; - _methodName190 = "deleteIntPratica"; + _methodName192 = "deleteIntPratica"; - _methodParameterTypes190 = new String[] { + _methodParameterTypes192 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName191 = "deleteIntPratica"; + _methodName193 = "deleteIntPratica"; - _methodParameterTypes191 = new String[] { + _methodParameterTypes193 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica" }; - _methodName192 = "cloneIntPratica"; + _methodName194 = "cloneIntPratica"; - _methodParameterTypes192 = new String[] { + _methodParameterTypes194 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName194 = "updateDelegati"; + _methodName196 = "updateDelegati"; - _methodParameterTypes194 = new String[] { + _methodParameterTypes196 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName195 = "fetchIntPratica"; + _methodName197 = "fetchIntPratica"; - _methodParameterTypes195 = new String[] { "long" }; + _methodParameterTypes197 = new String[] { "long" }; - _methodName196 = "findFascicoliNotProgetto"; + _methodName198 = "findFascicoliNotProgetto"; - _methodParameterTypes196 = new String[] { "int", "int" }; + _methodParameterTypes198 = new String[] { "int", "int" }; - _methodName197 = "countFascicoliNotProgetto"; + _methodName199 = "countFascicoliNotProgetto"; - _methodParameterTypes197 = new String[] { }; + _methodParameterTypes199 = new String[] { }; - _methodName199 = "addNumeroProgetto"; + _methodName201 = "addNumeroProgetto"; - _methodParameterTypes199 = new String[] { "long" }; + _methodParameterTypes201 = new String[] { "long" }; - _methodName201 = "sospendiPratica"; + _methodName203 = "sospendiPratica"; - _methodParameterTypes201 = new String[] { "long", "boolean" }; + _methodParameterTypes203 = new String[] { "long", "boolean" }; - _methodName202 = "cambiaTitolare"; + _methodName204 = "cambiaTitolare"; - _methodParameterTypes202 = new String[] { + _methodParameterTypes204 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName203 = "updateStatoPratica"; + _methodName205 = "updateStatoPratica"; - _methodParameterTypes203 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes205 = new String[] { "long", "java.lang.String" }; - _methodName204 = "updateIntPraticaSorteggio"; + _methodName206 = "updateIntPraticaSorteggio"; - _methodParameterTypes204 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes206 = new String[] { "long", "java.util.Date" }; - _methodName205 = "updateIntPraticaSorteggio"; + _methodName207 = "updateIntPraticaSorteggio"; - _methodParameterTypes205 = new String[] { + _methodParameterTypes207 = new String[] { "long", "java.util.Date", "java.lang.String" }; - _methodName206 = "findByC_UserId"; + _methodName208 = "findByC_UserId"; - _methodParameterTypes206 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes208 = new String[] { "long", "long", "int", "int" }; - _methodName207 = "countByC_UserId"; + _methodName209 = "countByC_UserId"; - _methodParameterTypes207 = new String[] { "long", "long" }; + _methodParameterTypes209 = new String[] { "long", "long" }; - _methodName208 = "updateStatus"; + _methodName210 = "updateStatus"; - _methodParameterTypes208 = new String[] { "long", "int" }; + _methodParameterTypes210 = new String[] { "long", "int" }; - _methodName209 = "findByCompanyIdSoggettoProgetti"; + _methodName211 = "findByCompanyIdSoggettoProgetti"; - _methodParameterTypes209 = new String[] { "long", "long" }; + _methodParameterTypes211 = new String[] { "long", "long" }; - _methodName210 = "countByCompanyIdSoggettoProgetti"; + _methodName212 = "countByCompanyIdSoggettoProgetti"; - _methodParameterTypes210 = new String[] { "long", "long" }; + _methodParameterTypes212 = new String[] { "long", "long" }; - _methodName212 = "findByCompanyIdSoggettoArchivio"; + _methodName214 = "findByCompanyIdSoggettoArchivio"; - _methodParameterTypes212 = new String[] { "long", "long" }; + _methodParameterTypes214 = new String[] { "long", "long" }; - _methodName213 = "countByCompanyIdSoggettoArchivio"; + _methodName215 = "countByCompanyIdSoggettoArchivio"; - _methodParameterTypes213 = new String[] { "long", "long" }; + _methodParameterTypes215 = new String[] { "long", "long" }; - _methodName215 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName217 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes215 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes217 = new String[] { "long", "long", "int", "int" }; - _methodName216 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName218 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes216 = new String[] { "long", "long" }; + _methodParameterTypes218 = new String[] { "long", "long" }; - _methodName218 = "findByCanAddFineLavori"; + _methodName220 = "findByCanAddFineLavori"; - _methodParameterTypes218 = new String[] { + _methodParameterTypes220 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName219 = "countByCanAddFineLavori"; + _methodName221 = "countByCanAddFineLavori"; - _methodParameterTypes219 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes221 = new String[] { "long", "java.lang.String" }; - _methodName221 = "findByCanAddCollaudo"; + _methodName223 = "findByCanAddCollaudo"; - _methodParameterTypes221 = new String[] { + _methodParameterTypes223 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName222 = "countByCanAddCollaudo"; + _methodName224 = "countByCanAddCollaudo"; - _methodParameterTypes222 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes224 = new String[] { "long", "java.lang.String" }; - _methodName223 = "search"; + _methodName225 = "search"; - _methodParameterTypes223 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes225 = new String[] { "java.util.List", "int", "int" }; - _methodName224 = "countSearch"; + _methodName226 = "countSearch"; - _methodParameterTypes224 = new String[] { "java.util.List" }; + _methodParameterTypes226 = new String[] { "java.util.List" }; - _methodName225 = "searchWithIntPraticaId"; + _methodName227 = "searchWithIntPraticaId"; - _methodParameterTypes225 = new String[] { + _methodParameterTypes227 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName226 = "countSearchWithIntPraticaId"; + _methodName228 = "countSearchWithIntPraticaId"; - _methodParameterTypes226 = new String[] { "java.util.List", "long" }; + _methodParameterTypes228 = new String[] { "java.util.List", "long" }; - _methodName227 = "allegaFileAnnullamento"; + _methodName229 = "allegaFileAnnullamento"; - _methodParameterTypes227 = new String[] { + _methodParameterTypes229 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName228 = "generateFileAnnullamento"; + _methodName230 = "generateFileAnnullamento"; - _methodParameterTypes228 = new String[] { + _methodParameterTypes230 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName229 = "deleteFileAnnullamento"; + _methodName231 = "deleteFileAnnullamento"; - _methodParameterTypes229 = new String[] { "long" }; + _methodParameterTypes231 = new String[] { "long" }; - _methodName230 = "completeAnnullamento"; + _methodName232 = "completeAnnullamento"; - _methodParameterTypes230 = new String[] { "long" }; + _methodParameterTypes232 = new String[] { "long" }; - _methodName231 = "cambiaIstruttore"; + _methodName233 = "cambiaIstruttore"; - _methodParameterTypes231 = new String[] { "long", "long", "long" }; + _methodParameterTypes233 = new String[] { "long", "long", "long" }; - _methodName232 = "countCaricoLavoroCF"; + _methodName234 = "countCaricoLavoroCF"; - _methodParameterTypes232 = new String[] { + _methodParameterTypes234 = new String[] { "long", "java.lang.String", "java.lang.Boolean", "java.lang.Long[][]" }; - _methodName233 = "countCaricoLavoroIstruttore"; + _methodName235 = "countCaricoLavoroIstruttore"; - _methodParameterTypes233 = new String[] { + _methodParameterTypes235 = new String[] { "long", "java.lang.String", "java.lang.Boolean" }; - _methodName234 = "generateReportPratica"; + _methodName236 = "generateReportPratica"; - _methodParameterTypes234 = new String[] { + _methodParameterTypes236 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName235 = "updateModifiedDate"; + _methodName237 = "updateModifiedDate"; - _methodParameterTypes235 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes237 = new String[] { "long", "java.util.Date" }; - _methodName236 = "countAutorizzazione"; + _methodName238 = "countAutorizzazione"; - _methodParameterTypes236 = new String[] { + _methodParameterTypes238 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName237 = "countSanatorie"; + _methodName239 = "countSanatorie"; - _methodParameterTypes237 = new String[] { + _methodParameterTypes239 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName238 = "countOpereMinoreImportanza"; + _methodName240 = "countOpereMinoreImportanza"; - _methodParameterTypes238 = new String[] { + _methodParameterTypes240 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName239 = "countDeposito"; + _methodName241 = "countDeposito"; - _methodParameterTypes239 = new String[] { + _methodParameterTypes241 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName240 = "countVidimate"; + _methodName242 = "countVidimate"; - _methodParameterTypes240 = new String[] { + _methodParameterTypes242 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName241 = "countControllo"; + _methodName243 = "countControllo"; - _methodParameterTypes241 = new String[] { + _methodParameterTypes243 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName242 = "findIntPraticaNotExist"; + _methodName244 = "findIntPraticaNotExist"; - _methodParameterTypes242 = new String[] { }; + _methodParameterTypes244 = new String[] { }; - _methodName243 = "riparaWorkflow"; + _methodName245 = "riparaWorkflow"; - _methodParameterTypes243 = new String[] { }; + _methodParameterTypes245 = new String[] { }; - _methodName244 = "reIndexFascicolo"; + _methodName246 = "reIndexFascicolo"; - _methodParameterTypes244 = new String[] { + _methodParameterTypes246 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName245 = "reIndexFasciolo"; + _methodName247 = "reIndexFasciolo"; - _methodParameterTypes245 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes247 = new String[] { "java.lang.String", "long" }; - _methodName246 = "reIndexFasciolo"; + _methodName248 = "reIndexFasciolo"; - _methodParameterTypes246 = new String[] { "long", "long" }; + _methodParameterTypes248 = new String[] { "long", "long" }; - _methodName247 = "trovaDoppioni"; + _methodName249 = "trovaDoppioni"; - _methodParameterTypes247 = new String[] { }; + _methodParameterTypes249 = new String[] { }; - _methodName248 = "findByNumeroProgetto"; + _methodName250 = "findByNumeroProgetto"; - _methodParameterTypes248 = new String[] { "java.lang.String" }; + _methodParameterTypes250 = new String[] { "java.lang.String" }; - _methodName249 = "findByTerritorioId"; + _methodName251 = "findByTerritorioId"; - _methodParameterTypes249 = new String[] { "long" }; + _methodParameterTypes251 = new String[] { "long" }; - _methodName250 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName252 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; - _methodParameterTypes250 = new String[] { + _methodParameterTypes252 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName251 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; + _methodName253 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; - _methodParameterTypes251 = new String[] { + _methodParameterTypes253 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName252 = "reportPraticheVidimate"; + _methodName254 = "reportPraticheVidimate"; - _methodParameterTypes252 = new String[] { + _methodParameterTypes254 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName253 = "reportPraticheVidimateCalcolaDataSorteggio"; + _methodName255 = "reportPraticheVidimateCalcolaDataSorteggio"; - _methodParameterTypes253 = new String[] { + _methodParameterTypes255 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName254 = "countIngressiAutorizzazioni"; + _methodName256 = "countIngressiAutorizzazioni"; - _methodParameterTypes254 = new String[] { + _methodParameterTypes256 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName255 = "countIngressiDepositi"; + _methodName257 = "countIngressiDepositi"; - _methodParameterTypes255 = new String[] { + _methodParameterTypes257 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName256 = "countIngressiCO"; + _methodName258 = "countIngressiCO"; - _methodParameterTypes256 = new String[] { + _methodParameterTypes258 = new String[] { "java.util.Date", "java.util.Date", "long" }; } @@ -580,27 +584,32 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName186.equals(name) && - Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { + if (_methodName187.equals(name) && + Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { + return IntPraticaLocalServiceUtil.getTipiProcedure(); + } + + if (_methodName188.equals(name) && + Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { return IntPraticaLocalServiceUtil.findSorteggiabiliNew(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName187.equals(name) && - Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { + if (_methodName189.equals(name) && + Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { return IntPraticaLocalServiceUtil.findSorteggiabili(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName188.equals(name) && - Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { + if (_methodName190.equals(name) && + Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { return IntPraticaLocalServiceUtil.addIntPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName189.equals(name) && - Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { + if (_methodName191.equals(name) && + Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { return IntPraticaLocalServiceUtil.addIntPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Long)arguments[3]).longValue(), @@ -612,226 +621,226 @@ public class IntPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[11]); } - if (_methodName190.equals(name) && - Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { + if (_methodName192.equals(name) && + Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Boolean)arguments[1]).booleanValue()); } - if (_methodName191.equals(name) && - Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { + if (_methodName193.equals(name) && + Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); } - if (_methodName192.equals(name) && - Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { + if (_methodName194.equals(name) && + Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { return IntPraticaLocalServiceUtil.cloneIntPratica(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName194.equals(name) && - Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { + if (_methodName196.equals(name) && + Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { return IntPraticaLocalServiceUtil.updateDelegati(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Boolean)arguments[3]).booleanValue()); } - if (_methodName195.equals(name) && - Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { return IntPraticaLocalServiceUtil.fetchIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName196.equals(name) && - Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { + if (_methodName198.equals(name) && + Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { return IntPraticaLocalServiceUtil.findFascicoliNotProgetto(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName197.equals(name) && - Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { - return IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); - } - if (_methodName199.equals(name) && Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { - return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue()); + return IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); } if (_methodName201.equals(name) && Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { + return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue()); + } + + if (_methodName203.equals(name) && + Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { return IntPraticaLocalServiceUtil.sospendiPratica(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName202.equals(name) && - Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { + if (_methodName204.equals(name) && + Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { return IntPraticaLocalServiceUtil.cambiaTitolare(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName203.equals(name) && - Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return IntPraticaLocalServiceUtil.updateStatoPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName204.equals(name) && - Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName205.equals(name) && - Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { + if (_methodName207.equals(name) && + Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1], (java.lang.String)arguments[2]); } - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { return IntPraticaLocalServiceUtil.findByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName207.equals(name) && - Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return IntPraticaLocalServiceUtil.countByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName210.equals(name) && + Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { IntPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); return null; } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName213.equals(name) && - Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { + if (_methodName215.equals(name) && + Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { return IntPraticaLocalServiceUtil.allegaFileAnnullamento(((Long)arguments[0]).longValue(), (byte[])arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (com.liferay.portal.service.ServiceContext)arguments[4]); } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName232.equals(name) && + Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -839,161 +848,161 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Boolean)arguments[2], (java.lang.Long[])arguments[3]); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Boolean)arguments[2]); } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName236.equals(name) && + Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName237.equals(name) && + Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName238.equals(name) && + Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName237.equals(name) && - Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { + if (_methodName239.equals(name) && + Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName238.equals(name) && - Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName239.equals(name) && - Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), ((Boolean)arguments[3]).booleanValue()); } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName242.equals(name) && + Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { return IntPraticaLocalServiceUtil.countVidimate((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3], ((Boolean)arguments[4]).booleanValue()); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { + if (_methodName243.equals(name) && + Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { return IntPraticaLocalServiceUtil.countControllo((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3], ((Boolean)arguments[4]).booleanValue()); } - if (_methodName242.equals(name) && - Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { + if (_methodName244.equals(name) && + Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { return IntPraticaLocalServiceUtil.findIntPraticaNotExist(); } - if (_methodName243.equals(name) && - Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { + if (_methodName245.equals(name) && + Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { return IntPraticaLocalServiceUtil.riparaWorkflow(); } - if (_methodName244.equals(name) && - Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { + if (_methodName246.equals(name) && + Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName245.equals(name) && - Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + if (_methodName247.equals(name) && + Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName246.equals(name) && - Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { + if (_methodName248.equals(name) && + Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); return null; } - if (_methodName247.equals(name) && - Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { + if (_methodName249.equals(name) && + Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { return IntPraticaLocalServiceUtil.trovaDoppioni(); } - if (_methodName248.equals(name) && - Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { + if (_methodName250.equals(name) && + Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } - if (_methodName249.equals(name) && - Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { + if (_methodName251.equals(name) && + Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } - if (_methodName250.equals(name) && - Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { + if (_methodName252.equals(name) && + Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); } - if (_methodName251.equals(name) && - Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { + if (_methodName253.equals(name) && + Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieCalcolaDataSorteggio((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName252.equals(name) && - Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { + if (_methodName254.equals(name) && + Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { return IntPraticaLocalServiceUtil.reportPraticheVidimate((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); } - if (_methodName253.equals(name) && - Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { + if (_methodName255.equals(name) && + Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { return IntPraticaLocalServiceUtil.reportPraticheVidimateCalcolaDataSorteggio((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName254.equals(name) && - Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { + if (_methodName256.equals(name) && + Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiAutorizzazioni((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName255.equals(name) && - Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { + if (_methodName257.equals(name) && + Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiDepositi((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName256.equals(name) && - Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { + if (_methodName258.equals(name) && + Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiCO((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } @@ -1045,8 +1054,6 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes180; private String _methodName181; private String[] _methodParameterTypes181; - private String _methodName186; - private String[] _methodParameterTypes186; private String _methodName187; private String[] _methodParameterTypes187; private String _methodName188; @@ -1059,20 +1066,20 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes191; private String _methodName192; private String[] _methodParameterTypes192; + private String _methodName193; + private String[] _methodParameterTypes193; private String _methodName194; private String[] _methodParameterTypes194; - private String _methodName195; - private String[] _methodParameterTypes195; private String _methodName196; private String[] _methodParameterTypes196; private String _methodName197; private String[] _methodParameterTypes197; + private String _methodName198; + private String[] _methodParameterTypes198; private String _methodName199; private String[] _methodParameterTypes199; private String _methodName201; private String[] _methodParameterTypes201; - private String _methodName202; - private String[] _methodParameterTypes202; private String _methodName203; private String[] _methodParameterTypes203; private String _methodName204; @@ -1089,22 +1096,22 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes209; private String _methodName210; private String[] _methodParameterTypes210; + private String _methodName211; + private String[] _methodParameterTypes211; private String _methodName212; private String[] _methodParameterTypes212; - private String _methodName213; - private String[] _methodParameterTypes213; + private String _methodName214; + private String[] _methodParameterTypes214; private String _methodName215; private String[] _methodParameterTypes215; - private String _methodName216; - private String[] _methodParameterTypes216; + private String _methodName217; + private String[] _methodParameterTypes217; private String _methodName218; private String[] _methodParameterTypes218; - private String _methodName219; - private String[] _methodParameterTypes219; + private String _methodName220; + private String[] _methodParameterTypes220; private String _methodName221; private String[] _methodParameterTypes221; - private String _methodName222; - private String[] _methodParameterTypes222; private String _methodName223; private String[] _methodParameterTypes223; private String _methodName224; @@ -1173,4 +1180,8 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes255; private String _methodName256; private String[] _methodParameterTypes256; + private String _methodName257; + private String[] _methodParameterTypes257; + private String _methodName258; + private String[] _methodParameterTypes258; } \ 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/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 801fabc3..d97e38f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -67,6 +67,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -135,6 +136,23 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { */ private static Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class); + + private static final Map tipiProcedure = new LinkedHashMap<>(); + static { + putTipoProcedura(Constants.PROCEDURA_A); + putTipoProcedura(Constants.PROCEDURA_B); + putTipoProcedura(Constants.PROCEDURA_C); + } + + private static void putTipoProcedura(String tipo) { + tipiProcedure.put(tipo, LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-procedura-" + tipo)); + } + + @Override + public Map getTipiProcedure() { + return tipiProcedure; + } + /** * Restituisce la lista di pratiche da sottoporre a sorteggio suddivisa per codice provincia. Modificata secondo il 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 bf192cf4..8a4df545 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=2658 - build.date=1624364186440 + build.number=2661 + build.date=1624456745283 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp index 0e889e6b..4f999def 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp @@ -1,3 +1,4 @@ +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/fascicolofe/init.jsp" %> <% String formName = ParamUtil.getString(request, "formName","fm"); %> @@ -25,11 +26,20 @@
- + <% + for (Entry procedura : IntPraticaLocalServiceUtil.getTipiProcedure() + .entrySet()) { + String tipo = procedura.getKey(); + String label = procedura.getValue(); + %> + - - + <% + } + %>
From d22339cfd780639b694181870cc3f8e24980e83c Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Thu, 24 Jun 2021 10:08:35 +0200 Subject: [PATCH 6/7] filtri tipo pratica --- .../ControlloPraticaAdvancedSearch.java | 5 +++- .../bo/search/IntPraticaAdvancedSearch.java | 11 +++++++++ .../portos/bo/indexer/IntPraticaIndexer.java | 7 ++++++ .../portos/bo/portlet/FascicoloPortlet.java | 8 +++---- .../docroot/WEB-INF/src/service.properties | 4 ++-- .../html/fascicolo/advanced_search.jsp | 13 +++++----- .../html/gestioneattivita/advanced_search.jsp | 24 +++++-------------- 7 files changed, 40 insertions(+), 32 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java index 9637aa1e..0f92a271 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java @@ -48,7 +48,7 @@ import com.liferay.portal.service.RoleLocalServiceUtil; public class ControlloPraticaAdvancedSearch { public static final String[] OVERRIDE_KEYWORDS = { "controlloPraticaId", "numeroProgetto", "tipoPratica", "statoPratica", "dataRichiesta", "committente", "soggettiInteressati", "status", "entryClassName", - "userId", "descIntervento" }; + "userId", "descIntervento", "tipoProcedura" }; public static final Format DATE_FORMAT_LUCENE = FastDateFormatFactoryUtil.getSimpleDateFormat("yyyyMMdd"); public static final DateFormat DATE_FORMAT_STRING = new SimpleDateFormat("dd/MM/yyyy"); @@ -518,6 +518,9 @@ public class ControlloPraticaAdvancedSearch { String tipoAttivita = ParamUtil.getString(request, "tipoAttivita"); String controlloObbligatorioSearch = ParamUtil.getString(request, "controlloObbligatorio"); String sorteggiataSearch = ParamUtil.getString(request, "sorteggiata"); + + _log.info(tipoProcedura); + try { if (Validator.isNotNull(tipoAttivita) && !tipoAttivita.equals("-1")) { TermQuery tipoAttivitaTermQuery = TermQueryFactoryUtil.create(searchContext, "workflowState", diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java index 3294a66f..8aa501d6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java @@ -376,6 +376,7 @@ public class IntPraticaAdvancedSearch { } queryStatoPratica(request, booleanQuery, searchContext); + queryTipoProcedura(request, booleanQuery, searchContext); addRequiredTerms(booleanQuery, PortosIndexField.COMMITTENTI, ParamUtil.getString(request, "committente")); @@ -615,6 +616,16 @@ public class IntPraticaAdvancedSearch { booleanQuery.add(termQuery, BooleanClauseOccur.MUST); } } + + private static void queryTipoProcedura(HttpServletRequest request, BooleanQuery booleanQuery, + SearchContext searchContext) throws ParseException { + String tipoProcedura = ParamUtil.getString(request, PortosIndexField.TIPO_PROCEDURA); + if (Validator.isNotNull(tipoProcedura)) { + TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PROCEDURA, tipoProcedura); + if (Validator.isNotNull(termQuery)) + booleanQuery.add(termQuery, BooleanClauseOccur.MUST); + } + } private static void logResults(User user, BooleanQuery booleanQuery, Hits hits) { if (_log.isDebugEnabled()) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java index 940b9d85..e41a5a40 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java @@ -16,6 +16,7 @@ import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.persistence.IntPraticaActionableDynamicQuery; +import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.PortosIndexField; @@ -162,6 +163,12 @@ public class IntPraticaIndexer extends BaseIndexer { boolean sorteggiata = SorteggioLocalServiceUtil.findByIntPratica(intPraticaFromDB.getIntPraticaId()) != null; document.addKeyword("sorteggiata", sorteggiata); document.addKeyword("controlloObbligatorio", intPraticaFromDB.isControlloObbligatorio()); + String tipoProcedura = intPratica.getTipoProcedura(); + if (Validator.isNotNull(tipoProcedura)) { + if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_B1)) + tipoProcedura = Constants.PROCEDURA_B; + document.addKeyword(PortosIndexField.TIPO_PROCEDURA, tipoProcedura); + } // Gestione pratica aperta/chiusa fine lavori if (intPraticaFromDB.getCollaudoTotale()) { document.addKeyword(PortosIndexField.PRATICA_APERTA, false); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index fdd7c042..15699fa2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -236,10 +236,10 @@ public class FascicoloPortlet extends MVCPortlet { } public void searchURL(ActionRequest actionRequest, ActionResponse actionResponse) { - String numeroProgetto = actionRequest.getParameter("numeroProgetto"); String protocollo = actionRequest.getParameter("protocollo"); - String tipoPratica = actionRequest.getParameter("tipoPratica"); + //String tipoPratica = actionRequest.getParameter("tipoPratica"); + String tipoProcedura = actionRequest.getParameter("tipoProcedura"); String statoPratica = actionRequest.getParameter("statoPratica"); String committente = actionRequest.getParameter("committente"); String descInterventoSearch = actionRequest.getParameter("descIntervento"); @@ -277,8 +277,8 @@ public class FascicoloPortlet extends MVCPortlet { actionResponse.setRenderParameter("praticaAperta", praticaAperta); actionResponse.setRenderParameter("descIntervento", descInterventoSearch); actionResponse.setRenderParameter("protocollo", protocollo); - actionResponse.setRenderParameter("tipoPratica", tipoPratica); - actionResponse.setRenderParameter("tipoPratica", tipoPratica); + //actionResponse.setRenderParameter("tipoPratica", tipoPratica); + actionResponse.setRenderParameter("tipoProcedura", tipoProcedura); actionResponse.setRenderParameter("statoPratica", statoPratica); actionResponse.setRenderParameter("committente", committente); if (Validator.isNotNull(provincia)) { 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 8a4df545..96f70be3 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=2661 - build.date=1624456745283 + build.number=2668 + build.date=1624463936907 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp index d29a4cb5..00b80b64 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp @@ -34,12 +34,11 @@
- - Seleziona il tipo di pratica - - - - + + Tutte + INTERVENTO A (Autorizzazione) + INTERVENTO B (Deposito) + INTERVENTO C (Privo di rilevanza)
@@ -57,7 +56,7 @@ - +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp index e47c3fcd..f537ff76 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/advanced_search.jsp @@ -23,13 +23,11 @@ List organizationList = OrganizationLocalServiceUtil.getUserOrgani
- - Seleziona il tipo di pratica - - - - - + + Tutte + INTERVENTO A (Autorizzazione) + INTERVENTO B (Deposito) + INTERVENTO C (Privo di rilevanza)
@@ -43,7 +41,7 @@ List organizationList = OrganizationLocalServiceUtil.getUserOrgani - + @@ -140,16 +138,6 @@ List organizationList = OrganizationLocalServiceUtil.getUserOrgani
- - Tutte - Procedura A - Procedura B - Procedura C - -
-
-
-
Tutte Assegnazione From 50d513a51f5e24e5d30af4f1deea0e5f97c37e48 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Thu, 24 Jun 2021 17:30:43 +0200 Subject: [PATCH 7/7] destinazione --- .../WEB-INF/src/content/Portal.properties | 114 +++++++++--------- .../docroot/WEB-INF/src/service.properties | 4 +- .../domanda/page_dettagli_principali.jsp | 90 +++++++------- 3 files changed, 104 insertions(+), 104 deletions(-) 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 daa5c245..9aad42fd 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 @@ -300,63 +300,63 @@ destinazione-uso-5 = INFRASTRU. o ALTRO STRAT. / RILEV (a4 a5 b4 b5) titolo-destinazione = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO III E IV -destinazione-A = A) EDIFICI DI INTERESSE STRATEGICO E OPERE INFRASTRUTTURALI - -destinazione-A1 = 1. Strutture Ospedaliere e sanitarie -destinazione-A1A = a) Ospedali, case di Cura e strutture funzionali primarie annesse -destinazione-A1B = b) Aziende sanitarie, presidi medici, poliambulatori ed altre strutture sanitarie, dotate di Pronto Soccorso o dipartimenti di emergenza, urgenza e accettazione -destinazione-A1C = c) Centrali operative 118 - -destinazione-A2 = 2. Strutture Civili -destinazione-A2A = a) Sedi istituzionali di enti pubblici -destinazione-A2B = b) sedi di Sale Operative per la gestione delle emergenze (COM, COC) -destinazione-A2C = c) centri funzionali di supporto alle attività di protezione civile -destinazione-A2D = d) Edifici ed opere individuate nei piani d'emergenza o in altre disposizioni per la gestione dell'emergenza - -destinazione-A3 = 3. Strutture Militari -destinazione-A3A = a) Caserme delle Forze Armate, dei Carabinieri, della Pubblica Sicurezza, dei Vigili del Fuoco, della Guardia di Finanza, del Corpo Forestale dello Stato - -destinazione-A4 = 4. Infrastrutture -destinazione-A4A = a) Centrali Elettriche di importanza primaria -destinazione-A4B = b) Strutture primarie per le telecomunicazioni (radio, televisioni, telefonia fissa e portatile, ponti radio della rete nazionale) -destinazione-A4C = c) Vie di comunicazione (strade, ferrovie) ed opere d'arte annesse, limitatamente a quelle strategiche individuate nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza -destinazione-A4D = d) Porti, aeroporti ed eliporti individuati nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza -destinazione-A4E = e) Strutture primarie connesse con la produzione, il trasporto e la distribuzione di materiali combustibili (oleodotti,gasdotti) -destinazione-A4F = f) Strutture primarie connesse con il funzionamento di acquedotti locali - -destinazione-A5 = 5. Altre strutture e infrastrutture specificate nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza. -destinazione-A5A = altre infrastrutture - -destinazione-B = B) EDIFICI E OPERE INFRASTRUTTURALI RILEVANTI - -destinazione-B1 = 1. Strutture per l'Istruzione sia pubbliche che private -destinazione-B1A = a) Scuole di ogni ordine e grado, comprese le strutture funzionali primarie annesse -destinazione-B1B = b) Palestre annesse agli edifici scolastici -destinazione-B1C = c) Sedi universitarie, accademie, conservatori e relative strutture gestionali e di coordinamento - -destinazione-B2 = 2. Strutture Civili -destinazione-B2A = a) Uffici amministrativi degli enti pubblici -destinazione-B2B = b) Uffici con notevole accesso al pubblico (uffici postali e bancari principali, centri civici, centri per convegni, mense) -destinazione-B2C = c) Edifici con elevato contenuto artistico e/o patrimoniale (musei, biblioteche) -destinazione-B2D = d) Edifici per il culto con superficie utile > 200 mq -destinazione-B2E = e) Sale per lo spettacolo, teatri, cinema, sale da ballo, con capienza utile > 100 persone -destinazione-B2F = f) Edifici adibiti ad attivitàsportive o ad esse funzionali e destinati al pubblico, con capienza utile > 100 persone (Stadi, tribune, palazzetti dello sport) -destinazione-B2G = g) Grandi magazzini di vendita, mercati coperti, centri commerciali con superficie di vendita > 2500 mq -destinazione-B2H = h) Edifici con destinazione residenziale con cubatura > 5.000 mc ed altezza > 25 m -destinazione-B2I = i) Edifici con destinazione alberghiera con capacità ricettiva > 50 persone -destinazione-B2J = j) Strutture sanitarie o socioassistenziali con ospiti non autosufficienti (ospizi, orfanotrofi) - -destinazione-B3 = 3. Strutture Industriali -destinazione-B3A = a) Edifici industriali ove sia prevista una presenza contemporanea media > 200 addetti -destinazione-B3B = b) Edifici industriali nei quali avvengono lavorazioni di materie insalubri o pericolose - -destinazione-B4 = 4. Infrastrutture -destinazione-B4A = a) Vie di comunicazione (strade, ferrovie, banchine portuali, piste aeroportuali , funivie) ed opere d'arte annesse, il collasso delle quali può determinare gravi conseguenze in termini di perdite di vite umane, ovvero interruzioni prolungate del traffico -destinazione-B4B = b) Opere di ritenuta (dighe) con volume di acqua invasato > 50000 mc o altezza dello sbarramento > 5 m -destinazione-B4C = c) Impianti primari di depurazione - -destinazione-B5 = 5. Altre strutture e infrastrutture individuate nei piani di emergenza o in altre disposizioni di protezione civile -destinazione-B5A = altre infrastrutture +destinazione-A = EDIFICI DI INTERESSE STRATEGICO E OPERE INFRASTRUTTURALI + +destinazione-A1 = Strutture Ospedaliere e sanitarie +destinazione-A1A = Ospedali, case di Cura e strutture funzionali primarie annesse +destinazione-A1B = Aziende sanitarie, presidi medici, poliambulatori ed altre strutture sanitarie, dotate di Pronto Soccorso o dipartimenti di emergenza, urgenza e accettazione +destinazione-A1C = Centrali operative 118 + +destinazione-A2 = Strutture Civili +destinazione-A2A = Sedi istituzionali di enti pubblici +destinazione-A2B = Sedi di Sale Operative per la gestione delle emergenze (COM, COC) +destinazione-A2C = Centri funzionali di supporto alle attività di protezione civile +destinazione-A2D = Edifici ed opere individuate nei piani d'emergenza o in altre disposizioni per la gestione dell'emergenza + +destinazione-A3 = Strutture Militari +destinazione-A3A = Caserme delle Forze Armate, dei Carabinieri, della Pubblica Sicurezza, dei Vigili del Fuoco, della Guardia di Finanza, del Corpo Forestale dello Stato + +destinazione-A4 = Infrastrutture +destinazione-A4A = Centrali Elettriche di importanza primaria +destinazione-A4B = Strutture primarie per le telecomunicazioni (radio, televisioni, telefonia fissa e portatile, ponti radio della rete nazionale) +destinazione-A4C = Vie di comunicazione (strade, ferrovie) ed opere d'arte annesse, limitatamente a quelle strategiche individuate nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza +destinazione-A4D = Porti, aeroporti ed eliporti individuati nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza +destinazione-A4E = Strutture primarie connesse con la produzione, il trasporto e la distribuzione di materiali combustibili (oleodotti,gasdotti) +destinazione-A4F = Strutture primarie connesse con il funzionamento di acquedotti locali + +destinazione-A5 = Altre strutture e infrastrutture specificate nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza. +destinazione-A5A = Altre infrastrutture + +destinazione-B = EDIFICI E OPERE INFRASTRUTTURALI RILEVANTI + +destinazione-B1 = Strutture per l'Istruzione sia pubbliche che private +destinazione-B1A = Scuole di ogni ordine e grado, comprese le strutture funzionali primarie annesse +destinazione-B1B = Palestre annesse agli edifici scolastici +destinazione-B1C = Sedi universitarie, accademie, conservatori e relative strutture gestionali e di coordinamento + +destinazione-B2 = Strutture Civili +destinazione-B2A = Uffici amministrativi degli enti pubblici +destinazione-B2B = Uffici con notevole accesso al pubblico (uffici postali e bancari principali, centri civici, centri per convegni, mense) +destinazione-B2C = Edifici con elevato contenuto artistico e/o patrimoniale (musei, biblioteche) +destinazione-B2D = Edifici per il culto con superficie utile > 200 mq +destinazione-B2E = Sale per lo spettacolo, teatri, cinema, sale da ballo, con capienza utile > 100 persone +destinazione-B2F = Edifici adibiti ad attivitàsportive o ad esse funzionali e destinati al pubblico, con capienza utile > 100 persone (Stadi, tribune, palazzetti dello sport) +destinazione-B2G = Grandi magazzini di vendita, mercati coperti, centri commerciali con superficie di vendita > 2500 mq +destinazione-B2H = Edifici con destinazione residenziale con cubatura > 5.000 mc ed altezza > 25 m +destinazione-B2I = Edifici con destinazione alberghiera con capacità ricettiva > 50 persone +destinazione-B2J = Strutture sanitarie o socioassistenziali con ospiti non autosufficienti (ospizi, orfanotrofi) + +destinazione-B3 = Strutture Industriali +destinazione-B3A = Edifici industriali ove sia prevista una presenza contemporanea media > 200 addetti +destinazione-B3B = Edifici industriali nei quali avvengono lavorazioni di materie insalubri o pericolose + +destinazione-B4 = Infrastrutture +destinazione-B4A = Vie di comunicazione (strade, ferrovie, banchine portuali, piste aeroportuali , funivie) ed opere d'arte annesse, il collasso delle quali può determinare gravi conseguenze in termini di perdite di vite umane, ovvero interruzioni prolungate del traffico +destinazione-B4B = Opere di ritenuta (dighe) con volume di acqua invasato > 50000 mc o altezza dello sbarramento > 5 m +destinazione-B4C = Impianti primari di depurazione + +destinazione-B5 = Altre strutture e infrastrutture individuate nei piani di emergenza o in altre disposizioni di protezione civile +destinazione-B5A = Altre infrastrutture ## SISTEMI COSTRUTTIVI E NORME DI RIFERIMENTO ## dp-sc = Sistemi Costruttivi 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 96f70be3..9fe376b1 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=2668 - build.date=1624463936907 + build.number=2672 + build.date=1624548328001 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index 1eb289dc..fcbb1a7d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -577,62 +577,62 @@ String displayStyle = proceduraC ? "display:none" : "";
-

<%=LanguageUtil.get(pageContext, "destinazione-A")%>

+

A. <%=LanguageUtil.get(pageContext, "destinazione-A")%>

 

-

<%=LanguageUtil.get(pageContext, "destinazione-A1")%>

+

1. <%=LanguageUtil.get(pageContext, "destinazione-A1")%>

+ name="destinazione" value="A1A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A1A") %>' /> + name="destinazione" value="A1B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A1B") %>' /> + name="destinazione" value="A1C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A1C") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-A2")%>

+

2. <%=LanguageUtil.get(pageContext, "destinazione-A2")%>

 

+ name="destinazione" value="A2A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A2A") %>' /> + name="destinazione" value="A2B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A2B") %>' /> + name="destinazione" value="A2C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A1C") %>' /> + name="destinazione" value="A2D" label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-A2D") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-A3")%>

+

3. <%=LanguageUtil.get(pageContext, "destinazione-A3")%>

 

+ name="destinazione" value="A3A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A3A") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-A4")%>

+

4. <%=LanguageUtil.get(pageContext, "destinazione-A4")%>

 

+ name="destinazione" value="A4A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A4A") %>' /> + name="destinazione" value="A4B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A4B") %>' /> + name="destinazione" value="A4C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A4C") %>' /> + name="destinazione" value="A4D" label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-A4D") %>' /> + name="destinazione" value="A4E" label='<%= "e) " + LanguageUtil.get(pageContext, "destinazione-A4E") %>' /> + name="destinazione" value="A4F" label='<%= "f) " + LanguageUtil.get(pageContext, "destinazione-A4F") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-A5")%>

+

5. <%=LanguageUtil.get(pageContext, "destinazione-A5")%>

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B")%>

+

B) <%=LanguageUtil.get(pageContext, "destinazione-B")%>

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B1")%>

+

1. <%=LanguageUtil.get(pageContext, "destinazione-B1")%>

+ name="destinazione" value="B1A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B1A") %>' /> + name="destinazione" value="B1B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B1B") %>' /> + name="destinazione" value="B1C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B1C") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B2")%>

+

2. <%=LanguageUtil.get(pageContext, "destinazione-B2")%>

 

+ name="destinazione" value="B2A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B2A") %>' /> + name="destinazione" value="B2B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B2B") %>' /> + name="destinazione" value="B2C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B2C") %>' /> + name="destinazione" value="B2D" label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-B2D") %>' /> + name="destinazione" value="B2E" label='<%= "e) " + LanguageUtil.get(pageContext, "destinazione-B2E") %>' /> + name="destinazione" value="B2F" label='<%= "f) " + LanguageUtil.get(pageContext, "destinazione-B2F") %>' /> + name="destinazione" value="B2G" label='<%= "g) " + LanguageUtil.get(pageContext, "destinazione-B2G") %>' /> + name="destinazione" value="B2H" label='<%= "h) " + LanguageUtil.get(pageContext, "destinazione-B2H") %>' /> + name="destinazione" value="B2I" label='<%= "i) " + LanguageUtil.get(pageContext, "destinazione-B2I") %>' /> + name="destinazione" value="B2J" label='<%= "j) " + LanguageUtil.get(pageContext, "destinazione-B2J") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B3")%>

+

3. <%=LanguageUtil.get(pageContext, "destinazione-B3")%>

 

+ name="destinazione" value="B3A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B3A") %>' /> + name="destinazione" value="B3B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B3B") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B4")%>

+

4. <%=LanguageUtil.get(pageContext, "destinazione-B4")%>

 

+ name="destinazione" value="B4A" label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B4A") %>' /> + name="destinazione" value="B4B" label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B4B") %>' /> + name="destinazione" value="B4C" label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B4C") %>' />

 

-

<%=LanguageUtil.get(pageContext, "destinazione-B5")%>

+

5. <%=LanguageUtil.get(pageContext, "destinazione-B5")%>

 

+ name="destinazione" value="B5A" label='<%= LanguageUtil.get(pageContext, "destinazione-B5A") %>' />