From d45596a69b1d60cbf83b98fd947deb253fdf8aa6 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Mon, 18 Oct 2021 12:56:21 +0200 Subject: [PATCH] Aggiunta colonna esito in gestione firme. Rimosso codice estraneo dal portlet di BO --- .../html/accesso_atti_fe/visualizza-atto.jsp | 1 - .../tref/liferay/portos/bo/model/Avviso.java | 16 +- .../liferay/portos/bo/model/AvvisoClp.java | 16 + .../portos/bo/model/AvvisoWrapper.java | 27 +- .../tref/liferay/portos/bo/model/Delega.java | 4 + .../liferay/portos/bo/model/DelegaClp.java | 19 + .../portos/bo/model/DelegaWrapper.java | 7 + .../liferay/portos/bo/model/DettPratica.java | 29 + .../portos/bo/model/DettPraticaClp.java | 378 ++++--- .../portos/bo/model/DettPraticaWrapper.java | 53 + .../liferay/portos/bo/model/DocPratica.java | 8 + .../portos/bo/model/DocPraticaClp.java | 38 + .../portos/bo/model/DocPraticaWrapper.java | 14 + .../liferay/portos/bo/model/IntPratica.java | 29 + .../portos/bo/model/IntPraticaClp.java | 419 +++++--- .../portos/bo/model/IntPraticaWrapper.java | 48 + .../bo/service/PagamentoLocalService.java | 156 +-- .../bo/service/PagamentoLocalServiceClp.java | 958 +++++++++++------- .../bo/service/PagamentoLocalServiceUtil.java | 250 +++-- .../service/PagamentoLocalServiceWrapper.java | 263 +++-- .../liferay/portos/bo/util/DelegheUtil.java | 276 ----- .../tref/liferay/portos/bo/util/MailUtil.java | 258 ----- .../portos/bo/util/PagamentiCommonUtil.java | 181 ---- .../sismica/bo/util/ManutenzioneDatabase.java | 2 +- .../it/mwg/sismica/bo/util/SismicaUtil.java | 2 +- .../portos/bo/model/impl/AvvisoImpl.java | 218 ++-- .../portos/bo/model/impl/DelegaImpl.java | 7 + .../portos/bo/model/impl/DettPraticaImpl.java | 159 ++- .../portos/bo/model/impl/DocPraticaImpl.java | 85 ++ .../portos/bo/model/impl/IntPraticaImpl.java | 104 +- .../bo/portlet/GestioneAttivitaPortlet.java | 53 +- .../builder/ReportAvvisoBeanBuilder.java | 3 +- .../scheduler/SchedulerGeneraDocumento.java | 2 +- .../scheduler/SchedulerGeneraProtocollo.java | 2 +- .../bo/scheduler/SchedulerInvioDocumento.java | 18 +- .../bo/scheduler/SchedulerPratiche.java | 2 +- .../base/PagamentoLocalServiceClpInvoker.java | 480 +++++---- .../impl/AllegatoManualeLocalServiceImpl.java | 2 +- .../impl/AsseverazioneLocalServiceImpl.java | 6 +- .../service/impl/AvvisoLocalServiceImpl.java | 2 +- .../impl/CollaudoLocalServiceImpl.java | 16 +- .../impl/ComunicazioneLocalServiceImpl.java | 9 +- .../ControlloPraticaLocalServiceImpl.java | 2 +- .../service/impl/DelegaLocalServiceImpl.java | 2 +- .../bo/service/impl/DelegaServiceImpl.java | 12 +- .../impl/DettPraticaLocalServiceImpl.java | 12 +- .../impl/FineLavoriLocalServiceImpl.java | 11 +- .../impl/IntPraticaLocalServiceImpl.java | 2 +- .../impl/PagamentoLocalServiceImpl.java | 486 ++++++--- .../bo/service/impl/PagamentoServiceImpl.java | 7 +- .../liferay/portos/bo/util/PagamentiUtil.java | 142 --- .../docroot/WEB-INF/src/service.properties | 4 +- .../amministrazione/tabs/parametri/view.jsp | 2 +- .../docroot/html/avvisi/view.jsp | 2 +- .../docroot/html/cronologia/view.jsp | 2 +- .../navigator/page_sez_geologica.jsp | 2 +- .../html/gestionefirme/avvisi_da_firmare.jsp | 19 +- .../gestionefirme/avvisi_da_firmare_altri.jsp | 10 +- .../html/gestionefirme/avvisi_firme.jsp | 12 +- .../docroot/html/pagamenti/view.jsp | 2 - .../html/pagamenti/view_pagamenti_pending.jsp | 1 - .../pagamenti/view_panel_form_bollettino.jsp | 1 - .../html/pagamenti/view_panel_generic.jsp | 3 +- .../html/pagamenti/view_panel_pagamenti.jsp | 1 - .../pagamenti/view_panel_pagamenti_bolli.jsp | 3 +- .../pagamenti/view_panel_pagamenti_spese.jsp | 1 - .../fe/portlet/AllegatiPraticaPortlet.java | 10 +- .../portos/fe/portlet/FascicoloFePortlet.java | 19 +- .../fe/portlet/ParereGeologoPortlet.java | 66 +- .../html/allegatipratica/allegati_action.jsp | 4 +- .../docroot/html/allegatipratica/view.jsp | 5 +- .../fascicolofe/asseverazione_actions.jsp | 2 +- .../html/fascicolofe/edit_collaudo.jsp | 1 - .../html/fascicolofe/edit_fascicolo.jsp | 2 +- .../html/fascicolofe/edit_fine-lavori.jsp | 1 - .../docroot/html/fascicolofe/init.jsp | 1 - .../navigator/common/html_top_pagamento.jspf | 3 +- .../navigator/common/save_actions.jspf | 12 +- .../navigator/domanda/page_allegati.jsp | 1 - .../domanda/page_asseverazioni_riepilogo.jsp | 3 +- .../navigator/domanda/page_desc_edificio.jsp | 3 +- .../domanda/page_dettagli_principali.jsp | 3 +- .../navigator/domanda/page_geologica.jsp | 4 +- .../navigator/domanda/page_soggetti.jsp | 2 +- .../html/fascicolofe/navigator/header.jsp | 6 +- .../fascicolofe/pagamenti/replace_payment.jsp | 1 - .../fascicolofe/verify_collaudo_calcolo.jsp | 9 +- .../html/fascicolofe/verify_fascicolo.jsp | 3 +- .../fascicolofe/verify_fascicolo_calcolo.jsp | 12 +- .../verify_fine-lavori_calcolo.jsp | 9 +- .../fascicolofe/view_collaudi_columns.jsp | 1 - .../html/fascicolofe/view_deleghe_columns.jsp | 2 +- .../view_fascicolo_columns_generic.jspf | 5 +- .../view_fascicolo_comunicazioni.jsp | 1 - .../fascicolofe/view_fascicolo_dettagli.jsp | 2 +- .../fascicolofe/view_finelavori_columns.jsp | 1 - .../docroot/html/soggettipratica/view.jsp | 3 +- .../html/soggettipratica/view_valida_fino.jsp | 2 +- .../sismica/bo/shared}/util/AvvisoUtil.java | 38 +- .../sismica/bo/shared/util/DelegheUtil.java | 35 + .../sismica/bo/shared/util/PagamentiUtil.java | 48 + .../docroot/WEB-INF/src/service.properties | 4 +- 102 files changed, 3283 insertions(+), 2402 deletions(-) delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java rename liferay-plugins-sdk-6.2/{portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo => shared/portos-bo-shared/src/it/mwg/sismica/bo/shared}/util/AvvisoUtil.java (85%) create mode 100644 liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/DelegheUtil.java create mode 100644 liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/PagamentiUtil.java diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp index fa700aec..dfea9fc5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp @@ -6,7 +6,6 @@ <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java index c7cfc6ba..a96deb96 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Avviso.java @@ -31,7 +31,7 @@ public interface Avviso extends AvvisoModel, PersistedModel { * * Never modify this interface directly. Add methods to {@link it.tref.liferay.portos.bo.model.impl.AvvisoImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface. */ - public java.lang.String getFullDescription() + public java.lang.String getDescriptionOggettoProtocollo() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; @@ -40,21 +40,25 @@ public interface Avviso extends AvvisoModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public java.lang.String getDescriptionOggettoProtocollo() + public java.lang.String getDownloadUrl( + com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public java.lang.String getDownloadUrl( - com.liferay.portal.theme.ThemeDisplay themeDisplay) + public java.lang.String getFullDescription() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public java.lang.String translateTipoDocumento( - java.lang.String tipoProcedura) + public void invioNotificaAssegnazioneIstruttore() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; public java.lang.String translateTipoDocumento() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + + public java.lang.String translateTipoDocumento( + java.lang.String tipoProcedura) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ 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/AvvisoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java index 4d223417..8b3a2696 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoClp.java @@ -1399,6 +1399,22 @@ public class AvvisoClp extends BaseModelImpl implements Avviso { } } + @Override + public void invioNotificaAssegnazioneIstruttore() { + try { + String methodName = "invioNotificaAssegnazioneIstruttore"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + invokeOnRemoteModel(methodName, parameterTypes, parameterValues); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java index 77aba716..e841887c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/AvvisoWrapper.java @@ -1297,10 +1297,10 @@ public class AvvisoWrapper implements Avviso, ModelWrapper { } @Override - public java.lang.String getFullDescription() + public java.lang.String getDescriptionOggettoProtocollo() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _avviso.getFullDescription(); + return _avviso.getDescriptionOggettoProtocollo(); } @Override @@ -1312,26 +1312,25 @@ public class AvvisoWrapper implements Avviso, ModelWrapper { } @Override - public java.lang.String getDescriptionOggettoProtocollo() + public java.lang.String getDownloadUrl( + com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _avviso.getDescriptionOggettoProtocollo(); + return _avviso.getDownloadUrl(themeDisplay); } @Override - public java.lang.String getDownloadUrl( - com.liferay.portal.theme.ThemeDisplay themeDisplay) + public java.lang.String getFullDescription() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _avviso.getDownloadUrl(themeDisplay); + return _avviso.getFullDescription(); } @Override - public java.lang.String translateTipoDocumento( - java.lang.String tipoProcedura) + public void invioNotificaAssegnazioneIstruttore() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _avviso.translateTipoDocumento(tipoProcedura); + _avviso.invioNotificaAssegnazioneIstruttore(); } @Override @@ -1341,6 +1340,14 @@ public class AvvisoWrapper implements Avviso, ModelWrapper { return _avviso.translateTipoDocumento(); } + @Override + public java.lang.String translateTipoDocumento( + java.lang.String tipoProcedura) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _avviso.translateTipoDocumento(tipoProcedura); + } + @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java index 7f3c0c83..fe9e1b73 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/Delega.java @@ -32,4 +32,8 @@ public interface Delega extends DelegaModel, PersistedModel { * Never modify this interface directly. Add methods to {@link it.tref.liferay.portos.bo.model.impl.DelegaImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface. */ public java.util.Map getDichiarazioniMap(); + + public boolean hasCambioStatoDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ 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/DelegaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java index 350d5fcf..dfcc2c44 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaClp.java @@ -561,6 +561,25 @@ public class DelegaClp extends BaseModelImpl implements Delega { } } + @Override + public boolean hasCambioStatoDelega(long userId) { + try { + String methodName = "hasCambioStatoDelega"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { userId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java index d09f73ed..9c296e98 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DelegaWrapper.java @@ -613,6 +613,13 @@ public class DelegaWrapper implements Delega, ModelWrapper { return _delega.getDichiarazioniMap(); } + @Override + public boolean hasCambioStatoDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _delega.hasCambioStatoDelega(userId); + } + @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java index c335c868..280c8845 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java @@ -47,6 +47,10 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean canCompilaDomanda(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean canCompleteDettPraticaEsente() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; @@ -59,6 +63,10 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean canDoPayment(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean delegheCompilazioneIsEnable() throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; @@ -67,6 +75,16 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneDomanda() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneSezioneGeologica() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public java.lang.String getTipoReport(java.lang.String tipoDocumento); + public boolean hasAnnullaAsseverazioni(long userId) throws com.liferay.portal.kernel.exception.SystemException; @@ -77,6 +95,10 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { public boolean hasAsseverazioniAttive() throws com.liferay.portal.kernel.exception.SystemException; + public boolean hasDelegaAttiva(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean hasDelegaCompilazioneDomanda(long userId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; @@ -89,6 +111,13 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean hasDelegaPagamento(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean hasDelegheCompilazioneAttive() + throws com.liferay.portal.kernel.exception.SystemException; + public boolean hasRichiediAsseverazioni(long userId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java index a9547875..ab4d0295 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java @@ -8423,15 +8423,15 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public java.util.Set getDocObbligatoriDomanda() { + public boolean canCompilaDomanda(long userId) { try { - String methodName = "getDocObbligatoriDomanda"; + String methodName = "canCompilaDomanda"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { userId }; - java.util.Set returnObj = (java.util.Set)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -8442,9 +8442,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasDelegaCompilazioneSezioneGeologica(long userId) { + public boolean hasAsseverazioneAttiva(long userId) { try { - String methodName = "hasDelegaCompilazioneSezioneGeologica"; + String methodName = "hasAsseverazioneAttiva"; Class[] parameterTypes = new Class[] { long.class }; @@ -8461,15 +8461,54 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean canCompleteIntegrazione() { + public boolean hasAnnullaAsseverazioni(long userId) { try { - String methodName = "canCompleteIntegrazione"; + String methodName = "hasAnnullaAsseverazioni"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { userId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public java.util.List notCompletedSection( + java.lang.String section) { + try { + String methodName = "notCompletedSection"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { section }; + + java.util.List returnObj = (java.util.List)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public java.lang.String getTitle() { + try { + String methodName = "getTitle"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -8480,13 +8519,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasAnnullaAsseverazioni(long userId) { + public boolean hasDelegheCompilazioneAttive() { try { - String methodName = "hasAnnullaAsseverazioni"; + String methodName = "hasDelegheCompilazioneAttive"; - Class[] parameterTypes = new Class[] { long.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { userId }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8499,13 +8538,20 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasAsseverazioneAttiva(long userId) { + public boolean isRequiredTerna(java.lang.String codiceDoc, + java.util.List ditte, + java.util.List committenti) { try { - String methodName = "hasAsseverazioneAttiva"; + String methodName = "isRequiredTerna"; - Class[] parameterTypes = new Class[] { long.class }; + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.util.List.class, + java.util.List.class + }; - Object[] parameterValues = new Object[] { userId }; + Object[] parameterValues = new Object[] { + codiceDoc, ditte, committenti + }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8518,16 +8564,15 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public java.util.List notCompletedSection( - java.lang.String section) { + public boolean hasAsseverazioniAttive() { try { - String methodName = "notCompletedSection"; + String methodName = "hasAsseverazioniAttive"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { section }; + Object[] parameterValues = new Object[] { }; - java.util.List returnObj = (java.util.List)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -8538,9 +8583,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isCollaudatoreRequired() { + public boolean canCompleteDettPraticaEsente() { try { - String methodName = "isCollaudatoreRequired"; + String methodName = "canCompleteDettPraticaEsente"; Class[] parameterTypes = new Class[] { }; @@ -8557,18 +8602,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isSoggettoPrincipale(java.lang.String codiceFiscale, - java.lang.String tipologiaSoggetto) { + public boolean canCompleteUserEditing() { try { - String methodName = "isSoggettoPrincipale"; + String methodName = "canCompleteUserEditing"; - Class[] parameterTypes = new Class[] { - java.lang.String.class, java.lang.String.class - }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { - codiceFiscale, tipologiaSoggetto - }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8581,14 +8621,33 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean allAsseverazioniCompleted() { + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneDomanda() { try { - String methodName = "allAsseverazioniCompleted"; + String methodName = "getPersonaDelegaCompilazioneDomanda"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; + it.tref.liferay.portos.bo.model.Soggetto returnObj = (it.tref.liferay.portos.bo.model.Soggetto)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) { + try { + String methodName = "hasSoggettoPrincipale"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { tipologiaSoggetto }; + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8600,9 +8659,28 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean praticaIsEditable() { + public boolean canDoPayment(long userId) { try { - String methodName = "praticaIsEditable"; + String methodName = "canDoPayment"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { userId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean delegheCompilazioneIsEnable() { + try { + String methodName = "delegheCompilazioneIsEnable"; Class[] parameterTypes = new Class[] { }; @@ -8619,9 +8697,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public java.lang.String getTitle() { + public java.lang.String getFullDescription() { try { - String methodName = "getTitle"; + String methodName = "getFullDescription"; Class[] parameterTypes = new Class[] { }; @@ -8638,15 +8716,35 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public java.util.List notCompletedSezioneGeologica() { + public boolean isAsseverazioneDomandaRequiredByTipoSoggetto( + java.lang.String tipoSoggetto) { try { - String methodName = "notCompletedSezioneGeologica"; + String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { tipoSoggetto }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public java.util.Set getDocObbligatoriDomanda() { + try { + String methodName = "getDocObbligatoriDomanda"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - java.util.List returnObj = (java.util.List)invokeOnRemoteModel(methodName, + java.util.Set returnObj = (java.util.Set)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -8657,13 +8755,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isSoggettoPrincipale(long soggettoId) { + public boolean hasDelegaCompilazioneSezioneGeologica(long userId) { try { - String methodName = "isSoggettoPrincipale"; + String methodName = "hasDelegaCompilazioneSezioneGeologica"; Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { soggettoId }; + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8676,20 +8774,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isRequiredTerna(java.lang.String codiceDoc, - java.util.List ditte, - java.util.List committenti) { + public boolean canCompleteIntegrazione() { try { - String methodName = "isRequiredTerna"; + String methodName = "canCompleteIntegrazione"; - Class[] parameterTypes = new Class[] { - java.lang.String.class, java.util.List.class, - java.util.List.class - }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { - codiceDoc, ditte, committenti - }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8702,9 +8793,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean pagamentoIsEnable() { + public boolean isCollaudatoreRequired() { try { - String methodName = "pagamentoIsEnable"; + String methodName = "isCollaudatoreRequired"; Class[] parameterTypes = new Class[] { }; @@ -8721,9 +8812,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasAsseverazioniAttive() { + public boolean allAsseverazioniCompleted() { try { - String methodName = "hasAsseverazioniAttive"; + String methodName = "allAsseverazioniCompleted"; Class[] parameterTypes = new Class[] { }; @@ -8740,13 +8831,18 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean praticaIsCompleta() { + public boolean isSoggettoPrincipale(java.lang.String codiceFiscale, + java.lang.String tipologiaSoggetto) { try { - String methodName = "praticaIsCompleta"; + String methodName = "isSoggettoPrincipale"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.lang.String.class + }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { + codiceFiscale, tipologiaSoggetto + }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8759,9 +8855,9 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean canCompleteDettPraticaEsente() { + public boolean praticaIsEditable() { try { - String methodName = "canCompleteDettPraticaEsente"; + String methodName = "praticaIsEditable"; Class[] parameterTypes = new Class[] { }; @@ -8778,13 +8874,32 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public java.lang.String getTitle(java.util.Locale locale) { + public boolean hasDelegaAttiva(long userId) { try { - String methodName = "getTitle"; + String methodName = "hasDelegaAttiva"; - Class[] parameterTypes = new Class[] { java.util.Locale.class }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { locale }; + Object[] parameterValues = new Object[] { userId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public java.lang.String getTipoReport(java.lang.String tipoDocumento) { + try { + String methodName = "getTipoReport"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { tipoDocumento }; java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8797,9 +8912,47 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean canCompleteUserEditing() { + public boolean isSoggettoPrincipale(long soggettoId) { try { - String methodName = "canCompleteUserEditing"; + String methodName = "isSoggettoPrincipale"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { soggettoId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public java.util.List notCompletedSezioneGeologica() { + try { + String methodName = "notCompletedSezioneGeologica"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + java.util.List returnObj = (java.util.List)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean pagamentoIsEnable() { + try { + String methodName = "pagamentoIsEnable"; Class[] parameterTypes = new Class[] { }; @@ -8816,13 +8969,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasRichiediAsseverazioni(long userId) { + public boolean praticaIsCompleta() { try { - String methodName = "hasRichiediAsseverazioni"; + String methodName = "praticaIsCompleta"; - Class[] parameterTypes = new Class[] { long.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { userId }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8835,14 +8988,32 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto( - java.lang.String tipoSoggetto) { + public java.lang.String getTitle(java.util.Locale locale) { try { - String methodName = "isAsseverazioneDomandaRecommendedByTipoSoggetto"; + String methodName = "getTitle"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { java.util.Locale.class }; - Object[] parameterValues = new Object[] { tipoSoggetto }; + Object[] parameterValues = new Object[] { locale }; + + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean hasRichiediAsseverazioni(long userId) { + try { + String methodName = "hasRichiediAsseverazioni"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8855,13 +9026,14 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) { + public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto( + java.lang.String tipoSoggetto) { try { - String methodName = "hasSoggettoPrincipale"; + String methodName = "isAsseverazioneDomandaRecommendedByTipoSoggetto"; Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { tipologiaSoggetto }; + Object[] parameterValues = new Object[] { tipoSoggetto }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -8931,15 +9103,15 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean delegheCompilazioneIsEnable() { + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneSezioneGeologica() { try { - String methodName = "delegheCompilazioneIsEnable"; + String methodName = "getPersonaDelegaCompilazioneSezioneGeologica"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + it.tref.liferay.portos.bo.model.Soggetto returnObj = (it.tref.liferay.portos.bo.model.Soggetto)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -8988,14 +9160,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isAsseverazioneDomandaRequiredByTipoSoggetto( - java.lang.String tipoSoggetto) { + public boolean hasDelegaPagamento(long userId) { try { - String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto"; + String methodName = "hasDelegaPagamento"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { tipoSoggetto }; + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -9007,25 +9178,6 @@ public class DettPraticaClp extends BaseModelImpl } } - @Override - public java.lang.String getFullDescription() { - try { - String methodName = "getFullDescription"; - - Class[] parameterTypes = new Class[] { }; - - Object[] parameterValues = new Object[] { }; - - java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, - parameterTypes, parameterValues); - - return returnObj; - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - @Override public boolean isCollaudatorePresent() { try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java index a91d768b..cfde884e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java @@ -8263,6 +8263,13 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.asseverazioniIsEnable(); } + @Override + public boolean canCompilaDomanda(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.canCompilaDomanda(userId); + } + @Override public boolean canCompleteDettPraticaEsente() throws com.liferay.portal.kernel.exception.PortalException, @@ -8284,6 +8291,13 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.canCompleteUserEditing(); } + @Override + public boolean canDoPayment(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.canDoPayment(userId); + } + @Override public boolean delegheCompilazioneIsEnable() throws com.liferay.portal.kernel.exception.PortalException, @@ -8298,6 +8312,25 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.getDocObbligatoriDomanda(); } + @Override + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneDomanda() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.getPersonaDelegaCompilazioneDomanda(); + } + + @Override + public it.tref.liferay.portos.bo.model.Soggetto getPersonaDelegaCompilazioneSezioneGeologica() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.getPersonaDelegaCompilazioneSezioneGeologica(); + } + + @Override + public java.lang.String getTipoReport(java.lang.String tipoDocumento) { + return _dettPratica.getTipoReport(tipoDocumento); + } + @Override public boolean hasAnnullaAsseverazioni(long userId) throws com.liferay.portal.kernel.exception.SystemException { @@ -8317,6 +8350,13 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.hasAsseverazioniAttive(); } + @Override + public boolean hasDelegaAttiva(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.hasDelegaAttiva(userId); + } + @Override public boolean hasDelegaCompilazioneDomanda(long userId) throws com.liferay.portal.kernel.exception.PortalException, @@ -8338,6 +8378,19 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.hasDelegaFirmaAllegati(userId); } + @Override + public boolean hasDelegaPagamento(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.hasDelegaPagamento(userId); + } + + @Override + public boolean hasDelegheCompilazioneAttive() + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.hasDelegheCompilazioneAttive(); + } + @Override public boolean hasRichiediAsseverazioni(long userId) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java index 177ee7a5..4bdafb42 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java @@ -39,4 +39,12 @@ public interface DocPratica extends DocPraticaModel, PersistedModel { com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ 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/DocPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java index bb2d909f..481e8df0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java @@ -872,6 +872,44 @@ public class DocPraticaClp extends BaseModelImpl } } + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) { + try { + String methodName = "hasDelegaFirma"; + + Class[] parameterTypes = new Class[] { long.class, boolean.class }; + + Object[] parameterValues = new Object[] { userId, sezioneGeologica }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) { + try { + String methodName = "hasDelegaDeleteFile"; + + Class[] parameterTypes = new Class[] { long.class, boolean.class }; + + Object[] parameterValues = new Object[] { userId, sezioneGeologica }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java index 6705c7b3..335f1538 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java @@ -897,6 +897,20 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper { return _docPratica.getDownloadUrl(themeDisplay); } + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _docPratica.hasDelegaFirma(userId, sezioneGeologica); + } + + @Override + public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _docPratica.hasDelegaDeleteFile(userId, sezioneGeologica); + } + @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java index 5cefa30d..f03bc67d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java @@ -159,8 +159,33 @@ public interface IntPratica extends IntPraticaModel, PersistedModel { public boolean praticaHasIntegrazioneInProgress() throws com.liferay.portal.kernel.exception.SystemException; + public java.util.List getGeologi() + throws com.liferay.portal.kernel.exception.SystemException; + + public boolean hasAnnullaDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean hasCreazioneDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean hasDeleteDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean hasRichiestaIntegrazioneAttiva(); + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean isAllowedAction(java.lang.String action) throws com.liferay.portal.kernel.exception.SystemException; @@ -170,6 +195,10 @@ public interface IntPratica extends IntPraticaModel, PersistedModel { public boolean praticaInProgress() throws com.liferay.portal.kernel.exception.SystemException; + public com.liferay.portal.model.User recuperaTecnicoIstruttore() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean signaturesContains(java.lang.String tipoSoggetto, java.util.List signatures) throws com.liferay.portal.kernel.exception.SystemException; 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 2350c41d..2dc2cbed 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 @@ -1186,9 +1186,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasAnnullamento() { + public boolean canEditPratica() { try { - String methodName = "praticaHasAnnullamento"; + String methodName = "canEditPratica"; Class[] parameterTypes = new Class[] { }; @@ -1205,9 +1205,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean hasRichiestaIntegrazioneAttiva() { + public boolean canAddVariazioneSoggetti() { try { - String methodName = "hasRichiestaIntegrazioneAttiva"; + String methodName = "canAddVariazioneSoggetti"; Class[] parameterTypes = new Class[] { }; @@ -1224,9 +1224,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canAddVariazioneSoggetti() { + public boolean canEditUsers() { try { - String methodName = "canAddVariazioneSoggetti"; + String methodName = "canEditUsers"; Class[] parameterTypes = new Class[] { }; @@ -1243,9 +1243,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canEditPratica() { + public boolean praticaCanAddIntegrazione() { try { - String methodName = "canEditPratica"; + String methodName = "praticaCanAddIntegrazione"; Class[] parameterTypes = new Class[] { }; @@ -1262,15 +1262,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canAddPagamento(long userId) { + public java.lang.String getIndirizzo() { try { - String methodName = "canAddPagamento"; + String methodName = "getIndirizzo"; - Class[] parameterTypes = new Class[] { long.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { userId }; + Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1281,15 +1281,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canEditUsers() { + public java.lang.Integer getDistanzaOrtodromica() { try { - String methodName = "canEditUsers"; + String methodName = "getDistanzaOrtodromica"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + java.lang.Integer returnObj = (java.lang.Integer)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1300,9 +1300,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanAddIntegrazione() { + public boolean isAutorizzazione() { try { - String methodName = "praticaCanAddIntegrazione"; + String methodName = "isAutorizzazione"; Class[] parameterTypes = new Class[] { }; @@ -1319,9 +1319,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaInProgress() { + public boolean canPrintFascicolo() { try { - String methodName = "praticaInProgress"; + String methodName = "canPrintFascicolo"; Class[] parameterTypes = new Class[] { }; @@ -1338,15 +1338,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public java.lang.String getIndirizzo() { + public boolean praticaCanDeleteVariante() { try { - String methodName = "getIndirizzo"; + String methodName = "praticaCanDeleteVariante"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1357,15 +1357,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public java.lang.Integer getDistanzaOrtodromica() { + public boolean canDeletePratica(long userId) { try { - String methodName = "getDistanzaOrtodromica"; + String methodName = "canDeletePratica"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { userId }; - java.lang.Integer returnObj = (java.lang.Integer)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1376,15 +1376,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public int getTipoRichiesta() { + public boolean isDeposito() { try { - String methodName = "getTipoRichiesta"; + String methodName = "isDeposito"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Integer returnObj = (Integer)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1395,9 +1395,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isAutorizzazione() { + public boolean praticaHasCollaudoInProgress() { try { - String methodName = "isAutorizzazione"; + String methodName = "praticaHasCollaudoInProgress"; Class[] parameterTypes = new Class[] { }; @@ -1414,15 +1414,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public java.lang.String getTitle(boolean completed) { + public java.util.List getGeologi() { try { - String methodName = "getTitle"; + String methodName = "getGeologi"; - Class[] parameterTypes = new Class[] { boolean.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { completed }; + Object[] parameterValues = new Object[] { }; - java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, + java.util.List returnObj = (java.util.List)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1433,13 +1433,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canPrintFascicolo() { + public boolean praticaCanAddFineLavori(java.lang.String userScreenName) { try { - String methodName = "canPrintFascicolo"; + String methodName = "praticaCanAddFineLavori"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { userScreenName }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1452,9 +1452,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanDeleteVariante() { + public boolean praticaCanDeleteIntegrazione() { try { - String methodName = "praticaCanDeleteVariante"; + String methodName = "praticaCanDeleteIntegrazione"; Class[] parameterTypes = new Class[] { }; @@ -1471,9 +1471,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasCollaudoInProgress() { + public boolean isCommittenteAndDitta() { try { - String methodName = "praticaHasCollaudoInProgress"; + String methodName = "isCommittenteAndDitta"; Class[] parameterTypes = new Class[] { }; @@ -1490,9 +1490,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isDeposito() { + public boolean isAnnullata() { try { - String methodName = "isDeposito"; + String methodName = "isAnnullata"; Class[] parameterTypes = new Class[] { }; @@ -1509,13 +1509,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canDeletePratica(long userId) { + public boolean praticaCanDeleteFineLavori(java.lang.String userScreenName) { try { - String methodName = "canDeletePratica"; + String methodName = "praticaCanDeleteFineLavori"; - Class[] parameterTypes = new Class[] { long.class }; + Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { userId }; + Object[] parameterValues = new Object[] { userScreenName }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1528,9 +1528,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canAddSoggetto(java.lang.String tipoSoggetto) { + public boolean canRemoveSoggetto(java.lang.String tipoSoggetto) { try { - String methodName = "canAddSoggetto"; + String methodName = "canRemoveSoggetto"; Class[] parameterTypes = new Class[] { java.lang.String.class }; @@ -1547,13 +1547,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanAddFineLavori(java.lang.String userScreenName) { + public boolean isAllowedAction(java.lang.String action) { try { - String methodName = "praticaCanAddFineLavori"; + String methodName = "isAllowedAction"; Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { action }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1566,9 +1566,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasVarianteInProgress() { + public boolean canPrintFascicoloVariante() { try { - String methodName = "praticaHasVarianteInProgress"; + String methodName = "canPrintFascicoloVariante"; Class[] parameterTypes = new Class[] { }; @@ -1585,9 +1585,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanDeleteIntegrazione() { + public boolean isTitolareInCommittenti() { try { - String methodName = "praticaCanDeleteIntegrazione"; + String methodName = "isTitolareInCommittenti"; Class[] parameterTypes = new Class[] { }; @@ -1604,9 +1604,28 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isCommittenteAndDitta() { + public boolean praticaCanEditCollaudo(java.lang.String userScreenName) { try { - String methodName = "isCommittenteAndDitta"; + String methodName = "praticaCanEditCollaudo"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { userScreenName }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean praticaCanEditVariante() { + try { + String methodName = "praticaCanEditVariante"; Class[] parameterTypes = new Class[] { }; @@ -1623,9 +1642,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasFineLavoriPaymentPending() { + public boolean praticaHasCollaudoPaymentPending() { try { - String methodName = "praticaHasFineLavoriPaymentPending"; + String methodName = "praticaHasCollaudoPaymentPending"; Class[] parameterTypes = new Class[] { }; @@ -1642,9 +1661,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isAnnullata() { + public boolean praticaHasIntegrazioneInProgress() { try { - String methodName = "isAnnullata"; + String methodName = "praticaHasIntegrazioneInProgress"; Class[] parameterTypes = new Class[] { }; @@ -1661,13 +1680,16 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanDeleteFineLavori(java.lang.String userScreenName) { + public boolean signaturesContains(java.lang.String tipoSoggetto, + java.util.List signatures) { try { - String methodName = "praticaCanDeleteFineLavori"; + String methodName = "signaturesContains"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.util.List.class + }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { tipoSoggetto, signatures }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1680,13 +1702,41 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canRemoveSoggetto(java.lang.String tipoSoggetto) { + public boolean isAllRequiredValid(java.lang.String codiceDoc, + java.util.List signatures, + java.util.List tipologiaSoggetti, + it.tref.liferay.portos.bo.model.DocPratica docPratica) { try { - String methodName = "canRemoveSoggetto"; + String methodName = "isAllRequiredValid"; + + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.util.List.class, + java.util.List.class, + it.tref.liferay.portos.bo.model.DocPratica.class + }; + + Object[] parameterValues = new Object[] { + codiceDoc, signatures, tipologiaSoggetti, docPratica + }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean praticaCanAddCollaudo(java.lang.String userScreenName) { + try { + String methodName = "praticaCanAddCollaudo"; Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { tipoSoggetto }; + Object[] parameterValues = new Object[] { userScreenName }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1699,13 +1749,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isAllowedAction(java.lang.String action) { + public boolean praticaCanDeleteCollaudo(java.lang.String userScreenName) { try { - String methodName = "isAllowedAction"; + String methodName = "praticaCanDeleteCollaudo"; Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { action }; + Object[] parameterValues = new Object[] { userScreenName }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1718,9 +1768,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean canPrintFascicoloVariante() { + public boolean praticaHasAnnullamento() { try { - String methodName = "canPrintFascicoloVariante"; + String methodName = "praticaHasAnnullamento"; Class[] parameterTypes = new Class[] { }; @@ -1737,13 +1787,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isChiusa() { + public boolean hasCreazioneDelega(long userId) { try { - String methodName = "isChiusa"; + String methodName = "hasCreazioneDelega"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1756,9 +1806,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isTitolareInCommittenti() { + public boolean hasRichiestaIntegrazioneAttiva() { try { - String methodName = "isTitolareInCommittenti"; + String methodName = "hasRichiestaIntegrazioneAttiva"; Class[] parameterTypes = new Class[] { }; @@ -1775,13 +1825,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanEditCollaudo(java.lang.String userScreenName) { + public boolean canAddPagamento(long userId) { try { - String methodName = "praticaCanEditCollaudo"; + String methodName = "canAddPagamento"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1794,13 +1844,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanEditFineLavori(java.lang.String userScreenName) { + public boolean praticaInProgress() { try { - String methodName = "praticaCanEditFineLavori"; + String methodName = "praticaInProgress"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1813,15 +1863,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasFineLavoriInProgress() { + public com.liferay.portal.model.User recuperaTecnicoIstruttore() { try { - String methodName = "praticaHasFineLavoriInProgress"; + String methodName = "recuperaTecnicoIstruttore"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + com.liferay.portal.model.User returnObj = (com.liferay.portal.model.User)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1832,15 +1882,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanEditVariante() { + public int getTipoRichiesta() { try { - String methodName = "praticaCanEditVariante"; + String methodName = "getTipoRichiesta"; Class[] parameterTypes = new Class[] { }; Object[] parameterValues = new Object[] { }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + Integer returnObj = (Integer)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1851,15 +1901,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public java.lang.String getTitle(java.util.Locale locale, boolean completed) { + public java.lang.String getTitle(boolean completed) { try { String methodName = "getTitle"; - Class[] parameterTypes = new Class[] { - java.util.Locale.class, boolean.class - }; + Class[] parameterTypes = new Class[] { boolean.class }; - Object[] parameterValues = new Object[] { locale, completed }; + Object[] parameterValues = new Object[] { completed }; java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1872,13 +1920,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanEditIntegrazione() { + public boolean hasDeleteDelega(long userId) { try { - String methodName = "praticaCanEditIntegrazione"; + String methodName = "hasDeleteDelega"; - Class[] parameterTypes = new Class[] { }; + Class[] parameterTypes = new Class[] { long.class }; - Object[] parameterValues = new Object[] { }; + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1891,17 +1939,15 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public java.lang.Integer calcolaDistanzaOrtodromica(double lat, double lng) { + public boolean canAddSoggetto(java.lang.String tipoSoggetto) { try { - String methodName = "calcolaDistanzaOrtodromica"; + String methodName = "canAddSoggetto"; - Class[] parameterTypes = new Class[] { - double.class, double.class - }; + Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { lat, lng }; + Object[] parameterValues = new Object[] { tipoSoggetto }; - java.lang.Integer returnObj = (java.lang.Integer)invokeOnRemoteModel(methodName, + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -1912,9 +1958,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasCollaudoPaymentPending() { + public boolean praticaHasVarianteInProgress() { try { - String methodName = "praticaHasCollaudoPaymentPending"; + String methodName = "praticaHasVarianteInProgress"; Class[] parameterTypes = new Class[] { }; @@ -1931,9 +1977,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanAddVariante() { + public boolean praticaHasFineLavoriPaymentPending() { try { - String methodName = "praticaCanAddVariante"; + String methodName = "praticaHasFineLavoriPaymentPending"; Class[] parameterTypes = new Class[] { }; @@ -1950,9 +1996,9 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaHasIntegrazioneInProgress() { + public boolean isChiusa() { try { - String methodName = "praticaHasIntegrazioneInProgress"; + String methodName = "isChiusa"; Class[] parameterTypes = new Class[] { }; @@ -1969,16 +2015,64 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean signaturesContains(java.lang.String tipoSoggetto, - java.util.List signatures) { + public boolean praticaCanEditFineLavori(java.lang.String userScreenName) { try { - String methodName = "signaturesContains"; + String methodName = "praticaCanEditFineLavori"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { userScreenName }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) { + try { + String methodName = "invioMailNotifica"; Class[] parameterTypes = new Class[] { - java.lang.String.class, java.util.List.class + long.class, long.class, java.lang.String.class, + java.lang.String.class, java.lang.String.class, + java.lang.String.class, java.lang.String.class, + com.liferay.portal.kernel.json.JSONObject.class, + java.util.List.class, + com.liferay.portal.service.ServiceContext.class }; - Object[] parameterValues = new Object[] { tipoSoggetto, signatures }; + Object[] parameterValues = new Object[] { + dettPraticaId, classPk, className, to, cc, ccn, templateName, + templateVariables, allegati, serviceContext + }; + + invokeOnRemoteModel(methodName, parameterTypes, parameterValues); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean praticaHasFineLavoriInProgress() { + try { + String methodName = "praticaHasFineLavoriInProgress"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -1991,15 +2085,17 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanDeleteCollaudo(java.lang.String userScreenName) { + public java.lang.String getTitle(java.util.Locale locale, boolean completed) { try { - String methodName = "praticaCanDeleteCollaudo"; + String methodName = "getTitle"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { + java.util.Locale.class, boolean.class + }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { locale, completed }; - Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); return returnObj; @@ -2010,13 +2106,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanAddCollaudo(java.lang.String userScreenName) { + public boolean praticaCanEditIntegrazione() { try { - String methodName = "praticaCanAddCollaudo"; + String methodName = "praticaCanEditIntegrazione"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -2029,22 +2125,53 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isAllRequiredValid(java.lang.String codiceDoc, - java.util.List signatures, - java.util.List tipologiaSoggetti, - it.tref.liferay.portos.bo.model.DocPratica docPratica) { + public java.lang.Integer calcolaDistanzaOrtodromica(double lat, double lng) { try { - String methodName = "isAllRequiredValid"; + String methodName = "calcolaDistanzaOrtodromica"; Class[] parameterTypes = new Class[] { - java.lang.String.class, java.util.List.class, - java.util.List.class, - it.tref.liferay.portos.bo.model.DocPratica.class + double.class, double.class }; - Object[] parameterValues = new Object[] { - codiceDoc, signatures, tipologiaSoggetti, docPratica - }; + Object[] parameterValues = new Object[] { lat, lng }; + + java.lang.Integer returnObj = (java.lang.Integer)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean praticaCanAddVariante() { + try { + String methodName = "praticaCanAddVariante"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + + @Override + public boolean hasAnnullaDelega(long userId) { + try { + String methodName = "hasAnnullaDelega"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { userId }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); 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 f972ce99..ac93a16e 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 @@ -1484,11 +1484,52 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { return _intPratica.praticaHasIntegrazioneInProgress(); } + @Override + public java.util.List getGeologi() + throws com.liferay.portal.kernel.exception.SystemException { + return _intPratica.getGeologi(); + } + + @Override + public boolean hasAnnullaDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _intPratica.hasAnnullaDelega(userId); + } + + @Override + public boolean hasCreazioneDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _intPratica.hasCreazioneDelega(userId); + } + + @Override + public boolean hasDeleteDelega(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _intPratica.hasDeleteDelega(userId); + } + @Override public boolean hasRichiestaIntegrazioneAttiva() { return _intPratica.hasRichiestaIntegrazioneAttiva(); } + @Override + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + _intPratica.invioMailNotifica(dettPraticaId, classPk, className, to, + cc, ccn, templateName, templateVariables, allegati, serviceContext); + } + @Override public boolean isAllowedAction(java.lang.String action) throws com.liferay.portal.kernel.exception.SystemException { @@ -1507,6 +1548,13 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { return _intPratica.praticaInProgress(); } + @Override + public com.liferay.portal.model.User recuperaTecnicoIstruttore() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _intPratica.recuperaTecnicoIstruttore(); + } + @Override public boolean signaturesContains(java.lang.String tipoSoggetto, java.util.List signatures) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java index f2f17de4..887d71bb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java @@ -312,12 +312,6 @@ public interface PagamentoLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.util.Map getPagamenti(); - - public long createPagamentoId() - throws com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Pagamento addPagamento( java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, @@ -328,7 +322,7 @@ public interface PagamentoLocalService extends BaseLocalService, com.liferay.portal.kernel.exception.SystemException; public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - java.lang.String codice, java.lang.String causale, + long pagamentoId, java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, java.lang.String tipoPagamento, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, @@ -339,73 +333,51 @@ public interface PagamentoLocalService extends BaseLocalService, public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( long pagamentoId, java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String tipoImporto, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, + java.lang.String url, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - long pagamentoId, java.lang.String codice, java.lang.String causale, + java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoImporto, java.lang.String importo, + java.lang.String tipoPagamento, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, - java.lang.String url, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String codiceFiscaleCommittente, - java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( - long pagamentoId, java.lang.String utilizzata) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Pagamento annullaPagamento( long pagamentoId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCommittente_Mezzo( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - int start, int end) + public int countByClassPk(long classPk) throws com.liferay.portal.kernel.exception.SystemException; public int countByCommittente_Mezzo( java.lang.String codiceFiscaleCommittente, java.lang.String mezzo) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCommittente_Mezzo_Utilizzata( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String utilizzata, int start, int end) - throws com.liferay.portal.kernel.exception.SystemException; - public int countByCommittente_Mezzo_Utilizzata( java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByMezzo_Utilizzata( - java.lang.String mezzo, java.lang.String utilizzata, int start, int end) + public int countByIntPratica(long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; + + public int countByIntPratica_Visible(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException; public int countByMezzo_Utilizzata(java.lang.String mezzo, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByMezzo_Utilizzata_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - java.util.Date date, int start, int end) + public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, + java.lang.String utilizzata, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException; public int countByMezzo_Utilizzata_EmailPending_CreateDate( @@ -413,49 +385,84 @@ public interface PagamentoLocalService extends BaseLocalService, boolean emailPending, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - boolean emailPending, java.util.Date date, int start, int end) + public int countInPending(java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findInPending( - java.util.Date date, int start, int end, - com.liferay.portal.kernel.util.OrderByComparator comparator) + public long createPagamentoId() throws com.liferay.portal.kernel.exception.SystemException; - public int countInPending(java.util.Date date) + public java.util.List findByClassPk( + long classPk) throws com.liferay.portal.kernel.exception.SystemException; - public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, - java.lang.String utilizzata, java.util.Date date) + public java.util.List findByCommittente_Mezzo( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + int start, int end) throws com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( - long pagamentoId, boolean emailPending) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByClassPk(long classPk) + public java.util.List findByCommittente_Mezzo_Utilizzata( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String utilizzata, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByClassPk( - long classPk) + public java.util.List findByIntPratica( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByIntPratica( + public java.util.List findByIntPratica_Visible( long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException; - public int countByIntPratica(long intPraticaId) + public java.util.List findByMezzo_Utilizzata( + java.lang.String mezzo, java.lang.String utilizzata, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByIntPratica_Visible( - long intPraticaId) + public java.util.List findByMezzo_Utilizzata_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; - public int countByIntPratica_Visible(long intPraticaId) + public java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + boolean emailPending, java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; + public java.util.List findInPending( + java.util.Date date, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator comparator) + throws com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.math.BigDecimal getImportoBolli(long companyId, + long dettPraticaId, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.math.BigDecimal getImportoBolli(long companyId, long classPK, + java.lang.String className, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.util.Map getPagamenti(); + + public it.tref.liferay.portos.bo.model.Pagamento nuovoPagamento( + java.lang.String currentURL, long classPk, java.lang.String className, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String codiceFiscaleCommittente, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean pagamentiCompleted(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean pagamentiInitialized(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public void sostituisciPagamento(long pagamentoId, java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, java.lang.String url, @@ -463,6 +470,27 @@ public interface PagamentoLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( + long pagamentoId, boolean emailPending) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public it.tref.liferay.portos.bo.model.Pagamento updateOtf( + long pagamentoId, boolean otf) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String codiceFiscaleCommittente, + java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public void updatePagamentoManuale(long pagamentoId, java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, @@ -477,8 +505,8 @@ public interface PagamentoLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Pagamento updateOtf( - long pagamentoId, boolean otf) + public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( + long pagamentoId, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; } \ 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/PagamentoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java index 38d6fab6..cab1c5f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java @@ -130,20 +130,31 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { _methodParameterTypes21 = new String[] { "java.lang.String" }; - _methodName23 = "getPagamenti"; + _methodName23 = "addPagamento"; - _methodParameterTypes23 = new String[] { }; + _methodParameterTypes23 = new String[] { + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "long", "java.lang.String", + "com.liferay.portal.service.ServiceContext" + }; - _methodName24 = "createPagamentoId"; + _methodName24 = "addPagamentoAndUpdate"; - _methodParameterTypes24 = new String[] { }; + _methodParameterTypes24 = new String[] { + "long", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "long", + "java.lang.String", "com.liferay.portal.service.ServiceContext" + }; - _methodName25 = "addPagamento"; + _methodName25 = "addPagamentoAndUpdate"; _methodParameterTypes25 = new String[] { + "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "long", "java.lang.String", + "java.lang.String", "java.lang.String", "long", + "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -156,170 +167,187 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName27 = "addPagamentoAndUpdate"; + _methodName27 = "annullaPagamento"; - _methodParameterTypes27 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", - "java.lang.String", "com.liferay.portal.service.ServiceContext" - }; + _methodParameterTypes27 = new String[] { "long" }; - _methodName28 = "addPagamentoAndUpdate"; + _methodName28 = "countByClassPk"; - _methodParameterTypes28 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", - "java.lang.String", "java.lang.String", - "com.liferay.portal.service.ServiceContext" - }; + _methodParameterTypes28 = new String[] { "long" }; - _methodName29 = "updatePagamento"; + _methodName29 = "countByCommittente_Mezzo"; - _methodParameterTypes29 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes29 = new String[] { + "java.lang.String", "java.lang.String" + }; - _methodName30 = "updatePagamento"; + _methodName30 = "countByCommittente_Mezzo_Utilizzata"; _methodParameterTypes30 = new String[] { - "long", "java.lang.String", "java.lang.String" + "java.lang.String", "java.lang.String", "java.lang.String" }; - _methodName31 = "updatePagamentoUtilizzata"; + _methodName31 = "countByIntPratica"; - _methodParameterTypes31 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes31 = new String[] { "long" }; - _methodName32 = "annullaPagamento"; + _methodName32 = "countByIntPratica_Visible"; _methodParameterTypes32 = new String[] { "long" }; - _methodName33 = "findByCommittente_Mezzo"; + _methodName33 = "countByMezzo_Utilizzata"; _methodParameterTypes33 = new String[] { - "java.lang.String", "java.lang.String", "int", "int" + "java.lang.String", "java.lang.String" }; - _methodName34 = "countByCommittente_Mezzo"; + _methodName34 = "countByMezzo_Utilizzata_CreateDate"; _methodParameterTypes34 = new String[] { - "java.lang.String", "java.lang.String" + "java.lang.String", "java.lang.String", "java.util.Date" }; - _methodName35 = "findByCommittente_Mezzo_Utilizzata"; + _methodName35 = "countByMezzo_Utilizzata_EmailPending_CreateDate"; _methodParameterTypes35 = new String[] { - "java.lang.String", "java.lang.String", "java.lang.String", - "int", "int" + "java.lang.String", "java.lang.String", "boolean", + "java.util.Date" }; - _methodName36 = "countByCommittente_Mezzo_Utilizzata"; + _methodName36 = "countInPending"; - _methodParameterTypes36 = new String[] { - "java.lang.String", "java.lang.String", "java.lang.String" - }; + _methodParameterTypes36 = new String[] { "java.util.Date" }; - _methodName37 = "findByMezzo_Utilizzata"; + _methodName37 = "createPagamentoId"; - _methodParameterTypes37 = new String[] { + _methodParameterTypes37 = new String[] { }; + + _methodName38 = "findByClassPk"; + + _methodParameterTypes38 = new String[] { "long" }; + + _methodName39 = "findByCommittente_Mezzo"; + + _methodParameterTypes39 = new String[] { "java.lang.String", "java.lang.String", "int", "int" }; - _methodName38 = "countByMezzo_Utilizzata"; + _methodName40 = "findByCommittente_Mezzo_Utilizzata"; - _methodParameterTypes38 = new String[] { - "java.lang.String", "java.lang.String" + _methodParameterTypes40 = new String[] { + "java.lang.String", "java.lang.String", "java.lang.String", + "int", "int" }; - _methodName39 = "findByMezzo_Utilizzata_CreateDate"; + _methodName41 = "findByIntPratica"; - _methodParameterTypes39 = new String[] { - "java.lang.String", "java.lang.String", "java.util.Date", "int", - "int" + _methodParameterTypes41 = new String[] { "long" }; + + _methodName42 = "findByIntPratica_Visible"; + + _methodParameterTypes42 = new String[] { "long" }; + + _methodName43 = "findByMezzo_Utilizzata"; + + _methodParameterTypes43 = new String[] { + "java.lang.String", "java.lang.String", "int", "int" }; - _methodName40 = "countByMezzo_Utilizzata_EmailPending_CreateDate"; + _methodName44 = "findByMezzo_Utilizzata_CreateDate"; - _methodParameterTypes40 = new String[] { - "java.lang.String", "java.lang.String", "boolean", - "java.util.Date" + _methodParameterTypes44 = new String[] { + "java.lang.String", "java.lang.String", "java.util.Date", "int", + "int" }; - _methodName41 = "findByMezzo_Utilizzata_EmailPending_CreateDate"; + _methodName45 = "findByMezzo_Utilizzata_EmailPending_CreateDate"; - _methodParameterTypes41 = new String[] { + _methodParameterTypes45 = new String[] { "java.lang.String", "java.lang.String", "boolean", "java.util.Date", "int", "int" }; - _methodName42 = "findInPending"; + _methodName46 = "findInPending"; - _methodParameterTypes42 = new String[] { + _methodParameterTypes46 = new String[] { "java.util.Date", "int", "int", "com.liferay.portal.kernel.util.OrderByComparator" }; - _methodName43 = "countInPending"; + _methodName47 = "getImportoBolli"; - _methodParameterTypes43 = new String[] { "java.util.Date" }; + _methodParameterTypes47 = new String[] { + "long", "long", "java.lang.String" + }; - _methodName44 = "countByMezzo_Utilizzata_CreateDate"; + _methodName48 = "getImportoBolli"; - _methodParameterTypes44 = new String[] { - "java.lang.String", "java.lang.String", "java.util.Date" + _methodParameterTypes48 = new String[] { + "long", "long", "java.lang.String", "java.lang.String" }; - _methodName45 = "updateEmailPendingPagamento"; + _methodName49 = "getPagamenti"; + + _methodParameterTypes49 = new String[] { }; + + _methodName50 = "nuovoPagamento"; - _methodParameterTypes45 = new String[] { "long", "boolean" }; + _methodParameterTypes50 = new String[] { + "java.lang.String", "long", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.String", + "com.liferay.portal.service.ServiceContext" + }; - _methodName46 = "countByClassPk"; + _methodName51 = "pagamentiCompleted"; - _methodParameterTypes46 = new String[] { "long" }; + _methodParameterTypes51 = new String[] { "long", "java.lang.String" }; - _methodName47 = "findByClassPk"; + _methodName52 = "pagamentiInitialized"; - _methodParameterTypes47 = new String[] { "long" }; + _methodParameterTypes52 = new String[] { "long", "java.lang.String" }; - _methodName48 = "findByIntPratica"; + _methodName53 = "sostituisciPagamento"; - _methodParameterTypes48 = new String[] { "long" }; + _methodParameterTypes53 = new String[] { + "long", "java.lang.String", "java.lang.String", + "java.lang.String", "com.liferay.portal.service.ServiceContext" + }; - _methodName49 = "countByIntPratica"; + _methodName54 = "updateEmailPendingPagamento"; - _methodParameterTypes49 = new String[] { "long" }; + _methodParameterTypes54 = new String[] { "long", "boolean" }; - _methodName50 = "findByIntPratica_Visible"; + _methodName55 = "updateOtf"; - _methodParameterTypes50 = new String[] { "long" }; + _methodParameterTypes55 = new String[] { "long", "boolean" }; - _methodName51 = "countByIntPratica_Visible"; + _methodName56 = "updatePagamento"; - _methodParameterTypes51 = new String[] { "long" }; + _methodParameterTypes56 = new String[] { "long", "java.lang.String" }; - _methodName52 = "sostituisciPagamento"; + _methodName57 = "updatePagamento"; - _methodParameterTypes52 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "com.liferay.portal.service.ServiceContext" + _methodParameterTypes57 = new String[] { + "long", "java.lang.String", "java.lang.String" }; - _methodName53 = "updatePagamentoManuale"; + _methodName58 = "updatePagamentoManuale"; - _methodParameterTypes53 = new String[] { + _methodParameterTypes58 = new String[] { "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName54 = "updatePagamentoManualeFromImport"; + _methodName59 = "updatePagamentoManualeFromImport"; - _methodParameterTypes54 = new String[] { + _methodParameterTypes59 = new String[] { "long", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName55 = "updateOtf"; + _methodName60 = "updatePagamentoUtilizzata"; - _methodParameterTypes55 = new String[] { "long", "boolean" }; + _methodParameterTypes60 = new String[] { "long", "java.lang.String" }; } @Override @@ -1007,57 +1035,6 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { throw new UnsupportedOperationException(); } - @Override - public java.util.Map getPagamenti() { - 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 long createPagamentoId() - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName24, - _methodParameterTypes24, new Object[] { }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Long)returnObj).longValue(); - } - @Override public it.tref.liferay.portos.bo.model.Pagamento addPagamento( java.lang.String codice, java.lang.String causale, @@ -1070,8 +1047,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName25, - _methodParameterTypes25, + returnObj = _invokableLocalService.invokeMethod(_methodName23, + _methodParameterTypes23, new Object[] { ClpSerializer.translateInput(codice), @@ -1119,7 +1096,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { @Override public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - java.lang.String codice, java.lang.String causale, + long pagamentoId, java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, java.lang.String tipoPagamento, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, @@ -1129,10 +1106,12 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, + returnObj = _invokableLocalService.invokeMethod(_methodName24, + _methodParameterTypes24, new Object[] { - ClpSerializer.translateInput(codice), + pagamentoId, + + ClpSerializer.translateInput(codice), ClpSerializer.translateInput(causale), @@ -1180,16 +1159,17 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( long pagamentoId, java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String tipoImporto, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, + java.lang.String url, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, + returnObj = _invokableLocalService.invokeMethod(_methodName25, + _methodParameterTypes25, new Object[] { pagamentoId, @@ -1201,7 +1181,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { ClpSerializer.translateInput(codiceFiscaleCommittente), - ClpSerializer.translateInput(tipoPagamento), + ClpSerializer.translateInput(tipoImporto), ClpSerializer.translateInput(importo), @@ -1211,6 +1191,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { ClpSerializer.translateInput(className), + ClpSerializer.translateInput(url), + ClpSerializer.translateInput(serviceContext) }); } @@ -1239,23 +1221,20 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { @Override public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - long pagamentoId, java.lang.String codice, java.lang.String causale, + java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoImporto, java.lang.String importo, + java.lang.String tipoPagamento, java.lang.String importo, java.lang.String utilizzata, long classPk, java.lang.String className, - java.lang.String url, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, new Object[] { - pagamentoId, - - ClpSerializer.translateInput(codice), + ClpSerializer.translateInput(codice), ClpSerializer.translateInput(causale), @@ -1263,7 +1242,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { ClpSerializer.translateInput(codiceFiscaleCommittente), - ClpSerializer.translateInput(tipoImporto), + ClpSerializer.translateInput(tipoPagamento), ClpSerializer.translateInput(importo), @@ -1273,8 +1252,6 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { ClpSerializer.translateInput(className), - ClpSerializer.translateInput(url), - ClpSerializer.translateInput(serviceContext) }); } @@ -1302,20 +1279,15 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String importo) + public it.tref.liferay.portos.bo.model.Pagamento annullaPagamento( + long pagamentoId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, - new Object[] { - pagamentoId, - - ClpSerializer.translateInput(importo) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { pagamentoId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1341,31 +1313,17 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String codiceFiscaleCommittente, - java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + public int countByClassPk(long classPk) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, - new Object[] { - pagamentoId, - - ClpSerializer.translateInput(codiceFiscaleCommittente), - - ClpSerializer.translateInput(importo) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, new Object[] { classPk }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1379,32 +1337,27 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); + return ((Integer)returnObj).intValue(); } @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( - long pagamentoId, java.lang.String utilizzata) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + public int countByCommittente_Mezzo( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { - pagamentoId, + ClpSerializer.translateInput(codiceFiscaleCommittente), - ClpSerializer.translateInput(utilizzata) + ClpSerializer.translateInput(mezzo) }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1418,27 +1371,30 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); + return ((Integer)returnObj).intValue(); } @Override - public it.tref.liferay.portos.bo.model.Pagamento annullaPagamento( - long pagamentoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + public int countByCommittente_Mezzo_Utilizzata( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String utilizzata) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, new Object[] { pagamentoId }); + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, + new Object[] { + ClpSerializer.translateInput(codiceFiscaleCommittente), + + ClpSerializer.translateInput(mezzo), + + ClpSerializer.translateInput(utilizzata) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1452,27 +1408,78 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); + return ((Integer)returnObj).intValue(); } @Override - public java.util.List findByCommittente_Mezzo( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - int start, int end) + public int countByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { intPraticaId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Integer)returnObj).intValue(); + } + + @Override + public int countByIntPratica_Visible(long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { intPraticaId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Integer)returnObj).intValue(); + } + + @Override + public int countByMezzo_Utilizzata(java.lang.String mezzo, + java.lang.String utilizzata) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { - ClpSerializer.translateInput(codiceFiscaleCommittente), - - ClpSerializer.translateInput(mezzo), - - start, + ClpSerializer.translateInput(mezzo), - end + ClpSerializer.translateInput(utilizzata) }); } catch (Throwable t) { @@ -1491,12 +1498,12 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return ((Integer)returnObj).intValue(); } @Override - public int countByCommittente_Mezzo( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo) + public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, + java.lang.String utilizzata, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -1504,9 +1511,11 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { returnObj = _invokableLocalService.invokeMethod(_methodName34, _methodParameterTypes34, new Object[] { - ClpSerializer.translateInput(codiceFiscaleCommittente), + ClpSerializer.translateInput(mezzo), - ClpSerializer.translateInput(mezzo) + ClpSerializer.translateInput(utilizzata), + + ClpSerializer.translateInput(date) }); } catch (Throwable t) { @@ -1529,9 +1538,9 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public java.util.List findByCommittente_Mezzo_Utilizzata( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String utilizzata, int start, int end) + public int countByMezzo_Utilizzata_EmailPending_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + boolean emailPending, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -1539,15 +1548,13 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { returnObj = _invokableLocalService.invokeMethod(_methodName35, _methodParameterTypes35, new Object[] { - ClpSerializer.translateInput(codiceFiscaleCommittente), - - ClpSerializer.translateInput(mezzo), + ClpSerializer.translateInput(mezzo), ClpSerializer.translateInput(utilizzata), - start, + emailPending, - end + ClpSerializer.translateInput(date) }); } catch (Throwable t) { @@ -1566,25 +1573,113 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return ((Integer)returnObj).intValue(); } @Override - public int countByCommittente_Mezzo_Utilizzata( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String utilizzata) + public int countInPending(java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableLocalService.invokeMethod(_methodName36, _methodParameterTypes36, + new Object[] { ClpSerializer.translateInput(date) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Integer)returnObj).intValue(); + } + + @Override + public long createPagamentoId() + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Long)returnObj).longValue(); + } + + @Override + public java.util.List findByClassPk( + long classPk) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { classPk }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.List findByCommittente_Mezzo( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { ClpSerializer.translateInput(codiceFiscaleCommittente), ClpSerializer.translateInput(mezzo), - ClpSerializer.translateInput(utilizzata) + start, + + end }); } catch (Throwable t) { @@ -1603,20 +1698,23 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.util.List findByMezzo_Utilizzata( - java.lang.String mezzo, java.lang.String utilizzata, int start, int end) + public java.util.List findByCommittente_Mezzo_Utilizzata( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String utilizzata, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { - ClpSerializer.translateInput(mezzo), + ClpSerializer.translateInput(codiceFiscaleCommittente), + + ClpSerializer.translateInput(mezzo), ClpSerializer.translateInput(utilizzata), @@ -1645,19 +1743,14 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public int countByMezzo_Utilizzata(java.lang.String mezzo, - java.lang.String utilizzata) + public java.util.List findByIntPratica( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, - new Object[] { - ClpSerializer.translateInput(mezzo), - - ClpSerializer.translateInput(utilizzata) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1675,26 +1768,52 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.util.List findByMezzo_Utilizzata_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - java.util.Date date, int start, int end) + public java.util.List findByIntPratica_Visible( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { intPraticaId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.List findByMezzo_Utilizzata( + java.lang.String mezzo, java.lang.String utilizzata, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { ClpSerializer.translateInput(mezzo), ClpSerializer.translateInput(utilizzata), - ClpSerializer.translateInput(date), - start, end @@ -1720,23 +1839,25 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public int countByMezzo_Utilizzata_EmailPending_CreateDate( + public java.util.List findByMezzo_Utilizzata_CreateDate( java.lang.String mezzo, java.lang.String utilizzata, - boolean emailPending, java.util.Date date) + java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { ClpSerializer.translateInput(mezzo), ClpSerializer.translateInput(utilizzata), - emailPending, + ClpSerializer.translateInput(date), - ClpSerializer.translateInput(date) + start, + + end }); } catch (Throwable t) { @@ -1755,7 +1876,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override @@ -1766,8 +1887,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { ClpSerializer.translateInput(mezzo), @@ -1809,8 +1930,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { ClpSerializer.translateInput(date), @@ -1841,18 +1962,30 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public int countInPending(java.util.Date date) - throws com.liferay.portal.kernel.exception.SystemException { + public java.math.BigDecimal getImportoBolli(long companyId, + long dettPraticaId, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, - new Object[] { ClpSerializer.translateInput(date) }); + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, + new Object[] { + companyId, + + dettPraticaId, + + ClpSerializer.translateInput(tipoIntegrazione) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1866,29 +1999,36 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.math.BigDecimal)ClpSerializer.translateOutput(returnObj); } @Override - public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, - java.lang.String utilizzata, java.util.Date date) - throws com.liferay.portal.kernel.exception.SystemException { + public java.math.BigDecimal getImportoBolli(long companyId, long classPK, + java.lang.String className, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { - ClpSerializer.translateInput(mezzo), + companyId, - ClpSerializer.translateInput(utilizzata), + classPK, - ClpSerializer.translateInput(date) + ClpSerializer.translateInput(className), + + ClpSerializer.translateInput(tipoIntegrazione) }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1902,20 +2042,60 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.math.BigDecimal)ClpSerializer.translateOutput(returnObj); } @Override - public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( - long pagamentoId, boolean emailPending) + public java.util.Map getPagamenti() { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, 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 it.tref.liferay.portos.bo.model.Pagamento nuovoPagamento( + java.lang.String currentURL, long classPk, java.lang.String className, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String codiceFiscaleCommittente, + com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, - new Object[] { pagamentoId, emailPending }); + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, + new Object[] { + ClpSerializer.translateInput(currentURL), + + classPk, + + ClpSerializer.translateInput(className), + + ClpSerializer.translateInput(tipoPagamento), + + ClpSerializer.translateInput(importo), + + ClpSerializer.translateInput(codiceFiscaleCommittente), + + ClpSerializer.translateInput(serviceContext) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1941,17 +2121,27 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public int countByClassPk(long classPk) - throws com.liferay.portal.kernel.exception.SystemException { + public boolean pagamentiCompleted(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, + new Object[] { + classPK, + + ClpSerializer.translateInput(className) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1965,22 +2155,31 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return ((Boolean)returnObj).booleanValue(); } @Override - public java.util.List findByClassPk( - long classPk) - throws com.liferay.portal.kernel.exception.SystemException { + public boolean pagamentiInitialized(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, + new Object[] { + classPK, + + ClpSerializer.translateInput(className) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -1994,22 +2193,38 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return ((Boolean)returnObj).booleanValue(); } @Override - public java.util.List findByIntPratica( - long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - + public void sostituisciPagamento(long pagamentoId, + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String url, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, + new Object[] { + pagamentoId, + + ClpSerializer.translateInput(codiceFiscaleCommittente), + + ClpSerializer.translateInput(mezzo), + + ClpSerializer.translateInput(url), + + ClpSerializer.translateInput(serviceContext) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -2022,22 +2237,27 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { " is not a valid exception"); } } - - return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public int countByIntPratica(long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { + public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( + long pagamentoId, boolean emailPending) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, + new Object[] { pagamentoId, emailPending }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -2051,22 +2271,27 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); } @Override - public java.util.List findByIntPratica_Visible( - long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { + public it.tref.liferay.portos.bo.model.Pagamento updateOtf( + long pagamentoId, boolean otf) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { pagamentoId, otf }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -2080,21 +2305,32 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); } @Override - public int countByIntPratica_Visible(long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, + new Object[] { + pagamentoId, + + ClpSerializer.translateInput(importo) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -2108,30 +2344,27 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } } - return ((Integer)returnObj).intValue(); + return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); } @Override - public void sostituisciPagamento(long pagamentoId, - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String url, - com.liferay.portal.service.ServiceContext serviceContext) + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String codiceFiscaleCommittente, + java.lang.String importo) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + try { - _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, - new Object[] { - pagamentoId, - - ClpSerializer.translateInput(codiceFiscaleCommittente), - - ClpSerializer.translateInput(mezzo), - - ClpSerializer.translateInput(url), - - ClpSerializer.translateInput(serviceContext) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, + new Object[] { + pagamentoId, + + ClpSerializer.translateInput(codiceFiscaleCommittente), + + ClpSerializer.translateInput(importo) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2152,6 +2385,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { " is not a valid exception"); } } + + return (it.tref.liferay.portos.bo.model.Pagamento)ClpSerializer.translateOutput(returnObj); } @Override @@ -2163,8 +2398,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { com.liferay.portal.kernel.exception.SystemException, java.io.IOException { try { - _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { pagamentoId, @@ -2209,8 +2444,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { pagamentoId, @@ -2243,15 +2478,20 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public it.tref.liferay.portos.bo.model.Pagamento updateOtf( - long pagamentoId, boolean otf) + public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( + long pagamentoId, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, new Object[] { pagamentoId, otf }); + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, + new Object[] { + pagamentoId, + + ClpSerializer.translateInput(utilizzata) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2387,4 +2627,14 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { private String[] _methodParameterTypes54; private String _methodName55; private String[] _methodParameterTypes55; + private String _methodName56; + private String[] _methodParameterTypes56; + private String _methodName57; + private String[] _methodParameterTypes57; + private String _methodName58; + private String[] _methodParameterTypes58; + private String _methodName59; + private String[] _methodParameterTypes59; + private String _methodName60; + private String[] _methodParameterTypes60; } \ 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/PagamentoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java index 8795a639..f8bd0f52 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java @@ -337,15 +337,6 @@ public class PagamentoLocalServiceUtil { return getService().invokeMethod(name, parameterTypes, arguments); } - public static java.util.Map getPagamenti() { - return getService().getPagamenti(); - } - - public static long createPagamentoId() - throws com.liferay.portal.kernel.exception.SystemException { - return getService().createPagamentoId(); - } - public static it.tref.liferay.portos.bo.model.Pagamento addPagamento( java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, @@ -360,20 +351,6 @@ public class PagamentoLocalServiceUtil { classPk, className, serviceContext); } - public static it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - java.lang.String codice, java.lang.String causale, - java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoPagamento, java.lang.String importo, - java.lang.String utilizzata, long classPk, java.lang.String className, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .addPagamentoAndUpdate(codice, causale, mezzo, - codiceFiscaleCommittente, tipoPagamento, importo, utilizzata, - classPk, className, serviceContext); - } - public static it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( long pagamentoId, java.lang.String codice, java.lang.String causale, java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, @@ -403,28 +380,18 @@ public class PagamentoLocalServiceUtil { classPk, className, url, serviceContext); } - public static it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService().updatePagamento(pagamentoId, importo); - } - - public static it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String codiceFiscaleCommittente, - java.lang.String importo) + public static it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( + java.lang.String codice, java.lang.String causale, + java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String utilizzata, long classPk, java.lang.String className, + com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { return getService() - .updatePagamento(pagamentoId, codiceFiscaleCommittente, - importo); - } - - public static it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( - long pagamentoId, java.lang.String utilizzata) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService().updatePagamentoUtilizzata(pagamentoId, utilizzata); + .addPagamentoAndUpdate(codice, causale, mezzo, + codiceFiscaleCommittente, tipoPagamento, importo, utilizzata, + classPk, className, serviceContext); } public static it.tref.liferay.portos.bo.model.Pagamento annullaPagamento( @@ -434,13 +401,9 @@ public class PagamentoLocalServiceUtil { return getService().annullaPagamento(pagamentoId); } - public static java.util.List findByCommittente_Mezzo( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - int start, int end) + public static int countByClassPk(long classPk) throws com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCommittente_Mezzo(codiceFiscaleCommittente, mezzo, - start, end); + return getService().countByClassPk(classPk); } public static int countByCommittente_Mezzo( @@ -450,15 +413,6 @@ public class PagamentoLocalServiceUtil { .countByCommittente_Mezzo(codiceFiscaleCommittente, mezzo); } - public static java.util.List findByCommittente_Mezzo_Utilizzata( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String utilizzata, int start, int end) - throws com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, utilizzata, start, end); - } - public static int countByCommittente_Mezzo_Utilizzata( java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, java.lang.String utilizzata) @@ -468,10 +422,14 @@ public class PagamentoLocalServiceUtil { mezzo, utilizzata); } - public static java.util.List findByMezzo_Utilizzata( - java.lang.String mezzo, java.lang.String utilizzata, int start, int end) + public static int countByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return getService().findByMezzo_Utilizzata(mezzo, utilizzata, start, end); + return getService().countByIntPratica(intPraticaId); + } + + public static int countByIntPratica_Visible(long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().countByIntPratica_Visible(intPraticaId); } public static int countByMezzo_Utilizzata(java.lang.String mezzo, @@ -480,13 +438,11 @@ public class PagamentoLocalServiceUtil { return getService().countByMezzo_Utilizzata(mezzo, utilizzata); } - public static java.util.List findByMezzo_Utilizzata_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - java.util.Date date, int start, int end) + public static int countByMezzo_Utilizzata_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { return getService() - .findByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date, - start, end); + .countByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date); } public static int countByMezzo_Utilizzata_EmailPending_CreateDate( @@ -498,73 +454,129 @@ public class PagamentoLocalServiceUtil { utilizzata, emailPending, date); } - public static java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - boolean emailPending, java.util.Date date, int start, int end) + public static int countInPending(java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, - utilizzata, emailPending, date, start, end); + return getService().countInPending(date); } - public static java.util.List findInPending( - java.util.Date date, int start, int end, - com.liferay.portal.kernel.util.OrderByComparator comparator) + public static long createPagamentoId() throws com.liferay.portal.kernel.exception.SystemException { - return getService().findInPending(date, start, end, comparator); + return getService().createPagamentoId(); } - public static int countInPending(java.util.Date date) + public static java.util.List findByClassPk( + long classPk) throws com.liferay.portal.kernel.exception.SystemException { - return getService().countInPending(date); + return getService().findByClassPk(classPk); } - public static int countByMezzo_Utilizzata_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, java.util.Date date) + public static java.util.List findByCommittente_Mezzo( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + int start, int end) throws com.liferay.portal.kernel.exception.SystemException { return getService() - .countByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date); + .findByCommittente_Mezzo(codiceFiscaleCommittente, mezzo, + start, end); } - public static it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( - long pagamentoId, boolean emailPending) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + public static java.util.List findByCommittente_Mezzo_Utilizzata( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String utilizzata, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { return getService() - .updateEmailPendingPagamento(pagamentoId, emailPending); + .findByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, + mezzo, utilizzata, start, end); } - public static int countByClassPk(long classPk) + public static java.util.List findByIntPratica( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return getService().countByClassPk(classPk); + return getService().findByIntPratica(intPraticaId); } - public static java.util.List findByClassPk( - long classPk) + public static java.util.List findByIntPratica_Visible( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return getService().findByClassPk(classPk); + return getService().findByIntPratica_Visible(intPraticaId); } - public static java.util.List findByIntPratica( - long intPraticaId) + public static java.util.List findByMezzo_Utilizzata( + java.lang.String mezzo, java.lang.String utilizzata, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return getService().findByIntPratica(intPraticaId); + return getService().findByMezzo_Utilizzata(mezzo, utilizzata, start, end); } - public static int countByIntPratica(long intPraticaId) + public static java.util.List findByMezzo_Utilizzata_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return getService().countByIntPratica(intPraticaId); + return getService() + .findByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date, + start, end); } - public static java.util.List findByIntPratica_Visible( - long intPraticaId) + public static java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + boolean emailPending, java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return getService().findByIntPratica_Visible(intPraticaId); + return getService() + .findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, + utilizzata, emailPending, date, start, end); } - public static int countByIntPratica_Visible(long intPraticaId) + public static java.util.List findInPending( + java.util.Date date, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator comparator) throws com.liferay.portal.kernel.exception.SystemException { - return getService().countByIntPratica_Visible(intPraticaId); + return getService().findInPending(date, start, end, comparator); + } + + public static java.math.BigDecimal getImportoBolli(long companyId, + long dettPraticaId, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .getImportoBolli(companyId, dettPraticaId, tipoIntegrazione); + } + + public static java.math.BigDecimal getImportoBolli(long companyId, + long classPK, java.lang.String className, + java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .getImportoBolli(companyId, classPK, className, + tipoIntegrazione); + } + + public static java.util.Map getPagamenti() { + return getService().getPagamenti(); + } + + public static it.tref.liferay.portos.bo.model.Pagamento nuovoPagamento( + java.lang.String currentURL, long classPk, java.lang.String className, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String codiceFiscaleCommittente, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .nuovoPagamento(currentURL, classPk, className, + tipoPagamento, importo, codiceFiscaleCommittente, serviceContext); + } + + public static boolean pagamentiCompleted(long classPK, + java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().pagamentiCompleted(classPK, className); + } + + public static boolean pagamentiInitialized(long classPK, + java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().pagamentiInitialized(classPK, className); } public static void sostituisciPagamento(long pagamentoId, @@ -578,6 +590,38 @@ public class PagamentoLocalServiceUtil { url, serviceContext); } + public static it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( + long pagamentoId, boolean emailPending) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .updateEmailPendingPagamento(pagamentoId, emailPending); + } + + public static it.tref.liferay.portos.bo.model.Pagamento updateOtf( + long pagamentoId, boolean otf) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().updateOtf(pagamentoId, otf); + } + + public static it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().updatePagamento(pagamentoId, importo); + } + + public static it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String codiceFiscaleCommittente, + java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .updatePagamento(pagamentoId, codiceFiscaleCommittente, + importo); + } + public static void updatePagamentoManuale(long pagamentoId, java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, @@ -600,11 +644,11 @@ public class PagamentoLocalServiceUtil { sourceFileName, serviceContext); } - public static it.tref.liferay.portos.bo.model.Pagamento updateOtf( - long pagamentoId, boolean otf) + public static it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( + long pagamentoId, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return getService().updateOtf(pagamentoId, otf); + return getService().updatePagamentoUtilizzata(pagamentoId, utilizzata); } public static void clearService() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java index 8cbe29b0..3a464572 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java @@ -355,17 +355,6 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, arguments); } - @Override - public java.util.Map getPagamenti() { - return _pagamentoLocalService.getPagamenti(); - } - - @Override - public long createPagamentoId() - throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.createPagamentoId(); - } - @Override public it.tref.liferay.portos.bo.model.Pagamento addPagamento( java.lang.String codice, java.lang.String causale, @@ -380,20 +369,6 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, classPk, className, serviceContext); } - @Override - public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( - java.lang.String codice, java.lang.String causale, - java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, - java.lang.String tipoPagamento, java.lang.String importo, - java.lang.String utilizzata, long classPk, java.lang.String className, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.addPagamentoAndUpdate(codice, causale, - mezzo, codiceFiscaleCommittente, tipoPagamento, importo, - utilizzata, classPk, className, serviceContext); - } - @Override public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( long pagamentoId, java.lang.String codice, java.lang.String causale, @@ -424,30 +399,17 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.updatePagamento(pagamentoId, importo); - } - - @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( - long pagamentoId, java.lang.String codiceFiscaleCommittente, - java.lang.String importo) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.updatePagamento(pagamentoId, - codiceFiscaleCommittente, importo); - } - - @Override - public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( - long pagamentoId, java.lang.String utilizzata) + public it.tref.liferay.portos.bo.model.Pagamento addPagamentoAndUpdate( + java.lang.String codice, java.lang.String causale, + java.lang.String mezzo, java.lang.String codiceFiscaleCommittente, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String utilizzata, long classPk, java.lang.String className, + com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, - utilizzata); + return _pagamentoLocalService.addPagamentoAndUpdate(codice, causale, + mezzo, codiceFiscaleCommittente, tipoPagamento, importo, + utilizzata, classPk, className, serviceContext); } @Override @@ -459,12 +421,9 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public java.util.List findByCommittente_Mezzo( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - int start, int end) + public int countByClassPk(long classPk) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByCommittente_Mezzo(codiceFiscaleCommittente, - mezzo, start, end); + return _pagamentoLocalService.countByClassPk(classPk); } @Override @@ -475,15 +434,6 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, mezzo); } - @Override - public java.util.List findByCommittente_Mezzo_Utilizzata( - java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, - java.lang.String utilizzata, int start, int end) - throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, utilizzata, start, end); - } - @Override public int countByCommittente_Mezzo_Utilizzata( java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, @@ -494,11 +444,15 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public java.util.List findByMezzo_Utilizzata( - java.lang.String mezzo, java.lang.String utilizzata, int start, int end) + public int countByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByMezzo_Utilizzata(mezzo, utilizzata, - start, end); + return _pagamentoLocalService.countByIntPratica(intPraticaId); + } + + @Override + public int countByIntPratica_Visible(long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.countByIntPratica_Visible(intPraticaId); } @Override @@ -509,12 +463,11 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public java.util.List findByMezzo_Utilizzata_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - java.util.Date date, int start, int end) + public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, + java.lang.String utilizzata, java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByMezzo_Utilizzata_CreateDate(mezzo, - utilizzata, date, start, end); + return _pagamentoLocalService.countByMezzo_Utilizzata_CreateDate(mezzo, + utilizzata, date); } @Override @@ -527,82 +480,138 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( - java.lang.String mezzo, java.lang.String utilizzata, - boolean emailPending, java.util.Date date, int start, int end) + public int countInPending(java.util.Date date) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, - utilizzata, emailPending, date, start, end); + return _pagamentoLocalService.countInPending(date); } @Override - public java.util.List findInPending( - java.util.Date date, int start, int end, - com.liferay.portal.kernel.util.OrderByComparator comparator) + public long createPagamentoId() throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findInPending(date, start, end, comparator); + return _pagamentoLocalService.createPagamentoId(); } @Override - public int countInPending(java.util.Date date) + public java.util.List findByClassPk( + long classPk) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.countInPending(date); + return _pagamentoLocalService.findByClassPk(classPk); } @Override - public int countByMezzo_Utilizzata_CreateDate(java.lang.String mezzo, - java.lang.String utilizzata, java.util.Date date) + public java.util.List findByCommittente_Mezzo( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.countByMezzo_Utilizzata_CreateDate(mezzo, - utilizzata, date); + return _pagamentoLocalService.findByCommittente_Mezzo(codiceFiscaleCommittente, + mezzo, start, end); } @Override - public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( - long pagamentoId, boolean emailPending) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.updateEmailPendingPagamento(pagamentoId, - emailPending); + public java.util.List findByCommittente_Mezzo_Utilizzata( + java.lang.String codiceFiscaleCommittente, java.lang.String mezzo, + java.lang.String utilizzata, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.findByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, + mezzo, utilizzata, start, end); } @Override - public int countByClassPk(long classPk) + public java.util.List findByIntPratica( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.countByClassPk(classPk); + return _pagamentoLocalService.findByIntPratica(intPraticaId); } @Override - public java.util.List findByClassPk( - long classPk) + public java.util.List findByIntPratica_Visible( + long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByClassPk(classPk); + return _pagamentoLocalService.findByIntPratica_Visible(intPraticaId); } @Override - public java.util.List findByIntPratica( - long intPraticaId) + public java.util.List findByMezzo_Utilizzata( + java.lang.String mezzo, java.lang.String utilizzata, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByIntPratica(intPraticaId); + return _pagamentoLocalService.findByMezzo_Utilizzata(mezzo, utilizzata, + start, end); } @Override - public int countByIntPratica(long intPraticaId) + public java.util.List findByMezzo_Utilizzata_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.countByIntPratica(intPraticaId); + return _pagamentoLocalService.findByMezzo_Utilizzata_CreateDate(mezzo, + utilizzata, date, start, end); } @Override - public java.util.List findByIntPratica_Visible( - long intPraticaId) + public java.util.List findByMezzo_Utilizzata_EmailPending_CreateDate( + java.lang.String mezzo, java.lang.String utilizzata, + boolean emailPending, java.util.Date date, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.findByIntPratica_Visible(intPraticaId); + return _pagamentoLocalService.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, + utilizzata, emailPending, date, start, end); } @Override - public int countByIntPratica_Visible(long intPraticaId) + public java.util.List findInPending( + java.util.Date date, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator comparator) throws com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.countByIntPratica_Visible(intPraticaId); + return _pagamentoLocalService.findInPending(date, start, end, comparator); + } + + @Override + public java.math.BigDecimal getImportoBolli(long companyId, + long dettPraticaId, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.getImportoBolli(companyId, dettPraticaId, + tipoIntegrazione); + } + + @Override + public java.math.BigDecimal getImportoBolli(long companyId, long classPK, + java.lang.String className, java.lang.String tipoIntegrazione) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.getImportoBolli(companyId, classPK, + className, tipoIntegrazione); + } + + @Override + public java.util.Map getPagamenti() { + return _pagamentoLocalService.getPagamenti(); + } + + @Override + public it.tref.liferay.portos.bo.model.Pagamento nuovoPagamento( + java.lang.String currentURL, long classPk, java.lang.String className, + java.lang.String tipoPagamento, java.lang.String importo, + java.lang.String codiceFiscaleCommittente, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.nuovoPagamento(currentURL, classPk, + className, tipoPagamento, importo, codiceFiscaleCommittente, + serviceContext); + } + + @Override + public boolean pagamentiCompleted(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.pagamentiCompleted(classPK, className); + } + + @Override + public boolean pagamentiInitialized(long classPK, java.lang.String className) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.pagamentiInitialized(classPK, className); } @Override @@ -616,6 +625,41 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, codiceFiscaleCommittente, mezzo, url, serviceContext); } + @Override + public it.tref.liferay.portos.bo.model.Pagamento updateEmailPendingPagamento( + long pagamentoId, boolean emailPending) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.updateEmailPendingPagamento(pagamentoId, + emailPending); + } + + @Override + public it.tref.liferay.portos.bo.model.Pagamento updateOtf( + long pagamentoId, boolean otf) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.updateOtf(pagamentoId, otf); + } + + @Override + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.updatePagamento(pagamentoId, importo); + } + + @Override + public it.tref.liferay.portos.bo.model.Pagamento updatePagamento( + long pagamentoId, java.lang.String codiceFiscaleCommittente, + java.lang.String importo) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _pagamentoLocalService.updatePagamento(pagamentoId, + codiceFiscaleCommittente, importo); + } + @Override public void updatePagamentoManuale(long pagamentoId, java.lang.String numeroBollettino, byte[] content, @@ -639,11 +683,12 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public it.tref.liferay.portos.bo.model.Pagamento updateOtf( - long pagamentoId, boolean otf) + public it.tref.liferay.portos.bo.model.Pagamento updatePagamentoUtilizzata( + long pagamentoId, java.lang.String utilizzata) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _pagamentoLocalService.updateOtf(pagamentoId, otf); + return _pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, + utilizzata); } /** diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java deleted file mode 100644 index eab50494..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java +++ /dev/null @@ -1,276 +0,0 @@ -package it.tref.liferay.portos.bo.util; - -import it.tref.liferay.portos.bo.model.Collaudo; -import it.tref.liferay.portos.bo.model.Delega; -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.DocPratica; -import it.tref.liferay.portos.bo.model.FineLavori; -import it.tref.liferay.portos.bo.model.Soggetto; -import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; -import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; -import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -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.util.Validator; -import com.liferay.portal.model.User; -import com.liferay.portal.service.UserLocalServiceUtil; - -public class DelegheUtil { - - public static final String STATO_ASSEGNATA = "AS"; - public static final String STATO_ESEGUITA = "ES"; - public static final String STATO_ANNULLATA = "AN"; - public static final String STATO_RIFIUTATA = "RI"; - - public static final String TIPO_TOTALE = "TT"; - public static final String TIPO_COMPILAZIONE = "CO"; - public static final String TIPO_GEOLOGO = "GE"; - public static final String TIPO_FIRMA_INSERIMENTO_ALLEGATI = "FI"; - public static final String TIPO_PAGAMENTO = "PG"; - public static final String TIPO_VISUALIZZAZIONE = "VI"; - public static final String TIPO_FINE_LAVORI = "FL"; - public static final String TIPO_COLLAUDO = "CL"; - - public static boolean hasDelegaFirma(long userId, long docPraticaId, boolean sezioneGeologica) - throws PortalException, SystemException { - - DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); - boolean controllo = true; - DettPratica dettPratica = null; - if (DettPratica.class.getName().equals(docPratica.getClassName())) { - dettPratica = DettPraticaServiceUtil.getDettPratica(docPratica.getClassPk()); - controllo = dettPratica.praticaIsEditable(); - } - if (controllo) { - User user = UserLocalServiceUtil.getUser(userId); - long owner = 0L; - long intPraticaId = 0L; - if (DettPratica.class.getName().equals(docPratica.getClassName())) { - intPraticaId = dettPratica.getIntPraticaId(); - owner = dettPratica.getUserId(); - } else if (FineLavori.class.getName().equals(docPratica.getClassName())) { - FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(docPratica.getClassPk()); - owner = fineLavori.getUserId(); - } else if (Collaudo.class.getName().equals(docPratica.getClassName())) { - Collaudo collaudo = CollaudoServiceUtil.getCollaudo(docPratica.getClassPk()); - owner = collaudo.getUserId(); - } - if (user.getUserId() == owner) { - controllo = true; - } else if (DettPratica.class.getName().equals(docPratica.getClassName())) { - List deleghe = findDeleghe(intPraticaId, sezioneGeologica); - controllo = false; - if (!deleghe.isEmpty()) { - controllo = false; - for (Delega delega : deleghe) { - if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { - controllo = true; - break; - } - } - } - } else { - controllo = false; - } - } - return controllo; - } - - private static List findDeleghe(long intPraticaid, boolean sezioneGeologica) throws SystemException { - - List deleghe = new ArrayList(); - deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, - DelegheUtil.TIPO_COMPILAZIONE, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null)); - deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, - DelegheUtil.TIPO_FIRMA_INSERIMENTO_ALLEGATI, new String[] { DelegheUtil.STATO_ASSEGNATA }, - QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)); - if (sezioneGeologica) { - deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, - DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null)); - } - return deleghe; - } - - public static boolean hasDelegaDeleteFile(long userId, long docPraticaId, boolean sezioneGeologica) - throws PortalException, SystemException { - - // TODO completare e controllare - DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk()); - return dettPratica.praticaIsEditable(); - } - - public static boolean hasCambioStatoDelega(long userId, long delegaId) throws PortalException, SystemException { - - return true; - } - - public static boolean hasCreazioneDelega(long userId, long intPraticaId) throws PortalException, SystemException { - - return true; - } - - public static boolean hasDeleteDelega(long userId, long intPraticaId) throws PortalException, SystemException { - - return hasCreazioneDelega(userId, intPraticaId); - } - - public static boolean hasAnnullaDelega(long userId, long intPraticaId) throws PortalException, SystemException { - - return hasCreazioneDelega(userId, intPraticaId); - } - - public static boolean canCompilaDomanda(long userId, long dettPraticaId) throws PortalException, SystemException { - - boolean controllo = false; - User user = UserLocalServiceUtil.getUser(userId); - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(dettPratica.getIntPraticaId(), - DelegheUtil.TIPO_COMPILAZIONE, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null); - if (deleghe.isEmpty()) { - if (user.getUserId() == dettPratica.getUserId()) { - controllo = true; - } else { - controllo = false; - } - } else { - controllo = false; - for (Delega delega : deleghe) { - if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { - controllo = true; - } - } - } - return controllo; - } - - public static Soggetto getPersonaDelegaCompilazioneDomanda(long dettPraticaId) throws SystemException, - PortalException { - - Soggetto soggetto = null; - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - if (dettPratica.praticaIsEditable()) { - List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito( - dettPratica.getIntPraticaId(), DelegheUtil.TIPO_COMPILAZIONE, - new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - if (!deleghe.isEmpty()) { - for (Delega delega : deleghe) { - List soggetti = SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale(dettPraticaId, - delega.getCodiceFiscale()); - for (Soggetto soggettoTmp : soggetti) { - soggetto = soggettoTmp; - } - } - } - } - return soggetto; - } - - public static Soggetto getPersonaDelegaCompilazioneSezioneGeologica(long dettPraticaId) throws SystemException, - PortalException { - - Soggetto soggetto = null; - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - if (dettPratica.praticaIsEditable()) { - List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito( - dettPratica.getIntPraticaId(), DelegheUtil.TIPO_GEOLOGO, - new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - if (!deleghe.isEmpty()) { - for (Delega delega : deleghe) { - List soggetti = SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale(dettPraticaId, - delega.getCodiceFiscale()); - for (Soggetto soggettoTmp : soggetti) { - soggetto = soggettoTmp; - } - } - } else { - soggetto = getPersonaDelegaCompilazioneDomanda(dettPraticaId); - } - } - return soggetto; - } - - public static List getGeologi(long intPraticaId) throws SystemException { - - List geologi = new ArrayList(); - List soggetti = SoggettoLocalServiceUtil.findByIntPratica(intPraticaId); - for (Soggetto soggetto : soggetti) { - if (soggetto.getTipologiaSoggetto().equalsIgnoreCase(TipoSoggettoUtil.GEOLOGO) - && Validator.isNull(soggetto.getSostituitoDa())) - geologi.add(soggetto); - } - return geologi; - } - - public static boolean hasDelegaPagamento(long userId, long dettPraticaId) throws PortalException, SystemException { - - boolean controllo = false; - User user = UserLocalServiceUtil.getUser(userId); - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(dettPratica.getIntPraticaId(), - DelegheUtil.TIPO_PAGAMENTO, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null); - if (deleghe.isEmpty()) { - if (user.getUserId() == dettPratica.getUserId()) { - controllo = true; - } else { - controllo = false; - } - } else { - controllo = false; - for (Delega delega : deleghe) { - if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { - controllo = true; - } - } - } - return controllo; - } - - public static boolean canDoPayment(long userId, long dettPraticaId) throws PortalException, SystemException { - - return canCompilaDomanda(userId, dettPraticaId) || hasDelegaPagamento(userId, dettPraticaId); - } - - public static boolean hasDelegheCompilazioneAttive(long dettPraticaId) throws SystemException { - - return DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { - TIPO_COMPILAZIONE, TIPO_GEOLOGO, TIPO_FIRMA_INSERIMENTO_ALLEGATI }, new String[] { STATO_ASSEGNATA }) > 0; - } - - public static boolean hasDelegaAttiva(long userId, long dettPraticaId) throws PortalException, SystemException { - - User user = UserLocalServiceUtil.getUser(userId); - return DelegaLocalServiceUtil.countByDettPratica_CodiceFiscale_InEsito(dettPraticaId, user.getScreenName(), - new String[] { STATO_ASSEGNATA }) > 0; - } - - @SuppressWarnings("serial") - public static final Map iconMapper = new HashMap() { - { - put(TIPO_TOTALE, "fa-bullseye"); - put(TIPO_COMPILAZIONE, "fa-pencil"); - put(TIPO_FIRMA_INSERIMENTO_ALLEGATI, "fa-paperclip"); - put(TIPO_GEOLOGO, "fa-globe"); - put(TIPO_COLLAUDO, "fa-cogs"); - put(TIPO_PAGAMENTO, "fa-eur"); - put(TIPO_VISUALIZZAZIONE, "fa-eye"); - put(TIPO_FINE_LAVORI, "fa-window-close"); - } - }; -} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java deleted file mode 100644 index 7ecc669e..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/MailUtil.java +++ /dev/null @@ -1,258 +0,0 @@ -package it.tref.liferay.portos.bo.util; - -import it.mwg.sismica.bo.shared.util.WorkflowConstants; -import it.tref.liferay.portos.bo.model.Avviso; -import it.tref.liferay.portos.bo.model.Comune; -import it.tref.liferay.portos.bo.model.ControlloPratica; -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.ParereGeologo; -import it.tref.liferay.portos.bo.model.Provincia; -import it.tref.liferay.portos.bo.model.Soggetto; -import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; -import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; - -import java.util.Date; -import java.util.List; - -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.model.User; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.UserLocalServiceUtil; - -public class MailUtil { - - private static final Log _log = LogFactoryUtil.getLog(MailUtil.class); - - public static void invioMailNotifica(long intPraticaId, long dettPraticaId, long classPk, String className, - String[] to, String[] cc, String[] ccn, String templateName, JSONObject templateVariables, - List allegati, ServiceContext serviceContext) throws PortalException, SystemException { - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - User titolaredigitaleUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); - List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale( - intPratica.getIntPraticaId(), titolaredigitaleUser.getScreenName()); - String titolareDigitale = StringPool.BLANK; - String titolareDigitaleMail = StringPool.BLANK; - String titolareDigitaleRoles = StringPool.BLANK; - if (!titolari.isEmpty()) { - titolareDigitale = titolari.get(0).getTitle(); - titolareDigitaleMail = titolari.get(0).getEmail(); - for (Soggetto titolare : titolari) { - titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN, - "gc-soggetto-" + titolare.getTipologiaSoggetto()) - + StringPool.SPACE; - } - } - String committenteTitle = StringPool.BLANK; - String descIntervento = StringPool.BLANK; - String tempId = StringPool.BLANK; - if (Validator.isNotNull(dettPratica)) { - tempId = dettPratica.getTitle(); - descIntervento = dettPratica.getDescLongIntervento(); - Soggetto committentePrincipale = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(intPratica.getIntPraticaId(), - dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); - if (Validator.isNotNull(committentePrincipale)) { - committenteTitle = committentePrincipale.getTitle(); - } - } - templateVariables.put("tempId", tempId); - templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); - templateVariables.put("titolareDigitale", titolareDigitale); - templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles); - templateVariables.put("titolareDigitaleMail", titolareDigitaleMail); - templateVariables.put("intervento", descIntervento); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - templateVariables.put("committente", committenteTitle); - MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables, - allegati, serviceContext); - } - - // ADT - public static void invioNotificaAssegnazioneIstruttore(Avviso avviso) throws PortalException, SystemException { - - _log.info("start invioNotificaAssegnazioneIstruttore: avviso_id = " + avviso.getAvvisoId() - + " - IntPraticaId = " + avviso.getIntPraticaId()); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(avviso.getClassPk()); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - if (avviso.getControlloPraticaId() == 0) { - _log.info("invioNotificaAssegnazioneIstruttore - skip invio email - controllopratica non trovato per avviso_id = " - + avviso.getAvvisoId()); - AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(avviso.getAvvisoId(), true); - return; - } - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(avviso - .getControlloPraticaId()); - ServiceContext serviceContext = new ServiceContext(); - serviceContext.setCompanyId(controlloPratica.getCompanyId()); - serviceContext.setScopeGroupId(controlloPratica.getGroupId()); - serviceContext.setUserId(controlloPratica.getUserId()); - User tecnicoIstruttore = recuperaTecnicoIstruttore(intPratica); - if (tecnicoIstruttore == null) { - _log.info("invioNotificaAssegnazioneIstruttore - skip invio email - tecnicoIstruttore non trovato per avviso_id = " - + avviso.getAvvisoId()); - AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(avviso.getAvvisoId(), true); - return; - } - String[] to = { tecnicoIstruttore.getEmailAddress() }; - String[] cc = new String[0]; - String[] ccn = new String[0]; - // recupero dati - String tipoPratica = StringPool.BLANK; - if (intPratica.isDeposito()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (intPratica.isAutorizzazione()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); - } - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("receiver", tecnicoIstruttore.getFullName()); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", "Assegnazione Istruttoria"); - templateVariables.put( - "dataInvio", - FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( - intPratica.getStatusDate() != null ? intPratica.getStatusDate() : new Date())); - templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - String className = IntPratica.class.getName(); - long classPk = intPratica.getIntPraticaId(); - MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-BO", to, cc, ccn, templateVariables, null, - serviceContext); - AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(avviso.getAvvisoId(), true); - } - - // Invio notifica istruttore dopo inserimento parere geologo - public static void invioNotificaIstruttoreByGeologo(long parereGeologoId, ServiceContext serviceContext) { - - _log.info("start invioNotificaIstruttoreByGeologo parereGeologoId=" + parereGeologoId); - long intPraticaId = 0L; - try { - ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId); - intPraticaId = parereGeologo.getIntPraticaId(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - User tecnicoIstruttore = recuperaTecnicoIstruttore(intPratica); - _log.info("email tecnico istruttore=" + tecnicoIstruttore.getEmailAddress()); - String[] to = { tecnicoIstruttore.getEmailAddress() }; - String[] cc = new String[0]; - String[] ccn = new String[0]; - // recupero dati - String tipoPratica = StringPool.BLANK; - if (intPratica.isDeposito()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (intPratica.isAutorizzazione()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); - } - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("receiver", tecnicoIstruttore.getFullName()); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", "Risposta a Richiesta Parere Endoprocedimentale"); - templateVariables - .put("dataInvio", - FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( - parereGeologo.getDtCompilazione() != null ? parereGeologo.getDtCompilazione() - : new Date())); - templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - String className = ParereGeologo.class.getName(); - long classPk = parereGeologoId; - MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-BO", to, cc, ccn, templateVariables, - null, serviceContext); - } catch (Exception e) { - _log.error("invioNotificaIstruttoreByGeologo - Errore invio mail al tecnico istruttore per pratica id=" - + intPraticaId, e); - } - } - - public static void invioNotificaGeologo(ParereGeologo parereGeologo, ServiceContext serviceContext) { - - _log.info("start invioNotificaGeologo parereGeologo=" + parereGeologo.getParereGeologoId()); - try { - User geologo = UserLocalServiceUtil.getUser(parereGeologo.getGeologoUserId()); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parereGeologo.getIntPraticaId()); - _log.info("email geologo = " + geologo.getEmailAddress()); - String[] to = { geologo.getEmailAddress() }; - String[] cc = new String[0]; - String[] ccn = new String[0]; - String tipoPratica = StringPool.BLANK; - if (intPratica.isDeposito()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (intPratica.isAutorizzazione()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); - } - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("receiver", geologo.getFullName()); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", "Richiesta Parere"); - templateVariables - .put("dataInvio", - FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( - parereGeologo.getDtCompilazione() != null ? parereGeologo.getDtCompilazione() - : new Date())); - templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - String className = ParereGeologo.class.getName(); - long classPk = parereGeologo.getParereGeologoId(); - MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn, - templateVariables, null, serviceContext); - } catch (Exception e) { - _log.error( - "invioNotificaGeologo - Errore invio mail al geologo - ParereGeologoId=" - + parereGeologo.getParereGeologoId(), e); - } - } - - public static User recuperaTecnicoIstruttore(IntPratica intPratica) throws PortalException, SystemException { - - long statusByUserId = intPratica.getStatusByUserId(); - User istruttoreUser = null; - if (Validator.isNotNull(statusByUserId) && intPratica.getStatus() != WorkflowConstants.STATUS_DRAFT) { - istruttoreUser = UserLocalServiceUtil.getUser(statusByUserId); - _log.info("istruttore pratica id=" + intPratica.getIntPraticaId() + StringPool.COLON - + istruttoreUser.getScreenName() + StringPool.SPACE + istruttoreUser.getEmailAddress()); - } - return istruttoreUser; - } -} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java deleted file mode 100644 index 80dc199b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PagamentiCommonUtil.java +++ /dev/null @@ -1,181 +0,0 @@ -package it.tref.liferay.portos.bo.util; - -import it.tref.liferay.portos.bo.model.Collaudo; -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.FineLavori; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; -import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; -import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; - -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; - -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.util.Validator; - -public abstract class PagamentiCommonUtil { - - private static Log _log = LogFactoryUtil.getLog(PagamentiCommonUtil.class); - - private static final Map NUMERO_BOLLI_INTEGRAZIONE = new HashMap() { - { - put(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, 0); - put(TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE, 2); - put(TipoIntegrazioneUtil.FINE_LAVORI, 2); - put(TipoIntegrazioneUtil.COLLAUDO_PARZIALE, 2); - put(TipoIntegrazioneUtil.COLLAUDO, 2); - put(TipoIntegrazioneUtil.VARIANTE, 2); - put(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO, 0); - } - }; - - public static boolean isPagamentoRidotto(long dettPraticaId) throws Exception { - - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - return intPratica.getTipoPratica().equals(Constants.TIPO_PRATICA_DEPOSITO); - } - - public static BigDecimal getImportoBolli(long companyId, long classPK, String className, String tipoIntegrazione) - throws PortalException, SystemException { - - try { - boolean normEsenteBollo = false; - if (DettPratica.class.getName().equals(className)) { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPK); - normEsenteBollo = dettPratica.isNormEsenteBollo(); - } else if (FineLavori.class.getName().equals(className)) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPK); - normEsenteBollo = fineLavori.isNormEsenteBollo(); - } else if (Collaudo.class.getName().equals(className)) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPK); - normEsenteBollo = collaudo.isNormEsenteBollo(); - } - if (normEsenteBollo) { - return new BigDecimal("0.00"); - } - } catch (PortalException e) {} - int numeroBolli = getNumeroBolli(tipoIntegrazione); - BigDecimal importoBolliBigDecimal = new BigDecimal(ConfigurazioneLocalServiceUtil.findByC_ChiaveString( - companyId, ConfigurazioneConstants.IMPORTO_BOLLO)); - return importoBolliBigDecimal.multiply(new BigDecimal(numeroBolli)); - - } - - public static Integer getNumeroBolli(String tipoIntegrazione) throws PortalException, SystemException { - - if (Validator.isNull(tipoIntegrazione)) { - return 2; - } else { - return getNumeroBolliByTipoIntegrazione(tipoIntegrazione); - } - } - - private static Integer getNumeroBolliByTipoIntegrazione(String tipoIntegrazione) { - - return NUMERO_BOLLI_INTEGRAZIONE.get(tipoIntegrazione); - } - - public static boolean existsSpeseIstruttoria(String tipoIntegrazione) { - - return !TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE.equals(tipoIntegrazione) - && !TipoIntegrazioneUtil.FINE_LAVORI.equals(tipoIntegrazione) - && !TipoIntegrazioneUtil.COLLAUDO_PARZIALE.equals(tipoIntegrazione) - && !TipoIntegrazioneUtil.COLLAUDO.equals(tipoIntegrazione); - } - - public static boolean pagamentiInitialized(long classPK, String className) throws PortalException, SystemException { - - boolean normEsenteSpese = false; - boolean normEsenteBollo = false; - long pagamentoIdSpese = 0L; - long pagamentoIdBolli = 0L; - if (DettPratica.class.getName().equals(className)) { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPK); - normEsenteSpese = dettPratica.isNormEsenteSpese(); - normEsenteBollo = dettPratica.isNormEsenteBollo(); - pagamentoIdSpese = dettPratica.getPagamentoIdOneri(); - pagamentoIdBolli = dettPratica.getPagamentoIdBolli(); - } else if (FineLavori.class.getName().equals(className)) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPK); - normEsenteSpese = true; - normEsenteBollo = fineLavori.isNormEsenteBollo(); - pagamentoIdSpese = 0L; - pagamentoIdBolli = fineLavori.getPagamentoId(); - } else if (Collaudo.class.getName().equals(className)) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPK); - normEsenteSpese = true; - normEsenteBollo = collaudo.isNormEsenteBollo(); - pagamentoIdSpese = 0L; - pagamentoIdBolli = collaudo.getPagamentoId(); - } - if (!normEsenteBollo && !normEsenteSpese) { - return Validator.isNotNull(pagamentoIdBolli) || Validator.isNotNull(pagamentoIdSpese); - } else if (normEsenteBollo) { - return Validator.isNotNull(pagamentoIdSpese); - } else if (normEsenteSpese) { - return Validator.isNotNull(pagamentoIdBolli); - } - return false; - } - - public static boolean pagamentiCompleted(long classPK, String className) throws PortalException, SystemException { - - boolean normEsenteSpese = false; - boolean normEsenteBollo = false; - long pagamentoIdSpese = 0; - long pagamentoIdBolli = 0; - - if (DettPratica.class.getName().equals(className)) { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPK); - normEsenteSpese = dettPratica.isNormEsenteSpese(); - normEsenteBollo = dettPratica.isNormEsenteBollo(); - pagamentoIdSpese = dettPratica.getPagamentoIdOneri(); - pagamentoIdBolli = dettPratica.getPagamentoIdBolli(); - } else if (FineLavori.class.getName().equals(className)) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPK); - normEsenteSpese = true; - normEsenteBollo = fineLavori.isNormEsenteBollo(); - pagamentoIdSpese = 0L; - pagamentoIdBolli = fineLavori.getPagamentoId(); - } else if (Collaudo.class.getName().equals(className)) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPK); - normEsenteSpese = true; - normEsenteBollo = collaudo.isNormEsenteBollo(); - pagamentoIdSpese = 0L; - pagamentoIdBolli = collaudo.getPagamentoId(); - } - boolean completed = false; - if (!normEsenteBollo && !normEsenteSpese) { - if (Validator.isNull(pagamentoIdBolli) || Validator.isNull(pagamentoIdSpese)) { - return false; - } - Pagamento pagamentoBolli = PagamentoLocalServiceUtil.getPagamento(pagamentoIdBolli); - Pagamento pagamentoSpese = PagamentoLocalServiceUtil.getPagamento(pagamentoIdSpese); - completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli.getUtilizzata()) - && PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese.getUtilizzata()); - } else { - if (normEsenteBollo && Validator.isNotNull(pagamentoIdSpese)) { - Pagamento pagamentoSpese = PagamentoLocalServiceUtil.getPagamento(pagamentoIdSpese); - completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese.getUtilizzata()); - } else if (normEsenteSpese && Validator.isNotNull(pagamentoIdBolli)) { - Pagamento pagamentoBolli = PagamentoLocalServiceUtil.getPagamento(pagamentoIdBolli); - completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli.getUtilizzata()); - } - } - return completed; - } -} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java index a25c016c..1cebbda3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java @@ -3,6 +3,7 @@ */ package it.mwg.sismica.bo.util; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.Asseverazione; @@ -39,7 +40,6 @@ import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.Constants; import it.tref.liferay.portos.mailmanager.model.Email; import it.tref.liferay.portos.mailmanager.model.EmailAttachment; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index aefa1107..565b3761 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -3,6 +3,7 @@ */ package it.mwg.sismica.bo.util; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.WorkflowConstants; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.Collaudo; @@ -19,7 +20,6 @@ import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.Constants; 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/model/impl/AvvisoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java index 5063f3d9..27dc143f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java @@ -8,27 +8,46 @@ package it.tref.liferay.portos.bo.model.impl; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.tref.liferay.portos.bo.model.Collaudo; +import it.tref.liferay.portos.bo.model.Comune; +import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.Provincia; +import it.tref.liferay.portos.bo.model.Territorio; +import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; +import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; +import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; 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.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; + +import java.util.Date; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.language.LanguageUtil; +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.util.FastDateFormatFactoryUtil; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.User; +import com.liferay.portal.service.ServiceContext; import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.DLUtil; @@ -49,62 +68,13 @@ public class AvvisoImpl extends AvvisoBaseImpl { * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a avviso model instance should * use the {@link it.tref.liferay.portos.bo.model.Avviso} interface instead. */ + private static final Log _log = LogFactoryUtil.getLog(AvvisoImpl.class); + @Override - public String getFullDescription() throws PortalException, SystemException { + public String getDescriptionOggettoProtocollo() throws PortalException, SystemException { - String tipoDocumento = AvvisoUtil.getAllTipoDocumento().containsKey(this.getTipoDocumento()) ? AvvisoUtil - .getAllTipoDocumento().get(this.getTipoDocumento()) - : "label.admingeniocivile.avviso.tipoDocumento.avvisomanuale"; - String fullDescription = LanguageUtil.get(LocaleUtil.ITALIAN, tipoDocumento); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); - if (intPratica.getTipoRichiesta() == Constants.VIARCH) { - switch (this.getTipoDocumento()) { - case StatoPraticaConstants.AUTORIZZATA: - case StatoPraticaConstants.CONFORME: - return "Avviso di " - + LanguageUtil.get(LocaleUtil.ITALIAN, "stato-pratica-" - + StatoPraticaConstants.VIARCH_APERTO); - case StatoPraticaConstants.NON_AUTORIZZATA: - case StatoPraticaConstants.NON_CONFORME: - return "Avviso di " - + LanguageUtil.get(LocaleUtil.ITALIAN, "stato-pratica-" - + StatoPraticaConstants.VIARCH_CHIUSO); - } - } - if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.VIDIMATA)) { - if (this.getClassName().equals(DettPratica.class.getName())) { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(this.getClassPk()); - if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { - fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-12") - + ""; - } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica - .getTipoIntegrazione())) { - fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-05") - + " n° " + dettPratica.getIntegrazione() + ""; - } else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { - fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-13") - + " n° " + dettPratica.getVarianteNumero() + ""; - } - } else if (this.getClassName().equals(FineLavori.class.getName())) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(this.getClassPk()); - fullDescription += " di " - + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" - + (fineLavori.getParziale() ? "09" : "07")) + " n° " + fineLavori.getNumero() - + ""; - } else if (this.getClassName().equals(Collaudo.class.getName())) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(this.getClassPk()); - fullDescription += " di " - + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" - + (collaudo.getParziale() ? "10" : "08")) + " n° " + collaudo.getNumero() + ""; - } - } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.CONFORME) - || this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) { - return LanguageUtil.get( - LocaleUtil.ITALIAN, - AvvisoUtil.getAllTipoDocumento().get( - PraticaUtil.getStatoPraticaCode(this.getTipoDocumento(), intPratica))); - } - return fullDescription; + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()); + return getDescriptionOggettoProtocollo(intPratica.getTipoProcedura()); } @Override @@ -163,13 +133,6 @@ public class AvvisoImpl extends AvvisoBaseImpl { return fullDescription.replace("Avviso di ", StringPool.BLANK); } - @Override - public String getDescriptionOggettoProtocollo() throws PortalException, SystemException { - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()); - return getDescriptionOggettoProtocollo(intPratica.getTipoProcedura()); - } - @Override public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException { @@ -180,6 +143,130 @@ public class AvvisoImpl extends AvvisoBaseImpl { return null; } + @Override + public String getFullDescription() throws PortalException, SystemException { + + String tipoDocumento = AvvisoUtil.getAllTipoDocumento().containsKey(this.getTipoDocumento()) ? AvvisoUtil + .getAllTipoDocumento().get(this.getTipoDocumento()) + : "label.admingeniocivile.avviso.tipoDocumento.avvisomanuale"; + String fullDescription = LanguageUtil.get(LocaleUtil.ITALIAN, tipoDocumento); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); + if (intPratica.getTipoRichiesta() == Constants.VIARCH) { + switch (this.getTipoDocumento()) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + return "Avviso di " + + LanguageUtil.get(LocaleUtil.ITALIAN, "stato-pratica-" + + StatoPraticaConstants.VIARCH_APERTO); + case StatoPraticaConstants.NON_AUTORIZZATA: + case StatoPraticaConstants.NON_CONFORME: + return "Avviso di " + + LanguageUtil.get(LocaleUtil.ITALIAN, "stato-pratica-" + + StatoPraticaConstants.VIARCH_CHIUSO); + } + } + if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.VIDIMATA)) { + if (this.getClassName().equals(DettPratica.class.getName())) { + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(this.getClassPk()); + if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { + fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-12") + + ""; + } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica + .getTipoIntegrazione())) { + fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-05") + + " n° " + dettPratica.getIntegrazione() + ""; + } else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { + fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-13") + + " n° " + dettPratica.getVarianteNumero() + ""; + } + } else if (this.getClassName().equals(FineLavori.class.getName())) { + FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(this.getClassPk()); + fullDescription += " di " + + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + + (fineLavori.getParziale() ? "09" : "07")) + " n° " + fineLavori.getNumero() + + ""; + } else if (this.getClassName().equals(Collaudo.class.getName())) { + Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(this.getClassPk()); + fullDescription += " di " + + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + + (collaudo.getParziale() ? "10" : "08")) + " n° " + collaudo.getNumero() + ""; + } + } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.CONFORME) + || this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) { + return LanguageUtil.get( + LocaleUtil.ITALIAN, + AvvisoUtil.getAllTipoDocumento().get( + PraticaUtil.getStatoPraticaCode(this.getTipoDocumento(), intPratica))); + } + return fullDescription; + } + + // ADT + @Override + public void invioNotificaAssegnazioneIstruttore() throws PortalException, SystemException { + + _log.info("start invioNotificaAssegnazioneIstruttore: avviso_id = " + getAvvisoId() + " - IntPraticaId = " + + getIntPraticaId()); + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getClassPk()); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + if (getControlloPraticaId() == 0) { + _log.info("invioNotificaAssegnazioneIstruttore - skip invio email - controllopratica non trovato per avviso_id = " + + getAvvisoId()); + AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(getAvvisoId(), true); + return; + } + ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil + .getControlloPratica(getControlloPraticaId()); + ServiceContext serviceContext = new ServiceContext(); + serviceContext.setCompanyId(controlloPratica.getCompanyId()); + serviceContext.setScopeGroupId(controlloPratica.getGroupId()); + serviceContext.setUserId(controlloPratica.getUserId()); + User tecnicoIstruttore = intPratica.recuperaTecnicoIstruttore(); + if (tecnicoIstruttore == null) { + _log.info("invioNotificaAssegnazioneIstruttore - skip invio email - tecnicoIstruttore non trovato per avviso_id = " + + getAvvisoId()); + AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(getAvvisoId(), true); + return; + } + String[] to = { tecnicoIstruttore.getEmailAddress() }; + String[] cc = new String[0]; + String[] ccn = new String[0]; + // recupero dati + String tipoPratica = StringPool.BLANK; + if (intPratica.isDeposito()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (intPratica.isAutorizzazione()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("receiver", tecnicoIstruttore.getFullName()); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", "Assegnazione Istruttoria"); + templateVariables.put( + "dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( + intPratica.getStatusDate() != null ? intPratica.getStatusDate() : new Date())); + templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + String className = IntPratica.class.getName(); + long classPk = intPratica.getIntPraticaId(); + MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-BO", to, cc, ccn, templateVariables, null, + serviceContext); + AvvisoLocalServiceUtil.updateAvvisoInviatoTecnico(getAvvisoId(), true); + } + + @Override + public String translateTipoDocumento() throws PortalException, SystemException { + + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()); + return translateTipoDocumento(intPratica.getTipoProcedura()); + } + @Override public String translateTipoDocumento(String tipoProcedura) throws PortalException, SystemException { @@ -208,11 +295,4 @@ public class AvvisoImpl extends AvvisoBaseImpl { } return tipoDocumento; } - - @Override - public String translateTipoDocumento() throws PortalException, SystemException { - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()); - return translateTipoDocumento(intPratica.getTipoProcedura()); - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java index 3c60937c..793d4d5f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java @@ -11,6 +11,8 @@ package it.tref.liferay.portos.bo.model.impl; import java.io.Serializable; import java.util.Map; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONDeserializer; import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.util.Validator; @@ -43,4 +45,9 @@ public class DelegaImpl extends DelegaBaseImpl { } return deserializer.deserialize(dichiarazioni); } + + public boolean hasCambioStatoDelega(long userId) throws PortalException, SystemException { + + return true; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index 4ec8bd89..23396103 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -9,6 +9,8 @@ package it.tref.liferay.portos.bo.model.impl; import it.mwg.sismica.bo.shared.util.AsseverazioniUtil; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; +import it.mwg.sismica.bo.shared.util.DelegheUtil; import it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Delega; @@ -26,9 +28,9 @@ import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.SezioniUtil; +import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -246,22 +248,42 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { return hasAsseverazioniAttive() || (getStatus() == WorkflowConstants.STATUS_DRAFT && SoggettoLocalServiceUtil.countValidTmpByIntPratica(getIntPraticaId()) > 0 - && praticaIsCompleta() && !DelegheUtil.hasDelegheCompilazioneAttive(getDettPraticaId())); + && praticaIsCompleta() && !hasDelegheCompilazioneAttive()); + } + + @Override + public boolean canCompilaDomanda(long userId) throws PortalException, SystemException { + + boolean controllo = false; + User user = UserLocalServiceUtil.getUser(userId); + List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(getIntPraticaId(), + DelegheUtil.TIPO_COMPILAZIONE, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + if (deleghe.isEmpty()) { + controllo = userId == getUserId(); + } else { + controllo = false; + for (Delega delega : deleghe) { + if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { + controllo = true; + break; + } + } + } + return controllo; } @Override public boolean canCompleteDettPraticaEsente() throws SystemException, PortalException { - return praticaIsCompleta() && !DelegheUtil.hasDelegheCompilazioneAttive(getDettPraticaId()) - && allAsseverazioniCompleted() && !isCompleta() + return praticaIsCompleta() && !hasDelegheCompilazioneAttive() && allAsseverazioniCompleted() && !isCompleta() && !IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(getIntPraticaId()); } @Override public boolean canCompleteIntegrazione() throws SystemException, PortalException { - return praticaIsCompleta() && !DelegheUtil.hasDelegheCompilazioneAttive(getDettPraticaId()) - && allAsseverazioniCompleted() + return praticaIsCompleta() && !hasDelegheCompilazioneAttive() && allAsseverazioniCompleted() && IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(getIntPraticaId()) && getStatus() != WorkflowConstants.STATUS_APPROVED; } @@ -275,6 +297,12 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { && TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(getTipoIntegrazione()); } + @Override + public boolean canDoPayment(long userId) throws PortalException, SystemException { + + return canCompilaDomanda(userId) || hasDelegaPagamento(userId); + } + private boolean checkAsseverazioniRichiestaOriginaria(String tipoSoggetto) throws SystemException { List soggettiPerTipologia = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto( @@ -463,6 +491,75 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { return firme; } + @Override + public Soggetto getPersonaDelegaCompilazioneDomanda() throws SystemException, PortalException { + + Soggetto soggetto = null; + if (praticaIsEditable()) { + List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(getIntPraticaId(), + DelegheUtil.TIPO_COMPILAZIONE, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + if (!deleghe.isEmpty()) { + for (Delega delega : deleghe) { + List soggetti = SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale( + getDettPraticaId(), delega.getCodiceFiscale()); + for (Soggetto soggettoTmp : soggetti) { + soggetto = soggettoTmp; + } + } + } + } + return soggetto; + } + + @Override + public Soggetto getPersonaDelegaCompilazioneSezioneGeologica() throws SystemException, PortalException { + + Soggetto soggetto = null; + if (praticaIsEditable()) { + List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(getIntPraticaId(), + DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + if (!deleghe.isEmpty()) { + for (Delega delega : deleghe) { + List soggetti = SoggettoLocalServiceUtil.findByDettPratica_CodiceFiscale( + getDettPraticaId(), delega.getCodiceFiscale()); + for (Soggetto soggettoTmp : soggetti) { + soggetto = soggettoTmp; + } + } + } else { + soggetto = getPersonaDelegaCompilazioneDomanda(); + } + } + return soggetto; + } + + @Override + public String getTipoReport(String tipoDocumento) { + + String tipoReport = null; + try { + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(getIntPraticaId()); + if (Validator.isNull(getTipoIntegrazione()) + || (Validator.isNotNull(getTipoIntegrazione()) && getTipoIntegrazione().equals( + TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) {} + if (intPratica.getTipoPratica().equals(Constants.TIPO_PRATICA_AUTORIZZAZIONE) + && (tipoDocumento.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE) + || tipoDocumento.equals(StatoPraticaConstants.INTEGRAZIONE) + || tipoDocumento.equals(StatoPraticaConstants.PREAVVISO_CONTRARIO) + || tipoDocumento.equals(StatoPraticaConstants.PERIZIA_SANZIONE) || tipoDocumento + .equals(StatoPraticaConstants.DECRETO_SANZIONE))) { + tipoReport = AvvisoUtil.TIPO_REPORT_AUTORIZZAZIONE; + } else { + tipoReport = AvvisoUtil.TIPO_REPORT_CONTROLLO_OBBLIGATORIO; + } + } catch (SystemException | PortalException e) { + _log.warn(e, e); + } + return tipoReport; + } + @Override public boolean hasAnnullaAsseverazioni(long userId) throws SystemException { @@ -483,6 +580,14 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { AsseverazioniUtil.STATO_ASSEGNATA, AsseverazioniUtil.STATO_ESEGUITA }) > 0; } + @Override + public boolean hasDelegaAttiva(long userId) throws PortalException, SystemException { + + User user = UserLocalServiceUtil.getUser(userId); + return DelegaLocalServiceUtil.countByDettPratica_CodiceFiscale_InEsito(getDettPraticaId(), + user.getScreenName(), new String[] { DelegheUtil.STATO_ASSEGNATA }) > 0; + } + @Override public boolean hasDelegaCompilazioneDomanda(long userId) throws PortalException, SystemException { @@ -552,6 +657,39 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { return controllo; } + @Override + public boolean hasDelegaPagamento(long userId) throws PortalException, SystemException { + + boolean controllo = false; + User user = UserLocalServiceUtil.getUser(userId); + List deleghe = DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(getIntPraticaId(), + DelegheUtil.TIPO_PAGAMENTO, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + if (deleghe.isEmpty()) { + if (user.getUserId() == getUserId()) { + controllo = true; + } else { + controllo = false; + } + } else { + controllo = false; + for (Delega delega : deleghe) { + if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { + controllo = true; + } + } + } + return controllo; + } + + @Override + public boolean hasDelegheCompilazioneAttive() throws SystemException { + + return DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(getDettPraticaId(), new String[] { + DelegheUtil.TIPO_COMPILAZIONE, DelegheUtil.TIPO_GEOLOGO, DelegheUtil.TIPO_FIRMA_INSERIMENTO_ALLEGATI }, + new String[] { DelegheUtil.STATO_ASSEGNATA }) > 0; + } + @Override public boolean hasRichiediAsseverazioni(long userId) throws SystemException, PortalException { @@ -608,9 +746,9 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { tipoSoggetto)); List cfNuoviSoggetti = SoggettoLocalServiceUtil.getCfValidTmpByDettPratica_TipologiaSoggetto( getDettPraticaId(), tipoSoggetto); - List nuoviDelegati = DelegaLocalServiceUtil.findCfByDettPratica_Tipologia_InEsito( + List nuoviDelegati = new ArrayList<>(DelegaLocalServiceUtil.findCfByDettPratica_Tipologia_InEsito( getDettPraticaId(), new String[] { tipoSoggetto }, - new String[] { AsseverazioniUtil.STATO_ESEGUITA }); + new String[] { AsseverazioniUtil.STATO_ESEGUITA })); nuoviDelegati.removeAll(cfNuoviSoggetti); for (String cfDelegato : nuoviDelegati) { nuoviSoggetti.addAll(SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(getIntPraticaId(), @@ -1188,9 +1326,8 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { @Override public boolean pagamentoIsEnable() throws SystemException, PortalException { - return praticaIsCompleta() && !DelegheUtil.hasDelegheCompilazioneAttive(getDettPraticaId()) - && allAsseverazioniCompleted() - // se è un'integrazione non si paga + return praticaIsCompleta() && !hasDelegheCompilazioneAttive() && allAsseverazioniCompleted() + // se è un'integrazione non si paga && !IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(getIntPraticaId()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java index 8602121a..801c0ec8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java @@ -8,10 +8,27 @@ package it.tref.liferay.portos.bo.model.impl; +import it.mwg.sismica.bo.shared.util.DelegheUtil; +import it.tref.liferay.portos.bo.model.Collaudo; +import it.tref.liferay.portos.bo.model.Delega; +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.FineLavori; +import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; +import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; +import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil; + +import java.util.ArrayList; +import java.util.List; + +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.repository.model.FileEntry; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.User; +import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; @@ -36,6 +53,23 @@ public class DocPraticaImpl extends DocPraticaBaseImpl { */ public DocPraticaImpl() {} + private List findDeleghe(long intPraticaid, boolean sezioneGeologica) throws SystemException { + + List deleghe = new ArrayList(); + deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, + DelegheUtil.TIPO_COMPILAZIONE, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null)); + deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, + DelegheUtil.TIPO_FIRMA_INSERIMENTO_ALLEGATI, new String[] { DelegheUtil.STATO_ASSEGNATA }, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)); + if (sezioneGeologica) { + deleghe.addAll(DelegaLocalServiceUtil.findByIntPratica_Tipologia_InEsito(intPraticaid, + DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null)); + } + return deleghe; + } + @Override public String getFileName() throws PortalException, SystemException { @@ -55,4 +89,55 @@ public class DocPraticaImpl extends DocPraticaBaseImpl { FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getDlFileEntryId()); return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true"); } + + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) throws PortalException, SystemException { + + boolean controllo = true; + DettPratica dettPratica = null; + if (DettPratica.class.getName().equals(getClassName())) { + dettPratica = DettPraticaServiceUtil.getDettPratica(getClassPk()); + controllo = dettPratica.praticaIsEditable(); + } + if (controllo) { + User user = UserLocalServiceUtil.getUser(userId); + long owner = 0L; + long intPraticaId = 0L; + if (DettPratica.class.getName().equals(getClassName())) { + intPraticaId = dettPratica.getIntPraticaId(); + owner = dettPratica.getUserId(); + } else if (FineLavori.class.getName().equals(getClassName())) { + FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(getClassPk()); + owner = fineLavori.getUserId(); + } else if (Collaudo.class.getName().equals(getClassName())) { + Collaudo collaudo = CollaudoServiceUtil.getCollaudo(getClassPk()); + owner = collaudo.getUserId(); + } + if (user.getUserId() == owner) { + controllo = true; + } else if (DettPratica.class.getName().equals(getClassName())) { + List deleghe = findDeleghe(intPraticaId, sezioneGeologica); + controllo = false; + if (!deleghe.isEmpty()) { + controllo = false; + for (Delega delega : deleghe) { + if (delega.getCodiceFiscale().equalsIgnoreCase(user.getScreenName())) { + controllo = true; + break; + } + } + } + } else { + controllo = false; + } + } + return controllo; + } + + public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) throws PortalException, SystemException { + + // TODO completare e controllare + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getClassPk()); + return dettPratica.praticaIsEditable(); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java index d712d172..a72448e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java @@ -40,7 +40,8 @@ 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.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; +import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; import java.util.ArrayList; import java.util.Arrays; @@ -51,6 +52,8 @@ import org.apache.commons.lang.StringUtils; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.HtmlUtil; @@ -58,6 +61,8 @@ import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.workflow.WorkflowConstants; +import com.liferay.portal.model.User; +import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; /** @@ -224,8 +229,7 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { if (Validator.isNull(dettPratica)) { return false; } - return dettPratica.pagamentoIsEnable() - && DelegheUtil.hasDelegaPagamento(userId, dettPratica.getDettPraticaId()); + return dettPratica.pagamentoIsEnable() && dettPratica.hasDelegaPagamento(userId); } @Override @@ -495,6 +499,19 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { return Validator.isNotNull(dettPratica); } + @Override + public List getGeologi() throws SystemException { + + List geologi = new ArrayList<>(); + List soggetti = SoggettoLocalServiceUtil.findByIntPratica(getIntPraticaId()); + for (Soggetto soggetto : soggetti) { + if (soggetto.getTipologiaSoggetto().equalsIgnoreCase(TipoSoggettoUtil.GEOLOGO) + && Validator.isNull(soggetto.getSostituitoDa())) + geologi.add(soggetto); + } + return geologi; + } + private List getSignaturePerSubject(List signatures, String tipoSoggetto, long docPraticaClassPk) throws SystemException { @@ -511,6 +528,24 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { return signaturesPerSubject; } + @Override + public boolean hasAnnullaDelega(long userId) throws PortalException, SystemException { + + return hasCreazioneDelega(userId); + } + + @Override + public boolean hasCreazioneDelega(long userId) throws PortalException, SystemException { + + return true; + } + + @Override + public boolean hasDeleteDelega(long userId) throws PortalException, SystemException { + + return hasCreazioneDelega(userId); + } + @Override public boolean hasRichiestaIntegrazioneAttiva() { @@ -521,6 +556,56 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { || StatoPraticaConstants.PERIZIA_SANZIONE.equals(stato); } + public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc, + String[] ccn, String templateName, JSONObject templateVariables, List allegati, + ServiceContext serviceContext) throws PortalException, SystemException { + + DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId); + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + User titolaredigitaleUser = UserLocalServiceUtil.getUser(getUserId()); + List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(getIntPraticaId(), + titolaredigitaleUser.getScreenName()); + String titolareDigitale = StringPool.BLANK; + String titolareDigitaleMail = StringPool.BLANK; + String titolareDigitaleRoles = StringPool.BLANK; + if (!titolari.isEmpty()) { + titolareDigitale = titolari.get(0).getTitle(); + titolareDigitaleMail = titolari.get(0).getEmail(); + for (Soggetto titolare : titolari) { + titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN, + "gc-soggetto-" + titolare.getTipologiaSoggetto()) + + StringPool.SPACE; + } + } + String committenteTitle = StringPool.BLANK; + String descIntervento = StringPool.BLANK; + String tempId = StringPool.BLANK; + if (Validator.isNotNull(dettPratica)) { + tempId = dettPratica.getTitle(); + descIntervento = dettPratica.getDescLongIntervento(); + Soggetto committentePrincipale = SoggettoLocalServiceUtil + .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(getIntPraticaId(), + dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); + if (Validator.isNotNull(committentePrincipale)) { + committenteTitle = committentePrincipale.getTitle(); + } + } + templateVariables.put("tempId", tempId); + templateVariables.put("praticaNum", getNumeroProgetto()); + templateVariables.put("titolareDigitale", titolareDigitale); + templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles); + templateVariables.put("titolareDigitaleMail", titolareDigitaleMail); + templateVariables.put("intervento", descIntervento); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + templateVariables.put("committente", committenteTitle); + MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables, + allegati, serviceContext); + } + @Override public boolean isAllowedAction(String action) throws SystemException { @@ -618,6 +703,19 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { || getStatus() == WorkflowConstants.STATUS_INCOMPLETE; } + @Override + public User recuperaTecnicoIstruttore() throws PortalException, SystemException { + + long statusByUserId = getStatusByUserId(); + User istruttoreUser = null; + if (Validator.isNotNull(statusByUserId) && getStatus() != WorkflowConstants.STATUS_DRAFT) { + istruttoreUser = UserLocalServiceUtil.getUser(statusByUserId); + _log.info("istruttore pratica id=" + getIntPraticaId() + StringPool.COLON + istruttoreUser.getScreenName() + + StringPool.SPACE + istruttoreUser.getEmailAddress()); + } + return istruttoreUser; + } + @Override public boolean signaturesContains(String tipoSoggetto, List signatures) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java index b7cda847..b6f20098 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java @@ -1,6 +1,7 @@ package it.tref.liferay.portos.bo.portlet; import it.mwg.sismica.bo.search.ControlloPraticaAdvancedSearch; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.ControlloPratica; @@ -20,9 +21,8 @@ import it.tref.liferay.portos.bo.service.permission.IntPraticaPermission; import it.tref.liferay.portos.bo.shared.bean.IstruttoreBean; import it.tref.liferay.portos.bo.shared.util.ActionKeys; import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; -import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; import java.io.IOException; import java.text.SimpleDateFormat; @@ -57,7 +57,9 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.CSVUtil; import com.liferay.portal.kernel.util.ContentTypes; +import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; import com.liferay.portal.kernel.util.GetterUtil; +import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; @@ -85,7 +87,7 @@ import com.liferay.util.bridges.mvc.MVCPortlet; public class GestioneAttivitaPortlet extends MVCPortlet { - private Log _log = LogFactoryUtil.getLog(GestioneAttivitaPortlet.class); + private static final Log _log = LogFactoryUtil.getLog(GestioneAttivitaPortlet.class); public void search2URL(ActionRequest actionRequest, ActionResponse actionResponse) { @@ -249,13 +251,56 @@ public class GestioneAttivitaPortlet extends MVCPortlet { ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, noteRichiedente, serviceContext); // ADT: aggiunta notifica geologo - MailUtil.invioNotificaGeologo(parereGeologo, serviceContext); + invioNotificaGeologo(parereGeologo, serviceContext); } catch (PortalException | SystemException e) { _log.error(e, e); SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere"); } } + private static void invioNotificaGeologo(ParereGeologo parereGeologo, ServiceContext serviceContext) { + + _log.info("start invioNotificaGeologo parereGeologo=" + parereGeologo.getParereGeologoId()); + try { + User geologo = UserLocalServiceUtil.getUser(parereGeologo.getGeologoUserId()); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parereGeologo.getIntPraticaId()); + _log.info("email geologo = " + geologo.getEmailAddress()); + String[] to = { geologo.getEmailAddress() }; + String[] cc = new String[0]; + String[] ccn = new String[0]; + String tipoPratica = StringPool.BLANK; + if (intPratica.isDeposito()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (intPratica.isAutorizzazione()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("receiver", geologo.getFullName()); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", "Richiesta Parere"); + templateVariables + .put("dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( + parereGeologo.getDtCompilazione() != null ? parereGeologo.getDtCompilazione() + : new Date())); + templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + String className = ParereGeologo.class.getName(); + long classPk = parereGeologo.getParereGeologoId(); + MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn, + templateVariables, null, serviceContext); + } catch (Exception e) { + _log.error( + "invioNotificaGeologo - Errore invio mail al geologo - ParereGeologoId=" + + parereGeologo.getParereGeologoId(), e); + } + } + public void aggiungiDettPraticheAlControllo(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index 03e18206..c9a414c3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -28,7 +28,6 @@ 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.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.io.Serializable; @@ -103,7 +102,7 @@ public class ReportAvvisoBeanBuilder { } } bean.setSoggetti(soggettiBean); - String tipo = AvvisoUtil.getTipoReport(dettPratica, avviso.getTipoDocumento()); + String tipo = dettPratica.getTipoReport(avviso.getTipoDocumento()); bean.setTipo(tipo); int numeroProtocolloIntegrazione = DettPraticaLocalServiceUtil .countByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java index ff8845be..742ae4a8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java @@ -1,5 +1,6 @@ package it.tref.liferay.portos.bo.scheduler; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.WorkflowConstants; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.DettPratica; @@ -10,7 +11,6 @@ import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.ProtocollazioneUtil; import it.tref.liferay.portos.report.shared.constants.ReportConstants; import it.tref.liferay.portos.report.shared.dto.ReportDto; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java index 13e03129..395e5f69 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java @@ -1,8 +1,8 @@ package it.tref.liferay.portos.bo.scheduler; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.report.shared.constants.ReportConstants; import it.tref.liferay.portos.report.shared.dto.ReportDto; import it.tref.liferay.portos.report.shared.dto.ReportResultDto; 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 4c52283d..a2849447 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 @@ -1,5 +1,6 @@ package it.tref.liferay.portos.bo.scheduler; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.WorkflowConstants; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.Collaudo; @@ -25,8 +26,6 @@ import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; -import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; @@ -188,7 +187,7 @@ public class SchedulerInvioDocumento implements MessageListener { for (Avviso avviso : avvisi) { try { // trattandosi solo di avvisi con tipo documento CI oppure SP si tratta di assegnazione istruttore - MailUtil.invioNotificaAssegnazioneIstruttore(avviso); + avviso.invioNotificaAssegnazioneIstruttore(); } catch (Exception e) { _log.error("Error", e); } @@ -284,8 +283,8 @@ public class SchedulerInvioDocumento implements MessageListener { serviceContext.setScopeGroupId(avviso.getGroupId()); serviceContext.setCompanyId(avviso.getCompanyId()); serviceContext.setUserId(avviso.getUserId()); - MailUtil.invioMailNotifica(intPraticaId, dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, - cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext); + intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn, + "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext); if (null != committentePrincipale) { to = new String[] { committentePrincipale.getEmail() }; List allegati = new ArrayList(); @@ -311,8 +310,8 @@ public class SchedulerInvioDocumento implements MessageListener { fileAttachment.generateFile(); allegati.add(fileAttachment); } - MailUtil.invioMailNotifica(intPraticaId, dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), - to, cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati, serviceContext); + intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn, + "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati, serviceContext); String[] suapEnabled = new String[] { StatoPraticaConstants.CONFORME, StatoPraticaConstants.NON_CONFORME }; if ((intPratica.isAutorizzazione() && ArrayUtil.contains(suapEnabled, avviso.getTipoDocumento())) || (StatoPraticaConstants.VIDIMATA.equals(avviso.getTipoDocumento()))) { @@ -332,9 +331,8 @@ public class SchedulerInvioDocumento implements MessageListener { FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( intPratica.getDtPratica())); if (to.length > 0 && to[0] != StringPool.BLANK) { - MailUtil.invioMailNotifica(intPraticaId, dettPratica.getDettPraticaId(), avvisoId, - Avviso.class.getName(), to, cc, ccn, "INVIO-SUAP", templateVariables, allegati, - serviceContext); + intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, + cc, ccn, "INVIO-SUAP", templateVariables, allegati, serviceContext); } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index e5a29b82..20e5fe3a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -1,5 +1,6 @@ package it.tref.liferay.portos.bo.scheduler; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.DettPratica; @@ -16,7 +17,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.ProtocollazioneUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java index 218309df..d54691e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java @@ -130,44 +130,27 @@ public class PagamentoLocalServiceClpInvoker { _methodParameterTypes165 = new String[] { "java.lang.String" }; - _methodName170 = "getPagamenti"; + _methodName170 = "addPagamento"; - _methodParameterTypes170 = new String[] { }; - - _methodName171 = "createPagamentoId"; - - _methodParameterTypes171 = new String[] { }; - - _methodName172 = "addPagamento"; - - _methodParameterTypes172 = new String[] { - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "long", "java.lang.String", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName173 = "addPagamentoAndUpdate"; - - _methodParameterTypes173 = new String[] { + _methodParameterTypes170 = new String[] { "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName174 = "addPagamentoAndUpdate"; + _methodName171 = "addPagamentoAndUpdate"; - _methodParameterTypes174 = new String[] { + _methodParameterTypes171 = new String[] { "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName175 = "addPagamentoAndUpdate"; + _methodName172 = "addPagamentoAndUpdate"; - _methodParameterTypes175 = new String[] { + _methodParameterTypes172 = new String[] { "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "long", @@ -175,161 +158,206 @@ public class PagamentoLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName177 = "updatePagamento"; + _methodName174 = "addPagamentoAndUpdate"; + + _methodParameterTypes174 = new String[] { + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "long", "java.lang.String", + "com.liferay.portal.service.ServiceContext" + }; + + _methodName175 = "annullaPagamento"; + + _methodParameterTypes175 = new String[] { "long" }; + + _methodName176 = "countByClassPk"; + + _methodParameterTypes176 = new String[] { "long" }; - _methodParameterTypes177 = new String[] { "long", "java.lang.String" }; + _methodName177 = "countByCommittente_Mezzo"; - _methodName178 = "updatePagamento"; + _methodParameterTypes177 = new String[] { + "java.lang.String", "java.lang.String" + }; + + _methodName178 = "countByCommittente_Mezzo_Utilizzata"; _methodParameterTypes178 = new String[] { - "long", "java.lang.String", "java.lang.String" + "java.lang.String", "java.lang.String", "java.lang.String" }; - _methodName179 = "updatePagamentoUtilizzata"; + _methodName179 = "countByIntPratica"; - _methodParameterTypes179 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes179 = new String[] { "long" }; - _methodName180 = "annullaPagamento"; + _methodName180 = "countByIntPratica_Visible"; _methodParameterTypes180 = new String[] { "long" }; - _methodName181 = "findByCommittente_Mezzo"; + _methodName181 = "countByMezzo_Utilizzata"; _methodParameterTypes181 = new String[] { - "java.lang.String", "java.lang.String", "int", "int" + "java.lang.String", "java.lang.String" }; - _methodName182 = "countByCommittente_Mezzo"; + _methodName182 = "countByMezzo_Utilizzata_CreateDate"; _methodParameterTypes182 = new String[] { - "java.lang.String", "java.lang.String" + "java.lang.String", "java.lang.String", "java.util.Date" }; - _methodName183 = "findByCommittente_Mezzo_Utilizzata"; + _methodName183 = "countByMezzo_Utilizzata_EmailPending_CreateDate"; _methodParameterTypes183 = new String[] { - "java.lang.String", "java.lang.String", "java.lang.String", - "int", "int" + "java.lang.String", "java.lang.String", "boolean", + "java.util.Date" }; - _methodName184 = "countByCommittente_Mezzo_Utilizzata"; + _methodName184 = "countInPending"; - _methodParameterTypes184 = new String[] { - "java.lang.String", "java.lang.String", "java.lang.String" + _methodParameterTypes184 = new String[] { "java.util.Date" }; + + _methodName186 = "createPagamentoId"; + + _methodParameterTypes186 = new String[] { }; + + _methodName189 = "deletePagamento"; + + _methodParameterTypes189 = new String[] { "long" }; + + _methodName190 = "deletePagamento"; + + _methodParameterTypes190 = new String[] { + "it.tref.liferay.portos.bo.model.Pagamento" }; - _methodName185 = "findByMezzo_Utilizzata"; + _methodName192 = "findByClassPk"; + + _methodParameterTypes192 = new String[] { "long" }; - _methodParameterTypes185 = new String[] { + _methodName193 = "findByCommittente_Mezzo"; + + _methodParameterTypes193 = new String[] { "java.lang.String", "java.lang.String", "int", "int" }; - _methodName186 = "countByMezzo_Utilizzata"; + _methodName194 = "findByCommittente_Mezzo_Utilizzata"; - _methodParameterTypes186 = new String[] { - "java.lang.String", "java.lang.String" + _methodParameterTypes194 = new String[] { + "java.lang.String", "java.lang.String", "java.lang.String", + "int", "int" }; - _methodName187 = "findByMezzo_Utilizzata_CreateDate"; + _methodName195 = "findByIntPratica"; - _methodParameterTypes187 = new String[] { - "java.lang.String", "java.lang.String", "java.util.Date", "int", - "int" + _methodParameterTypes195 = new String[] { "long" }; + + _methodName196 = "findByIntPratica_Visible"; + + _methodParameterTypes196 = new String[] { "long" }; + + _methodName197 = "findByMezzo_Utilizzata"; + + _methodParameterTypes197 = new String[] { + "java.lang.String", "java.lang.String", "int", "int" }; - _methodName188 = "countByMezzo_Utilizzata_EmailPending_CreateDate"; + _methodName198 = "findByMezzo_Utilizzata_CreateDate"; - _methodParameterTypes188 = new String[] { - "java.lang.String", "java.lang.String", "boolean", - "java.util.Date" + _methodParameterTypes198 = new String[] { + "java.lang.String", "java.lang.String", "java.util.Date", "int", + "int" }; - _methodName189 = "findByMezzo_Utilizzata_EmailPending_CreateDate"; + _methodName199 = "findByMezzo_Utilizzata_EmailPending_CreateDate"; - _methodParameterTypes189 = new String[] { + _methodParameterTypes199 = new String[] { "java.lang.String", "java.lang.String", "boolean", "java.util.Date", "int", "int" }; - _methodName190 = "findInPending"; + _methodName200 = "findInPending"; - _methodParameterTypes190 = new String[] { + _methodParameterTypes200 = new String[] { "java.util.Date", "int", "int", "com.liferay.portal.kernel.util.OrderByComparator" }; - _methodName191 = "countInPending"; + _methodName201 = "getImportoBolli"; - _methodParameterTypes191 = new String[] { "java.util.Date" }; + _methodParameterTypes201 = new String[] { + "long", "long", "java.lang.String" + }; - _methodName193 = "countByMezzo_Utilizzata_CreateDate"; + _methodName202 = "getImportoBolli"; - _methodParameterTypes193 = new String[] { - "java.lang.String", "java.lang.String", "java.util.Date" + _methodParameterTypes202 = new String[] { + "long", "long", "java.lang.String", "java.lang.String" }; - _methodName194 = "deletePagamento"; + _methodName203 = "getPagamenti"; - _methodParameterTypes194 = new String[] { "long" }; + _methodParameterTypes203 = new String[] { }; - _methodName195 = "deletePagamento"; + _methodName204 = "nuovoPagamento"; - _methodParameterTypes195 = new String[] { - "it.tref.liferay.portos.bo.model.Pagamento" + _methodParameterTypes204 = new String[] { + "java.lang.String", "long", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.String", + "com.liferay.portal.service.ServiceContext" }; - _methodName196 = "updateEmailPendingPagamento"; - - _methodParameterTypes196 = new String[] { "long", "boolean" }; - - _methodName199 = "countByClassPk"; + _methodName205 = "pagamentiCompleted"; - _methodParameterTypes199 = new String[] { "long" }; + _methodParameterTypes205 = new String[] { "long", "java.lang.String" }; - _methodName200 = "findByClassPk"; + _methodName206 = "pagamentiInitialized"; - _methodParameterTypes200 = new String[] { "long" }; + _methodParameterTypes206 = new String[] { "long", "java.lang.String" }; - _methodName201 = "findByIntPratica"; + _methodName207 = "sostituisciPagamento"; - _methodParameterTypes201 = new String[] { "long" }; + _methodParameterTypes207 = new String[] { + "long", "java.lang.String", "java.lang.String", + "java.lang.String", "com.liferay.portal.service.ServiceContext" + }; - _methodName202 = "countByIntPratica"; + _methodName208 = "updateEmailPendingPagamento"; - _methodParameterTypes202 = new String[] { "long" }; + _methodParameterTypes208 = new String[] { "long", "boolean" }; - _methodName203 = "findByIntPratica_Visible"; + _methodName209 = "updateOtf"; - _methodParameterTypes203 = new String[] { "long" }; + _methodParameterTypes209 = new String[] { "long", "boolean" }; - _methodName204 = "countByIntPratica_Visible"; + _methodName210 = "updatePagamento"; - _methodParameterTypes204 = new String[] { "long" }; + _methodParameterTypes210 = new String[] { "long", "java.lang.String" }; - _methodName206 = "sostituisciPagamento"; + _methodName211 = "updatePagamento"; - _methodParameterTypes206 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "com.liferay.portal.service.ServiceContext" + _methodParameterTypes211 = new String[] { + "long", "java.lang.String", "java.lang.String" }; - _methodName207 = "updatePagamentoManuale"; + _methodName212 = "updatePagamentoManuale"; - _methodParameterTypes207 = new String[] { + _methodParameterTypes212 = new String[] { "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName208 = "updatePagamentoManualeFromImport"; + _methodName213 = "updatePagamentoManualeFromImport"; - _methodParameterTypes208 = new String[] { + _methodParameterTypes213 = new String[] { "long", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName209 = "updateOtf"; + _methodName214 = "updatePagamentoUtilizzata"; - _methodParameterTypes209 = new String[] { "long", "boolean" }; + _methodParameterTypes214 = new String[] { "long", "java.lang.String" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -459,16 +487,6 @@ public class PagamentoLocalServiceClpInvoker { if (_methodName170.equals(name) && Arrays.deepEquals(_methodParameterTypes170, parameterTypes)) { - return PagamentoLocalServiceUtil.getPagamenti(); - } - - if (_methodName171.equals(name) && - Arrays.deepEquals(_methodParameterTypes171, parameterTypes)) { - return PagamentoLocalServiceUtil.createPagamentoId(); - } - - if (_methodName172.equals(name) && - Arrays.deepEquals(_methodParameterTypes172, parameterTypes)) { return PagamentoLocalServiceUtil.addPagamento((java.lang.String)arguments[0], (java.lang.String)arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (java.lang.String)arguments[4], @@ -478,19 +496,8 @@ public class PagamentoLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[9]); } - if (_methodName173.equals(name) && - Arrays.deepEquals(_methodParameterTypes173, parameterTypes)) { - return PagamentoLocalServiceUtil.addPagamentoAndUpdate((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.lang.String)arguments[2], - (java.lang.String)arguments[3], (java.lang.String)arguments[4], - (java.lang.String)arguments[5], (java.lang.String)arguments[6], - ((Long)arguments[7]).longValue(), - (java.lang.String)arguments[8], - (com.liferay.portal.service.ServiceContext)arguments[9]); - } - - if (_methodName174.equals(name) && - Arrays.deepEquals(_methodParameterTypes174, parameterTypes)) { + if (_methodName171.equals(name) && + Arrays.deepEquals(_methodParameterTypes171, parameterTypes)) { return PagamentoLocalServiceUtil.addPagamentoAndUpdate(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (java.lang.String)arguments[4], @@ -501,8 +508,8 @@ public class PagamentoLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[10]); } - if (_methodName175.equals(name) && - Arrays.deepEquals(_methodParameterTypes175, parameterTypes)) { + if (_methodName172.equals(name) && + Arrays.deepEquals(_methodParameterTypes172, parameterTypes)) { return PagamentoLocalServiceUtil.addPagamentoAndUpdate(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (java.lang.String)arguments[4], @@ -514,164 +521,195 @@ public class PagamentoLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[11]); } + if (_methodName174.equals(name) && + Arrays.deepEquals(_methodParameterTypes174, parameterTypes)) { + return PagamentoLocalServiceUtil.addPagamentoAndUpdate((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.lang.String)arguments[2], + (java.lang.String)arguments[3], (java.lang.String)arguments[4], + (java.lang.String)arguments[5], (java.lang.String)arguments[6], + ((Long)arguments[7]).longValue(), + (java.lang.String)arguments[8], + (com.liferay.portal.service.ServiceContext)arguments[9]); + } + + if (_methodName175.equals(name) && + Arrays.deepEquals(_methodParameterTypes175, parameterTypes)) { + return PagamentoLocalServiceUtil.annullaPagamento(((Long)arguments[0]).longValue()); + } + + if (_methodName176.equals(name) && + Arrays.deepEquals(_methodParameterTypes176, parameterTypes)) { + return PagamentoLocalServiceUtil.countByClassPk(((Long)arguments[0]).longValue()); + } + if (_methodName177.equals(name) && Arrays.deepEquals(_methodParameterTypes177, parameterTypes)) { - return PagamentoLocalServiceUtil.updatePagamento(((Long)arguments[0]).longValue(), + return PagamentoLocalServiceUtil.countByCommittente_Mezzo((java.lang.String)arguments[0], (java.lang.String)arguments[1]); } if (_methodName178.equals(name) && Arrays.deepEquals(_methodParameterTypes178, parameterTypes)) { - return PagamentoLocalServiceUtil.updatePagamento(((Long)arguments[0]).longValue(), + return PagamentoLocalServiceUtil.countByCommittente_Mezzo_Utilizzata((java.lang.String)arguments[0], (java.lang.String)arguments[1], (java.lang.String)arguments[2]); } if (_methodName179.equals(name) && Arrays.deepEquals(_methodParameterTypes179, parameterTypes)) { - return PagamentoLocalServiceUtil.updatePagamentoUtilizzata(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1]); + return PagamentoLocalServiceUtil.countByIntPratica(((Long)arguments[0]).longValue()); } if (_methodName180.equals(name) && Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) { - return PagamentoLocalServiceUtil.annullaPagamento(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.countByIntPratica_Visible(((Long)arguments[0]).longValue()); } if (_methodName181.equals(name) && Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) { - return PagamentoLocalServiceUtil.findByCommittente_Mezzo((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - ((Integer)arguments[2]).intValue(), - ((Integer)arguments[3]).intValue()); + return PagamentoLocalServiceUtil.countByMezzo_Utilizzata((java.lang.String)arguments[0], + (java.lang.String)arguments[1]); } if (_methodName182.equals(name) && Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) { - return PagamentoLocalServiceUtil.countByCommittente_Mezzo((java.lang.String)arguments[0], - (java.lang.String)arguments[1]); + return PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.util.Date)arguments[2]); } if (_methodName183.equals(name) && Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) { - return PagamentoLocalServiceUtil.findByCommittente_Mezzo_Utilizzata((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.lang.String)arguments[2], - ((Integer)arguments[3]).intValue(), - ((Integer)arguments[4]).intValue()); + return PagamentoLocalServiceUtil.countByMezzo_Utilizzata_EmailPending_CreateDate((java.lang.String)arguments[0], + (java.lang.String)arguments[1], + ((Boolean)arguments[2]).booleanValue(), + (java.util.Date)arguments[3]); } if (_methodName184.equals(name) && Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) { - return PagamentoLocalServiceUtil.countByCommittente_Mezzo_Utilizzata((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.lang.String)arguments[2]); - } - - if (_methodName185.equals(name) && - Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) { - return PagamentoLocalServiceUtil.findByMezzo_Utilizzata((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - ((Integer)arguments[2]).intValue(), - ((Integer)arguments[3]).intValue()); + return PagamentoLocalServiceUtil.countInPending((java.util.Date)arguments[0]); } if (_methodName186.equals(name) && Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { - return PagamentoLocalServiceUtil.countByMezzo_Utilizzata((java.lang.String)arguments[0], - (java.lang.String)arguments[1]); - } - - if (_methodName187.equals(name) && - Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { - return PagamentoLocalServiceUtil.findByMezzo_Utilizzata_CreateDate((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.util.Date)arguments[2], - ((Integer)arguments[3]).intValue(), - ((Integer)arguments[4]).intValue()); - } - - if (_methodName188.equals(name) && - Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { - return PagamentoLocalServiceUtil.countByMezzo_Utilizzata_EmailPending_CreateDate((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - ((Boolean)arguments[2]).booleanValue(), - (java.util.Date)arguments[3]); + return PagamentoLocalServiceUtil.createPagamentoId(); } if (_methodName189.equals(name) && Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { - return PagamentoLocalServiceUtil.findByMezzo_Utilizzata_EmailPending_CreateDate((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - ((Boolean)arguments[2]).booleanValue(), - (java.util.Date)arguments[3], - ((Integer)arguments[4]).intValue(), - ((Integer)arguments[5]).intValue()); + return PagamentoLocalServiceUtil.deletePagamento(((Long)arguments[0]).longValue()); } if (_methodName190.equals(name) && Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { - return PagamentoLocalServiceUtil.findInPending((java.util.Date)arguments[0], - ((Integer)arguments[1]).intValue(), - ((Integer)arguments[2]).intValue(), - (com.liferay.portal.kernel.util.OrderByComparator)arguments[3]); + return PagamentoLocalServiceUtil.deletePagamento((it.tref.liferay.portos.bo.model.Pagamento)arguments[0]); } - if (_methodName191.equals(name) && - Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { - return PagamentoLocalServiceUtil.countInPending((java.util.Date)arguments[0]); + if (_methodName192.equals(name) && + Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { + return PagamentoLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue()); } if (_methodName193.equals(name) && Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { - return PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.util.Date)arguments[2]); + return PagamentoLocalServiceUtil.findByCommittente_Mezzo((java.lang.String)arguments[0], + (java.lang.String)arguments[1], + ((Integer)arguments[2]).intValue(), + ((Integer)arguments[3]).intValue()); } if (_methodName194.equals(name) && Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { - return PagamentoLocalServiceUtil.deletePagamento(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.findByCommittente_Mezzo_Utilizzata((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.lang.String)arguments[2], + ((Integer)arguments[3]).intValue(), + ((Integer)arguments[4]).intValue()); } if (_methodName195.equals(name) && Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { - return PagamentoLocalServiceUtil.deletePagamento((it.tref.liferay.portos.bo.model.Pagamento)arguments[0]); + return PagamentoLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } if (_methodName196.equals(name) && Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { - return PagamentoLocalServiceUtil.updateEmailPendingPagamento(((Long)arguments[0]).longValue(), - ((Boolean)arguments[1]).booleanValue()); + return PagamentoLocalServiceUtil.findByIntPratica_Visible(((Long)arguments[0]).longValue()); + } + + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { + return PagamentoLocalServiceUtil.findByMezzo_Utilizzata((java.lang.String)arguments[0], + (java.lang.String)arguments[1], + ((Integer)arguments[2]).intValue(), + ((Integer)arguments[3]).intValue()); + } + + if (_methodName198.equals(name) && + Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { + return PagamentoLocalServiceUtil.findByMezzo_Utilizzata_CreateDate((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.util.Date)arguments[2], + ((Integer)arguments[3]).intValue(), + ((Integer)arguments[4]).intValue()); } if (_methodName199.equals(name) && Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { - return PagamentoLocalServiceUtil.countByClassPk(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.findByMezzo_Utilizzata_EmailPending_CreateDate((java.lang.String)arguments[0], + (java.lang.String)arguments[1], + ((Boolean)arguments[2]).booleanValue(), + (java.util.Date)arguments[3], + ((Integer)arguments[4]).intValue(), + ((Integer)arguments[5]).intValue()); } if (_methodName200.equals(name) && Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { - return PagamentoLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.findInPending((java.util.Date)arguments[0], + ((Integer)arguments[1]).intValue(), + ((Integer)arguments[2]).intValue(), + (com.liferay.portal.kernel.util.OrderByComparator)arguments[3]); } if (_methodName201.equals(name) && Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { - return PagamentoLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.getImportoBolli(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } if (_methodName202.equals(name) && Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { - return PagamentoLocalServiceUtil.countByIntPratica(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.getImportoBolli(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue(), + (java.lang.String)arguments[2], (java.lang.String)arguments[3]); } if (_methodName203.equals(name) && Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { - return PagamentoLocalServiceUtil.findByIntPratica_Visible(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.getPagamenti(); } if (_methodName204.equals(name) && Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { - return PagamentoLocalServiceUtil.countByIntPratica_Visible(((Long)arguments[0]).longValue()); + return PagamentoLocalServiceUtil.nuovoPagamento((java.lang.String)arguments[0], + ((Long)arguments[1]).longValue(), + (java.lang.String)arguments[2], (java.lang.String)arguments[3], + (java.lang.String)arguments[4], (java.lang.String)arguments[5], + (com.liferay.portal.service.ServiceContext)arguments[6]); + } + + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { + return PagamentoLocalServiceUtil.pagamentiCompleted(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } if (_methodName206.equals(name) && Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + return PagamentoLocalServiceUtil.pagamentiInitialized(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); + } + + if (_methodName207.equals(name) && + Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { PagamentoLocalServiceUtil.sostituisciPagamento(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], @@ -680,8 +718,32 @@ public class PagamentoLocalServiceClpInvoker { return null; } - if (_methodName207.equals(name) && - Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + return PagamentoLocalServiceUtil.updateEmailPendingPagamento(((Long)arguments[0]).longValue(), + ((Boolean)arguments[1]).booleanValue()); + } + + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + return PagamentoLocalServiceUtil.updateOtf(((Long)arguments[0]).longValue(), + ((Boolean)arguments[1]).booleanValue()); + } + + if (_methodName210.equals(name) && + Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + return PagamentoLocalServiceUtil.updatePagamento(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); + } + + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { + return PagamentoLocalServiceUtil.updatePagamento(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1], (java.lang.String)arguments[2]); + } + + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { PagamentoLocalServiceUtil.updatePagamentoManuale(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (byte[])arguments[2], (java.lang.String)arguments[3], @@ -690,8 +752,8 @@ public class PagamentoLocalServiceClpInvoker { return null; } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName213.equals(name) && + Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { PagamentoLocalServiceUtil.updatePagamentoManualeFromImport(((Long)arguments[0]).longValue(), (byte[])arguments[1], (java.lang.String)arguments[2], (com.liferay.portal.service.ServiceContext)arguments[3]); @@ -699,10 +761,10 @@ public class PagamentoLocalServiceClpInvoker { return null; } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { - return PagamentoLocalServiceUtil.updateOtf(((Long)arguments[0]).longValue(), - ((Boolean)arguments[1]).booleanValue()); + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + return PagamentoLocalServiceUtil.updatePagamentoUtilizzata(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } throw new UnsupportedOperationException(); @@ -758,12 +820,12 @@ public class PagamentoLocalServiceClpInvoker { private String[] _methodParameterTypes171; private String _methodName172; private String[] _methodParameterTypes172; - private String _methodName173; - private String[] _methodParameterTypes173; private String _methodName174; private String[] _methodParameterTypes174; private String _methodName175; private String[] _methodParameterTypes175; + private String _methodName176; + private String[] _methodParameterTypes176; private String _methodName177; private String[] _methodParameterTypes177; private String _methodName178; @@ -780,20 +842,14 @@ public class PagamentoLocalServiceClpInvoker { private String[] _methodParameterTypes183; private String _methodName184; private String[] _methodParameterTypes184; - private String _methodName185; - private String[] _methodParameterTypes185; private String _methodName186; private String[] _methodParameterTypes186; - private String _methodName187; - private String[] _methodParameterTypes187; - private String _methodName188; - private String[] _methodParameterTypes188; private String _methodName189; private String[] _methodParameterTypes189; private String _methodName190; private String[] _methodParameterTypes190; - private String _methodName191; - private String[] _methodParameterTypes191; + private String _methodName192; + private String[] _methodParameterTypes192; private String _methodName193; private String[] _methodParameterTypes193; private String _methodName194; @@ -802,6 +858,10 @@ public class PagamentoLocalServiceClpInvoker { 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 _methodName200; @@ -814,6 +874,8 @@ public class PagamentoLocalServiceClpInvoker { private String[] _methodParameterTypes203; private String _methodName204; private String[] _methodParameterTypes204; + private String _methodName205; + private String[] _methodParameterTypes205; private String _methodName206; private String[] _methodParameterTypes206; private String _methodName207; @@ -822,4 +884,14 @@ public class PagamentoLocalServiceClpInvoker { private String[] _methodParameterTypes208; private String _methodName209; 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; } \ 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/AllegatoManualeLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java index 1922b813..7cb17077 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java @@ -8,6 +8,7 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.DettPratica; @@ -17,7 +18,6 @@ import it.tref.liferay.portos.bo.service.base.AllegatoManualeLocalServiceBaseImp import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import java.util.Date; 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 24157530..c84f0d21 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 @@ -9,6 +9,8 @@ package it.tref.liferay.portos.bo.service.impl; import it.mwg.sismica.bo.shared.util.AsseverazioniUtil; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; +import it.mwg.sismica.bo.shared.util.DelegheUtil; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.DettPratica; @@ -20,8 +22,6 @@ import it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.report.shared.constants.ReportConstants; import it.tref.liferay.portos.report.shared.dto.ReportDto; @@ -655,11 +655,13 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase start, end, orderByComparator); } + @Override public int countByIntPratica_Esito(long intPraticaId, String esito) throws SystemException { return asseverazionePersistence.countByIntPratica_InEsito(intPraticaId, esito); } + @Override public List findByIntPratica_Esito(long intPraticaId, String esito, int start, int end, OrderByComparator orderByComparator) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java index 0e82c5fb..0661808a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java @@ -8,12 +8,12 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.ProtocollazioneUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java index 6c90d6e1..1b6e79ea 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java @@ -17,9 +17,6 @@ import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.service.base.CollaudoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.util.MailUtil; -import it.tref.liferay.portos.bo.util.PagamentiCommonUtil; -import it.tref.liferay.portos.bo.util.PagamentiUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.math.BigDecimal; @@ -247,8 +244,8 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { serviceContext.setScopeGroupId(collaudo.getGroupId()); serviceContext.setCompanyId(collaudo.getCompanyId()); serviceContext.setUserId(collaudo.getUserId()); - MailUtil.invioMailNotifica(collaudo.getIntPraticaId(), 0, collaudoId, Collaudo.class.getName(), to, cc, ccn, - "NOTIFICA-BO", templateVariables, null, serviceContext); + intPratica.invioMailNotifica(0, collaudoId, Collaudo.class.getName(), to, cc, ccn, "NOTIFICA-BO", + templateVariables, null, serviceContext); } private IntPratica updateIntPraticaStatus(Collaudo collaudo, long intPraticaId) throws PortalException, @@ -294,18 +291,19 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { ServiceContext serviceContext) throws SystemException, PortalException { Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); - BigDecimal importoBolli = PagamentiCommonUtil.getImportoBolli(collaudo.getCompanyId(), + BigDecimal importoBolli = pagamentoLocalService.getImportoBolli(collaudo.getCompanyId(), collaudo.getCollaudoId(), Collaudo.class.getName(), TipoIntegrazioneUtil.COLLAUDO); collaudo.setImportoBolli(importoBolli.toString()); collaudo = updateCollaudo(collaudo); - PagamentiUtil.nuovoPagamento(currentURL, collaudo.getCollaudoId(), Collaudo.class.getName(), + pagamentoLocalService.nuovoPagamento(currentURL, collaudo.getCollaudoId(), Collaudo.class.getName(), PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); return collaudo; } @Override - public List findByIntPraticaId(long intPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { + public List + findByIntPraticaId(long intPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { return collaudoPersistence.findByIntPraticaId(intPraticaId, start, end, orderByComparator); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java index 6a8d0909..6cd4fa02 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java @@ -14,7 +14,6 @@ import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.base.ComunicazioneLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil; import it.tref.liferay.portos.bo.shared.util.PortletKeys; -import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.util.Date; @@ -147,8 +146,8 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase JSONObject templateVariable = JSONFactoryUtil.createJSONObject(); templateVariable.put("receiver", receiver); templateVariable.put("link", url); - MailUtil.invioMailNotifica(comunicazione.getIntPraticaId(), 0, comunicazioneId, Comunicazione.class.getName(), - to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariable, null, serviceContext); + intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, + "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariable, null, serviceContext); } private void invioUpdateMailNotifica(long comunicazioneId, long tecnicoIstruttoreId, Date date) @@ -176,7 +175,7 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase serviceContext.setScopeGroupId(comunicazione.getGroupId()); serviceContext.setCompanyId(comunicazione.getCompanyId()); serviceContext.setUserId(comunicazione.getUserId()); - MailUtil.invioMailNotifica(comunicazione.getIntPraticaId(), 0, comunicazioneId, Comunicazione.class.getName(), - to, cc, ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); + intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, "NOTIFICA-BO", + templateVariables, null, serviceContext); } } 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 5ed74797..93872f78 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 @@ -9,6 +9,7 @@ package it.tref.liferay.portos.bo.service.impl; import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.Generics; import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil; import it.mwg.sismica.bo.util.CarichiLavoroUtil; @@ -21,7 +22,6 @@ import it.tref.liferay.portos.bo.service.base.ControlloPraticaLocalServiceBaseIm 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.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.GestioneFirmeUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java index ad820bc6..b6908ba5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java @@ -9,12 +9,12 @@ package it.tref.liferay.portos.bo.service.impl; import it.mwg.sismica.bo.shared.util.AsseverazioniUtil; +import it.mwg.sismica.bo.shared.util.DelegheUtil; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.service.base.DelegaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.report.shared.constants.ReportConstants; import it.tref.liferay.portos.report.shared.dto.ReportDto; import it.tref.liferay.portos.report.shared.dto.ReportResultDto; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java index 7465c94c..fbefe96d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java @@ -8,10 +8,10 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.util.DelegheUtil; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.service.base.DelegaServiceBaseImpl; -import it.tref.liferay.portos.bo.util.DelegheUtil; import java.util.List; @@ -44,7 +44,8 @@ public class DelegaServiceImpl extends DelegaServiceBaseImpl { public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale, ServiceContext serviceContext) throws PortalException, SystemException { - if (!DelegheUtil.hasCreazioneDelega(userId, intPraticaId)) { + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + if (!intPratica.hasCreazioneDelega(userId)) { throw new SystemException("TODO aggiungere eccezione"); } return delegaLocalService.addDelega(userId, intPraticaId, dettPraticaId, tipologia, codiceFiscale, @@ -61,7 +62,7 @@ public class DelegaServiceImpl extends DelegaServiceBaseImpl { public Delega annullaDelega(Delega delega) throws PortalException, SystemException { IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); - if (!DelegheUtil.hasAnnullaDelega(getUserId(), intPratica.getIntPraticaId())) { + if (!intPratica.hasAnnullaDelega(getUserId())) { throw new SystemException("TODO aggiungere eccezione"); } return delegaLocalService.cambioStato(delega.getDelegaId(), DelegheUtil.STATO_ANNULLATA); @@ -71,7 +72,7 @@ public class DelegaServiceImpl extends DelegaServiceBaseImpl { public Delega deleteDelega(Delega delega) throws PortalException, SystemException { IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); - if (!DelegheUtil.hasDeleteDelega(getUserId(), intPratica.getIntPraticaId())) { + if (!intPratica.hasDeleteDelega(getUserId())) { throw new SystemException("TODO aggiungere eccezione"); } return delegaLocalService.deleteDelega(delega); @@ -86,7 +87,8 @@ public class DelegaServiceImpl extends DelegaServiceBaseImpl { @Override public Delega cambioStato(long userId, long delegaId, String esito) throws PortalException, SystemException { - if (!DelegheUtil.hasCambioStatoDelega(userId, delegaId)) { + Delega delega = delegaLocalService.getDelega(delegaId); + if (!delega.hasCambioStatoDelega(userId)) { throw new SystemException("TODO aggiungere eccezione"); } return delegaLocalService.cambioStato(delegaId, esito); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 0711408e..925a70b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -24,8 +24,6 @@ import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.MailUtil; -import it.tref.liferay.portos.bo.util.PagamentiUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.io.IOException; @@ -1336,8 +1334,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl serviceContext.setScopeGroupId(dettPratica.getGroupId()); serviceContext.setCompanyId(dettPratica.getCompanyId()); serviceContext.setUserId(dettPratica.getUserId()); - MailUtil.invioMailNotifica(dettPratica.getIntPraticaId(), dettPraticaId, dettPraticaId, - DettPratica.class.getName(), to, cc, ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); + intPratica.invioMailNotifica(dettPraticaId, dettPraticaId, DettPratica.class.getName(), to, cc, ccn, + "NOTIFICA-BO", templateVariables, null, serviceContext); } @Override @@ -1365,11 +1363,11 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl throws SystemException, PortalException { DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(dettPraticaId); - BigDecimal importoBolli = PagamentiUtil.getImportoBolli(dettPratica.getCompanyId(), + BigDecimal importoBolli = pagamentoLocalService.getImportoBolli(dettPratica.getCompanyId(), dettPratica.getDettPraticaId(), dettPratica.getTipoIntegrazione()); - PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), + pagamentoLocalService.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); - PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), + pagamentoLocalService.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), PagamentoConstants.PAGAMENTO_ONERI, importoSpeseIstruttoria, codiceFiscaleCommittente, serviceContext); dettPratica = updateDettPraticaPagamento(dettPratica.getDettPraticaId(), importoSpeseIstruttoria, importoBolli.toString(), pagInterventiRestauroManufatti, pagAltriCasiCulturali, pagLottizzazioni, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index 79803ce9..099c11e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -17,9 +17,6 @@ import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.service.base.FineLavoriLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.util.MailUtil; -import it.tref.liferay.portos.bo.util.PagamentiCommonUtil; -import it.tref.liferay.portos.bo.util.PagamentiUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.math.BigDecimal; @@ -175,11 +172,11 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { ServiceContext serviceContext) throws SystemException, PortalException { FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); - BigDecimal importoBolli = PagamentiCommonUtil.getImportoBolli(fineLavori.getCompanyId(), + BigDecimal importoBolli = pagamentoLocalService.getImportoBolli(fineLavori.getCompanyId(), fineLavori.getFineLavoriId(), FineLavori.class.getName(), TipoIntegrazioneUtil.FINE_LAVORI); fineLavori.setImportoBolli(importoBolli.toString()); fineLavori = updateFineLavori(fineLavori); - PagamentiUtil.nuovoPagamento(currentURL, fineLavori.getFineLavoriId(), FineLavori.class.getName(), + pagamentoLocalService.nuovoPagamento(currentURL, fineLavori.getFineLavoriId(), FineLavori.class.getName(), PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); return fineLavori; } @@ -267,8 +264,8 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { serviceContext.setScopeGroupId(fineLavori.getGroupId()); serviceContext.setCompanyId(fineLavori.getCompanyId()); serviceContext.setUserId(fineLavori.getUserId()); - MailUtil.invioMailNotifica(fineLavori.getIntPraticaId(), 0, fineLavoriId, FineLavori.class.getName(), to, cc, - ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); + intPratica.invioMailNotifica(0, fineLavoriId, FineLavori.class.getName(), to, cc, ccn, "NOTIFICA-BO", + templateVariables, null, serviceContext); } private IntPratica updateIntPraticaStatus(FineLavori fineLavori, long intPraticaId) throws PortalException, 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 7ef6ac42..a4d2b6a8 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 @@ -9,6 +9,7 @@ package it.tref.liferay.portos.bo.service.impl; import it.mwg.sismica.bo.search.IntPraticaAdvancedSearch; +import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil; import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil; import it.mwg.sismica.bo.shared.util.WorkflowConstants; @@ -34,7 +35,6 @@ import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.Constants; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index a591028b..7a1fa2e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -8,6 +8,7 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.util.PagamentiUtil; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.FineLavori; @@ -16,10 +17,12 @@ import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; import it.tref.liferay.portos.bo.service.base.PagamentoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; -import it.tref.liferay.portos.bo.util.PagamentiUtil; +import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -87,18 +90,6 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } }; - @Override - public Map getPagamenti() { - - return PAGAMENTI; - } - - @Override - public long createPagamentoId() throws SystemException { - - return counterLocalService.increment(Pagamento.class.getName()); - } - @Override public Pagamento addPagamento(String codice, String causale, String mezzo, String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, String className, @@ -108,15 +99,6 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { utilizzata, classPk, className, false, StringPool.BLANK, serviceContext); } - @Override - public Pagamento addPagamentoAndUpdate(String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, - String className, ServiceContext serviceContext) throws PortalException, SystemException { - - return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, importo, - utilizzata, classPk, className, true, StringPool.BLANK, serviceContext); - } - @Override public Pagamento addPagamentoAndUpdate(long pagamentoId, String codice, String causale, String mezzo, String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, @@ -223,30 +205,12 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public Pagamento updatePagamento(long pagamentoId, String importo) throws PortalException, SystemException { - - Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); - pagamento.setImporto(importo); - return updatePagamento(pagamento); - } - - @Override - public Pagamento updatePagamento(long pagamentoId, String codiceFiscaleCommittente, String importo) - throws PortalException, SystemException { - - Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); - pagamento.setCodiceFiscaleCommittente(codiceFiscaleCommittente); - pagamento.setImporto(importo); - return updatePagamento(pagamento); - } - - @Override - public Pagamento updatePagamentoUtilizzata(long pagamentoId, String utilizzata) throws PortalException, - SystemException { + public Pagamento addPagamentoAndUpdate(String codice, String causale, String mezzo, + String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, + String className, ServiceContext serviceContext) throws PortalException, SystemException { - Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); - pagamento.setUtilizzata(utilizzata); - return updatePagamento(pagamento); + return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, importo, + utilizzata, classPk, className, true, StringPool.BLANK, serviceContext); } @Override @@ -257,15 +221,10 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return updatePagamento(pagamento); } - @SuppressWarnings("unchecked") @Override - public List findByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo, int start, int end) - throws SystemException { + public int countByClassPk(long classPk) throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, - null); - return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, - OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + return pagamentoPersistence.countByClassPk(classPk); } @Override @@ -276,32 +235,26 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } - @SuppressWarnings("unchecked") @Override - public List findByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, - String utilizzata, int start, int end) throws SystemException { + public int countByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata) + throws SystemException { DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, utilizzata); - return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, - OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } @Override - public int countByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata) - throws SystemException { + public int countByIntPratica(long intPraticaId) throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, - utilizzata); - return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); + return pagamentoPersistence.countByIntPratica(intPraticaId); } @Override - public List findByMezzo_Utilizzata(String mezzo, String utilizzata, int start, int end) - throws SystemException { + public int countByIntPratica_Visible(long intPraticaId) throws SystemException { - return pagamentoPersistence.findByMezzo_Utilizzata(mezzo, utilizzata, start, end, - OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + DynamicQuery dynamicQuery = createPagamentiVisibleByIntPratica(intPraticaId); + return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } @Override @@ -311,11 +264,9 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public List findByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date, int start, - int end) throws SystemException { + public int countByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date) throws SystemException { - return pagamentoPersistence.findByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date, start, end, - OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + return pagamentoPersistence.countByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date); } @Override @@ -327,28 +278,24 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public List findByMezzo_Utilizzata_EmailPending_CreateDate(String mezzo, String utilizzata, - boolean emailPending, Date date, int start, int end) throws SystemException { + public int countInPending(Date date) throws SystemException { - return pagamentoPersistence.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, emailPending, - date, start, end, - OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + DynamicQuery dynamicQuery = createPendingQuery(date); + return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } - @SuppressWarnings("unchecked") - @Override - public List findInPending(Date date, int start, int end, OrderByComparator comparator) - throws SystemException { + private DynamicQuery createPagamentiVisibleByIntPratica(long intPraticaId) { - DynamicQuery dynamicQuery = createPendingQuery(date); - return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, comparator); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.ne("utilizzata", PagamentoConstants.UTILIZZATA_IN_CORSO)); + return dynamicQuery; } @Override - public int countInPending(Date date) throws SystemException { + public long createPagamentoId() throws SystemException { - DynamicQuery dynamicQuery = createPendingQuery(date); - return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); + return counterLocalService.increment(Pagamento.class.getName()); } private DynamicQuery createPendingQuery(Date date) { @@ -360,10 +307,17 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return dynamicQuery; } - @Override - public int countByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date) throws SystemException { + private void deleteDettPraticaPagamento(Pagamento pagamento) throws SystemException { - return pagamentoPersistence.countByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date); + List dettPraticas = dettPraticaLocalService.findByPagamentoId(pagamento.getPagamentoId()); + for (DettPratica dettPratica : dettPraticas) { + if (PagamentoConstants.PAGAMENTO_ONERI.equals(pagamento.getTipoPagamento())) { + dettPratica.setPagamentoIdOneri(0L); + } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(pagamento.getTipoPagamento())) { + dettPratica.setPagamentoIdBolli(0L); + } + dettPraticaLocalService.updateDettPratica(dettPratica); + } } @Override @@ -392,29 +346,6 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return pagamento; } - @Override - public Pagamento updateEmailPendingPagamento(long pagamentoId, boolean emailPending) throws PortalException, - SystemException { - - Pagamento pagamento = getPagamento(pagamentoId); - pagamento.setModifiedDate(new Date()); - pagamento.setEmailPending(emailPending); - return updatePagamento(pagamento); - } - - private void deleteDettPraticaPagamento(Pagamento pagamento) throws SystemException { - - List dettPraticas = dettPraticaLocalService.findByPagamentoId(pagamento.getPagamentoId()); - for (DettPratica dettPratica : dettPraticas) { - if (PagamentoConstants.PAGAMENTO_ONERI.equals(pagamento.getTipoPagamento())) { - dettPratica.setPagamentoIdOneri(0L); - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(pagamento.getTipoPagamento())) { - dettPratica.setPagamentoIdBolli(0L); - } - dettPraticaLocalService.updateDettPratica(dettPratica); - } - } - private DynamicQuery dynamicQueryFindByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata) { @@ -428,27 +359,37 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public int countByClassPk(long classPk) throws SystemException { + public List findByClassPk(long classPk) throws SystemException { - return pagamentoPersistence.countByClassPk(classPk); + return pagamentoPersistence.findByClassPk(classPk); } + @SuppressWarnings("unchecked") @Override - public List findByClassPk(long classPk) throws SystemException { + public List findByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo, int start, int end) + throws SystemException { - return pagamentoPersistence.findByClassPk(classPk); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + null); + return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, + OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } + @SuppressWarnings("unchecked") @Override - public List findByIntPratica(long intPraticaId) throws SystemException { + public List findByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, + String utilizzata, int start, int end) throws SystemException { - return pagamentoPersistence.findByIntPratica(intPraticaId); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + utilizzata); + return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, + OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } @Override - public int countByIntPratica(long intPraticaId) throws SystemException { + public List findByIntPratica(long intPraticaId) throws SystemException { - return pagamentoPersistence.countByIntPratica(intPraticaId); + return pagamentoPersistence.findByIntPratica(intPraticaId); } @SuppressWarnings("unchecked") @@ -460,18 +401,256 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public int countByIntPratica_Visible(long intPraticaId) throws SystemException { + public List findByMezzo_Utilizzata(String mezzo, String utilizzata, int start, int end) + throws SystemException { - DynamicQuery dynamicQuery = createPagamentiVisibleByIntPratica(intPraticaId); - return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); + return pagamentoPersistence.findByMezzo_Utilizzata(mezzo, utilizzata, start, end, + OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } - private DynamicQuery createPagamentiVisibleByIntPratica(long intPraticaId) { + @Override + public List findByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date, int start, + int end) throws SystemException { - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("utilizzata", PagamentoConstants.UTILIZZATA_IN_CORSO)); - return dynamicQuery; + return pagamentoPersistence.findByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date, start, end, + OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + } + + @Override + public List findByMezzo_Utilizzata_EmailPending_CreateDate(String mezzo, String utilizzata, + boolean emailPending, Date date, int start, int end) throws SystemException { + + return pagamentoPersistence.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, emailPending, + date, start, end, + OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); + } + + @SuppressWarnings("unchecked") + @Override + public List findInPending(Date date, int start, int end, OrderByComparator comparator) + throws SystemException { + + DynamicQuery dynamicQuery = createPendingQuery(date); + return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, comparator); + } + + @Override + public BigDecimal getImportoBolli(long companyId, long dettPraticaId, String tipoIntegrazione) + throws PortalException, SystemException { + + return getImportoBolli(companyId, dettPraticaId, DettPratica.class.getName(), tipoIntegrazione); + } + + @Override + public BigDecimal getImportoBolli(long companyId, long classPK, String className, String tipoIntegrazione) + throws PortalException, SystemException { + + try { + boolean normEsenteBollo = false; + if (DettPratica.class.getName().equals(className)) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(classPK); + normEsenteBollo = dettPratica.isNormEsenteBollo(); + } else if (FineLavori.class.getName().equals(className)) { + FineLavori fineLavori = fineLavoriLocalService.getFineLavori(classPK); + normEsenteBollo = fineLavori.isNormEsenteBollo(); + } else if (Collaudo.class.getName().equals(className)) { + Collaudo collaudo = collaudoLocalService.getCollaudo(classPK); + normEsenteBollo = collaudo.isNormEsenteBollo(); + } + if (normEsenteBollo) { + return new BigDecimal("0.00"); + } + } catch (PortalException e) {} + int numeroBolli = PagamentiUtil.getNumeroBolli(tipoIntegrazione); + BigDecimal importoBolliBigDecimal = new BigDecimal(configurazioneLocalService.findByC_ChiaveString(companyId, + ConfigurazioneConstants.IMPORTO_BOLLO)); + return importoBolliBigDecimal.multiply(new BigDecimal(numeroBolli)); + } + + @Override + public Map getPagamenti() { + + return PAGAMENTI; + } + + @Override + public Pagamento nuovoPagamento(String currentURL, long classPk, String className, String tipoPagamento, + String importo, String codiceFiscaleCommittente, ServiceContext serviceContext) throws PortalException, + SystemException { + + boolean esenzioneBolli = false; + boolean esenzioneSpeseIstruttoria = false; + String tipoIntegrazione = StringPool.BLANK; + long pagamentoId = 0L; + if (DettPratica.class.getName().equals(className)) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(classPk); + esenzioneBolli = dettPratica.isNormEsenteBollo(); + esenzioneSpeseIstruttoria = dettPratica.isNormEsenteSpese(); + tipoIntegrazione = dettPratica.getTipoIntegrazione(); + if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { + pagamentoId = dettPratica.getPagamentoIdOneri(); + } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { + pagamentoId = dettPratica.getPagamentoIdBolli(); + } + } else if (FineLavori.class.getName().equals(className)) { + FineLavori fineLavori = fineLavoriLocalService.getFineLavori(classPk); + esenzioneBolli = fineLavori.isNormEsenteBollo(); + esenzioneSpeseIstruttoria = true; + tipoIntegrazione = TipoIntegrazioneUtil.FINE_LAVORI; + if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { + throw new SystemException("error.fields.fineLavori.pagamento.classPk.invalid"); + } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { + pagamentoId = fineLavori.getPagamentoId(); + } + } else if (Collaudo.class.getName().equals(className)) { + Collaudo collaudo = collaudoLocalService.getCollaudo(classPk); + esenzioneBolli = collaudo.isNormEsenteBollo(); + esenzioneSpeseIstruttoria = true; + tipoIntegrazione = TipoIntegrazioneUtil.COLLAUDO; + if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { + throw new SystemException("error.fields.collaudo.pagamento.classPk.invalid"); + } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { + pagamentoId = collaudo.getPagamentoId(); + } + } else { + throw new SystemException("error.fields.pratica.pagamento.classPk.invalid"); + } + List importi = new ArrayList<>(); + if (esenzioneSpeseIstruttoria && esenzioneBolli) { + throw new SystemException("error.fields.pratica.pagamento.esente.oneri.bolli"); + } else { + if ((PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) && !esenzioneBolli) + || (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento) && !esenzioneSpeseIstruttoria)) { + if (Validator.isNotNull(importo)) { + importo = importo.replaceAll(StringPool.COMMA, StringPool.PERIOD); + try { + BigDecimal importoVal = new BigDecimal(importo); + importo = importoVal.toPlainString(); + if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { + int numeroBolli = PagamentiUtil.getNumeroBolli(tipoIntegrazione); + BigDecimal singoloImporto = importoVal.divide(new BigDecimal(numeroBolli)); + for (int i = 0; i < numeroBolli; i++) { + importi.add(singoloImporto.toPlainString()); + } + } else if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { + importi.add(importo); + } + } catch (NumberFormatException e) { + throw new SystemException("error.fields.pratica.pagamento." + + (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) ? "bolli" + : "speseistruttoria") + ".valid", e); + } + } else { + if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) + || PagamentiUtil.existsSpeseIstruttoria(tipoIntegrazione)) { + throw new SystemException("error.fields.pratica.pagamento." + + (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) ? "bolli" + : "speseistruttoria") + ".required"); + } + } + } else { + return null; + } + } + boolean add = true; + if (Validator.isNotNull(pagamentoId)) { + Pagamento pagamento = getPagamento(pagamentoId); + if (pagamento.getClassPk() == classPk) { + add = false; + updatePagamento(pagamentoId, codiceFiscaleCommittente, importo); + } + return pagamento; + } + if (add) { + return addPagamentoAndUpdate(StringPool.BLANK, StringPool.BLANK, PagamentoConstants.MEZZO_MANUALE, + codiceFiscaleCommittente, tipoPagamento, importo, PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, + className, serviceContext); + } + return null; + } + + @Override + public boolean pagamentiCompleted(long classPK, String className) throws PortalException, SystemException { + + boolean normEsenteSpese = false; + boolean normEsenteBollo = false; + long pagamentoIdSpese = 0; + long pagamentoIdBolli = 0; + + if (DettPratica.class.getName().equals(className)) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(classPK); + normEsenteSpese = dettPratica.isNormEsenteSpese(); + normEsenteBollo = dettPratica.isNormEsenteBollo(); + pagamentoIdSpese = dettPratica.getPagamentoIdOneri(); + pagamentoIdBolli = dettPratica.getPagamentoIdBolli(); + } else if (FineLavori.class.getName().equals(className)) { + FineLavori fineLavori = fineLavoriLocalService.getFineLavori(classPK); + normEsenteSpese = true; + normEsenteBollo = fineLavori.isNormEsenteBollo(); + pagamentoIdSpese = 0L; + pagamentoIdBolli = fineLavori.getPagamentoId(); + } else if (Collaudo.class.getName().equals(className)) { + Collaudo collaudo = collaudoLocalService.getCollaudo(classPK); + normEsenteSpese = true; + normEsenteBollo = collaudo.isNormEsenteBollo(); + pagamentoIdSpese = 0L; + pagamentoIdBolli = collaudo.getPagamentoId(); + } + boolean completed = false; + if (!normEsenteBollo && !normEsenteSpese) { + if (Validator.isNull(pagamentoIdBolli) || Validator.isNull(pagamentoIdSpese)) { + return false; + } + Pagamento pagamentoBolli = getPagamento(pagamentoIdBolli); + Pagamento pagamentoSpese = getPagamento(pagamentoIdSpese); + completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli.getUtilizzata()) + && PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese.getUtilizzata()); + } else { + if (normEsenteBollo && Validator.isNotNull(pagamentoIdSpese)) { + Pagamento pagamentoSpese = getPagamento(pagamentoIdSpese); + completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese.getUtilizzata()); + } else if (normEsenteSpese && Validator.isNotNull(pagamentoIdBolli)) { + Pagamento pagamentoBolli = getPagamento(pagamentoIdBolli); + completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli.getUtilizzata()); + } + } + return completed; + } + + @Override + public boolean pagamentiInitialized(long classPK, String className) throws PortalException, SystemException { + + boolean normEsenteSpese = false; + boolean normEsenteBollo = false; + long pagamentoIdSpese = 0L; + long pagamentoIdBolli = 0L; + if (DettPratica.class.getName().equals(className)) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(classPK); + normEsenteSpese = dettPratica.isNormEsenteSpese(); + normEsenteBollo = dettPratica.isNormEsenteBollo(); + pagamentoIdSpese = dettPratica.getPagamentoIdOneri(); + pagamentoIdBolli = dettPratica.getPagamentoIdBolli(); + } else if (FineLavori.class.getName().equals(className)) { + FineLavori fineLavori = fineLavoriLocalService.getFineLavori(classPK); + normEsenteSpese = true; + normEsenteBollo = fineLavori.isNormEsenteBollo(); + pagamentoIdSpese = 0L; + pagamentoIdBolli = fineLavori.getPagamentoId(); + } else if (Collaudo.class.getName().equals(className)) { + Collaudo collaudo = collaudoLocalService.getCollaudo(classPK); + normEsenteSpese = true; + normEsenteBollo = collaudo.isNormEsenteBollo(); + pagamentoIdSpese = 0L; + pagamentoIdBolli = collaudo.getPagamentoId(); + } + if (!normEsenteBollo && !normEsenteSpese) { + return Validator.isNotNull(pagamentoIdBolli) || Validator.isNotNull(pagamentoIdSpese); + } else if (normEsenteBollo) { + return Validator.isNotNull(pagamentoIdSpese); + } else if (normEsenteSpese) { + return Validator.isNotNull(pagamentoIdBolli); + } + return false; } @Override @@ -508,7 +687,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); pagamento.setUtilizzataSostituita(currentUtilizzata); updatePagamento(pagamento); - PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), tipoPagamento, + nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), tipoPagamento, pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); } else { throw new PortalException("Creazione pagamento manuale con stato " + currentUtilizzata @@ -519,6 +698,47 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } } + @Override + public Pagamento updateEmailPendingPagamento(long pagamentoId, boolean emailPending) throws PortalException, + SystemException { + + Pagamento pagamento = getPagamento(pagamentoId); + pagamento.setModifiedDate(new Date()); + pagamento.setEmailPending(emailPending); + return updatePagamento(pagamento); + } + + @Override + public Pagamento updateOtf(long pagamentoId, boolean otf) throws PortalException, SystemException { + + Pagamento pagamento = getPagamento(pagamentoId); + pagamento.setOtf(otf); + if (otf) { + pagamento.setOtfCreateDate(new Date()); + } else { + pagamento.setOtfCreateDate(null); + } + return updatePagamento(pagamento); + } + + @Override + public Pagamento updatePagamento(long pagamentoId, String importo) throws PortalException, SystemException { + + Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); + pagamento.setImporto(importo); + return updatePagamento(pagamento); + } + + @Override + public Pagamento updatePagamento(long pagamentoId, String codiceFiscaleCommittente, String importo) + throws PortalException, SystemException { + + Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); + pagamento.setCodiceFiscaleCommittente(codiceFiscaleCommittente); + pagamento.setImporto(importo); + return updatePagamento(pagamento); + } + @Override public void updatePagamentoManuale(long pagamentoId, String numeroBollettino, byte[] content, String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { @@ -610,15 +830,11 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } @Override - public Pagamento updateOtf(long pagamentoId, boolean otf) throws PortalException, SystemException { + public Pagamento updatePagamentoUtilizzata(long pagamentoId, String utilizzata) throws PortalException, + SystemException { - Pagamento pagamento = getPagamento(pagamentoId); - pagamento.setOtf(otf); - if (otf) { - pagamento.setOtfCreateDate(new Date()); - } else { - pagamento.setOtfCreateDate(null); - } + Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); + pagamento.setUtilizzata(utilizzata); return updatePagamento(pagamento); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java index d33be26a..5fee50cc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java @@ -15,7 +15,6 @@ import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.service.base.PagamentoServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.PendingPagamentiPermission; import it.tref.liferay.portos.bo.shared.util.ActionKeys; -import it.tref.liferay.portos.bo.util.DelegheUtil; import java.io.IOException; @@ -49,7 +48,8 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long userId = findTitolare(pagamentoId); - if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); + if (getUserId() == userId || dettPratica.hasDelegaPagamento(userId)) { pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); } else { @@ -89,7 +89,8 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long userId = findTitolare(pagamentoId); - if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); + if (getUserId() == userId || dettPratica.hasDelegaPagamento(userId)) { pagamentoLocalService.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext); } else { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java deleted file mode 100644 index 427848b1..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java +++ /dev/null @@ -1,142 +0,0 @@ -package it.tref.liferay.portos.bo.util; - -import it.tref.liferay.portos.bo.model.Collaudo; -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.FineLavori; -import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; -import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; -import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.util.CalendarFactoryUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.service.ServiceContext; - -public abstract class PagamentiUtil { - - public static BigDecimal getImportoBolli(long companyId, long dettPraticaId, String tipoIntegrazione) - throws PortalException, SystemException { - - return PagamentiCommonUtil.getImportoBolli(companyId, dettPraticaId, DettPratica.class.getName(), - tipoIntegrazione); - } - - public static Date getScadenzaPending() { - - Calendar calendar = CalendarFactoryUtil.getCalendar(); - calendar.add(Calendar.MINUTE, -30); - return calendar.getTime(); - } - - public static boolean isPagamentoScadutoInPending(Pagamento pagamento) { - - return pagamento.getCreateDate().compareTo(getScadenzaPending()) < 0; - } - - public static Pagamento nuovoPagamento(String currentURL, long classPk, String className, String tipoPagamento, - String importo, String codiceFiscaleCommittente, ServiceContext serviceContext) throws PortalException, - SystemException { - - boolean esenzioneBolli = false; - boolean esenzioneSpeseIstruttoria = false; - String tipoIntegrazione = StringPool.BLANK; - long pagamentoId = 0L; - if (DettPratica.class.getName().equals(className)) { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPk); - esenzioneBolli = dettPratica.isNormEsenteBollo(); - esenzioneSpeseIstruttoria = dettPratica.isNormEsenteSpese(); - tipoIntegrazione = dettPratica.getTipoIntegrazione(); - if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - pagamentoId = dettPratica.getPagamentoIdOneri(); - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { - pagamentoId = dettPratica.getPagamentoIdBolli(); - } - } else if (FineLavori.class.getName().equals(className)) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPk); - esenzioneBolli = fineLavori.isNormEsenteBollo(); - esenzioneSpeseIstruttoria = true; - tipoIntegrazione = TipoIntegrazioneUtil.FINE_LAVORI; - if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - throw new SystemException("error.fields.fineLavori.pagamento.classPk.invalid"); - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { - pagamentoId = fineLavori.getPagamentoId(); - } - } else if (Collaudo.class.getName().equals(className)) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPk); - esenzioneBolli = collaudo.isNormEsenteBollo(); - esenzioneSpeseIstruttoria = true; - tipoIntegrazione = TipoIntegrazioneUtil.COLLAUDO; - if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - throw new SystemException("error.fields.collaudo.pagamento.classPk.invalid"); - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { - pagamentoId = collaudo.getPagamentoId(); - } - } else { - throw new SystemException("error.fields.pratica.pagamento.classPk.invalid"); - } - List importi = new ArrayList<>(); - if (esenzioneSpeseIstruttoria && esenzioneBolli) { - throw new SystemException("error.fields.pratica.pagamento.esente.oneri.bolli"); - } else { - if ((PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) && !esenzioneBolli) - || (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento) && !esenzioneSpeseIstruttoria)) { - if (Validator.isNotNull(importo)) { - importo = importo.replaceAll(StringPool.COMMA, StringPool.PERIOD); - try { - BigDecimal importoVal = new BigDecimal(importo); - importo = importoVal.toPlainString(); - if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { - int numeroBolli = PagamentiCommonUtil.getNumeroBolli(tipoIntegrazione); - BigDecimal singoloImporto = importoVal.divide(new BigDecimal(numeroBolli)); - for (int i = 0; i < numeroBolli; i++) { - importi.add(singoloImporto.toPlainString()); - } - } else if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - importi.add(importo); - } - } catch (NumberFormatException e) { - throw new SystemException("error.fields.pratica.pagamento." - + (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) ? "bolli" - : "speseistruttoria") + ".valid", e); - } - } else { - if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) - || PagamentiCommonUtil.existsSpeseIstruttoria(tipoIntegrazione)) { - throw new SystemException("error.fields.pratica.pagamento." - + (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) ? "bolli" - : "speseistruttoria") + ".required"); - } - } - } else { - return null; - } - } - boolean add = true; - if (Validator.isNotNull(pagamentoId)) { - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); - if (pagamento.getClassPk() == classPk) { - add = false; - PagamentoLocalServiceUtil.updatePagamento(pagamentoId, codiceFiscaleCommittente, importo); - } - return pagamento; - } - if (add) { - return PagamentoLocalServiceUtil.addPagamentoAndUpdate(StringPool.BLANK, StringPool.BLANK, - PagamentoConstants.MEZZO_MANUALE, codiceFiscaleCommittente, tipoPagamento, importo, - PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, serviceContext); - } - return null; - } -} 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 95d89f05..bc514d89 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=3436 - build.date=1633525559869 + build.number=3461 + build.date=1634550844703 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp index 49efca0d..640f6da7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp @@ -5,8 +5,8 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLAppServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.AvvisoUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%> <%@page import="java.util.Collection"%> <%@ include file="/html/init.jsp"%> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp index 41efe377..81e72663 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp @@ -3,9 +3,9 @@ <%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.AvvisoUtil"%> <%@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.util.AvvisoUtil"%> <%@ include file="/html/avvisi/init.jsp" %> <% long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp index af88c286..807afa72 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp @@ -8,12 +8,12 @@ <%@page import="com.liferay.portlet.PortletURLFactoryUtil"%> <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.AvvisoUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.bean.CronostoriaLink"%> <%@page import="it.tref.liferay.portos.bo.shared.util.CronostoriaUtil"%> <%@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.util.AvvisoUtil"%> <%@page import="java.util.ArrayList"%> <%@page import="java.util.Collections"%> <%@page import="java.util.Comparator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_sez_geologica.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_sez_geologica.jsp index 89265c08..b7dfc8d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_sez_geologica.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_sez_geologica.jsp @@ -3,6 +3,7 @@ <%@page import="java.util.Date"%> <%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> @@ -11,7 +12,6 @@ <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@include file="/html/fascicolo/init.jsp"%> <% long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp index 2845b603..361cbc61 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp @@ -12,6 +12,7 @@ <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%> <%@page import="it.tref.liferay.portos.bo.util.GenioCivileBaseUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="javax.portlet.PortletURL"%> <%@include file="/html/gestionefirme/init.jsp"%> <% @@ -50,7 +51,9 @@ if (Validator.isNotNull(mvcPath)) { DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso .getClassPk()); IntPratica intPratica = null; - if (Validator.isNotNull(dettPratica)) { + if (Validator.isNull(dettPratica)) { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId()); + } else { intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); String urlDettaglioPratica = StringPool.BLANK; if (fromPopUp) { @@ -62,8 +65,6 @@ if (Validator.isNotNull(mvcPath)) { dettPratica.getDettPraticaId(), dettPratica.getStatus(), themeDisplay .getPortalURL(), true); } - } else { - intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId()); } String tipoProcedura = StringPool.BLANK; if (Validator.isNotNull(intPratica)) { @@ -89,9 +90,10 @@ if (Validator.isNotNull(mvcPath)) { <% - String tipoDocumento = avviso.translateTipoDocumento(intPratica.getTipoProcedura()); + String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), + avviso.getIntPraticaId()); %> - <% String urlFileEntryBase = StringPool.BLANK; @@ -202,10 +204,11 @@ if (Validator.isNotNull(mvcPath)) { <% - String tipoDocumento = avviso.translateTipoDocumento(intPratica.getTipoProcedura()); + String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), + avviso.getIntPraticaId()); %> - + <% String urlFileEntryBase = StringPool.BLANK; try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp index df89a768..f9ebe7c8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.util.ArrayUtil"%> <%@page import="com.liferay.portal.model.Organization"%> @@ -7,9 +8,9 @@ <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="com.liferay.portal.model.User"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> +<%@page import="it.mwg.sismica.bo.shared.util.AvvisoUtil"%> <%@page import="it.tref.liferay.portos.bo.util.GenioCivileBaseUtil"%> <%@page import="it.tref.liferay.portos.bo.util.Constants"%> -<%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%> <%@page import="com.liferay.portal.kernel.util.HttpUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.exception.PortalException"%> @@ -85,12 +86,11 @@ for (Organization organization:organizations) { - <% - String tipoDocumento = avviso.translateTipoDocumento(intPratica.getTipoProcedura()); + String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), + avviso.getIntPraticaId()); %> - - + <% String urlFileEntryBase = StringPool.BLANK; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp index 96668882..4716a5e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp @@ -1,10 +1,11 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> <%@page import="com.liferay.portal.model.User"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.AvvisoUtil"%> <%@page import="it.tref.liferay.portos.bo.util.GenioCivileBaseUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%> <%@page import="com.liferay.portal.util.PortalUtil"%> <%@page import="com.liferay.portal.kernel.exception.PortalException"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> @@ -65,16 +66,13 @@ searchURL.setParameter("tabs1", tabs1); String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName(); %> <%= genio %> - - <% - String tipoDocumento = avviso.translateTipoDocumento(intPratica.getTipoProcedura()); + String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), + avviso.getIntPraticaId()); %> - - - + <% String urlFileEntryBase = StringPool.BLANK; try { 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 5ead0b50..f77df746 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 @@ -1,9 +1,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> <%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> <%@ include file="/html/pagamenti/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_pagamenti_pending.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_pagamenti_pending.jsp index 9c3a3a7f..639082e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_pagamenti_pending.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_pagamenti_pending.jsp @@ -4,7 +4,6 @@ <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> <%@page import="it.tref.liferay.portos.bo.service.permission.PendingPagamentiPermission"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> <%@page import="java.text.NumberFormat"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp index 7da407f8..c2ad1add 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp @@ -1,6 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_generic.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_generic.jsp index 3d6c03f9..59a9f02e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_generic.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_generic.jsp @@ -1,7 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Locale"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> @@ -100,7 +99,7 @@
<% - BigDecimal importoBollo = isEsenteBollo ? new BigDecimal("0.00") : PagamentiCommonUtil.getImportoBolli(company.getCompanyId(), classPk, className, tipoIntegrazione); + BigDecimal importoBollo = isEsenteBollo ? new BigDecimal("0.00") : PagamentoLocalServiceUtil.getImportoBolli(company.getCompanyId(), classPk, className, tipoIntegrazione); %> Importo totale <%= NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoBollo) %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti.jsp index 88d3a159..b81a3beb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti.jsp @@ -1,5 +1,4 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_bolli.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_bolli.jsp index 508cdff9..8af39290 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_bolli.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_bolli.jsp @@ -1,6 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> @@ -78,7 +77,7 @@ if(Validator.isNotNull(pagamentoBolli)){ importoBollo = new BigDecimal(pagamentoBolli.getImporto()); } else { - importoBollo = dettPratica.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentiCommonUtil.getImportoBolli(companyId, dettPratica.getDettPraticaId(), DettPratica.class.getName(), dettPratica.getTipoIntegrazione()); + importoBollo = dettPratica.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentoLocalServiceUtil.getImportoBolli(companyId, dettPratica.getDettPraticaId(), DettPratica.class.getName(), dettPratica.getTipoIntegrazione()); } %> Importo totale <%= NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoBollo) %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp index a36acaf5..e1ebdb0f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_pagamenti_spese.jsp @@ -1,6 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java index d97c6574..02e39c84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java @@ -7,7 +7,6 @@ import it.tref.liferay.portos.bo.service.DocPraticaServiceUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; import java.io.File; import java.io.IOException; @@ -67,7 +66,8 @@ public class AllegatiPraticaPortlet extends MVCPortlet { if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) { controllo = true; } else { - controllo = DelegheUtil.hasDelegaDeleteFile(serviceContext.getUserId(), docPraticaId, + DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); + controllo = docPratica.hasDelegaDeleteFile(serviceContext.getUserId(), "page_geologo".equalsIgnoreCase(comingFrom)); } if (controllo) { @@ -166,7 +166,8 @@ public class AllegatiPraticaPortlet extends MVCPortlet { || comingFrom.equalsIgnoreCase("edit_soggetto")) { controllo = true; } else { - controllo = DelegheUtil.hasDelegaFirma(serviceContext.getUserId(), docPraticaId, + DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); + controllo = docPratica.hasDelegaFirma(serviceContext.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom)); } if (controllo) { @@ -185,7 +186,8 @@ public class AllegatiPraticaPortlet extends MVCPortlet { if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) { controllo = true; } else { - controllo = DelegheUtil.hasDelegaFirma(serviceContext.getUserId(), docPraticaId, + DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); + controllo = docPratica.hasDelegaFirma(serviceContext.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom)); } if (controllo) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index cecdf55c..4ef4525b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -1,6 +1,7 @@ package it.tref.liferay.portos.fe.portlet; import it.mwg.sismica.bo.shared.util.AsseverazioniUtil; +import it.mwg.sismica.bo.shared.util.DelegheUtil; import it.mwg.sismica.fe.util.ValidazionePraticaUtil; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Collaudo; @@ -37,8 +38,6 @@ import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.DelegheUtil; -import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.fe.util.ReportFascicoloUtil; import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; import it.tref.liferay.portos.report.shared.constants.ReportConstants; @@ -670,8 +669,7 @@ public class FascicoloFePortlet extends MVCPortlet { boolean bozza = ParamUtil.getBoolean(request, "bozza"); if (bozza) { saveDatiDettPratica(dettPraticaId, request, response); - } else if ("delega".equalsIgnoreCase(cmd) - && DelegheUtil.hasDelegaAttiva(serviceContext.getUserId(), dettPratica.getDettPraticaId())) { + } else if ("delega".equalsIgnoreCase(cmd) && dettPratica.hasDelegaAttiva(serviceContext.getUserId())) { concludiDelegaDomanda(request, response); String successURL = ParamUtil.getString(request, "successURL"); response.sendRedirect(successURL); @@ -696,8 +694,7 @@ public class FascicoloFePortlet extends MVCPortlet { boolean bozza = ParamUtil.getBoolean(request, "bozza"); if (bozza) { saveDatiTipoPratica(dettPraticaId, request, response); - } else if ("delega".equalsIgnoreCase(cmd) - && DelegheUtil.hasDelegaAttiva(serviceContext.getUserId(), dettPratica.getDettPraticaId())) { + } else if ("delega".equalsIgnoreCase(cmd) && dettPratica.hasDelegaAttiva(serviceContext.getUserId())) { concludiDelegaDomanda(request, response); String successURL = ParamUtil.getString(request, "successURL"); response.sendRedirect(successURL); @@ -1909,7 +1906,7 @@ public class FascicoloFePortlet extends MVCPortlet { String url = ParamUtil.getString(request, "url"); if (Validator.isNotNull(dettPraticaId)) { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - if (dettPratica.pagamentoIsEnable() && DelegheUtil.canDoPayment(serviceContext.getUserId(), dettPraticaId)) { + if (dettPratica.pagamentoIsEnable() && dettPratica.canDoPayment(serviceContext.getUserId())) { Double pagSoggettiAdAutorizzazione = ParamUtil.getDouble(request, "pagSoggettiAdAutorizzazione"); Double pagInterventiRestauroManufatti = ParamUtil.getDouble(request, "pagInterventiRestauroManufatti"); Double pagAltriCasiCulturali = ParamUtil.getDouble(request, "pagAltriCasiCulturali"); @@ -2021,8 +2018,8 @@ public class FascicoloFePortlet extends MVCPortlet { templateVariablesExtra.put("delega", LanguageUtil.get(LocaleUtil.ITALIAN, "label-deleghe-tipologia-" + delega.getTipologia())); templateVariablesExtra.put("link", url); - MailUtil.invioMailNotifica(delega.getIntPraticaId(), delega.getDettPraticaId(), delegaId, - Delega.class.getName(), to, cc, ccn, "INVIO-DELEGA", templateVariablesExtra, null, serviceContext); + intPratica.invioMailNotifica(delega.getDettPraticaId(), delegaId, Delega.class.getName(), to, cc, ccn, + "INVIO-DELEGA", templateVariablesExtra, null, serviceContext); } catch (Exception e) { _log.error(e, e); throw new SystemException(e); @@ -2079,8 +2076,8 @@ public class FascicoloFePortlet extends MVCPortlet { fileAttachment.setFileEntryId(asseverazione.getFileEntryId()); fileAttachment.generateFile(); allegati.add(fileAttachment); - MailUtil.invioMailNotifica(asseverazione.getIntPraticaId(), asseverazione.getDettPraticaId(), - asseverazioneId, Asseverazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", + intPratica.invioMailNotifica(asseverazione.getDettPraticaId(), asseverazioneId, + Asseverazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariablesExtra, allegati, serviceContext); } catch (Exception e) { _log.error("Error", e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/ParereGeologoPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/ParereGeologoPortlet.java index bb3989ed..1b818f77 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/ParereGeologoPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/ParereGeologoPortlet.java @@ -1,24 +1,40 @@ package it.tref.liferay.portos.fe.portlet; +import it.tref.liferay.portos.bo.model.Comune; +import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.ParereGeologo; +import it.tref.liferay.portos.bo.model.Provincia; +import it.tref.liferay.portos.bo.model.Territorio; +import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil; import it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil; -import it.tref.liferay.portos.bo.util.MailUtil; +import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; import java.io.File; +import java.util.Date; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.servlet.SessionMessages; import com.liferay.portal.kernel.upload.UploadPortletRequest; +import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; import com.liferay.portal.kernel.util.FileUtil; +import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PortalUtil; @@ -64,7 +80,7 @@ public class ParereGeologoPortlet extends MVCPortlet { ParereGeologoServiceUtil .updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext); // ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE - MailUtil.invioNotificaIstruttoreByGeologo(parereGeologoId, serviceContext); + invioNotificaIstruttoreByGeologo(parereGeologo, serviceContext); } else { throw new PortalException("parere già espresso"); } @@ -74,4 +90,50 @@ public class ParereGeologoPortlet extends MVCPortlet { SessionErrors.add(actionRequest, "error-update-parere-geologo"); } } + + // Invio notifica istruttore dopo inserimento parere geologo + private static void invioNotificaIstruttoreByGeologo(ParereGeologo parereGeologo, ServiceContext serviceContext) { + + _log.info("start invioNotificaIstruttoreByGeologo parereGeologoId=" + parereGeologo.getParereGeologoId()); + long intPraticaId = 0L; + try { + intPraticaId = parereGeologo.getIntPraticaId(); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + User tecnicoIstruttore = intPratica.recuperaTecnicoIstruttore(); + _log.info("email tecnico istruttore=" + tecnicoIstruttore.getEmailAddress()); + String[] to = { tecnicoIstruttore.getEmailAddress() }; + String[] cc = new String[0]; + String[] ccn = new String[0]; + // recupero dati + String tipoPratica = StringPool.BLANK; + if (intPratica.isDeposito()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (intPratica.isAutorizzazione()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("receiver", tecnicoIstruttore.getFullName()); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", "Risposta a Richiesta Parere Endoprocedimentale"); + templateVariables + .put("dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( + parereGeologo.getDtCompilazione() != null ? parereGeologo.getDtCompilazione() + : new Date())); + templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + String className = ParereGeologo.class.getName(); + long classPk = parereGeologo.getParereGeologoId(); + MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-BO", to, cc, ccn, templateVariables, + null, serviceContext); + } catch (Exception e) { + _log.error("invioNotificaIstruttoreByGeologo - Errore invio mail al tecnico istruttore per pratica id=" + + intPraticaId, e); + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp index 371d9541..0b8ce2b6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp @@ -3,7 +3,6 @@ <%@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.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%> @@ -30,8 +29,7 @@ long docPraticaId = ParamUtil.getLong(request, "docPraticaId"); DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId); FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); boolean disabledInput = ParamUtil.getBoolean(request, "disabledInput", false); -boolean hasDelegaFirma = DelegheUtil.hasDelegaFirma(user.getUserId(), docPraticaId, - "page_geologica".equalsIgnoreCase(comingFrom)); +boolean hasDelegaFirma = docPratica.hasDelegaFirma(user.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom)); boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma; %> 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 446a7b73..c81f0bcd 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 @@ -22,7 +22,6 @@ <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeDetail"%> <%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="java.util.ArrayList"%> <%@include file="/html/soggettipratica/init.jsp"%> <% @@ -66,10 +65,10 @@ if (Validator.isNotNull(request.getParameter("disabled"))) { } else if ("page_allegati".equalsIgnoreCase(comingFrom)) { disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) && !dettPratica.hasDelegaFirmaAllegati(user.getUserId()); - soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(classPk); + soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); } else if ("page_geologica".equalsIgnoreCase(comingFrom)) { disabledInput = !dettPratica.hasDelegaCompilazioneSezioneGeologica(user.getUserId()); - soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneSezioneGeologica(classPk); + soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneSezioneGeologica(); canSignGeoDocs = true; } else if ("page_fine_lavori".equalsIgnoreCase(comingFrom)) { disabledInput = disabled; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/asseverazione_actions.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/asseverazione_actions.jsp index 5710f969..1b814433 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/asseverazione_actions.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/asseverazione_actions.jsp @@ -18,7 +18,7 @@ String random = StringUtil.randomId().toString(); <% DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(asseverazione.getDettPraticaId()); %> - '> <% 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 669cf3d4..353f7974 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 @@ -12,7 +12,6 @@ <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> 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 f22d36c9..7c765e8b 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 @@ -125,7 +125,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" }; - + <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/init.jsp index 92220d06..45b3152a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/init.jsp @@ -25,7 +25,6 @@ <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> 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 4e54a4dc..992c5dc0 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 @@ -4,7 +4,6 @@ <%@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.DelegheUtil"%>
@@ -23,7 +22,7 @@ cssClass="inline_toolbar"> + || dettPratica.hasDelegaPagamento(user.getUserId()) %>"> 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 5216c02a..fc4382af 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 @@ -6,6 +6,7 @@ <%@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.mwg.sismica.bo.shared.util.DelegheUtil"%> <%@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.AsseverazioneLocalServiceUtil"%> @@ -17,7 +18,6 @@ <%@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.DelegheUtil"%> <%@page import="java.util.HashMap"%> <%@page import="java.util.List"%> <%@page import="java.util.Map"%> @@ -52,18 +52,18 @@ String script = linkCssClass="btn" /> - + - + <% boolean isEsente = dettPratica.getNormEsenteBollo() && dettPratica.getNormEsenteSpese(); boolean isIntegrazione = dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil @@ -115,8 +115,8 @@ String script = - + <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp index 9a64f2eb..c390c6ad 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp @@ -1,5 +1,4 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp index db1061f4..82a6ce7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp @@ -3,7 +3,6 @@ <%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> @@ -15,7 +14,7 @@ DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica") long dettPraticaId = dettPratica.getDettPraticaId(); long intPraticaId = dettPratica.getIntPraticaId(); boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_desc_edificio.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_desc_edificio.jsp index 4c0589c5..6a36475b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_desc_edificio.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_desc_edificio.jsp @@ -1,7 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="it.tref.liferay.portos.bo.model.Provincia"%> <%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> @@ -14,7 +13,7 @@ <% DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); request.setAttribute("bean.dettPratica",dettPratica); boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) || TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()); 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 d09722d4..cc99c160 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 @@ -4,7 +4,6 @@ <%@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.service.SoggettoServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> <%@page import="java.util.regex.Pattern"%> @@ -30,7 +29,7 @@ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.get Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); request.setAttribute("bean.dettPratica",dettPratica); boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) || TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_geologica.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_geologica.jsp index 27f4ed5e..b42d8ef7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_geologica.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_geologica.jsp @@ -6,7 +6,7 @@ <% DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); -List responsabiliCompilazione = DelegheUtil.getGeologi(intPratica.getIntPraticaId()); +List responsabiliCompilazione = intPratica.getGeologi(); if (responsabiliCompilazione.size() > 0) { request.setAttribute("responsabiliCompilazione", responsabiliCompilazione); } @@ -20,7 +20,7 @@ if (responsabiliCompilazione.size() > 0) { boolean disabledInput = !dettPratica.hasDelegaCompilazioneSezioneGeologica(user.getUserId()) || !dettPratica.praticaIsEditable() || !isGeologo; -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneSezioneGeologica(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneSezioneGeologica(); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp index 16689635..952faa2a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp @@ -15,7 +15,7 @@ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.get String tipoIntegrazione = (String) request.getAttribute("bean.tipoIntegrazione"); boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) || (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione) && dettPratica.isCompleta()); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); boolean inBO = ParamUtil.getBoolean(request, "inBO", false); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/header.jsp index 13194dc3..bf1430b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/header.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/header.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="org.apache.commons.lang.StringUtils"%> <%@ include file="/html/fascicolofe/init.jsp"%> <% @@ -51,8 +51,8 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
+ test="<%= PagamentoLocalServiceUtil.pagamentiInitialized(dettPratica.getDettPraticaId(), + DettPratica.class.getName()) %>">
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/pagamenti/replace_payment.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/pagamenti/replace_payment.jsp index 20ced21f..9c7b6fb0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/pagamenti/replace_payment.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/pagamenti/replace_payment.jsp @@ -1,6 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.util.UUID"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Pagamento"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo_calcolo.jsp index 1a8fc831..5e6e1115 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo_calcolo.jsp @@ -4,7 +4,6 @@ <%@page import="it.tref.liferay.portos.bo.model.Collaudo"%> <%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoServiceUtil"%> @@ -74,7 +73,7 @@

Calcolo importo

- + - + @@ -179,7 +178,7 @@
- + @@ -239,7 +238,7 @@ if(Validator.isNotNull(pagamento)){ importoBollo = new BigDecimal(pagamento.getImporto()); } else { - importoBollo = collaudo.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentiCommonUtil.getImportoBolli(companyId, collaudo.getCollaudoId(), Collaudo.class.getName(), TipoIntegrazioneUtil.COLLAUDO); + importoBollo = collaudo.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentoLocalServiceUtil.getImportoBolli(companyId, collaudo.getCollaudoId(), Collaudo.class.getName(), TipoIntegrazioneUtil.COLLAUDO); } %>
<%= NumberFormat.getCurrencyInstance(LocaleUtil.getSiteDefault()).format(importoBollo) %>
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 7016e561..2d4728e5 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 @@ -1,5 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.ParamUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.DelegheUtil"%> <%@page import="it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> @@ -97,7 +98,7 @@ if (dettPratica == null) { if (SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) == 0) { tooltipAsseverazioni.append("
  • Nessun soggetto
    • "); } - if (DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId)) { + if (dettPratica.hasDelegheCompilazioneAttive()) { tooltipAsseverazioni.append("
  • Deleghe Attive
    • "); } tooltipAsseverazioni.append(""); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp index 14d65e00..1c8154b8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp @@ -1,5 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.model.Organization"%> +<%@page import="it.mwg.sismica.bo.shared.util.PagamentiUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.model.Pagamento"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> @@ -8,7 +9,6 @@ <%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.math.BigDecimal"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.util.Locale"%> @@ -67,7 +67,7 @@ if (Validator.isNotNull(dettPratica.getPagamentoIdBolli())) { } String formRicevutaPagamento = "fmRicevuta"; String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request); -boolean disabledIstruttoria = !PagamentiCommonUtil.existsSpeseIstruttoria(dettPratica.getTipoIntegrazione()) +boolean disabledIstruttoria = !PagamentiUtil.existsSpeseIstruttoria(dettPratica.getTipoIntegrazione()) || dettPratica.isNormEsenteSpese(); boolean archivio = false; boolean beniCulturali = true; @@ -110,7 +110,7 @@ switch (intPratica.getTipoRichiesta()) {
    - "> @@ -324,7 +324,7 @@ switch (intPratica.getTipoRichiesta()) {
    -"> @@ -332,7 +332,7 @@ switch (intPratica.getTipoRichiesta()) {
    -"> @@ -741,7 +741,7 @@ switch (intPratica.getTipoRichiesta()) { importoBollo = new BigDecimal(pagamentoBolli.getImporto()); } else { importoBollo = dettPratica.isNormEsenteBollo() ? new BigDecimal("0.00") - : PagamentiCommonUtil.getImportoBolli(companyId, dettPratica + : PagamentoLocalServiceUtil.getImportoBolli(companyId, dettPratica .getDettPraticaId(), DettPratica.class.getName(), dettPratica.getTipoIntegrazione()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp index b0b06d39..42d13893 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp @@ -4,7 +4,6 @@ <%@page import="it.tref.liferay.portos.bo.model.FineLavori"%> <%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> <%@page import="java.util.Locale"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.PagamentoServiceUtil"%> @@ -73,7 +72,7 @@

    Calcolo importo

    - + - + @@ -179,7 +178,7 @@
    - + @@ -239,7 +238,7 @@ if(Validator.isNotNull(pagamento)){ importoBollo = new BigDecimal(pagamento.getImporto()); } else { - importoBollo = fineLavori.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentiCommonUtil.getImportoBolli(companyId, fineLavori.getFineLavoriId(), FineLavori.class.getName(), TipoIntegrazioneUtil.FINE_LAVORI); + importoBollo = fineLavori.isNormEsenteBollo() ? new BigDecimal("0.00") : PagamentoLocalServiceUtil.getImportoBolli(companyId, fineLavori.getFineLavoriId(), FineLavori.class.getName(), TipoIntegrazioneUtil.FINE_LAVORI); } %>
    <%= NumberFormat.getCurrencyInstance(LocaleUtil.getSiteDefault()).format(importoBollo) %>
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_collaudi_columns.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_collaudi_columns.jsp index 01955c09..18219451 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_collaudi_columns.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_collaudi_columns.jsp @@ -1,7 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@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.StatoPraticaConstants"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_deleghe_columns.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_deleghe_columns.jsp index bff47fc3..f5cda048 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_deleghe_columns.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_deleghe_columns.jsp @@ -1,7 +1,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.mwg.sismica.bo.shared.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@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.StatoPraticaConstants"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf index a1f7f45c..7cdaf61a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf @@ -24,7 +24,6 @@ <%@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.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.List"%> @@ -113,14 +112,14 @@ if (lastDettPratica == null) { int delegheCount = DelegaLocalServiceUtil.countByDettPratica(lastDettPratica.getDettPraticaId()); %> - + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_comunicazioni.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_comunicazioni.jsp index 16322b03..54104ea3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_comunicazioni.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_comunicazioni.jsp @@ -1,5 +1,4 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp index 12aa4a79..21255e2f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp @@ -1,10 +1,10 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.mwg.sismica.bo.shared.util.DelegheUtil"%> <%@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.DettPraticaLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> <%@page import="java.text.NumberFormat"%> <%@page import="java.math.BigDecimal"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp index 95f6a278..5d5ec546 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp @@ -1,7 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@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.StatoPraticaConstants"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp index 46aa724b..5147ac11 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp @@ -21,7 +21,6 @@ <%@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.DelegheUtil"%> <%@page import="java.text.DateFormat"%> <%@page import="java.util.ArrayList"%> <%@page import="java.util.HashMap"%> @@ -40,7 +39,7 @@ if (Validator.isNull(dettPratica)) { request.setAttribute("bean.dettPratica", dettPratica); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); boolean disabledInput = !dettPratica.praticaIsEditable(); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); boolean inBO = ParamUtil.getBoolean(request, "inBO", false); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp index 8cdfd04a..5fc896a1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp @@ -12,7 +12,7 @@ if (Validator.isNull(dettPratica)) { boolean disabledInput = !DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(), dettPratica.getDettPraticaId()); request.setAttribute("bean.dettPratica", dettPratica); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); -Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); +Soggetto soggettoDelegato = dettPratica.getPersonaDelegaCompilazioneDomanda(); boolean inBO = ParamUtil.getBoolean(request, "inBO", false); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/AvvisoUtil.java similarity index 85% rename from liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java rename to liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/AvvisoUtil.java index e148eb3a..38a36b44 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/AvvisoUtil.java @@ -1,27 +1,15 @@ -package it.tref.liferay.portos.bo.util; +package it.mwg.sismica.bo.shared.util; -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; 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.TipoIntegrazioneUtil; import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -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.util.Validator; - public class AvvisoUtil { - private static Log _log = LogFactoryUtil.getLog(AvvisoUtil.class); - // Ogni volta che leggo queste due righe mi sale la cattiveria public static final String DOCUMENTO_INVIATO = "S"; public static final String DOCUMENTO_NON_INVIATO = "N"; @@ -205,30 +193,6 @@ public class AvvisoUtil { return result; } - public static String getTipoReport(DettPratica dettPratica, String tipoDocumento) { - - String tipoReport = null; - try { - IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(dettPratica.getIntPraticaId()); - if (Validator.isNull(dettPratica.getTipoIntegrazione()) - || (Validator.isNotNull(dettPratica.getTipoIntegrazione()) && dettPratica.getTipoIntegrazione() - .equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) {} - if (intPratica.getTipoPratica().equals(Constants.TIPO_PRATICA_AUTORIZZAZIONE) - && (tipoDocumento.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE) - || tipoDocumento.equals(StatoPraticaConstants.INTEGRAZIONE) - || tipoDocumento.equals(StatoPraticaConstants.PREAVVISO_CONTRARIO) - || tipoDocumento.equals(StatoPraticaConstants.PERIZIA_SANZIONE) || tipoDocumento - .equals(StatoPraticaConstants.DECRETO_SANZIONE))) { - tipoReport = TIPO_REPORT_AUTORIZZAZIONE; - } else { - tipoReport = TIPO_REPORT_CONTROLLO_OBBLIGATORIO; - } - } catch (SystemException | PortalException e) { - _log.warn(e, e); - } - return tipoReport; - } - public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) { // TODO: In attesa di specifiche su stati validi diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/DelegheUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/DelegheUtil.java new file mode 100644 index 00000000..d4ecbddd --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/DelegheUtil.java @@ -0,0 +1,35 @@ +package it.mwg.sismica.bo.shared.util; + +import java.util.HashMap; +import java.util.Map; + +public class DelegheUtil { + + public static final String STATO_ASSEGNATA = "AS"; + public static final String STATO_ESEGUITA = "ES"; + public static final String STATO_ANNULLATA = "AN"; + public static final String STATO_RIFIUTATA = "RI"; + + public static final String TIPO_TOTALE = "TT"; + public static final String TIPO_COMPILAZIONE = "CO"; + public static final String TIPO_GEOLOGO = "GE"; + public static final String TIPO_FIRMA_INSERIMENTO_ALLEGATI = "FI"; + public static final String TIPO_PAGAMENTO = "PG"; + public static final String TIPO_VISUALIZZAZIONE = "VI"; + public static final String TIPO_FINE_LAVORI = "FL"; + public static final String TIPO_COLLAUDO = "CL"; + + @SuppressWarnings("serial") + public static final Map iconMapper = new HashMap() { + { + put(TIPO_TOTALE, "fa-bullseye"); + put(TIPO_COMPILAZIONE, "fa-pencil"); + put(TIPO_FIRMA_INSERIMENTO_ALLEGATI, "fa-paperclip"); + put(TIPO_GEOLOGO, "fa-globe"); + put(TIPO_COLLAUDO, "fa-cogs"); + put(TIPO_PAGAMENTO, "fa-eur"); + put(TIPO_VISUALIZZAZIONE, "fa-eye"); + put(TIPO_FINE_LAVORI, "fa-window-close"); + } + }; +} diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/PagamentiUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/PagamentiUtil.java new file mode 100644 index 00000000..f6bc3e69 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/PagamentiUtil.java @@ -0,0 +1,48 @@ +package it.mwg.sismica.bo.shared.util; + +import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; + +import java.util.HashMap; +import java.util.Map; + +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.util.Validator; + +public class PagamentiUtil { + + @SuppressWarnings("serial") + private static final Map NUMERO_BOLLI_INTEGRAZIONE = new HashMap() { + { + put(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, 0); + put(TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE, 2); + put(TipoIntegrazioneUtil.FINE_LAVORI, 2); + put(TipoIntegrazioneUtil.COLLAUDO_PARZIALE, 2); + put(TipoIntegrazioneUtil.COLLAUDO, 2); + put(TipoIntegrazioneUtil.VARIANTE, 2); + put(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO, 0); + } + }; + + public static boolean existsSpeseIstruttoria(String tipoIntegrazione) { + + return !TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE.equals(tipoIntegrazione) + && !TipoIntegrazioneUtil.FINE_LAVORI.equals(tipoIntegrazione) + && !TipoIntegrazioneUtil.COLLAUDO_PARZIALE.equals(tipoIntegrazione) + && !TipoIntegrazioneUtil.COLLAUDO.equals(tipoIntegrazione); + } + + public static Integer getNumeroBolli(String tipoIntegrazione) throws PortalException, SystemException { + + if (Validator.isNull(tipoIntegrazione)) { + return 2; + } else { + return getNumeroBolliByTipoIntegrazione(tipoIntegrazione); + } + } + + private static Integer getNumeroBolliByTipoIntegrazione(String tipoIntegrazione) { + + return NUMERO_BOLLI_INTEGRAZIONE.get(tipoIntegrazione); + } +} diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 6cf96de0..7219b4f0 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=68 - build.date=1634130387665 + build.number=69 + build.date=1634550959519 build.auto.upgrade=true ##