diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java index e724022f..f17c66c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java @@ -207,8 +207,8 @@ public class SchedulerInvioDocumento implements MessageListener { .getControlloPratica(controlloPraticaId); gestioneTempistica(avviso, controlloPratica); } catch (Exception e) { - _log.info(e.getMessage() + ", avviso " + avviso.getAvvisoId() + ", controlloPratica " - + avviso.getControlloPraticaId()); + _log.info("Avviso " + avviso.getAvvisoId() + ", controlloPratica " + + avviso.getControlloPraticaId() + ", messaggio: " + e.getMessage()); _log.debug("Error", e); } } @@ -256,12 +256,12 @@ public class SchedulerInvioDocumento implements MessageListener { if (avviso.getClassName().equals(DettPratica.class.getName())) { dettPratica = DettPraticaLocalServiceUtil.getDettPratica(avviso.getClassPk()); switch (dettPratica.getTipoIntegrazione()) { - case TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE: - case TipoIntegrazioneUtil.VARIANTE: - case TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO: - tipoAllegato += LanguageUtil.get(LocaleUtil.ITALIAN, - "label-integrazione-" + dettPratica.getTipoIntegrazione()); - break; + case TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE: + case TipoIntegrazioneUtil.VARIANTE: + case TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO: + tipoAllegato += LanguageUtil.get(LocaleUtil.ITALIAN, + "label-integrazione-" + dettPratica.getTipoIntegrazione()); + break; } } else { dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(avviso.getIntPraticaId()); @@ -445,8 +445,10 @@ public class SchedulerInvioDocumento implements MessageListener { Avviso avvisoExtra = null; List documentiVid = AvvisoLocalServiceUtil.findByIntPraticaId_tipoDocumento(intPraticaId, StatoPraticaConstants.VIDIMATA); - avvisoExtra = documentiVid.get(0); - dtInvio = avvisoExtra.getDtInvio(); + if (documentiVid.size() > 0) { + avvisoExtra = documentiVid.get(0); + dtInvio = avvisoExtra.getDtInvio(); + } Date now = new Date(); // FIX come sopra if (avvisoExtra != null) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 666b097f..0e0676d4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -497,7 +497,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi if (jsonSanatoria == null) { JSONArray esito = JSONFactoryUtil.createJSONArray(); esito.put(etichettaEsito(StatoPraticaConstants.CONFORME)); - esito.put(etichettaEsito("Perizia sanzione", StatoPraticaConstants.INTEGRAZIONE, true)); + esito.put(etichettaEsito("Decreto sanzione", StatoPraticaConstants.INTEGRAZIONE, true)); esito.put(etichettaEsito(StatoPraticaConstants.NON_CONFORME)); esito.put(etichettaEsito(StatoPraticaConstants.INTEGRAZIONE)); esito.put(etichettaEsito(StatoPraticaConstants.PREAVVISO_CONTRARIO)); 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 392af44e..0ef33164 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index d0f1112c..f9489e0d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index 9852406f..0ddea23d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index a676849e..1c9ee855 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index 691776e7..b5054e85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index b88225f1..b8d76564 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66d67c23..4a0e9a11 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 0cc84b84..7c1fa3f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index bbf7e7de..a2090464 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index ad2251be..714c3621 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 91ed3905..13626ed5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index d521d3f1..3e71e802 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 908947c5..e2a7716d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index b1f93960..7b45230e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index f6fb9408..5bd3b3e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index fa8c2ebd..fc11289b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index fc1c8fd4..2e01f399 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index e20dcc6f..28c40f09 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 98681e47..bbf346c5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 14d6996c..4aec658e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index e900e479..d91be1f6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index ecea7d65..c41df113 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 18e017b1..66665f3e 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=3308 - build.date=1630678547546 + build.number=3310 + build.date=1631007735211 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp index 8746e27e..115375fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp @@ -102,7 +102,7 @@ boolean nullable = (dt == null);
<% String toImport = "toImport"; -long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); //ADT: bug BO ID=6 stampa varianti in BO long groupId=GroupLocalServiceUtil.getGroup(intPratica.getCompanyId(), "Portos").getGroupId(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp index d79ba8d3..5d34b887 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp @@ -36,7 +36,7 @@ - + @@ -173,7 +173,7 @@ - +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp index 04984be2..bc33cf08 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp @@ -1,209 +1,190 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeDetail"%> +<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%> -<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil"%> -<%@page import="java.text.DateFormat"%> -<%@page import="javax.swing.text.html.parser.DocumentParser"%> <%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> - -<%@page import="java.util.List"%> -<%@page import="java.util.ArrayList"%> -<%@page import="java.util.Comparator"%> -<%@page import="java.util.Collections"%> -<%@page import="javax.portlet.PortletURL"%> - - -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> <%@page import="java.util.ArrayList"%> -<%@page import="java.io.Serializable"%> -<%@page import="javax.portlet.PortletURL"%> -<%@page import="java.util.LinkedHashMap"%> -<%@page import="java.util.Map.Entry"%> - <%@include file="/html/fascicolo/init.jsp"%> - - -

- +

<% - - DettPratica dettPratica = (DettPratica)request.getAttribute("bean.dettPratica.lastData"); - HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(request); - if(dettPratica==null){ - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); - if(dettPraticaId==0){ - dettPraticaId = GetterUtil.getLong( httpServletRequest.getParameter("dettPraticaId")); - } - dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); +DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica.lastData"); +HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(request); +if (dettPratica == null) { + long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); + if (dettPraticaId == 0) { + dettPraticaId = GetterUtil.getLong(httpServletRequest.getParameter("dettPraticaId")); } - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - - String tipologiaAllegato = DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO; - - List docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(dettPratica.getIntPraticaId(), tipologiaAllegato, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); +} +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); +String tipologiaAllegato = DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO; +List docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(dettPratica.getIntPraticaId(), + tipologiaAllegato, QueryUtil.ALL_POS, QueryUtil.ALL_POS); %> - -
-
- -
- <% - if(!docPraticas.isEmpty()){ +
+
+
+ <% + if (!docPraticas.isEmpty()) { %> - - - +
+ + - + - <% - for(DocPratica docPratica:docPraticas){ - long docPraticaId = docPratica.getDocPraticaId(); - %> - - - - + + + - - - - - <% + %> + + <%= firme.numeroFirme() %> + + <% + } else { + %> + + <% + } + %> + + + + + + <% } - %> - + %> +
STATO ALLEGATO FIRME AGGIUNTO DA INVALIDATO DA AZIONI
- - - <%= docPratica.getFileName() %> - - <% - FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); - StringBuilder title = new StringBuilder(); - if(firme.numeroFirme()>0){ - List cfCheck = new ArrayList(); - if(!firme.getFirmeDigitali().isEmpty()){ - title.append("Firma sul file:
    "); - for(FirmeDetail firma: firme.getFirmeDigitali()){ - List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(docPratica.getIntPraticaId(), firma.getCfFirmatario()); - if (soggetti.size() > 0 ){ - title.append("
  • "+soggetti.get(0).getNome() + " " + soggetti.get(0).getCognome()+"
    • "); + <% + for (DocPratica docPratica:docPraticas) { + long docPraticaId = docPratica.getDocPraticaId(); + %> +
+ + + <%= docPratica.getFileName() %> + + <% + FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); + StringBuilder title = new StringBuilder(); + if (firme.numeroFirme() > 0) { + List cfCheck = new ArrayList(); + if (!firme.getFirmeDigitali().isEmpty()) { + title.append("Firma sul file:
    "); + for (FirmeDetail firma: firme.getFirmeDigitali()) { + List soggetti = SoggettoLocalServiceUtil + .findByIntPratica_CodiceFiscale(docPratica.getIntPraticaId(), + firma.getCfFirmatario()); + if (soggetti.size() > 0) { + title.append("
  • ").append(soggetti.get(0).getNome()) + .append(StringPool.SPACE) + .append(soggetti.get(0).getCognome()).append("
    • "); + } + title.append("
  • ").append(firma.getCfFirmatario()); + cfCheck.add(firma.getCfFirmatario().trim()); + if (Validator.isNotNull(firma.getDtFirma())) { + title.append(" del ") + .append(dateFormatDate.format(firma.getDtFirma())); + } + title.append("
    • "); + } + title.append("
"); } - title.append("
  • "+firma.getCfFirmatario()); - cfCheck.add(firma.getCfFirmatario().trim()); - if(Validator.isNotNull(firma.getDtFirma())){ - title.append(" del "+dateFormatDate.format(firma.getDtFirma())); - } - title.append("
    • "); - } - title.append(""); - } - if(!firme.getFirmeApplicativo().isEmpty()){ - title.append("Firme da applicativo:
      "); - for(FirmeDetail firma: firme.getFirmeApplicativo()){ - List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(docPratica.getIntPraticaId(), firma.getCfFirmatario()); - if (soggetti.size() > 0 ){ - title.append("
    • "+soggetti.get(0).getNome() + " " + soggetti.get(0).getCognome()+"
      • "); + if (!firme.getFirmeApplicativo().isEmpty()) { + title.append("Firme da applicativo:
        "); + for (FirmeDetail firma: firme.getFirmeApplicativo()) { + List soggetti = SoggettoLocalServiceUtil + .findByIntPratica_CodiceFiscale(docPratica.getIntPraticaId(), + firma.getCfFirmatario()); + if (soggetti.size() > 0) { + title.append("
      • ").append(soggetti.get(0).getNome()) + .append(StringPool.SPACE) + .append(soggetti.get(0).getCognome()).append("
        • "); + } + title.append("
      • ").append(firma.getCfFirmatario()); + if (Validator.isNotNull(firma.getDtFirma())) { + title.append(" del ") + .append(dateFormatDate.format(firma.getDtFirma())); + } + title.append("
        • "); + } + title.append("
      "); } - title.append("
    • "+firma.getCfFirmatario()); - if(Validator.isNotNull(firma.getDtFirma())){ - title.append(" del "+dateFormatDate.format(firma.getDtFirma())); - } - title.append("
      • "); - } - title.append("
    "); - } - } - if(firme.numeroFirme()>0){ - %> - - <%=firme.numeroFirme() %> - - <% - }else{ - %> - - <% - } - %> -     		- <% - String description = StringPool.BLANK; - - if(DettPratica.class.getName().equalsIgnoreCase(docPratica.getClassName())){ - DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()); - if(adding!=null){ - //description = Validator.isNotNull(adding.getTipoIntegrazione()) ? LanguageUtil.get(pageContext, "label-integrazione-"+adding.getTipoIntegrazione())+" del "+adding.getDataEffettuazione() : "" ; - description = adding.getFullDescription(); - } - }else if(FineLavori.class.getName().equalsIgnoreCase(docPratica.getClassName())){ - FineLavori adding = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica.getClassPk()); - if(adding!=null){ - description = adding.getFullDescription() ; - } - }else if(Collaudo.class.getName().equalsIgnoreCase(docPratica.getClassName())){ - Collaudo adding = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk()); - if(adding!=null){ - description = adding.getFullDescription() ; - } - } - - out.print(description); - %> - - <% - //Lasciato solo dettpratica perche' fine lavori e collaudo non possono rimuovere gli allegati - DettPratica removing = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getDettPraticaIdRimozione()); - if(removing != null){ - %> - <%= removing.getFullDescription() %> - <% - } - %> - - - - - - - - - - -
    + <% + if (DettPratica.class.getName().equalsIgnoreCase(docPratica.getClassName())) { + DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica + .getClassPk()); + if (adding!=null) { + out.print(adding.getFullDescription()); + } + } else if (FineLavori.class.getName().equalsIgnoreCase(docPratica + .getClassName())) { + FineLavori adding = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica + .getClassPk()); + if (adding!=null) { + out.print(adding.getFullDescription()); + } + } else if (Collaudo.class.getName().equalsIgnoreCase(docPratica.getClassName())) { + Collaudo adding = CollaudoLocalServiceUtil.fetchCollaudo(docPratica + .getClassPk()); + if (adding!=null) { + out.print(adding.getFullDescription()); + } + } + %> + + <% + // Lasciato solo dettpratica perche' fine lavori e collaudo non possono rimuovere + // gli allegati + DettPratica removing = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica + .getDettPraticaIdRimozione()); + if (removing != null) { + out.print(removing.getFullDescription()); + } + %> + + + + + + + + + +
    <% - } + } %> -
    -<% - -%> +
    \ No newline at end of file +YUI().use('aui-tooltip', function(Y) { + new Y.TooltipDelegate({ + trigger: '.allegati-tipologia-table .tooltip-info', + position: 'top', + cssClass: 'tooltip-help', + html: true, + opacity: 1, + }); +}); + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_andamento.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_andamento.jsp index 45d450f3..582dd2b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_andamento.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_andamento.jsp @@ -1,44 +1,16 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.model.DLFileEntry"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> -<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Avviso"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayPortletMode"%> -<%@page import="javax.portlet.PortletRequest"%> -<%@page import="javax.portlet.PortletURL"%> -<%@page import="com.liferay.portlet.PortletURLFactoryUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.CronostoriaUtil"%> -<%@page import="java.util.Comparator"%> -<%@page import="java.util.Collections"%> -<%@page import="java.util.Date"%> -<%@page import="it.tref.liferay.portos.bo.shared.bean.CronostoriaBean"%> -<%@page import="java.util.ArrayList"%> - <%@ include file="/html/fascicolo/init.jsp" %> - <% - int start = ParamUtil.getInteger(request, "start" ,QueryUtil.ALL_POS); - int end = ParamUtil.getInteger(request, "end" ,QueryUtil.ALL_POS); - boolean header = ParamUtil.getBoolean(request,"header" , true); - - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); +int start = ParamUtil.getInteger(request, "start" , QueryUtil.ALL_POS); +int end = ParamUtil.getInteger(request, "end" , QueryUtil.ALL_POS); +boolean header = ParamUtil.getBoolean(request, "header", true); +IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica"); %> - - -

    + + +

    - - - - - \ No newline at end of file + + +     diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp index 8c7d4759..89c6be86 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp @@ -1,52 +1,23 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.Constants"%> -<%@page import="com.liferay.portal.kernel.log.LogFactoryUtil"%> -<%@page import="com.liferay.portal.kernel.log.Log"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> -<%@page import="com.liferay.portal.model.User"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> -<%@page import="com.liferay.portal.kernel.search.IndexerRegistryUtil"%> -<%@page import="com.liferay.portal.kernel.search.Indexer"%> <%@page import="com.liferay.portal.kernel.search.Document"%> <%@page import="com.liferay.portal.kernel.search.Hits"%> +<%@page import="com.liferay.portal.kernel.search.Indexer"%> +<%@page import="com.liferay.portal.kernel.search.IndexerRegistryUtil"%> +<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%> +<%@page import="com.liferay.portal.model.User"%> +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.search.IntPraticaAdvancedSearch"%> -<%@page import="com.liferay.portal.service.ServiceContext"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.ProtocollazioneUtil"%> -<%@page import="com.liferay.portal.kernel.json.JSONFactoryUtil"%> -<%@page import="com.liferay.portal.kernel.json.JSONSerializer"%> -<%@page import="java.io.IOException"%> -<%@page import="com.liferay.portal.kernel.util.HttpUtil"%> -<%@page import="com.liferay.portal.kernel.util.ContentTypes"%> -<%@page import="com.liferay.portal.kernel.util.Http.Body"%> -<%@page import="java.util.Map"%> -<%@page import="java.util.HashMap"%> -<%@page import="com.liferay.portal.kernel.util.Http.Options"%> -<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> - -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> +<%@page import="it.tref.liferay.portos.bo.util.Constants"%> +<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="java.util.ArrayList"%> - -<%@page import="java.io.Serializable"%> <%@page import="javax.portlet.PortletURL"%> -<%@page import="java.util.LinkedHashMap"%> -<%@page import="java.util.Map.Entry"%> -<%@page import="java.util.Collections"%> -<%@page import="java.util.Date" %> - -<%@ include file="/html/fascicolo/init.jsp" %> - - - +<%@include file="/html/fascicolo/init.jsp"%> + <% - //GESTIONE RICERCA CON PAGINATORE SEARCH CONTAINER String numeroProgettoSearch = ParamUtil.getString(request, "numeroProgetto"); String protocolloSearch = ParamUtil.getString(request, "protocollo"); @@ -67,10 +38,7 @@ String tipoIntervento = ParamUtil.getString(request, "tipoIntervento", StringPoo String indirizzo = ParamUtil.getString(request, "indirizzo"); String ordinaPer = ParamUtil.getString(request, "ordinaPer", StringPool.BLANK); String ordinaTipo = ParamUtil.getString(request, "ordinaTipo", StringPool.BLANK); - - boolean doSearch = true; - PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); iteratorURL.setParameter("numeroProgetto", numeroProgettoSearch); iteratorURL.setParameter("protocollo", protocolloSearch); @@ -91,122 +59,98 @@ iteratorURL.setParameter("praticaAperta", praticaAperta); iteratorURL.setParameter("indirizzo", indirizzo); iteratorURL.setParameter("ordinaPer", ordinaPer); iteratorURL.setParameter("ordinaTipo", ordinaTipo); - String orderByType = ParamUtil.getString(request, "orderByType", "asc"); String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); String keywords = StringPool.BLANK; - %> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
    - + - - + + -
    - +
    - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - -
    +
    - +
    - - + <% - List listaIntPratica = new ArrayList(); - Hits hits = IntPraticaAdvancedSearch.searchProgettiBO(request, user, searchContainer.getStart(), searchContainer.getEnd()); - - for (Document doc : hits.toList()) { - - String intPraticaId = doc.get("intPraticaId"); - if (Validator.isNotNull(intPraticaId)) { - - IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(GetterUtil.getLong(intPraticaId)); - if (Validator.isNotNull(intPratica)) { - listaIntPratica.add(intPratica); - }else{ - Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); - indexer.delete(company.getCompanyId(), doc.getUID()); - } - } - - } - - searchContainer.setTotal(hits.getLength()); + List listaIntPratica = new ArrayList(); + Hits hits = IntPraticaAdvancedSearch.searchProgettiBO(request, user, searchContainer.getStart(), searchContainer.getEnd()); + for (Document doc : hits.toList()) { + String intPraticaId = doc.get("intPraticaId"); + if (Validator.isNotNull(intPraticaId)) { + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(GetterUtil.getLong(intPraticaId)); + if (Validator.isNotNull(intPratica)) { + listaIntPratica.add(intPratica); + } else { + Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); + indexer.delete(company.getCompanyId(), doc.getUID()); + } + } + } + searchContainer.setTotal(hits.getLength()); %> - - - - + + <% - long intPraticaId = intPratica.getIntPraticaId(); - DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); - Log _log = LogFactoryUtil.getLog("fascicolo_view_jsp"); - if (lastDettPratica == null) { - _log.info("intPraticaId=" + intPraticaId + ", lastDettPratica null"); - } + long intPraticaId = intPratica.getIntPraticaId(); + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); %> - + -
    @@ -214,106 +158,111 @@ String keywords = StringPool.BLANK; - - - - <%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE %> - + + + <%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE %> + - - - - + + + +
    - <%= intPratica.getTitle(locale,true) %> + <%= intPratica.getTitle(locale, true) %> - - <% - Soggetto titolare = null; - User titolareUser = null; + + <% + Soggetto titolare = null; + User titolareUser = null; if(lastDettPratica != null) { - titolareUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); - /*List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(lastDettPratica.getIntPraticaId(), lastDettPratica.getCodiceFiscaleDelegatoCommittente()); - if(titolari != null && !titolari.isEmpty()){ - titolare = titolari.get(0); - }*/ - } + titolareUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); + } %> <%= titolareUser.getFirstName() %>
    <%= titolareUser.getLastName() %>     - - <% + + <% StringBuilder builder = new StringBuilder(); - if (lastDettPratica != null) { - List committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(lastDettPratica.getIntPraticaId(), TipoSoggettoUtil.COMMITTENTE); - for(Soggetto committente : committenti){ - builder.append(committente.getTitle()+"
    "+committente.getCodiceFiscale()) - .append(StringPool.COMMA_AND_SPACE).append("

    "); + List committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto( + lastDettPratica.getIntPraticaId(), TipoSoggettoUtil.COMMITTENTE); + for (Soggetto committente : committenti) { + if (builder.length() > 0) { + builder.append(",

    "); + } + builder.append(committente.getTitle()).append("
    ").append(committente.getCodiceFiscale()); } - if(builder.length()>0) - builder.setLength(builder.length()-12); - out.print(builder.toString()); } %>     - - + + <% - User istruttore = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); - if(istruttore!=null){ - out.print(istruttore.getFullName()); - }else{ - out.print( "["+intPratica.getStatusByUserId()+"]"); - } + User istruttore = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); + if (istruttore!=null) { + out.print(istruttore.getFullName()); + } else { + out.print(StringPool.OPEN_BRACKET); + out.print(intPratica.getStatusByUserId()); + out.print(StringPool.CLOSE_BRACKET); + } %> - - - <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getTipoProcedura())) %> + + <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica + .getStatoPratica(), intPratica.getTipoProcedura())) %> - <% - List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, OrderByComparatorFactoryUtil.create("portos_bo_Avviso", "createDate", false)); - StringBuilder sb = new StringBuilder(); - if(!avvisi.isEmpty()){ - sb.append("
      "); - for(Avviso avviso : avvisi){ - String tipoDocumento = avviso.translateTipoDocumento(); - String testoEvento =LanguageUtil.get(pageContext, tipoDocumento); - sb.append("
    • "+testoEvento+"
      • "); - } - sb.append("
    "); + List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, OrderByComparatorFactoryUtil.create("portos_bo_Avviso", "createDate", + false)); + StringBuilder sb = new StringBuilder(); + if (!avvisi.isEmpty()) { + sb.append("
      "); + for (Avviso avviso : avvisi) { + String tipoDocumento = avviso.translateTipoDocumento(); + String testoEvento = LanguageUtil.get(pageContext, tipoDocumento); + sb.append("
    • ").append(testoEvento).append("
      • "); + } + sb.append("
    "); %> - + - "> + "> - <%= avvisi.size() %> - + <%= avvisi.size() %> + <% - } - %> - <% - int variantiCount = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); - int integrazioniCount = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + } + int variantiCount = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica( + intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); + int integrazioniCount = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica( + intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); %> @@ -332,14 +281,15 @@ String keywords = StringPool.BLANK; - - + + P - + T @@ -363,43 +313,37 @@ String keywords = StringPool.BLANK; - +     - - - <% - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(themeDisplay.getCompanyId(), comune.getCodiceProvincia()); - + + <% + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(themeDisplay.getCompanyId(), comune + .getCodiceProvincia()); %> - - Territorio: <%= comune.getDenominazione() %> <%= (lastDettPratica == null || lastDettPratica.getLocalita().isEmpty()) ? "" : "(Loc. "+lastDettPratica.getLocalita()+" ) " %>- <%= provincia.getProvincia() %>
    - Localizzazione: <%= lastDettPratica == null ? "" : lastDettPratica.getVia() %>
    - <%= LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %>

    - <%= lastDettPratica == null ? "" : lastDettPratica.getDescLongIntervento() %> - + Territorio: <%= comune.getDenominazione() %> + <%= (lastDettPratica == null || lastDettPratica.getLocalita().isEmpty()) ? StringPool.BLANK + : "(Loc. "+lastDettPratica.getLocalita()+" ) " %>- <%= provincia.getProvincia() %>
    + Localizzazione: <%= lastDettPratica == null ? StringPool.BLANK + : lastDettPratica.getVia() %>
    + <%= LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %> +

    + <%= lastDettPratica == null ? StringPool.BLANK : lastDettPratica.getDescLongIntervento() %>     -     - - +     - \ No newline at end of file +YUI().use('aui-tooltip', function(Y) { + new Y.TooltipDelegate({ + trigger: '.tooltip-info', + position: 'top', + cssClass: 'tooltip-help', + html: true, + opacity: 1, + }); +}); + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/view.jsp index bd73132f..068966ec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/view.jsp @@ -10,7 +10,7 @@ String[] tabs = StringUtil.split(tabNames); %>
    - + <%-- ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV delle firme --%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp index 7597c874..e9d699a3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp @@ -90,7 +90,7 @@ String contentFormId = "pagamentoFormContent_"+index; String formNameBollettino = "fmPagamenti_"+index; %> - + - + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/storico/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/storico/view.jsp index 6fd42c5d..814d25f9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/storico/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/storico/view.jsp @@ -46,5 +46,5 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/input_date_time.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/input_date_time.jsp index 8e345fc6..79066374 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/input_date_time.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/input_date_time.jsp @@ -104,7 +104,7 @@ String customValidator = ParamUtil.getString(request, "customValidator", "");
    - <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> -<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="java.util.Calendar"%> -<%@ include file="/html/fascicolofe/init.jsp" %> - +<%@include file="/html/fascicolofe/init.jsp"%> <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - - String dialogId = ParamUtil.getString(request, "dialogId"); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); +String dialogId = ParamUtil.getString(request, "dialogId"); %> - - - - - - + + + + + - - - + + - - - - + + + - - +
    -
    +
    - +
    -
    +
    -
    -
    +
    <% - Soggetto titolareDigitale = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(intPraticaId, user.getScreenName()).get(0); + Soggetto titolareDigitale = SoggettoLocalServiceUtil + .getValidByIntPratica_CodiceFiscale(intPraticaId, user.getScreenName()) + .get(0); %> - +
    - + -
    @@ -73,110 +60,82 @@
    - -<%-- - - - - - - - -
    -
    -
    -
    - -
    -
    -
    - <% - Soggetto titolareDigitale = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(intPraticaId, user.getScreenName()).get(0); - %> - -
    -
    - - - -
    -     -
    -
    -
    -
    --%> - - A.one("#appSignCheckbox").on('change', function(event){ - var checked = event.currentTarget.get('checked'); - if(checked){ - A.one("#signButton").removeClass('disabled').set('disabled', false); - }else{ - A.one("#signButton").addClass('disabled').set('disabled', true); - } - }); - - <%--     --%> + + A.one("#appSignCheckbox").on('change', function (event) { + var checked = event.currentTarget.get('checked'); + if (checked) { + A.one("#signButton").removeClass('disabled').set('disabled', false); + } else { + A.one("#signButton").addClass('disabled').set('disabled', true); + } + }); + - - - - + + - - - - + + + - - +
    -
    +
    - +
    -
    - -
    +
    -
    +
    - + label='<%= MessageFormat.format(LanguageUtil.get(pageContext, + "label.conferma-annullamento"), user.getFullName(), + intPratica.getTitle(true)) %>'/>

    File Annullamento

    <% - DocPratica docAnnullamento = DocPraticaLocalServiceUtil.getDocPratica(intPratica.getDocPraticaAnnullamentoId()); + DocPratica docAnnullamento = DocPraticaLocalServiceUtil.getDocPratica( + intPratica.getDocPraticaAnnullamentoId()); %> - <%-- <%= fileEntry.getTitle() %> --%> <%= docAnnullamento.getDescLong() %> - - + <% - String downloadUrl = docAnnullamento.getDownloadUrl(themeDisplay); + String downloadUrl = docAnnullamento.getDownloadUrl(themeDisplay); %>
    - +
    - - + +
    - +
    - + A.one('<%="#"+renderResponse.getNamespace()+"delete_"+intPratica.getDocPraticaAnnullamentoId() %>').on( 'click', function(event) { @@ -199,16 +158,15 @@ } ); -
    -
    +
    - +
    @@ -220,33 +178,28 @@
    -
    +
    <%= MessageFormat.format(LanguageUtil.get(pageContext, "label.annullamento-ok"), intPratica.getTitle(true)) %>
    -
    +
    - +
    @@ -254,19 +207,9 @@ -Liferay.provide( - window, - 'closePopup', - function() { - - Liferay.fire( - 'closeWindow', - { - - id: '<%= dialogId %>' - } - ); - }, - ['aui-base','liferay-util-window'] -); +Liferay.provide(window, 'closePopup', function () { + Liferay.fire('closeWindow', { + id: '<%= dialogId %>' + }); +}, ['aui-base','liferay-util-window']); \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp index bee2007a..7c77a13f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp @@ -1,7 +1,7 @@ -<%@page import="it.tref.liferay.portos.bo.util.PortosIndexField"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> +<%@page import="it.tref.liferay.portos.bo.util.PortosIndexField"%> <%@include file="/html/fascicolofe/init.jsp"%> - <%@page import="it.tref.liferay.portos.bo.model.Delega"%> <%@ include file="/html/fascicolofe/init.jsp" %> - <% -ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); -Delega delega = (Delega)row.getObject(); - -String backUrl = (String)request.getAttribute("back"); +ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); +Delega delega = (Delega) row.getObject(); +String backUrl = (String) request.getAttribute("back"); %> - - - - - + + - + - + - + - - - - + + + - + - + - - + Nessuna azione disponibile - \ No newline at end of file +YUI().use('aui-tooltip', function (Y) { + new Y.TooltipDelegate({ + trigger: '.tooltip-info', + position: 'top', + cssClass: 'tooltip-help', + html: true, + opacity: 1, + }); +}); + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_collaudo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_collaudo.jsp index 29823d3f..01c9811c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_collaudo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_collaudo.jsp @@ -93,14 +93,14 @@ %>
    - + - + - +
    @@ -301,7 +301,7 @@ - +
    @@ -324,7 +324,7 @@ - +
    @@ -347,7 +347,7 @@ - +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp index 65290a5e..5c2db859 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp @@ -1,292 +1,230 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.HttpUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="it.tref.liferay.portos.bo.model.Delega"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%> - <%@ include file="/html/fascicolofe/init.jsp" %> - <% - - String backURL = ParamUtil.getString(request, "backURL"); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId",0l); - long intPraticaId = ParamUtil.getLong(request, "intPraticaId",0l); - String current_tab = ParamUtil.getString(request, "current_tab",StringPool.BLANK); - - boolean openVerifyUrl = ParamUtil.getBoolean(request, "openVerifyUrl"); - String verifyArea = ParamUtil.getString(request, "verifyArea", StringPool.BLANK); - DettPratica dettPratica = null; - IntPratica intPratica = null; - if(dettPraticaId!=0l){ - dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - intPraticaId = dettPratica.getIntPraticaId(); - }else{ - intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); - if(dettPratica==null){ - dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); - } - dettPraticaId = dettPratica.getDettPraticaId(); +String backURL = ParamUtil.getString(request, "backURL"); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0); +String current_tab = ParamUtil.getString(request, "current_tab", StringPool.BLANK); +boolean openVerifyUrl = ParamUtil.getBoolean(request, "openVerifyUrl"); +String verifyArea = ParamUtil.getString(request, "verifyArea", StringPool.BLANK); +DettPratica dettPratica = null; +IntPratica intPratica = null; +if (dettPraticaId != 0) { + dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); + intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + intPraticaId = dettPratica.getIntPraticaId(); +} else { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); + if (dettPratica == null) { + dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); } - - request.setAttribute("bean.dettPratica", dettPratica); - - String tipoIntegrazione = dettPratica.getTipoIntegrazione(); - request.setAttribute("bean.tipoIntegrazione", tipoIntegrazione); - - boolean disabledInput = !DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(),dettPratica.getDettPraticaId()); - boolean geoDisabledInput = !DelegheUtil.hasDelegaCompilazioneSezioneGeologica(user.getUserId(),dettPratica.getDettPraticaId()) - || !ValidazionePraticaUtil.praticaIsEditable(dettPratica.getDettPraticaId()); - - String[] pageDatiDomanda = new String[] {"page_dettagli_principali", "page_soggetti", "page_desc_edificio", - "page_geologica", "page_allegati", "page_asseverazioni_riepilogo"}; - - if(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione)){ - pageDatiDomanda = Arrays.copyOf(pageDatiDomanda, pageDatiDomanda.length-1); - } - - String[][] categorySections = {pageDatiDomanda}; - - String[] _CATEGORY_NAMES = {"cat_dati_domanda"}; - - + dettPraticaId = dettPratica.getDettPraticaId(); +} +request.setAttribute("bean.dettPratica", dettPratica); +String tipoIntegrazione = dettPratica.getTipoIntegrazione(); +request.setAttribute("bean.tipoIntegrazione", tipoIntegrazione); +boolean disabledInput = !DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(), dettPratica.getDettPraticaId()); +boolean geoDisabledInput = !DelegheUtil.hasDelegaCompilazioneSezioneGeologica(user.getUserId(), dettPratica + .getDettPraticaId()) || !ValidazionePraticaUtil.praticaIsEditable(dettPratica.getDettPraticaId()); +String[] pageDatiDomanda = new String[] { "page_dettagli_principali", "page_soggetti", "page_desc_edificio", + "page_geologica", "page_allegati", "page_asseverazioni_riepilogo" }; +if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione)) { + pageDatiDomanda = Arrays.copyOf(pageDatiDomanda, pageDatiDomanda.length-1); +} +String[][] categorySections = { pageDatiDomanda }; +String[] _CATEGORY_NAMES = { "cat_dati_domanda" }; %> - - - - + + + + - - - - + + + + - - - - - - + + + <%@include file="/html/fascicolofe/navigator/common/html_top.jspf"%> + + + <%@include file="/html/fascicolofe/navigator/common/html_top_pagamento.jspf"%> + + + + + <%@include file="/html/fascicolofe/navigator/common/html_bottom.jspf"%> + + + + - + - - - - <%@ include file="/html/fascicolofe/navigator/common/html_top.jspf" %> - - - <%@ include file="/html/fascicolofe/navigator/common/html_top_pagamento.jspf" %> - - - - - <%@ include file="/html/fascicolofe/navigator/common/html_bottom.jspf" %> - - - - - + - - - - + - + - - + + - Liferay.Util.openWindow( - { - id: 'openVerificaFascicolo', - title: 'Verifica Domanda', - uri: '<%=verifyRenderURL%>' - } - ); + Liferay.Util.openWindow({ + id: 'openVerificaFascicolo', + title: 'Verifica Domanda', + uri: '<%=verifyRenderURL%>', + }); - + - - + + - Liferay.Util.openWindow( - { - id: 'openVerificaDeleghe', - title: 'Gestione Deleghe', - uri: '<%=verifyDelegheRenderURL%>' - } - ); + Liferay.Util.openWindow({ + id: 'openVerificaDeleghe', + title: 'Gestione Deleghe', + uri: '<%=verifyDelegheRenderURL%>', + }); - + - - + + - Liferay.Util.openWindow( - { - id: 'openVerificaFascicolo', - title: 'Verifica Cambio Soggetti', - uri: '<%=verifyRenderURL%>' - } - ); + Liferay.Util.openWindow({ + id: 'openVerificaFascicolo', + title: 'Verifica Cambio Soggetti', + uri: '<%=verifyRenderURL%>', + }); - - + - - - - + + + + - Liferay.Util.openWindow( - { - id: 'openVerificaFascicolo', - title: 'Gestione Pagamenti', - uri: '<%=verifyPagamentiRenderURL%>' - } - ); + Liferay.Util.openWindow({ + id: 'openVerificaFascicolo', + title: 'Gestione Pagamenti', + uri: '<%=verifyPagamentiRenderURL%>', + }); - - <% - String refreshURL = HttpUtil.removeParameter(editEntryURL.toString(), "_"+PortletKeys.FASCICOLOFE+"_openVerifyUrl"); +String refreshURL = HttpUtil.removeParameter(editEntryURL.toString(), StringPool.UNDERLINE + PortletKeys.FASCICOLOFE + + "_openVerifyUrl"); %> - var verifyPopupReady = false; - Liferay.on('popupReady',function(event) { - - var modalName = event._event.details[0].windowName; - var modalWin = Liferay.Util.Window.getById(modalName); - - modalWin.after('visibleChange', function(event) { - Loading.start(); - if(event.prevVal && verifyPopupReady){ - window.location.href = "<%= refreshURL %>" - } - Loading.end(); - }); - modalWin.after('hide', function(event) { - Loading.start(); - if(verifyPopupReady){ - window.location.href = "<%= refreshURL %>" - } - Loading.end(); - }); - modalWin.after('destroy', function(event) { - Loading.start(); - if(verifyPopupReady){ - window.location.href = "<%= refreshURL %>" - } - Loading.end(); - }); +var verifyPopupReady = false; + +Liferay.on('popupReady', function (event) { + var modalName = event._event.details[0].windowName; + var modalWin = Liferay.Util.Window.getById(modalName); + modalWin.after('visibleChange', function (event) { + Loading.start(); + if (event.prevVal && verifyPopupReady) { + window.location.href = "<%= refreshURL %>" + } + Loading.end(); }); - Liferay.on('verifyPopup-ready',function(event) { - verifyPopupReady=true; + modalWin.after('hide', function (event) { + Loading.start(); + if (verifyPopupReady) { + window.location.href = "<%= refreshURL %>" + } + Loading.end(); }); - - - - A.one('#tabsBoundingBox').delegate( - 'click', - function(event){ - var nodeObject = event.currentTarget; - A.one('#current_tab').set('value', nodeObject.attr('data-sectionid')); - }, - 'li.tab'); - var current_tab = '<%=current_tab%>'; - - if(current_tab!='' && document.location.hash==''){ - document.location.hash='_1_WAR_portosfeportlet_tab=<%=current_tab%>'; - } +A.one('#tabsBoundingBox').delegate('click', function (event) { + var nodeObject = event.currentTarget; + A.one('#current_tab').set('value', nodeObject.attr('data-sectionid')); +}, 'li.tab'); + +var current_tab = '<%=current_tab%>'; +if (current_tab != '' && document.location.hash == '') { + document.location.hash='_1_WAR_portosfeportlet_tab=<%=current_tab%>'; +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fine-lavori.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fine-lavori.jsp index f525d1dc..4ebf49e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fine-lavori.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fine-lavori.jsp @@ -92,14 +92,14 @@ %>
    - + - + - + - - + +
    @@ -292,7 +292,7 @@ String contentId = "dettagliContent_"+index; String titleId = "Dettagli "+tipoIntegrazione+" #"+dettPraticaExtra.getDettPraticaId(); %> - + --%> - +
    @@ -379,7 +379,7 @@ - +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_bottom.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_bottom.jspf index f2874706..1f838603 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_bottom.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_bottom.jspf @@ -3,7 +3,6 @@
    <%@ include file="/html/fascicolofe/navigator/common/save_actions.jspf" %> -
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top.jspf index 88144196..dab008d1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top.jspf @@ -1,60 +1,57 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
    - + -
    +
    <% - String label = StringPool.BLANK; - String number = StringPool.BLANK; - if(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione())){ - label = "gestione-soggetti"; - }else if(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione())){ - label = "richiesta-integrazione"; - }else if(TipoIntegrazioneUtil.VARIANTE.equals(dettPratica.getTipoIntegrazione())){ - label = "variante"; - }else if(Validator.isNull(dettPraticaId)){ - label = "new-fascicolo"; - } else { - label = "edit-fascicolo"; - } - String message = LanguageUtil.get(pageContext, label); + String label = StringPool.BLANK; + String number = StringPool.BLANK; + if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione())) { + label = "gestione-soggetti"; + } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione())) { + label = "richiesta-integrazione"; + } else if (TipoIntegrazioneUtil.VARIANTE.equals(dettPratica.getTipoIntegrazione())) { + label = "variante"; + }else if (Validator.isNull(dettPraticaId)) { + label = "new-fascicolo"; + } else { + label = "edit-fascicolo"; + } + String message = LanguageUtil.get(pageContext, label); %> - +
    - -
    + +
    <%@ include file="/html/fascicolofe/navigator/common/save_actions.jspf" %> -
    -
    \ No newline at end of file +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top_pagamento.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top_pagamento.jspf index 599977cb..d1da1e7f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top_pagamento.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/html_top_pagamento.jspf @@ -1,53 +1,49 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - -<%@page import="com.liferay.portal.kernel.util.StringPool"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> - +<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> +<%@page import="com.liferay.portal.kernel.util.StringPool"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="java.util.List"%> -<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.AsseverazioniUtil"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%>
    -
    - +
    +
    -
    +
    <% - String formName = "fmDomande"; - String buttonId = "fmbuttonsalvaconferma"; + String formName = "fmDomande"; + String buttonId = "fmbuttonsalvaconferma"; %> - - - - - - - - - - - + + + + + + + +
    -
    -
    \ No newline at end of file +
    +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf index af99a96a..308d17ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf @@ -1,359 +1,336 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="com.liferay.portal.kernel.util.Validator"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> -<%@page import="javax.portlet.PortletResponse"%> -<%@page import="com.liferay.portal.model.Portlet"%> -<%@page import="java.util.HashMap"%> -<%@page import="java.util.Map"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.SezioniUtil"%> -<%@page import="java.util.ArrayList"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.util.StringPool"%> +<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> +<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> +<%@page import="com.liferay.portal.kernel.util.ParamUtil"%> +<%@page import="com.liferay.portal.kernel.util.StringPool"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="java.util.List"%> -<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.model.Delega"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.SezioniUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.util.AsseverazioniUtil"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> +<%@page import="java.util.HashMap"%> +<%@page import="java.util.List"%> +<%@page import="java.util.Map"%>
    - <% - String randomId = StringUtil.randomId(); - String formName = "fmDomande"; - String buttonId = "fmbuttonsalvaconferma_"+randomId; - String buttonAsseverazioneId = "fmbuttonasseverazione_"+randomId; - String script = - "var el_relazioni = $('textarea[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Relazioni]');" + - "if (el_relazioni.length) {" + - "var el_coniugio = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]');" + - "var el_coniugiochk = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]:checked');" + - - "console.log('length: ' + el_relazioni.length);" + - - "var err_coniugio = (el_coniugiochk.length == 0);" + - "var err_relazioni = ((el_relazioni.val().replace(/\\s*/g, '').length < 10) && (el_coniugiochk.val() == 1));" + - - "el_coniugio.parent().css({color:(err_coniugio ? '#a94442' : '#333')});" + - "el_relazioni.css({'border-color':(err_relazioni ?'#a94442' : '#ccc')});" + - - "if (err_coniugio || err_relazioni) {" + - "$('#" + renderResponse.getNamespace() + "{{prefix}}SaveAndCloseDiv_" + randomId + "').parent().scrollTop(0);" + - "return false;" + - "}" + - "}" + - "saveDettPratica(false, '{{type}}');"; - %> - +<% +String randomId = StringUtil.randomId(); +String formName = "fmDomande"; +String buttonId = "fmbuttonsalvaconferma_" + randomId; +String buttonAsseverazioneId = "fmbuttonasseverazione_" + randomId; +String script = + "var el_relazioni = $('textarea[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Relazioni]');" + + "if (el_relazioni.length) {" + + "var el_coniugio = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]');" + + "var el_coniugiochk = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]:checked');" + + "var err_coniugio = (el_coniugiochk.length == 0);" + + "var err_relazioni = ((el_relazioni.val().replace(/\\s*/g, '').length < 10) && (el_coniugiochk.val() == 1));" + + "el_coniugio.parent().css({color:(err_coniugio ? '#a94442' : '#333')});" + + "el_relazioni.css({'border-color':(err_relazioni ?'#a94442' : '#ccc')});" + + "if (err_coniugio || err_relazioni) {" + + "$('#" + renderResponse.getNamespace() + "{{prefix}}SaveAndCloseDiv_" + randomId + "').parent().scrollTop(0);" + + "return false;" + + "}" + + "}" + + "saveDettPratica(false, '{{type}}');"; +%> + - - - - - - - - - - - - - - + + + + + + + + + + + + + <% + boolean isEsente = dettPratica.getNormEsenteBollo() && dettPratica.getNormEsenteSpese(); + boolean isIntegrazione = dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil + .RICHIESTA_INTEGRAZIONE); + Map dataMap = new HashMap(); + dataMap.put("id", renderResponse.getNamespace() + "openVerificaFascicolo"); + %> + + + + + + + + + + + + + - - - - <% - boolean isEsente = dettPratica.getNormEsenteBollo() && dettPratica.getNormEsenteSpese(); - boolean isIntegrazione = dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE); - %> - <%-- - - --%> - <% - Map dataMap = new HashMap(); - dataMap.put("id", renderResponse.getNamespace()+"openVerificaFascicolo"); - %> - - - - - - - - - - + + + + + + linkCssClass='<%= ValidazionePraticaUtil.canCompleteDettPraticaEsente(dettPraticaId) ? + "btn btn-primary" : "btn btn-primary disabled" %>' + iconCssClass="fa fa-check" useDialog="true" message="Concludi Domanda" + url="<%= completeDomandaEsenteURL %>" data="<%= dataMap %>" /> - - - - - - - - - - - - + + - - - - - - <% - long delegaId = ParamUtil.getLong(request, "delegaId"); - Delega delega = DelegaLocalServiceUtil.getDelega(delegaId); - boolean validated = true; - StringBuilder tooltipSection = new StringBuilder(); - if(delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)){ - //List notCompleted = ValidazionePraticaUtil.notCompletedSection(SezioniUtil.SEZIONE_GEOLOGICA, dettPraticaId); - List notCompleted = ValidazionePraticaUtil.notCompletedSezioneGeologica(dettPraticaId); - if(!notCompleted.isEmpty()){ - validated = false; - tooltipSection.append("
      "); - for(String incomplete : notCompleted){ - tooltipSection.append("
    • "+LanguageUtil.get(pageContext, incomplete)+"
      • "); - } - tooltipSection.append("
    "); +     + + + <% + long delegaId = ParamUtil.getLong(request, "delegaId"); + Delega delega = DelegaLocalServiceUtil.getDelega(delegaId); + boolean validated = true; + StringBuilder tooltipSection = new StringBuilder(); + if (delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)) { + List notCompleted = ValidazionePraticaUtil.notCompletedSezioneGeologica(dettPraticaId); + if (!notCompleted.isEmpty()) { + validated = false; + tooltipSection.append("
      "); + for (String incomplete : notCompleted) { + tooltipSection.append("
    • ") + .append(LanguageUtil.get(pageContext, incomplete)).append("
      • "); } + tooltipSection.append("
    "); } + } %> - <% - String buttonIdVerifica = "fmbuttonverifica_"+randomId; + String buttonIdVerifica = "fmbuttonverifica_" + randomId; %> - - - - +