From 832230b155dd009777f98db3b9328b997a730b3f Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Wed, 17 Nov 2021 12:16:43 +0100 Subject: [PATCH] Port servlet mappe da Paesaggistica --- .../portlet/p7mpreview/P7mPreview.java | 27 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../docroot/WEB-INF/liferay-portlet.xml | 9 + .../docroot/WEB-INF/portlet.xml | 32 + .../liferay/portos/bo/model/DettPratica.java | 12 + .../portos/bo/model/DettPraticaClp.java | 48 ++ .../portos/bo/model/DettPraticaWrapper.java | 18 + .../liferay/portos/bo/util/AvvisoUtil.java | 1 - .../liferay/portos/bo/util/DelegheUtil.java | 3 - .../src/it/mwg/sismica/bo/bean/MappeBean.java | 104 +++ .../portlet/MappeConfigurazionePortlet.java | 30 + .../mwg/sismica/bo/servlet/MappeServlet.java | 137 ++++ .../it/mwg/sismica/bo/util/MappeUtil.java | 26 +- .../portos/bo/model/impl/CollaudoImpl.java | 2 - .../portos/bo/model/impl/ComuneImpl.java | 1 + .../portos/bo/model/impl/DettPraticaImpl.java | 20 +- .../portos/bo/model/impl/FineLavoriImpl.java | 2 - .../portos/bo/model/impl/SoggettoImpl.java | 21 +- .../KaleoInstanceTokenModelListener.java | 9 - .../model/listener/KaleoLogModelListener.java | 8 - .../KaleoTaskInstanceTokenModelListener.java | 8 - .../bo/portlet/GestioneAttivitaPortlet.java | 1 - .../portlet/SismicaAdministrationPortlet.java | 37 +- .../scheduler/SchedulerEstrazioneFirme.java | 1 - .../bo/scheduler/SchedulerInvioDocumento.java | 1 - .../impl/AsseverazioneLocalServiceImpl.java | 1 - .../ControlloPraticaLocalServiceImpl.java | 7 - .../service/impl/DettPraticaServiceImpl.java | 3 +- .../impl/DocPraticaLocalServiceImpl.java | 1 - .../service/impl/DocPraticaServiceImpl.java | 10 - .../impl/IntPraticaLocalServiceImpl.java | 9 - .../service/impl/IntPraticaServiceImpl.java | 5 - .../impl/ParereGeologoLocalServiceImpl.java | 2 +- .../impl/ParereGeologoServiceImpl.java | 5 - .../impl/SoggettoLocalServiceImpl.java | 1 - .../bo/service/impl/SoggettoServiceImpl.java | 11 - .../impl/SorteggioLocalServiceImpl.java | 1 - .../AllegatoManualePersistenceImpl.java | 1 + .../AsseverazionePersistenceImpl.java | 1 + .../persistence/AvvisoPersistenceImpl.java | 1 + .../persistence/CollaudoPersistenceImpl.java | 1 + .../persistence/ComunePersistenceImpl.java | 1 + .../ComunicazionePersistenceImpl.java | 1 + .../ConfigurazionePersistenceImpl.java | 1 + .../ControlloPraticaPersistenceImpl.java | 1 + .../persistence/DelegaPersistenceImpl.java | 1 + .../DettPraticaPersistenceImpl.java | 1 + .../DocAggiuntivaPersistenceImpl.java | 1 + .../DocPraticaPersistenceImpl.java | 1 + .../FineLavoriPersistenceImpl.java | 1 + .../HistoryWorkflowActionPersistenceImpl.java | 1 + .../IntPraticaPersistenceImpl.java | 1 + .../persistence/PagamentoPersistenceImpl.java | 1 + .../ParereGeologoPersistenceImpl.java | 1 + .../persistence/ProvinciaPersistenceImpl.java | 1 + .../persistence/SoggettoPersistenceImpl.java | 1 + .../persistence/SorteggioPersistenceImpl.java | 1 + ...StoricoSoggettoPraticaPersistenceImpl.java | 1 + .../TempisticaPersistenceImpl.java | 1 + .../TerritorioPersistenceImpl.java | 1 + .../portos/bo/startup/RoleUpdateAction.java | 1 - .../liferay/portos/bo/util/PagamentiUtil.java | 2 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../portos-bo-portlet/docroot/WEB-INF/web.xml | 14 +- .../actions/action_toggle_workflow.jsp | 1 - .../docroot/html/fascicolo/view_fascicolo.jsp | 2 +- .../html/mappe/configurazione/view.jsp | 32 + .../html/sismica_administration/view.jsp | 20 +- .../impl/DisponibilitaServiceImpl.java | 137 ++-- .../docroot/WEB-INF/src/service.properties | 4 +- .../ivy.xml.MD5 | 2 +- .../fe/portlet/AllegatiPraticaPortlet.java | 4 - .../portos/fe/portlet/FascicoloFePortlet.java | 1 - .../fe/portlet/ParereGeologoPortlet.java | 122 ++-- .../portos/fe/util/ReportFascicoloUtil.java | 2 - .../html/fascicolofe/advanced_search.jsp | 194 +++--- .../domanda/page_dettagli_principali.jsp | 3 +- .../docroot/html/fascicolofe/toolbar.jsp | 52 +- .../docroot/html/fascicolofe/view.jsp | 40 +- .../html/fascicolofe/view_fascicolo.jsp | 95 ++- .../fascicolofe/view_fascicolo_dettagli.jsp | 628 ++++++++---------- .../fascicolofe/view_fascicolo_riepilogo.jsp | 443 ++++++------ .../portos/firma/util/FirmaGetUtil.java | 3 - .../engine/util/ReportTempisticheBean.java | 59 +- .../mwg/sismica/bo/shared/util/Generics.java | 16 + 85 files changed, 1379 insertions(+), 1143 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java rename liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/{service => src}/it/mwg/sismica/bo/util/MappeUtil.java (88%) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java index c1c6c68d..073f22d5 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java @@ -1,5 +1,7 @@ package it.tref.liferay.portlet.p7mpreview; +import java.util.List; + import com.liferay.portal.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -8,53 +10,42 @@ import com.liferay.portal.kernel.repository.model.FileVersion; import com.liferay.portal.kernel.xml.Element; import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor; -import java.util.List; - public class P7mPreview extends DLPreviewableProcessor { Log _log = LogFactoryUtil.getLog(P7mPreview.class); @Override - public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub - - } + public void afterPropertiesSet() throws Exception {} @Override public boolean isSupported(String mimeType) { + _log.info("isSupported(\"" + mimeType + "\""); - // TODO Auto-generated method stub return false; } @Override protected void doExportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry, - Element fileEntryElement) throws Exception { - // TODO Auto-generated method stub - - } + Element fileEntryElement) throws Exception {} @Override protected void doImportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry, - FileEntry importedFileEntry, Element fileEntryElement) throws Exception { - // TODO Auto-generated method stub - - } + FileEntry importedFileEntry, Element fileEntryElement) throws Exception {} @Override protected List getFileVersionIds() { - // TODO Auto-generated method stub + return null; } @Override protected String getPreviewType(FileVersion fileVersion) { - // TODO Auto-generated method stub + return null; } @Override protected String getThumbnailType(FileVersion fileVersion) { - // TODO Auto-generated method stub + return null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties index 432067b4..dfea1c7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_atti - build.number=26 - build.date=1629993357414 + build.number=27 + build.date=1636989706590 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml index e8704a1f..a6fcf20f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -183,6 +183,15 @@ /js/main.js?v=2 portos-administration-portlet + + mappe-configurazione + /icon.png + configuration + 1.1 + /css/main.css?v=1 + /js/main.js?v=1 + mappe-configurazione-portlet + ricerca-posizione /icon.png diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml index 602342ba..e43cbf95 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml @@ -435,6 +435,38 @@ user + + mappe-configurazione + Configurazione plugin mappe + it.mwg.sismica.bo.portlet.MappeConfigurazionePortlet + + view-template + /html/mappe/configurazione/view.jsp + + 0 + + text/html + view + + content.Language + + Configurazione plugin mappe + Configurazione mappe + + + + administrator + + + guest + + + power-user + + + user + + ricerca-posizione Ricerca per posizione 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 47a48d14..b2bb8418 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 @@ -39,6 +39,18 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public java.lang.String getUrlMappeBo( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public java.lang.String getUrlMappeFe( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public java.util.Set getTipiSoggettiAsseveranti() 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 fcaea2a1..3d7cb8d0 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 @@ -8279,6 +8279,30 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public java.lang.String getUrlMappeBo( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) { + try { + String methodName = "getUrlMappeBo"; + + Class[] parameterTypes = new Class[] { + javax.servlet.http.HttpServletRequest.class, + it.tref.liferay.portos.bo.model.Comune.class, boolean.class + }; + + Object[] parameterValues = new Object[] { request, comune, readOnly }; + + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public java.lang.String serializeToVersioningPage() { try { @@ -8336,6 +8360,30 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public java.lang.String getUrlMappeFe( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) { + try { + String methodName = "getUrlMappeFe"; + + Class[] parameterTypes = new Class[] { + javax.servlet.http.HttpServletRequest.class, + it.tref.liferay.portos.bo.model.Comune.class, boolean.class + }; + + Object[] parameterValues = new Object[] { request, comune, readOnly }; + + java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public java.util.Set getSoggettiAsseveranti() { 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 a22ff378..58aef916 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 @@ -8090,6 +8090,24 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.getSoggettiAsseveranti(); } + @Override + public java.lang.String getUrlMappeBo( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.getUrlMappeBo(request, comune, readOnly); + } + + @Override + public java.lang.String getUrlMappeFe( + javax.servlet.http.HttpServletRequest request, + it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.getUrlMappeFe(request, comune, readOnly); + } + @Override public java.util.Set getTipiSoggettiAsseveranti() 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/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index a04801fb..dc63a435 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -171,7 +171,6 @@ public class AvvisoUtil { public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) { - // TODO: In attesa di specifiche su stati validi return getAllTipoDocumento().containsKey(statoPratica); } } 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 index 62c3fa38..4715e525 100644 --- 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 @@ -119,7 +119,6 @@ public class DelegheUtil { public static boolean hasDelegaDeleteFile(long userId, long docPraticaId, boolean sezioneGeologica) throws PortalException, SystemException { - // TODO completare e controllare DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); boolean controllo = ValidazionePraticaUtil.praticaIsEditable(docPratica.getClassPk()); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk()); @@ -139,7 +138,6 @@ public class DelegheUtil { public static boolean hasCambioStatoDelega(long userId, long delegaId) throws PortalException, SystemException { - // TODO completare e controllare boolean controllo = true; Delega delega = DelegaLocalServiceUtil.getDelega(delegaId); IntPratica dettPratica = IntPraticaLocalServiceUtil.getIntPratica(delega.getIntPraticaId()); @@ -154,7 +152,6 @@ public class DelegheUtil { public static boolean hasCreazioneDelega(long userId, long intPraticaId) throws PortalException, SystemException { - // TODO completare e controllare boolean controllo = true; IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); if (intPratica.getUserId() == userId) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java new file mode 100644 index 00000000..fc339ea5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java @@ -0,0 +1,104 @@ +package it.mwg.sismica.bo.bean; + +public class MappeBean { + + private String comune; + private String nomeComune; + private String provincia; + private String numeroProgetto; + private String descrizione; + private String estremiCatastali; + private Double lat; + private Double lng; + private String url; + + public String getComune() { + + return comune; + } + + public String getDescrizione() { + + return descrizione; + } + + public String getEstremiCatastali() { + + return estremiCatastali; + } + + public Double getLat() { + + return lat; + } + + public Double getLng() { + + return lng; + } + + public String getNomeComune() { + + return nomeComune; + } + + public String getNumeroProgetto() { + + return numeroProgetto; + } + + public String getProvincia() { + + return provincia; + } + + public String getUrl() { + + return url; + } + + public void setComune(String comune) { + + this.comune = comune; + } + + public void setDescrizione(String descrizione) { + + this.descrizione = descrizione; + } + + public void setEstremiCatastali(String estremiCatastali) { + + this.estremiCatastali = estremiCatastali; + } + + public void setLat(Double lat) { + + this.lat = lat; + } + + public void setLng(Double lng) { + + this.lng = lng; + } + + public void setNomeComune(String nomeComune) { + + this.nomeComune = nomeComune; + } + + public void setNumeroProgetto(String numeroProgetto) { + + this.numeroProgetto = numeroProgetto; + } + + public void setProvincia(String provincia) { + + this.provincia = provincia; + } + + public void setUrl(String url) { + + this.url = url; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java new file mode 100644 index 00000000..adb7a87a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java @@ -0,0 +1,30 @@ +package it.mwg.sismica.bo.portlet; + +import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; + +import java.util.Arrays; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.ServiceContextFactory; +import com.liferay.util.bridges.mvc.MVCPortlet; + +public class MappeConfigurazionePortlet extends MVCPortlet { + + public void salvaImpostazioni(ActionRequest request, ActionResponse response) throws PortalException, + SystemException { + + ServiceContext serviceContext = ServiceContextFactory.getInstance(request); + for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET, + ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO, + ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) { + ConfigurazioneLocalServiceUtil.storeConfig(campo, ParamUtil.getString(request, campo), serviceContext); + } + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java new file mode 100644 index 00000000..4c4e4175 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java @@ -0,0 +1,137 @@ +package it.mwg.sismica.bo.servlet; + +import it.mwg.sismica.bo.bean.MappeBean; +import it.tref.liferay.portos.bo.model.Comune; +import it.tref.liferay.portos.bo.model.DettPratica; +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.ComuneLocalServiceUtil; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +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.FascicoloURLUtil; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; + +import com.liferay.portal.kernel.dao.orm.DynamicQuery; +import com.liferay.portal.kernel.dao.orm.QueryUtil; +import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; +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.JSONSerializer; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.servlet.HttpHeaders; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.util.ContentTypes; +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.util.PortalUtil; + +@SuppressWarnings("serial") +public class MappeServlet extends HttpServlet { + + public static final String CODICE_PROVINCIA = "p"; + public static final String COMUNE_ID = "c"; + + private static final JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer().exclude("*.class"); + private static final Log _log = LogFactoryUtil.getLog(MappeServlet.class); + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + switch (request.getPathInfo()) { + case "/list": + String codiceProvincia = ParamUtil.getString(request, CODICE_PROVINCIA); + long comuneId = ParamUtil.getLong(request, COMUNE_ID); + _log.info("p=" + codiceProvincia + "&c=" + comuneId); + if (Validator.isNull(codiceProvincia) && (0 == comuneId)) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST, request.getRequestURI()); + } else { + long companyId = PortalUtil.getCompanyId(request); + response.setContentType(ContentTypes.APPLICATION_JSON); + response.setCharacterEncoding(StringPool.UTF8); + String filename = (0 == comuneId ? "P-" + codiceProvincia : "C-" + comuneId) + ".json"; + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + filename + + StringPool.QUOTE); + ServletResponseUtil.write(response, + serializer.serializeDeep(getPratiche(companyId, codiceProvincia, comuneId))); + } + break; + default: + response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); + } + } + + private static List getPratiche(long companyId, String codiceProvincia, long comuneId) { + + List result = new ArrayList<>(); + try { + Set territori = new HashSet<>(); + List comuni = Collections. emptyList(); + if (0 == comuneId) { + comuni = ComuneLocalServiceUtil.findByC_CP(companyId, codiceProvincia); + } else { + try { + comuni = Arrays. asList(ComuneLocalServiceUtil.getComune(comuneId)); + } catch (PortalException e) {} + } + for (Comune comune : comuni) { + for (Territorio territorio : TerritorioLocalServiceUtil.findByComuneId(comune.getComuneId(), + QueryUtil.ALL_POS, QueryUtil.ALL_POS)) { + territori.add(territorio.getTerritorioId()); + } + } + DynamicQuery dq = IntPraticaLocalServiceUtil.dynamicQuery(); + dq.add(RestrictionsFactoryUtil.in("territorioId", territori)); + dq.add(RestrictionsFactoryUtil.ne("numeroProgetto", StringPool.BLANK)); + dq.add(RestrictionsFactoryUtil.isNotNull("numeroProgetto")); + @SuppressWarnings("unchecked") + List pratiche = IntPraticaLocalServiceUtil.dynamicQuery(dq); + for (IntPratica pratica : pratiche) { + DettPratica dett = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(pratica.getIntPraticaId()); + MappeBean bean = new MappeBean(); + try { + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(pratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia()); + bean.setComune(comune.getCodiceBelfiore()); + bean.setNomeComune(comune.getDenominazione()); + bean.setProvincia(provincia.getSigla()); + bean.setNumeroProgetto(pratica.getNumeroProgetto()); + bean.setDescrizione(dett.getDescLongIntervento()); + bean.setEstremiCatastali(dett.getEstremiCatastali()); + String[] coordinate = StringUtils.split(dett.getLocalizzazioneGeografica(), '|'); + if (coordinate.length > 1) { + bean.setLat(Double.valueOf(coordinate[0])); + bean.setLng(Double.valueOf(coordinate[1])); + } + if (Validator.isNotNull(bean.getEstremiCatastali()) || Validator.isNotNull(bean.getLng())) { + bean.setUrl(FascicoloURLUtil.getFascicoloBOViewURL(companyId, pratica.getIntPraticaId())); + result.add(bean); + } + } catch (PortalException e) {} + } + } catch (SystemException e) { + e.printStackTrace(); + } + return result; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/MappeUtil.java similarity index 88% rename from liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/MappeUtil.java index 4ee0ce78..93ad03e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/MappeUtil.java @@ -1,5 +1,6 @@ package it.mwg.sismica.bo.util; +import it.mwg.sismica.bo.shared.util.Generics; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; @@ -10,8 +11,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.Date; import javax.servlet.http.HttpServletRequest; @@ -30,11 +29,10 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.theme.ThemeDisplay; public class MappeUtil { - private static final Log _log = LogFactoryUtil.getLog(MappeUtil.class); public static String getUrlFe(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly) - throws UnsupportedEncodingException, PortalException, SystemException { + throws PortalException, SystemException { ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); @@ -44,7 +42,7 @@ public class MappeUtil { } public static String getUrlBo(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly) - throws UnsupportedEncodingException, PortalException, SystemException { + throws PortalException, SystemException { ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); @@ -86,14 +84,14 @@ public class MappeUtil { url = ConfigurazioneLocalServiceUtil .findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA) .replace("{{PROVINCIA}}", siglaProvincia).replace("{{COD_BELFIORE}}", codiceBelfiore) - .replace("{{URL}}", urlEncode(cb.toString())) + .replace("{{URL}}", Generics.urlEncode(cb.toString())) + StringPool.AMPERSAND + getAuth(companyId, request.getServerName()); } return url; } private static String getUrlComune(HttpServletRequest request, String baseUrl, DettPratica dettPratica, - Comune comune, boolean readOnly) throws UnsupportedEncodingException, PortalException, SystemException { + Comune comune, boolean readOnly) throws PortalException, SystemException { ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); @@ -103,7 +101,7 @@ public class MappeUtil { String lng = StringPool.BLANK; String numeroProgetto = StringPool.BLANK; if (Validator.isNotNull(dettPratica)) { - estremiCatastali = urlEncode(dettPratica.getEstremiCatastali()); + estremiCatastali = Generics.urlEncode(dettPratica.getEstremiCatastali()); String localizzazione = dettPratica.getLocalizzazioneGeografica(); if (Validator.isNotNull(localizzazione)) { String[] coordinate = StringUtils.split(localizzazione, StringPool.PIPE); @@ -119,7 +117,7 @@ public class MappeUtil { String url = baseUrl; url = url .replace("{{COD_BELFIORE}}", - Validator.isNull(comune) ? StringPool.BLANK : urlEncode(comune.getCodiceBelfiore())) + Validator.isNull(comune) ? StringPool.BLANK : Generics.urlEncode(comune.getCodiceBelfiore())) .replace("{{ESTREMI_CAT}}", estremiCatastali).replace("{{LAT}}", lat).replace("{{LNG}}", lng) .replace("{{IDPRATICA}}", intPraticaId).replace("{{NPRATICA}}", numeroProgetto) .replace("{{READONLY}}", String.valueOf(readOnly)); @@ -145,14 +143,4 @@ public class MappeUtil { String auth = DigestUtils.sha256Hex(date + sharedSecret + serverName); return "date=" + date + "&auth=" + auth; } - - private static String urlEncode(String str) { - String encoded; - try { - encoded = URLEncoder.encode(str, StringPool.UTF8); - } catch (UnsupportedEncodingException e) { - encoded = str; - } - return encoded; - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java index e1fb7bb4..18e1367c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java @@ -56,8 +56,6 @@ public class CollaudoImpl extends CollaudoBaseImpl { } sb.append("n. "); if (Validator.isNotNull(getProtocollo())) { - // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato - // dovrebbe essere il primo sb.append(intPratica.getNumeroProgetto()).append(" del ") .append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())) .append(" - id ").append(intPratica.getIntPraticaId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java index 2889c174..73223d8c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ComuneImpl.java @@ -8,6 +8,7 @@ package it.tref.liferay.portos.bo.model.impl; + /** * The extended model implementation for the Comune service. Represents a row in the "portos_amm_Comune" * database table, with each column mapped to a property of this class. 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 7e2527f9..7eb1b988 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 @@ -8,6 +8,8 @@ package it.tref.liferay.portos.bo.model.impl; +import it.mwg.sismica.bo.util.MappeUtil; +import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; @@ -32,6 +34,8 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.lang.ArrayUtils; import org.codehaus.jettison.json.JSONObject; @@ -771,6 +775,20 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { return soggettiAsseveranti; } + @Override + public String getUrlMappeBo(HttpServletRequest request, Comune comune, boolean readOnly) throws PortalException, + SystemException { + + return MappeUtil.getUrlBo(request, this, comune, readOnly); + } + + @Override + public String getUrlMappeFe(HttpServletRequest request, Comune comune, boolean readOnly) throws PortalException, + SystemException { + + return MappeUtil.getUrlFe(request, this, comune, readOnly); + } + @Override public Set getTipiSoggettiAsseveranti() throws PortalException, SystemException { @@ -801,8 +819,6 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { } sb.append("n. "); if (Validator.isNotNull(getProtocollo())) { - // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato - // dovrebbe essere il primo sb.append(intPratica.getNumeroProgetto()).append(" del ").append(sdf.format(intPratica.getDtPratica())); } else { if (Validator.isNotNull(intPratica.getNumeroProgetto())) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java index 085a63c8..fdf2a72e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java @@ -57,8 +57,6 @@ public class FineLavoriImpl extends FineLavoriBaseImpl { } sb.append("n. "); if (Validator.isNotNull(getProtocollo())) { - // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo - // sbagliato dovrebbe essere il primo sb.append(intPratica.getNumeroProgetto()).append(" del ") .append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())) .append(" - id ").append(intPratica.getIntPraticaId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java index 799d0b94..077650b7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java @@ -10,7 +10,6 @@ package it.tref.liferay.portos.bo.model.impl; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; /** @@ -37,7 +36,7 @@ public class SoggettoImpl extends SoggettoBaseImpl { StringBuilder sb = new StringBuilder(LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + getTipologiaSoggetto())); if (Validator.isNotNull(getAmbitoProfessione())) { - sb.append(StringPool.SPACE).append(StringPool.DASH).append(StringPool.SPACE); + sb.append(" - "); if (getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro")) { sb.append(getAmbitoAttivita()); } else { @@ -51,15 +50,15 @@ public class SoggettoImpl extends SoggettoBaseImpl { public String getDescrizioneCompleta() { StringBuilder descrizione = new StringBuilder(); - descrizione.append(getCodiceFiscale().toUpperCase()).append(StringPool.SPACE).append(StringPool.DASH); + descrizione.append(getCodiceFiscale().toUpperCase()).append(" -"); if (Validator.isNotNull(getCognome())) { - descrizione.append(StringPool.SPACE).append(getCognome()); + descrizione.append(' ').append(getCognome()); } if (Validator.isNotNull(getNome())) { - descrizione.append(StringPool.SPACE).append(getNome()); + descrizione.append(' ').append(getNome()); } if (Validator.isNotNull(getDenominazione())) { - descrizione.append(StringPool.SPACE).append(getDenominazione()); + descrizione.append(' ').append(getDenominazione()); } return descrizione.toString(); } @@ -69,13 +68,13 @@ public class SoggettoImpl extends SoggettoBaseImpl { StringBuilder descrizione = new StringBuilder(); if (Validator.isNotNull(getCognome())) { - descrizione.append(StringPool.SPACE).append(getCognome()); + descrizione.append(' ').append(getCognome()); } if (Validator.isNotNull(getNome())) { - descrizione.append(StringPool.SPACE).append(getNome()); + descrizione.append(' ').append(getNome()); } if (Validator.isNotNull(getDenominazione())) { - descrizione.append(StringPool.SPACE).append(getDenominazione()); + descrizione.append(' ').append(getDenominazione()); } return descrizione.toString(); } @@ -83,7 +82,7 @@ public class SoggettoImpl extends SoggettoBaseImpl { @Override public String getDescrizioneRuolo() { - return getDescrizioneCompleta() + StringPool.SPACE + StringPool.DASH + StringPool.SPACE + return getDescrizioneCompleta() + " - " + LanguageUtil.get(LocaleUtil.getSiteDefault(), "gc-soggetto-" + getTipologiaSoggetto()); } @@ -93,6 +92,6 @@ public class SoggettoImpl extends SoggettoBaseImpl { if (Validator.isNotNull(getDenominazione())) { return getDenominazione(); } - return getNome() + StringPool.SPACE + getCognome(); + return getNome() + ' ' + getCognome(); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java index 08cf10c0..16c0a91f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java @@ -50,7 +50,6 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener { public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub super.onAfterAddAssociation(classPK, associationClassName, associationClassPK); } @@ -77,14 +76,12 @@ public class KaleoLogModelListener extends BaseModelListener { public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK); } @Override public void onAfterUpdate(KaleoLog model) throws ModelListenerException { - // TODO Auto-generated method stub super.onAfterUpdate(model); } @@ -92,21 +89,18 @@ public class KaleoLogModelListener extends BaseModelListener { public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK); } @Override public void onBeforeCreate(KaleoLog model) throws ModelListenerException { - // TODO Auto-generated method stub super.onBeforeCreate(model); } @Override public void onBeforeRemove(KaleoLog model) throws ModelListenerException { - // TODO Auto-generated method stub super.onBeforeRemove(model); } @@ -114,14 +108,12 @@ public class KaleoLogModelListener extends BaseModelListener { public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK); } @Override public void onBeforeUpdate(KaleoLog model) throws ModelListenerException { - // TODO Auto-generated method stub super.onBeforeUpdate(model); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoTaskInstanceTokenModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoTaskInstanceTokenModelListener.java index 61d281f8..b8b4233d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoTaskInstanceTokenModelListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoTaskInstanceTokenModelListener.java @@ -36,14 +36,12 @@ public class KaleoTaskInstanceTokenModelListener extends BaseModelListener esito = new ArrayList(); @@ -60,7 +40,6 @@ public class SismicaAdministrationPortlet extends MVCPortlet { for (Map.Entry entry : System.getenv().entrySet()) { esito.add(entry.getKey() + StringPool.EQUAL + entry.getValue()); } - esito.add("

Properties

"); for (Map.Entry entry : System.getProperties().entrySet()) { esito.add(entry.getKey() + StringPool.EQUAL + entry.getValue()); @@ -69,12 +48,8 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void generaDocumenti(ActionRequest actionRequest, ActionResponse actionResponse) { - // ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); + List esito = new ArrayList<>(); - // try { - // } catch (PortalException | SystemException e) { - // esito.add("Errore durante l'invio " + e.getMessage()); - // } actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()])); } @@ -83,6 +58,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void resetFirme(ActionRequest actionRequest, ActionResponse actionResponse) { + ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto"); List esito = new ArrayList<>(); @@ -95,6 +71,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void trasformaFLC(ActionRequest actionRequest, ActionResponse actionResponse) { + ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); String numeroPratica = ParamUtil.getString(actionRequest, "numeroPratica"); String tipoDaRiaprire = ParamUtil.getString(actionRequest, "tipoDaRiaprire"); @@ -124,6 +101,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void reIndexFascicoli(ActionRequest actionRequest, ActionResponse actionResponse) { + ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); List esito = null; esito = SismicaUtil.reIndexFascicoli(themeDisplay.getCompanyId()); @@ -132,6 +110,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void lanciaSorteggio(ActionRequest actionRequest, ActionResponse actionResponse) { + ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); List esito = null; _log.info("Sorteggio lanciato manualmente"); @@ -147,6 +126,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { public void manutenzioneDatabase(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, SystemException { + String mode = ParamUtil.getString(actionRequest, "mode"); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); List esito = ManutenzioneDatabase.pulisci(serviceContext, mode); @@ -154,6 +134,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet { } public void inviaAvviso(ActionRequest actionRequest, ActionResponse actionResponse) throws SystemException { + SismicaUtil.inviaAvviso(actionRequest, actionResponse); } @@ -163,13 +144,9 @@ public class SismicaAdministrationPortlet extends MVCPortlet { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); serviceContext.setScopeGroupId(-1L); serviceContext.setCompanyId(serviceContext.getCompanyId()); - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Date dataProssimoSorteggio = ParamUtil.getDate(actionRequest, "dataProssimoSorteggio", sdf); - ConfigurazioneServiceUtil.storeConfig("conf.geniocivile.sorteggio.data.prossimo.sorteggio", sdf.format(dataProssimoSorteggio), serviceContext); - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java index 172caf87..97313f79 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java @@ -56,7 +56,6 @@ public class SchedulerEstrazioneFirme implements MessageListener { try { for (Company company : CompanyLocalServiceUtil.getCompanies()) { // campo abilitazione scheduler - // TODO creare la configurazione aggiuntiva per lo scheduler estrazione firme boolean condition = Boolean.parseBoolean(ConfigurazioneLocalServiceUtil.findByC_ChiaveString( company.getCompanyId(), ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO)); if (condition) { 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 0947ed0c..f1489d39 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 @@ -458,7 +458,6 @@ public class SchedulerInvioDocumento implements MessageListener { private void gestioneTempistica(Avviso avviso, ControlloPratica controlloPratica) throws SystemException, PortalException { - // FIXME la tempistica non va bene mette le date sbagliate String tipoDocumento = avviso.getTipoDocumento(); Date dtInvio = avviso.getDtInvio(); if (tipoDocumento.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) { 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 de09edc0..c5fd2195 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 @@ -442,7 +442,6 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase Asseverazione asseverazione = getAsseverazione(asseverazioneId); DettPratica dettPratica = dettPraticaLocalService.getLastEditableByIntPratica(asseverazione.getIntPraticaId()); - // TODO forse dobbiamo mettere i permesssi ma non mi pare sicuro. FileEntry fileEntry = null; if (asseverazione.getEsito().equalsIgnoreCase(AsseverazioniUtil.STATO_ASSEGNATA)) { long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), 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 94bb4644..49be85df 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 @@ -311,7 +311,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi codiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), statoPratica); } - // TODO Da riempire String jsonParameters = StringPool.BLANK; avvisoLocalService.createStandardAvvisoPratica(controlloPratica.getIntPraticaId(), statoPratica, jsonParameters, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, @@ -522,12 +521,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi return result; } - /* - * TODO Controllare bene il processo. Ci deve essere un modo per capire se sono pratiche da importare o nuove. A mio - * parere (scuti) dovrebbe essere: if - * (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { return - * "portos1_integrazioni"; } else { return "portos1_esito"; } - */ @Override public String getReturnValueScriptIniziale(long controlloPraticaId) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 2c46c27f..2d319a20 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -210,7 +210,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { normEsenteBollo, normEsenteSpese, normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, - clRischioPostInt, intervFinPub, intervFinPubDesc, tcNuovaCostruzioneComplessa, contestoPaesaggistico, + clRischioPostInt, intervFinPub, intervFinPubDesc, tcNuovaCostruzioneComplessa, contestoPaesaggistico, livelloDiTutela, vincoli, serviceContext, bozza); } if (!geoDisabledSubmit && DelegheUtil.hasDelegaCompilazioneSezioneGeologica(userId, dettPraticaId)) { @@ -229,7 +229,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica fetchDettPratica(long dettPraticaId) throws SystemException { - // TODO permessi return dettPraticaLocalService.fetchDettPratica(dettPraticaId); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java index 6a944dbd..eacbdf57 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java @@ -225,7 +225,6 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { Territorio territorio = territorioPersistence.fetchByPrimaryKey(intPratica.getTerritorioId()); long companyId = territorio.getCompanyId(); long groupId = territorio.getGroupId(); - // TODO forse è meglio ragionare con un'altra logica per i permessi User user = userLocalService.getRoleUsers( RoleLocalServiceUtil.getRole(intPratica.getCompanyId(), RoleConstants.ADMINISTRATOR).getRoleId()) .get(0); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java index 29b88c10..8b725c92 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaServiceImpl.java @@ -43,7 +43,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { boolean aggiornato, String jsonFirmatari, long intPraticaIdRimozione, long dettPraticaIdRimozione, Date dtDataRimozione, ServiceContext serviceContext) throws PortalException, SystemException { - // TODO aggiungere controlli di permessi di aggiunta file!!!! return docPraticaLocalService.addDocPratica(userId, className, classPk, intPraticaId, dlFileEntry, fileName, version, praticaValidata, descLong, tipologia, sha256, aggiornato, jsonFirmatari, dettPraticaIdRimozione, dtDataRimozione, serviceContext); @@ -52,14 +51,12 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { @Override public DocPratica getDocPratica(long docPraticaId) throws PortalException, SystemException { - // TODO permessi return docPraticaLocalService.getDocPratica(docPraticaId); } @Override public int countByClassPk_Tipologia(long classPk, String tipologia) throws SystemException { - // TODO permessi return docPraticaLocalService.countByClassPk_Tipologia(classPk, tipologia); } @@ -67,7 +64,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { public List findByClassPk_Tipologia(long dettPratica, String tipologia, int start, int end) throws SystemException { - // TODO permessi return docPraticaLocalService.findByClassPk_Tipologia(dettPratica, tipologia, start, end); } @@ -75,7 +71,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { public List findByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) throws SystemException { - // TODO permessi return docPraticaLocalService.findByIntPratica_Tipologia(intPraticaId, tipologia, start, end); } @@ -101,7 +96,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { @Override public List getValidByIntPratica(long intPraticaId) throws SystemException { - // TODO permessi return docPraticaLocalService.getValidByIntPratica(intPraticaId); } @@ -109,7 +103,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { public List getValidByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) throws SystemException { - // TODO permessi return docPraticaLocalService.getValidByIntPratica_Tipologia(intPraticaId, tipologia, start, end); } @@ -117,21 +110,18 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl { public List getValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) throws SystemException { - // TODO permessi return docPraticaLocalService.getValidTmpByIntPratica_Tipologia(intPraticaId, tipologia, start, end); } @Override public List getInvalidByIntPratica(long intPraticaId) throws SystemException { - // TODO permessi return docPraticaLocalService.getInvalidByIntPratica(intPraticaId); } @Override public List getInvalidTmpByIntPratica(long intPraticaId) throws SystemException { - // TODO permessi return docPraticaLocalService.getInvalidTmpByIntPratica(intPraticaId); } 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 7d552875..47dc3b26 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 @@ -498,10 +498,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { // sostituisci int pratica intPratica.setUserId(soggettoId); intPratica.setUserName(newUser.getFullName()); - /* - * TODO: verificare che sia veramente come implementato sotto oppure bisogna cambiare il titolare anche di tutti - * i dettPratica - */ DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId); dettPratica.setCodiceFiscaleDelegatoCommittente(newUser.getScreenName()); dettPraticaLocalService.updateDettPratica(dettPratica); @@ -528,7 +524,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public IntPratica updateIntPraticaSorteggio(long intPraticaId, Date dtSorteggio) throws SystemException { - // TODO vedere se va cambiato lo stato return updateIntPraticaSorteggio(intPraticaId, dtSorteggio, null); } @@ -754,7 +749,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public List search(List groupIds, int start, int end) throws SystemException { - // TODO Modificare tramite Indexer DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica")); dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA)); @@ -764,7 +758,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public int countSearch(List groupIds) throws SystemException { - // TODO Modificare tramite Indexer DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica")); dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA)); @@ -776,7 +769,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { public List searchWithIntPraticaId(List groupIds, long intPraticaId, int start, int end) throws SystemException { - // TODO Modificare tramite Indexer DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica")); @@ -787,7 +779,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public int countSearchWithIntPraticaId(List groupIds, long intPraticaId) throws SystemException { - // TODO Modificare tramite Indexer DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica")); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java index 912cf939..e5d224ed 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java @@ -50,7 +50,6 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { @Override public IntPratica getIntPratica(long intPraticaId) throws PortalException, SystemException { - // TODO: Permessi return intPraticaLocalService.getIntPratica(intPraticaId); } @@ -96,16 +95,12 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { @Override public List search(List groupIds, int start, int end) throws SystemException { - // TODO Modificare tramite Indexer - // TODO Aggiungere controllo permessi return intPraticaLocalService.search(groupIds, start, end); } @Override public int countSearch(List groupIds) throws SystemException { - // TODO Modificare tramite Indexer - // TODO Aggiungere controllo permessi return intPraticaLocalService.countSearch(groupIds); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index caae1a28..3f4f2028 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -112,7 +112,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase } return updateParereGeologo(parereGeologo); } else { - // TODO error chi sta compilando non è il geologo designato o il geologo non esiste. + // chi sta compilando non è il geologo designato o il geologo non esiste. return parereGeologo; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java index 3a2af0c7..02f4c64d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java @@ -74,7 +74,6 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl { @Override public List findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException { - // TODO permessi return parereGeologoLocalService.findByIntPraticaId(intPraticaId, start, end); } @@ -82,28 +81,24 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl { public List findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end) throws SystemException { - // TODO permessi return parereGeologoLocalService.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end); } @Override public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException { - // TODO permessi return parereGeologoLocalService.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId); } @Override public List findByGeologoId(long geologoUserId, int start, int end) throws SystemException { - // TODO permessi return parereGeologoLocalService.findByGeologoId(geologoUserId, start, end); } @Override public int countByGeologoId(long geologoUserId) throws SystemException { - // TODO permessi return parereGeologoLocalService.countByGeologoId(geologoUserId); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java index 2622b393..78ee1a4b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java @@ -240,7 +240,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { soggetto.setIntPraticaIdRimozione(intPraticaIdRimozione); soggetto.setDettPraticaIdRimozione(dettPraticaIdRimozione); soggetto.setDtDataRimozione(dtDataRimozione); - // TODO aggiornare soggetto.setSoggettoSostituitoId(0l); soggetto.setOldSoggettoId(oldSoggettoId); soggetto.setTmp(tmp); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java index cff33ad9..8660505f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java @@ -62,7 +62,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { long intPraticaIdRimozione, long dettPraticaIdRimozione, Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, boolean tmp, ServiceContext serviceContext) throws PortalException, SystemException { - // TODO: permessi return soggettoLocalService.addSoggetto(userId, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, @@ -77,14 +76,12 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { @Override public Soggetto deleteSoggetto(Soggetto soggetto) throws PortalException, SystemException { - // TODO: permessi return soggettoLocalService.deleteSoggetto(soggetto); } @Override public Soggetto deleteSoggetto(long soggettoId) throws PortalException, SystemException { - // TODO: permessi return soggettoLocalService.deleteSoggetto(soggettoId); } @@ -103,7 +100,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, boolean tmp, ServiceContext serviceContext) throws PortalException, SystemException { - // TODO: permessi return soggettoLocalService.updateSoggetto(userId, soggettoId, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, @@ -126,7 +122,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { public List findByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) throws SystemException { - // TODO: permessi return soggettoLocalService.findByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); } @@ -134,7 +129,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { public List findByDettPratica_TipologiaSoggetto(long dettPraticaId, String tipologiaSoggetto) throws SystemException { - // TODO: permessi return soggettoLocalService.findByDettPratica_TipologiaSoggetto(dettPraticaId, tipologiaSoggetto); } @@ -142,7 +136,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { public List findByIntPratica_TipologiaSoggetto_Rimosso(long intPraticaId, String tipologiaSoggetto, boolean rimosso) throws SystemException { - // TODO: permessi return soggettoLocalService .findByIntPratica_TipologiaSoggetto_Rimosso(intPraticaId, tipologiaSoggetto, rimosso); } @@ -245,21 +238,18 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { @Override public List findByIntPratica(long intPraticaId) throws SystemException { - // TODO: permessi return soggettoLocalService.findByIntPratica(intPraticaId); } @Override public int countByIntPratica(long intPraticaId) throws SystemException { - // TODO: permessi return soggettoLocalService.countByIntPratica(intPraticaId); } @Override public List findByDettPratica(long dettPraticaId) throws SystemException { - // TODO: permessi return soggettoLocalService.findByDettPratica(dettPraticaId); } @@ -274,7 +264,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { String sourceFileName, String jsonFirmatari, ServiceContext serviceContext) throws SystemException, PortalException { - // TODO permessi return soggettoLocalService.allegaFileModifica(soggettoId, userId, intPraticaId, content, sourceFileName, jsonFirmatari, serviceContext); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java index c3992c22..a0eab667 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java @@ -275,7 +275,6 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { @Override public Sorteggio findByIntPratica(long intPraticaId) throws SystemException { - // XXX verificare se torna uno o piu List sorteggis = sorteggioPersistence.findByIntPraticaId(intPraticaId); return sorteggis != null && !sorteggis.isEmpty() ? sorteggis.get(0) : null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index fe5ffd69..68b9d749 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index d0f1112c..f9489e0d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index e35a9522..a8a28936 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index a676849e..1c9ee855 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index 691776e7..b5054e85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index b88225f1..b8d76564 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66d67c23..4a0e9a11 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 0cc84b84..7c1fa3f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index bbf7e7de..a2090464 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index 96ef6b28..284ef73a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 851c2c34..cbb97b8f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 4632fb51..1a35a013 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 908947c5..e2a7716d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index b1f93960..7b45230e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 6b1a1f76..605304c7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 31233ca0..a21d5628 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index 22211d67..d4e4eb82 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index e20dcc6f..28c40f09 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 488eee17..9472e823 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index 47f64b59..5bcc9a03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 04df6534..0bff1915 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 17b343d3..61d576eb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index 10006a9c..c7f4d1dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java index 2fef4fa4..f05afd59 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/RoleUpdateAction.java @@ -32,7 +32,6 @@ public class RoleUpdateAction extends SimpleAction { public void run(String[] ids) throws ActionException { for (String companyId : ids) { - // TODO aggiunta di tutti i ruoli try { Role role = RoleLocalServiceUtil.fetchRole(Long.valueOf(companyId), Constants.ROLE_NAME_GEOLOGO); if (Validator.isNull(role)) { 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 index 8bfe75a2..44d3587b 100644 --- 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 @@ -243,7 +243,7 @@ public abstract class PagamentiUtil { long irisPagamentoId = PagamentoLocalServiceUtil.createPagamentoId(); currentURL = StringUtil.replaceLast(currentURL, "/0", StringPool.SLASH + irisPagamentoId); String auth = HttpUtil.getParameter(currentURL, "p_auth", false); - // XXX Se non li rimuovi non funziona più + // Se non li rimuovi non funziona più Map parameters = HttpUtil.getParameterMap(HttpUtil.getQueryString(currentURL)); for (String key : parameters.keySet()) { currentURL = HttpUtil.removeParameter(currentURL, key); 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 3bdd3c7a..f7aa6aa4 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=2735 - build.date=1636717649195 + build.number=2741 + build.date=1637055953976 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/web.xml index 6a84959d..a2241643 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/web.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/web.xml @@ -1,2 +1,14 @@ - \ No newline at end of file + + + MappeServlet + it.mwg.sismica.bo.servlet.MappeServlet + + + MappeServlet + /mappe/* + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_toggle_workflow.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_toggle_workflow.jsp index 8518dce7..741666aa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_toggle_workflow.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/actions/action_toggle_workflow.jsp @@ -23,7 +23,6 @@ IntPratica intPratica = IntPraticaLocalServiceUtil .getIntPratica(intPraticaId); - // TODO: definire quando .... boolean isWorkFlowSospendibile = WorkflowUtil .isWorkflowDisattivabile(intPraticaId); boolean isWorkFlowAvviabile = WorkflowUtil diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp index da88d6f3..8f4dac4a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view_fascicolo.jsp @@ -29,7 +29,7 @@ DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedBy request.setAttribute("bean.intPratica", intPratica); request.setAttribute("bean.dettPratica.last", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId())); -request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));////TODO utilizzare getLastdByIntPraticaAndTipoPratica +request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId())); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp new file mode 100644 index 00000000..f8b8c9b8 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp @@ -0,0 +1,32 @@ +<%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@include file="/html/init.jsp"%> +<% +long companyId = company.getCompanyId(); +String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.MAPPE_URL_IFRAME_FE); +String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.MAPPE_URL_IFRAME_BO); +String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA); +String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.MAPPE_SHARED_SECRET); +%> + +

Configurazione plugin mappe

+ + <% + for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET, + ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO, + ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) { + %> + + + + <% + } + %> + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp index d0cbc548..6d1604d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp @@ -7,12 +7,8 @@ <%@page import="java.util.Map"%> <%@ include file="/html/sismica_administration/init.jsp"%> <% -long companyId = company.getCompanyId(); -String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.DATE_ULTIMO_SORTEGGIO); -String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_FE); -String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO); -String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA); -String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_SHARED_SECRET); +String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(company.getCompanyId(), + ConfigurazioneConstants.DATE_ULTIMO_SORTEGGIO); %> @@ -49,18 +45,6 @@ String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, -
-
Impostazioni sistema mappe
- -
- - - - - -
- -
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java index 7600e88d..020f17e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java @@ -1,13 +1,9 @@ /** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software + * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in + * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. */ package it.tref.portos.calendar.appointments.service.impl; @@ -46,15 +42,12 @@ import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the disponibilita remote service. - * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface. - * + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface. *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author 3F Consulting @@ -63,127 +56,109 @@ import com.liferay.portal.service.UserLocalServiceUtil; */ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the - * disponibilita remote service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the disponibilita remote + * service. */ - + private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class); + @Override public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { - return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio, serviceContext); + return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio, + serviceContext); } + @Override public List addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita, - Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, String oraFineDisponibilita, - ServiceContext serviceContext) throws SystemException, PortalException { + Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, + String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException { // ciclo su tutti i funzionari e chiamo il service su ogniuno di essi List funzionari = new ArrayList(); -// List funzionari = funzionarioLocalService.findByPresidio(presidio); + // List funzionari = funzionarioLocalService.findByPresidio(presidio); List listDisponibilita = new ArrayList<>(funzionari.size()); long funzionarioId; for (Funzionario funzionario : funzionari) { funzionarioId = funzionario.getFunzionarioId(); - listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId, dataInizioDisponibilita, - dataFineDisponibilita, presidio, serviceContext)); + listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId, + dataInizioDisponibilita, dataFineDisponibilita, presidio, serviceContext)); } return listDisponibilita; } - public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException { - + @Override + public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario) + throws SystemException, ParseException { + JSONObject json = JSONFactoryUtil.createJSONObject(); JSONArray array = JSONFactoryUtil.createJSONArray(); - + Organization org = OrganizationLocalServiceUtil.fetchOrganization(Long.parseLong(presidio)); - + SimpleDateFormat sfd = new SimpleDateFormat("dd/MM/yyyy"); Date dateVerifyTemp = sfd.parse(date); - + for (int i = 0; i < oreInizio.length; i++) { JSONObject jsonFiglio = JSONFactoryUtil.createJSONObject(); - + String oraInizio = oreInizio[i]; - + jsonFiglio.put("ora", oraInizio); - + Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp); - - - List lista = - PrenotazioneLocalServiceUtil.findByDateHourFunzionario( - dateVerify, Long.parseLong(idFunzionario), org.getGroupId()); - - if(lista.isEmpty()){ + + List lista = PrenotazioneLocalServiceUtil.findByDateHourFunzionario(dateVerify, + Long.parseLong(idFunzionario), org.getGroupId()); + + if (lista.isEmpty()) { jsonFiglio.put("disponibile", true); } else { jsonFiglio.put("disponibile", false); } - + array.put(jsonFiglio); } - - json.put("slot",array); + + json.put("slot", array); return json.toString(); } - - + + @Override public String getDisponibilitaByDate(String presidio, String date) throws SystemException, ParseException { - // TODO permessi - Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); - List userDefinitivo = new ArrayList(); - try { - - if(organization != null){ + if (organization != null) { List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); - for (User user : users) { - Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); - - if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ - - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( - user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); - - - if(isIstruttore){ + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), + "portos_calendario"); + if (!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), + organization.getGroupId(), portosIstruttore.getRoleId()); + if (isIstruttore) { userDefinitivo.add(user); } } } - } - - } catch (NumberFormatException | SystemException e) { - _log.error(e,e); - } catch (PortalException e) { - _log.error(e,e); - } - + } catch (NumberFormatException | PortalException | SystemException e) { + _log.error(e, e); + } Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date); - SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); - JSONArray json = JSONFactoryUtil.createJSONArray(); for (User funzionario : userDefinitivo) { - - List disponibilitaByFunzionario = - disponibilitaLocalService.findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId()); + List disponibilitaByFunzionario = disponibilitaLocalService + .findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId()); if (disponibilitaByFunzionario.isEmpty()) { continue; } @@ -192,7 +167,7 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { jsonDisponibilita.put("idFunzionario", funzionario.getUserId()); JSONArray jsonOre = JSONFactoryUtil.createJSONArray(); for (Disponibilita d : disponibilitaByFunzionario) { - + JSONObject jsonSlot = JSONFactoryUtil.createJSONObject(); jsonSlot.put("inizio", sdf.format(d.getStartDate())); jsonSlot.put("fine", sdf.format(d.getEndDate())); @@ -206,7 +181,7 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { return json.toString(); } - + private Date formatDateTime(String orario, Date day) throws ParseException { SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); Date data = sdf.parse(orario); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties index 9e4f6817..a0111226 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_calendar_appointments - build.number=174 - build.date=1602593587481 + build.number=176 + build.date=1636988959145 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 index 6d5213f4..2e919d89 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 @@ -1 +1 @@ -76d0533b883f0f5314585308586d9d83 +4c011c888941fe61afd3a1627c1f69ff 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 7ffe5932..0caba8ed 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 @@ -62,7 +62,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet { long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId"); String comingFrom = ParamUtil.getString(actionRequest, "comingFrom"); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - // TODO rivedere assolutamente il controllo boolean controllo = false; if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) { controllo = true; @@ -128,7 +127,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet { long intPraticaIdRimozione = 0L; long dettPraticaIdRimozione = 0L; Date dtDataRimozione = null; - // TODO attenzione perche' questo controllo potrebbe non andare bene per integrazioni e varianti boolean isUnivoco = DocumentiPraticaUtil.getDocUnivoci().contains(tipologia); if (isUnivoco && DocPraticaLocalServiceUtil.countByClassPk_Tipologia(classPk, tipologia) > 0) { SessionErrors.add(actionRequest, "error.geniocivilefe.allegato.univoco"); @@ -160,7 +158,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet { long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId"); String comingFrom = ParamUtil.getString(actionRequest, "comingFrom"); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - // TODO rivedere assolutamente il controllo boolean controllo = false; if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo") || comingFrom.equalsIgnoreCase("edit_soggetto")) { @@ -180,7 +177,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet { long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId"); String comingFrom = ParamUtil.getString(actionRequest, "comingFrom"); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - // TODO rivedere assolutamente il controllo boolean controllo = false; if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) { controllo = true; 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 9cfb9be3..63fc91d5 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 @@ -930,7 +930,6 @@ public class FascicoloFePortlet extends MVCPortlet { "codiceFiscaleDelegatoCollaudoEnabled"); String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil.getString(request, "codiceFiscaleDelegatoCollaudo") : StringPool.BLANK; - // FIXME A che serve??? String codiceRuoloDelegato = ParamUtil.getString(request, "codiceRuoloDelegato"); boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(request, "inizioLavoriContestualeOpera"); long pagamentoId = ParamUtil.getLong(request, "pagamentoId"); 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 7e6c8cb9..ecc3c89b 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,5 +1,15 @@ package it.tref.liferay.portos.fe.portlet; +import it.tref.liferay.portos.bo.model.ParereGeologo; +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 java.io.File; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -14,75 +24,53 @@ import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PortalUtil; import com.liferay.util.bridges.mvc.MVCPortlet; -import it.tref.liferay.portos.bo.model.ParereGeologo; -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 java.io.File; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - -/** - * Portlet implementation class FascicoloFePortlet - */ public class ParereGeologoPortlet extends MVCPortlet { - private static Log _log = LogFactoryUtil.getLog(ParereGeologoPortlet.class); - - public void aggiornaParere(ActionRequest actionRequest, ActionResponse actionResponse) { - - String parere = ParamUtil.getString(actionRequest, "parere"); - long intPraticaId = ParamUtil.getLong(actionRequest, "intPratica"); - long parereGeologoId = ParamUtil.getLong(actionRequest, "parereGeologoId"); - - UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest); - - ServiceContext serviceContext; - try { - ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId); - // TODO parere andrà rimosso se andrà implementata la modifica - if (Validator.isNotNull(parereGeologo.getParere())) { - SessionErrors.add(actionRequest, "error-update-parere-geologo"); - return; - } - - serviceContext = ServiceContextFactory.getInstance(actionRequest); - byte[] content = null; - - String fileName = uploadRequest.getFileName("docFile"); - File file = uploadRequest.getFile("docFile"); - - if (Validator.isNotNull(fileName) && file != null) { - // lunghezza fissata a 200 - if (fileName.length() > 200) { - SessionErrors.add(actionRequest, "error.geniocivilebo.pareregeologo.allegato.length.valid"); - } - } - - if (!SessionErrors.isEmpty(actionRequest)) { - PortalUtil.copyRequestParameters(actionRequest, actionResponse); - } else { - if (Validator.isNotNull(intPraticaId)) { - content = FileUtil.getBytes(file); - } - } + private static Log _log = LogFactoryUtil.getLog(ParereGeologoPortlet.class); - _log.info("Aggiorna il parere per la intPratica " + intPraticaId + " il parere è: \n" + parere); - if (Validator.isNull(parereGeologo.getParere())) { - ParereGeologoServiceUtil.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext); - //ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE - MailUtil.invioNotificaIstruttoreByGeologo(parereGeologoId,serviceContext); - - } else { - throw new PortalException("parere già espresso"); - } - SessionMessages.add(actionRequest, "success-update-parere-geologo"); - } catch (Exception e) { - _log.error(e, e); - SessionErrors.add(actionRequest, "error-update-parere-geologo"); - } + public void aggiornaParere(ActionRequest actionRequest, ActionResponse actionResponse) { - } + String parere = ParamUtil.getString(actionRequest, "parere"); + long intPraticaId = ParamUtil.getLong(actionRequest, "intPratica"); + long parereGeologoId = ParamUtil.getLong(actionRequest, "parereGeologoId"); + UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest); + ServiceContext serviceContext; + try { + ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId); + if (Validator.isNotNull(parereGeologo.getParere())) { + SessionErrors.add(actionRequest, "error-update-parere-geologo"); + return; + } + serviceContext = ServiceContextFactory.getInstance(actionRequest); + byte[] content = null; + String fileName = uploadRequest.getFileName("docFile"); + File file = uploadRequest.getFile("docFile"); + if (Validator.isNotNull(fileName) && file != null) { + // lunghezza fissata a 200 + if (fileName.length() > 200) { + SessionErrors.add(actionRequest, "error.geniocivilebo.pareregeologo.allegato.length.valid"); + } + } + if (!SessionErrors.isEmpty(actionRequest)) { + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + } else { + if (Validator.isNotNull(intPraticaId)) { + content = FileUtil.getBytes(file); + } + } + _log.info("Aggiorna il parere per la intPratica " + intPraticaId + " il parere è: \n" + parere); + if (Validator.isNull(parereGeologo.getParere())) { + ParereGeologoServiceUtil + .updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext); + // ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE + MailUtil.invioNotificaIstruttoreByGeologo(parereGeologoId, serviceContext); + } else { + throw new PortalException("parere già espresso"); + } + SessionMessages.add(actionRequest, "success-update-parere-geologo"); + } catch (Exception e) { + _log.error(e, e); + SessionErrors.add(actionRequest, "error-update-parere-geologo"); + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java index 2ff76513..2f20d64c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java @@ -1219,8 +1219,6 @@ public class ReportFascicoloUtil { sb.append("n. "); sb.append(intPratica.getNumeroProgetto()); SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato dovrebbe - // essere il primo sb.append(" del "); sb.append(sdf.format(intPratica.getDtPratica())); return sb.toString(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp index 88e41087..4226d823 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp @@ -1,106 +1,94 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@include file="/html/fascicolofe/init.jsp" %> - - - -
-
-
- -
-
- -
-
- - Seleziona il tipo di pratica - - - - -
-
- - Stato Pratica - - - - - - - - - - - - - - - - -
-
-
-
- -
-
- -
-
- -
- -
- -
-
-
-
- -
-
- - - - - - - - - - -
-
-
-
- - Numero Progetto - Protocollo - Data Creazione - -
-
- - Asc - Dec - -
-
-
-
- -
-
- -
-
+ +
+
+
+ +
+
+ +
+
+ + Seleziona il tipo di pratica + + + + +
+
+ + Stato Pratica + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+
+
+ + Numero Progetto + Protocollo + Data Creazione +
- - - \ No newline at end of file +
+ + Asc + Dec + +
+
+
+
+
+
+ +
+
+
+ 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 09ea36db..0321ddb8 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 @@ -23,7 +23,6 @@ <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> -<%@page import="it.mwg.sismica.bo.util.MappeUtil" %> <%@ include file="/html/fascicolofe/init.jsp"%> <% @@ -55,7 +54,7 @@ boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante"); boolean isDisabled = disabledInput && !enabledByIntegrazione; String displayStyle = proceduraC ? "display:none" : StringPool.BLANK; -String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, disabledInput || isGeoEditable); +String urlIframeMappe = dettPratica.getUrlMappeFe(request, comune, disabledInput || isGeoEditable); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/toolbar.jsp index c8a31e39..437388b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/toolbar.jsp @@ -1,49 +1,33 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portal.kernel.util.Validator"%> -<%@page import="com.liferay.portal.kernel.util.StringUtil"%> -<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> - -<%@include file="/html/fascicolofe/init.jsp" %> +<%@include file="/html/fascicolofe/init.jsp"%> <% String formName = "fm_fascicolo"; String buttonId = "saveAndCloseButton"; %> - - + - - + - - - - - - - + + + + + -
- - +
+ +
- - - - - -<%-- --%> - + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp index 5c81c3dd..85f4b088 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp @@ -5,9 +5,7 @@ <%@page import="it.tref.liferay.portos.bo.service.FineLavoriServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.CollaudoServiceUtil"%> <%@ include file="/html/fascicolofe/init.jsp" %> - - <% boolean doSearch = true; @@ -38,23 +36,23 @@ String keywords = StringPool.BLANK;
- - + + - + -
+
- + <% List listaIntPratica = new ArrayList(); - + Hits hits = IntPraticaAdvancedSearch.searchMieiProgetti(request, user, start, end); for (Document doc : hits.toList()) { @@ -75,23 +73,23 @@ String keywords = StringPool.BLANK; request.setAttribute("results", listaIntPratica); request.setAttribute("count", hits.getLength()); %> - + - + - + <% - List listaIntPratica = new ArrayList(); + List listaIntPratica = new ArrayList(); Hits hits = IntPraticaAdvancedSearch.searchAltriProgetti(request, user, start, end); - + for (Document doc : hits.toList()) { String intPraticaId = doc.get("intPraticaId"); if (Validator.isNotNull(intPraticaId)) { - + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(GetterUtil.getLong(intPraticaId)); if (Validator.isNotNull(intPratica)) { listaIntPratica.add(intPratica); @@ -101,29 +99,23 @@ String keywords = StringPool.BLANK; } } } - + request.setAttribute("results", listaIntPratica); request.setAttribute("count", hits.getLength()); %> - + - - - <% List listaIntPratica = new ArrayList(); Hits hits = IntPraticaAdvancedSearch.searchArchivioProgetti(request, user, start, end); - for (Document doc : hits.toList()) { - String intPraticaId = doc.get("intPraticaId"); if (Validator.isNotNull(intPraticaId)) { - IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(GetterUtil.getLong(intPraticaId)); if (Validator.isNotNull(intPratica)) { listaIntPratica.add(intPratica); @@ -132,18 +124,14 @@ String keywords = StringPool.BLANK; indexer.delete(company.getCompanyId(), doc.getUID()); } } - } - request.setAttribute("results", listaIntPratica); request.setAttribute("count", hits.getLength()); %> - -
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo.jsp index a1fb7e58..015b4c6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo.jsp @@ -1,86 +1,67 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@ include file="/html/fascicolofe/init.jsp" %> - +<%@include file="/html/fascicolofe/init.jsp"%> <% - String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo"); - String backURL = ParamUtil.getString(request, "backURL"); - String jspActionPage = ParamUtil.getString(request, "jspActionPage","/html/fascicolofe/fascicolo_action.jsp"); - - long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - String intPraticaTitle = Validator.isNotNull(intPratica) ? intPratica.getTitle(locale,false) : "Dettagli Fascicolo - protocollo n°XXX - Progetto n°YYY"; - +String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo"); +String backURL = ParamUtil.getString(request, "backURL"); +String jspActionPage = ParamUtil.getString(request, "jspActionPage","/html/fascicolofe/fascicolo_action.jsp"); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l); +IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); +String intPraticaTitle = Validator.isNotNull(intPratica) ? intPratica.getTitle(locale,false) : "Dettagli Fascicolo - protocollo n°XXX - Progetto n°YYY"; %> - - - - - + + - - + - + - - - + - + - + - - - + - + - + - - - + - + - + - - - + - + - + - - - +
- - - + + + @@ -94,13 +75,15 @@ - + - + - \ No newline at end of file + 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 eb83ce25..db3d6985 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,85 +1,50 @@ +<%@page import="it.mwg.sismica.bo.shared.util.Generics"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> +<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> +<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@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="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.util.AzioniPraticheUtil"%> -<%@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"%> <%@page import="java.util.Date"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> -<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> -<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> -<%@page import="it.tref.liferay.portos.bo.model.Comune"%> -<%@page import="it.tref.liferay.portos.bo.model.Territorio"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="java.util.ArrayList"%> <%@page import="java.util.regex.Pattern"%> -<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@ include file="/html/fascicolofe/init.jsp" %> - - -<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> -<%@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"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.service.DelegaServiceUtil"%> -<%@page import="java.util.ArrayList"%> -<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> - - <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l); - - DettPratica dettPratica = null; - IntPratica intPratica = null; - if(intPraticaId !=0l ){ - intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - if(dettPraticaId != 0l){ - dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - } else { - dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId); - if(dettPratica==null){ - dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0); +DettPratica dettPratica = null; +IntPratica intPratica = null; +if (intPraticaId != 0) { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + if (dettPraticaId != 0) { + dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); + } else { + dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId); + if (dettPratica == null) { + dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); } dettPraticaId = dettPratica.getDettPraticaId(); - } - } - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); + } +} +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); +Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); +String urlIframeMappe = dettPratica.getUrlMappeBo(request, comune, true); %> - - - - + + - -<%-- --%> -<%-- --%> -<%-- --%> -
-
+
- +
@@ -100,7 +65,9 @@ <%= LanguageUtil.get(pageContext, "dp-range-ag") %>
- <%= BeanPropertiesUtil.getString(territorio, "agMin") %> - <%= BeanPropertiesUtil.getString(territorio, "agMax") %> + <%= BeanPropertiesUtil.getString(territorio, "agMin") %> + - + <%= BeanPropertiesUtil.getString(territorio, "agMax") %>
<%= LanguageUtil.get(pageContext, "ag") %> @@ -110,138 +77,164 @@
-
-
<%= LanguageUtil.get(pageContext, "dp-sensi") %>
+
+
+ <%= LanguageUtil.get(pageContext, "dp-sensi") %> +
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dpr01-dep") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dpr02-dep") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dpr01-aut") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dpr02-aut") %>
-
-
<%= LanguageUtil.get(pageContext, "dp-rispetto") %>
+
+
+ <%= LanguageUtil.get(pageContext, "dp-rispetto") %> +
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dm2018") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dm01") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dm02") %>
-
-
<%= LanguageUtil.get(pageContext, "dp-normativa") %>:
+
+
+ <%= LanguageUtil.get(pageContext, "dp-normativa") %>: +
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dm03") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dprg01") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-dprg02") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-anr") %>
-
-
+
+
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-lavori-in-proprio") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "lavori-pubblici") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
-
- +
+ <%= LanguageUtil.get(pageContext, "collaudo-statico") %>
-
+
- +

<%= LanguageUtil.get(pageContext, "norm-art3com3") %>:

    -
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_1") %>;
    • -
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_2") %>;
    • -
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_3") %>;
    • -
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_4") %>;
    • -
+
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_1") %>;
    • +
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_2") %>;
    • +
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_3") %>;
    • +
  • <%= LanguageUtil.get(pageContext, "norm-art3com3_4") %>;
    • +
    -
    +
    -

    <%= LanguageUtil.get(pageContext, "norm-art3com4") %>

    +

    <%= LanguageUtil.get(pageContext, "norm-art3com4") %>

    -
    -
    +
    +
    -
    +
    - <%= LanguageUtil.get(pageContext, "suap") %> + <%= LanguageUtil.get(pageContext, "suap") %>
    -
    +
    - <%= LanguageUtil.get(pageContext, "norm-sisma-bonus") %> + <%= LanguageUtil.get(pageContext, "norm-sisma-bonus") %>
    -
    +
    <%=LanguageUtil.get(pageContext, "cl-rischio-pre-int") %>: @@ -258,35 +251,36 @@
    -
    +
    <%=LanguageUtil.get(pageContext, "cl-rischio-post-int") %>:
    <% - String clRischioPostIntVal = BeanPropertiesUtil.getString(dettPratica, "clRischioPostInt"); - if(Validator.isNotNull(clRischioPreIntVal)){ + String clRischioPostIntVal = BeanPropertiesUtil.getString(dettPratica, "clRischioPostInt"); + if (Validator.isNotNull(clRischioPreIntVal)) { %> - <%= LanguageUtil.get(pageContext, "cl-rischio-post-int-"+clRischioPostIntVal) %> + <%= LanguageUtil.get(pageContext, "cl-rischio-post-int-" + clRischioPostIntVal) %> <% - } + } %>
    -
    +
    - - <%= LanguageUtil.get(pageContext, "interv-fin-pub") %> + + <%= LanguageUtil.get(pageContext, "interv-fin-pub") %>
    -
    +
    -
    +
    <%=LanguageUtil.get(pageContext, "interv-fin-pub-desc") %>:
    -
    +
    <%= BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %>
    @@ -297,9 +291,8 @@
    -
    -
    +
    @@ -309,20 +302,18 @@
    - -
    -
    +
    -
    -
    Ubicazione
    +
    +
    Ubicazione
    -
    +
    @@ -373,16 +364,16 @@ %>
    -
    +
    <%=particelle.length>0?particelle[0]:StringPool.BLANK %>
    -
    +
    <%=particelle.length>1?particelle[1]:StringPool.BLANK %>
    -
    +
    <%=particelle.length>2?particelle[2]:StringPool.BLANK %>
    -
    +
    <%=particelle.length>3?particelle[3]:StringPool.BLANK %>
    @@ -414,73 +405,58 @@
    -
    <%= LanguageUtil.get(pageContext, "contesto-paesaggistico") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico")) %>
    -
    <%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela")) %>
    -
    <%= LanguageUtil.get(pageContext, "vincoli") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "vincoli")) %>
    -
    -
    +
    + <%-- Integrazione geoportal --%>
    - <% - String[] geolocalization = BeanPropertiesUtil.getString(dettPratica, "localizzazioneGeografica","").split(Pattern.quote("|")); - %> -
    - -
    -
    - -
    - - - - +
    + +
    + <%-- /Integrazione geoportal --%>
    -
    +
    -
    +
    -
    - <% +
    + <% String label = BeanPropertiesUtil.getString(dettPratica, "destinazione"); - String uso = ""; String title = ""; if(label.length() > 1){ @@ -491,7 +467,7 @@ out.print(LanguageUtil.get(pageContext, "destinazione-"+title)+":"); } %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "destinazione-"+BeanPropertiesUtil.getString(dettPratica, "destinazione"))%>
    @@ -501,29 +477,28 @@
    -
    +
    -
    +
    <%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
    <% - boolean checked = + boolean checked = BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") || - BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") || + BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") || BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale"); - %> -
    + %> +
    <%=LanguageUtil.get(pageContext, "tc-interventi-esistenti") %>
    • <%=LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %> -
    • @@ -541,9 +516,8 @@
    -
    -
    +
    @@ -569,8 +543,8 @@
    <%=LanguageUtil.get(pageContext, "tc-mista") %> -
    -
    +
    +
    @@ -579,7 +553,7 @@
    <%=LanguageUtil.get(pageContext, "tc-in-muratura-ordinaria") %> -
    +
    <%=LanguageUtil.get(pageContext, "tc-in-muratura-armata") %> @@ -596,14 +570,14 @@
    -
    +
    <%=LanguageUtil.get(pageContext, "tc-altro") %>
    <%=BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %>
    -
    +
    <%=LanguageUtil.get(pageContext, "tc-con-dispositivi") %>
    @@ -615,21 +589,21 @@
    -
    +
    - <% boolean inBO = true; %> + <% boolean inBO = true; %> -
    +
    -
    +
    @@ -640,7 +614,7 @@
    <% String dePiani = BeanPropertiesUtil.getString(dettPratica, "dePiani"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-piani-"+dePiani)%>
    @@ -650,7 +624,7 @@
    <% String deAltezza = BeanPropertiesUtil.getString(dettPratica, "deAltezza"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-altezza-"+deAltezza)%>
    @@ -662,10 +636,9 @@
    <% String deInterrati = BeanPropertiesUtil.getString(dettPratica, "deInterrati"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-interrati-"+deInterrati)%> -
    <%= LanguageUtil.get(pageContext, "de-superficie") %>: @@ -673,7 +646,7 @@
    <% String deSuperficie = BeanPropertiesUtil.getString(dettPratica, "deSuperficie"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-superficie-"+deSuperficie)%>
    @@ -685,7 +658,7 @@
    <% String deCostruzione = BeanPropertiesUtil.getString(dettPratica, "deCostruzione"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-costruzione-"+deCostruzione)%>
    @@ -695,7 +668,7 @@
    <% String deRistrutturazione = BeanPropertiesUtil.getString(dettPratica, "deRistrutturazione"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-ristrutturazione-"+deRistrutturazione)%>
    @@ -707,7 +680,7 @@
    <% String deUso = BeanPropertiesUtil.getString(dettPratica, "deUso"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-uso-"+deUso)%>
    @@ -717,7 +690,7 @@
    <% String deUtilizzazione = BeanPropertiesUtil.getString(dettPratica, "deUtilizzazione"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-utilizzazione-"+deUtilizzazione)%>
    @@ -729,7 +702,7 @@
    <% String dePosizioneEdificio = BeanPropertiesUtil.getString(dettPratica, "dePosizioneEdificio"); %> - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "de-posizione-edificio-"+dePosizioneEdificio)%>
    @@ -741,14 +714,14 @@
    <% String dePubblica = BeanPropertiesUtil.getString(dettPratica, "dePubblica"); %> - <%=BeanPropertiesUtil.getString(dettPratica, "dePubblica")%><%=LanguageUtil.get(pageContext, + <%=BeanPropertiesUtil.getString(dettPratica, "dePubblica")%><%=LanguageUtil.get(pageContext, "de-pubblica")%>
    <% String dePrivata = BeanPropertiesUtil.getString(dettPratica, "dePrivata"); %> - <%=BeanPropertiesUtil.getString(dettPratica, "dePrivata")%><%=LanguageUtil.get(pageContext, + <%=BeanPropertiesUtil.getString(dettPratica, "dePrivata")%><%=LanguageUtil.get(pageContext, "de-privata")%>
    @@ -759,7 +732,7 @@
    -
    +
    @@ -769,8 +742,8 @@ %>
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-fondazioni") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-fondazioni") %>
    @@ -778,37 +751,37 @@ <%=LanguageUtil.get(pageContext, "dcc-fondazioni-"+fondazioni_label)%>:
    - <%=LanguageUtil.get(pageContext, + <%=LanguageUtil.get(pageContext, "dcc-fondazioni-"+fondazioni)%>
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature") %>:
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-pietrame") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-laterizio") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-misto") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-storiche") %>
    @@ -816,23 +789,23 @@
    - <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-acciaio") %>: + <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-acciaio") %>:
    <% String acciaio = BeanPropertiesUtil.getString(dettPratica, "dccStruttureEleAcciaio"); %> - <%= Validator.isNotNull(acciaio) ? LanguageUtil.get(pageContext, + <%= Validator.isNotNull(acciaio) ? LanguageUtil.get(pageContext, "dcc-strutture-ele-acciaio-"+acciaio) : ""%>
    -
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-c-a") %>: +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-c-a") %>:
    <% String ca = BeanPropertiesUtil.getString(dettPratica, "dccStruttureEleCA"); %> - <%= Validator.isNotNull(ca) ? LanguageUtil.get(pageContext, + <%= Validator.isNotNull(ca) ? LanguageUtil.get(pageContext, "dcc-strutture-ele-c-a-"+ca) : ""%> - +
    @@ -841,195 +814,191 @@
    <% String legno = BeanPropertiesUtil.getString(dettPratica, "dccStruttureEleLegno"); %> - <%= Validator.isNotNull(legno) ? LanguageUtil.get(pageContext, + <%= Validator.isNotNull(legno) ? LanguageUtil.get(pageContext, "dcc-strutture-ele-legno-"+legno) : ""%>
    -
    - <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto") %>: +
    + <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto") %>:
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-c-a") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-acciaio") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-muratura") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-legno") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-prefabbricato") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-altro") %> <%=BeanPropertiesUtil.getString(dettPratica, "dccStruttureEleAltroDescrizione") %> -
    +
    -
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-c-a-acciaio") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-legno") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-legno-c-a") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-lamiera-grecata") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-volte") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-altro") %> <%=BeanPropertiesUtil.getString(dettPratica, "dccOrizzontamentiAltroDescrizione") %>
    -
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-copertura") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura") %>
    <% String copertura = BeanPropertiesUtil.getString(dettPratica, "dccCopertura"); %> - -
    - <%=LanguageUtil.get(pageContext, + +
    + <%=LanguageUtil.get(pageContext, "dcc-copertura-"+BeanPropertiesUtil.getString(dettPratica, "dccCopertura"))%>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-c-a-acciaio") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-legno") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-legno-c-a") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-lamiera-grecata") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-pannelli") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-p-v-c-telonati") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-leggere") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-copertura-altro") %> <%=BeanPropertiesUtil.getString(dettPratica, "dccCoperturaAltroDesrizione") %>
    -
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-laterizio") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-cartongesso") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-calcestruzzo") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-legno") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-altro") %> <%=BeanPropertiesUtil.getString(dettPratica, "dccElemNonStrutAltroDescrizione") %> -
    +
    -
    -
    -
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-catene") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-cordoli") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ini-armate") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-placcaggi") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-irr-solai") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-rinforzi-f-r-p") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-telai-e-cerchiature") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-rompitratta") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-altro") %> <%=BeanPropertiesUtil.getString(dettPratica, "dccOpereDiRinforzoAltroDescrizione") %> @@ -1041,13 +1010,13 @@
    -
    +
    -
    -
    <%= LanguageUtil.get(pageContext, "de-inf") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "de-inf") %>
    @@ -1129,90 +1098,72 @@
    -
    +
    - - + <%-- ADT : bug fe id 14 : visualizzazione deleghe eseguite --%>

    Gestione Deleghe

    -
    +
    <% - String orderByCol = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_COL_PARAM, "delegaId"); - String orderByType = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_TYPE_PARAM, "asc"); - OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create("portos_bo_Delega", orderByCol, "asc".equals(orderByType)); - DisplayTerms displayTerms = new DisplayTerms(renderRequest); + String orderByCol = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_COL_PARAM, "delegaId"); + String orderByType = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_TYPE_PARAM, "asc"); + OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create("portos_bo_Delega", orderByCol, "asc".equals(orderByType)); + DisplayTerms displayTerms = new DisplayTerms(renderRequest); %> - -
    - +
    - - <% - results = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId,new String[]{DelegheUtil.TIPO_GEOLOGO},new String[]{DelegheUtil.STATO_ESEGUITA} ,QueryUtil.ALL_POS, QueryUtil.ALL_POS, orderByComparator); - total =DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(dettPraticaId,new String[]{DelegheUtil.TIPO_GEOLOGO},new String[]{DelegheUtil.STATO_ESEGUITA}); + results = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { DelegheUtil.TIPO_GEOLOGO }, new String[] { DelegheUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, orderByComparator); + total =DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { DelegheUtil.TIPO_GEOLOGO }, new String[] { DelegheUtil.STATO_ESEGUITA }); pageContext.setAttribute("results", results); pageContext.setAttribute("total", total); %> - - - + <% - if(SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale())>0){ - List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale()); - for(Soggetto soggetto:soggetti){ - out.print("
    "+soggetto.getDescrizioneCompleta()+" "+LanguageUtil.get(pageContext, "gc-soggetto-"+soggetto.getTipologiaSoggetto())+"
    "); - } + if (SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale()) > 0) { + List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale()); + for (Soggetto soggetto : soggetti) { + out.print("
    "); + out.print(soggetto.getDescrizioneCompleta()); + out.print(" "); + out.print(LanguageUtil.get(pageContext, "gc-soggetto-" + soggetto.getTipologiaSoggetto())); + out.print("
    "); } - + } %>     - + - + - - <% - String downloadUrl=null; - long docPraticaId =0l; - List docPraticas =DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_TipologiaNew(delega.getIntPraticaId(),delega.getDelegaId(),"D_GEO_",QueryUtil.ALL_POS, QueryUtil.ALL_POS); - for(DocPratica docPratica:docPraticas){ - docPraticaId = docPratica.getDocPraticaId(); - downloadUrl=docPratica.getDownloadUrl(themeDisplay); - } + String downloadUrl = null; + long docPraticaId = 0; + List docPraticas =DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_TipologiaNew(delega.getIntPraticaId(), delega.getDelegaId(), "D_GEO_", QueryUtil.ALL_POS, QueryUtil.ALL_POS); + for (DocPratica docPratica : docPraticas) { + docPraticaId = docPratica.getDocPraticaId(); + downloadUrl = docPratica.getDownloadUrl(themeDisplay); + } %> - - - - - - + + + -     -     -
    - - - - -
    @@ -1220,17 +1171,16 @@
    <% - Date geoDate = (Date)BeanPropertiesUtil.getObject(dettPratica, "geoDtRelazione"); + Date geoDate = (Date) BeanPropertiesUtil.getObject(dettPratica, "geoDtRelazione"); %> - <%= dateFormatDate.format(geoDate) %> + <%= dateFormatDate.format(geoDate) %> -
    -
    -
    <%=LanguageUtil.get(pageContext, "geo-scheda-title") %>
    +
    +
    <%= LanguageUtil.get(pageContext, "geo-scheda-title") %>
    @@ -1240,7 +1190,7 @@
    <% String geoClasseIndagine = BeanPropertiesUtil.getString(dettPratica, "geoClasseIndagine"); %> - <%= LanguageUtil.get(pageContext, "geo-classe-indagine-"+geoClasseIndagine) %> + <%= LanguageUtil.get(pageContext, "geo-classe-indagine-" + geoClasseIndagine) %>
    @@ -1264,7 +1214,7 @@
    - <%=LanguageUtil.get(pageContext, "geo-categoria-topografica") %>: + <%=LanguageUtil.get(pageContext, "geo-categoria-topografica") %>:
    <% String geoCategoriaTopografica = BeanPropertiesUtil.getString(dettPratica, "geoCategoriaTopografica"); %> @@ -1434,7 +1384,7 @@
    -
    +
    @@ -1446,14 +1396,14 @@ -
    +
    -
    +
    @@ -1471,13 +1421,13 @@
    -
    +
    - +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp index 99499a07..3d785983 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp @@ -1,118 +1,108 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - -<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> +<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> +<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.Generics"%> +<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalService"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%> -<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> -<%@page import="it.tref.liferay.portos.bo.model.Pagamento"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%> -<%@page import="java.math.BigDecimal"%> -<%@page import="java.text.NumberFormat"%> -<%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> +<%@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.service.SoggettoLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="java.util.Date"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> -<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%> -<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> -<%@page import="it.tref.liferay.portos.bo.model.Comune"%> -<%@page import="it.tref.liferay.portos.bo.model.Territorio"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="java.util.ArrayList"%> +<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="java.util.regex.Pattern"%> -<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> -<%@ include file="/html/fascicolofe/init.jsp" %> - +<%@include file="/html/fascicolofe/init.jsp"%> <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId",0l); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId",0l); - - DettPratica dettPratica = null; - IntPratica intPratica = null; - if(intPraticaId!=0l){ - intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); - if(dettPratica==null){ - dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); - } - dettPraticaId = dettPratica.getDettPraticaId(); - } - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); - String name = StringPool.MINUS; - if(intPratica.getStatusByUserId() != 0) { - name = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()).getFullName(); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0); +DettPratica dettPratica = null; +IntPratica intPratica = null; +if (intPraticaId != 0) { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); + if (dettPratica == null) { + dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); } - - int nVarianti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(new String[]{TipoIntegrazioneUtil.VARIANTE})); - int nCambioSoggetti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(new String[]{TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO})); - int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true); - int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true); + dettPraticaId = dettPratica.getDettPraticaId(); +} +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); +Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); +String name = StringPool.MINUS; +if (intPratica.getStatusByUserId() != 0) { + name = Generics.capitalizeFull(UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()).getFullName()); +} +int nVarianti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); +int nCambioSoggetti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); +int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true); +int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true); +String urlIframeMappe = dettPratica.getUrlMappeBo(request, comune, true); %> -
    -
    - - +
    + + A - + D
    -
    +
    - +
    -
    +
    Validità
    -
    +
    - <% if(intPratica.getValidata()) { %> - - <% }else { %> - - <% } %> + <% + if (intPratica.getValidata()) { + %> + + <% + } else { + %> + + <% + } + %>
    -
    +
    Istruttore:
    -
    +
    <%=name %>
    -
    +
    Tipologia:
    -
    - <%= LanguageUtil.get(pageContext, "tipo-pratica-"+intPratica.getTipoPratica()) %> +
    + + <%= LanguageUtil.get(pageContext, "tipo-pratica-" + intPratica.getTipoPratica()) %> +
    -
    +
    Stato:
    -
    - <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %> +
    + + <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel( + intPratica.getStatoPratica(), intPratica)) %> +
    @@ -121,87 +111,124 @@
    -
    +
    - +
    - <% if(nVarianti == 0 ) { %> - Varianti Non presentate - <% } else if(nVarianti == 1 ) { %> - Variante Presentata <%=nVarianti %> volta - <% } else { %> - Varianti Presentate <%=nVarianti %> volte - <% } %> + + + Varianti + Non presentate + + + Variante + Presentata 1 volta + + + Varianti + Presentate <%=nVarianti %> volte + +
    -
    - <% if(nCambioSoggetti == 0 ) { %> - Cambio soggetti Non presentata - <% } else if(nCambioSoggetti == 1 ) { %> - Cambio soggetti Presentata <%=nCambioSoggetti %> volta - <% } else { %> - Cambio soggetti Presentata <%=nCambioSoggetti %> volte - <% } %> + Cambio soggetti + + + Non presentato + + + Presentato 1 volta + + + + Presentato <%=nCambioSoggetti %> volte + + +
    - <% if(nFineLavori == 0 ) { %> - Fine Lavori Non presentata - <% } else if(nVarianti == 1 ) { %> - Fine Lavori Presentata <%=nFineLavori %> volta - <% } else { %> - Fine Lavori Presentata <%=nFineLavori %> volte - <% } %> + Fine Lavori + + + Non presentata + + + Fine Lavori Presentata 1 volta + + + Fine Lavori + Presentata <%=nFineLavori %> volte + + +
    - <% if(nCollaudo == 0 ) { %> - Collaudo Non presentato - <% } else if(nCollaudo == 1 ) { %> - Collaudo Presentato <%=nFineLavori %> volta - <% } else { %> - Collaudo Presentato <%=nFineLavori %> volte - <% } %> + Collaudo + + + Non presentato + + + Presentato 1 volta + + + + Presentato <%= nCollaudo %> volte + + +
    -
    - <%=BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %> + <%= BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %>
    -
    -
    - - <%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %> +
    + + <%= LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
    <% - boolean checked = - BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") || - BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") || - BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale"); - %> -
    + boolean checked = + BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") || + BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") || + BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale"); + %> +
    <%=LanguageUtil.get(pageContext, "tc-interventi-esistenti") %> -
      +
      • - - <%=LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %> - + + <%= LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %>
      • - - <%=LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %> + + <%= LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %>
      • - - <%=LanguageUtil.get(pageContext, "tc-riparazione-intervento-locale") %> + + <%= LanguageUtil.get(pageContext, "tc-riparazione-intervento-locale") %>
    @@ -209,21 +236,24 @@
    -
    - +
    <% - List committenti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE); + List committenti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto( + intPraticaId, TipoSoggettoUtil.COMMITTENTE); %>
    -
    -
    <%=LanguageUtil.get(pageContext, "gc-soggetto-02") %>:
    +
    +
    + <%=LanguageUtil.get(pageContext, "gc-soggetto-02") %>: +
    <% - Soggetto committente = committenti.get(0); + Soggetto committente = committenti.get(0); %>
    @@ -239,13 +269,13 @@ Nome:
    - <%= committente.getNome() %> + <%= Generics.capitalizeFull(committente.getNome()) %>
    Cognome:
    - <%= committente.getCognome() %> + <%= Generics.capitalizeFull(committente.getCognome()) %>
    Codice Fiscale: @@ -254,15 +284,18 @@ <%= committente.getCodiceFiscale().toUpperCase() %>
    -
    +
    <% - List progettisti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.PROGETTISTA); + List progettisti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto( + intPraticaId, TipoSoggettoUtil.PROGETTISTA); %>
    -
    -
    <%=LanguageUtil.get(pageContext, "gc-soggetto-06") %>:
    +
    +
    + <%=LanguageUtil.get(pageContext, "gc-soggetto-06") %>: +
    @@ -270,13 +303,13 @@ Nome:
    - <%= progettisti.get(0).getNome() %> + <%= Generics.capitalizeFull(progettisti.get(0).getNome()) %>
    Cognome:
    - <%= progettisti.get(0).getCognome() %> + <%= Generics.capitalizeFull(progettisti.get(0).getCognome()) %>
    Codice Fiscale: @@ -287,11 +320,14 @@
    <% - List direttori = SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI); + List direttori = SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto( + intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI); %>
    -
    -
    <%=LanguageUtil.get(pageContext, "gc-soggetto-03") %>:
    +
    +
    + <%= LanguageUtil.get(pageContext, "gc-soggetto-03") %>: +
    @@ -300,13 +336,13 @@ Nome:
    - <%= direttori.get(0).getNome() %> + <%= Generics.capitalizeFull(direttori.get(0).getNome()) %>
    Cognome:
    - <%= direttori.get(0).getCognome() %> + <%= Generics.capitalizeFull(direttori.get(0).getCognome()) %>
    Codice Fiscale: @@ -320,68 +356,71 @@
    - - - + + +
    -
    +
    - +
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-zona-sismica") %>
    -
    +
    <%= BeanPropertiesUtil.getString(territorio, "zona") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-fascia-pericolosita") %>
    -
    +
    <%= BeanPropertiesUtil.getString(territorio, "fascia") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "ag") %>
    -
    +
    <%= BeanPropertiesUtil.getString(dettPratica, "ag") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-dc-prov") %>
    -
    - <%=BeanPropertiesUtil.getString(provincia, "provincia")%> +
    + <%= BeanPropertiesUtil.getString(provincia, "provincia") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-dc-comune") %>
    -
    - <%=BeanPropertiesUtil.getString(comune, "denominazione")%> +
    + <%= BeanPropertiesUtil.getString(comune, "denominazione") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-dc-loc") %>
    -
    - <%=BeanPropertiesUtil.getString(dettPratica, "localita") %> +
    + <%= BeanPropertiesUtil.getString(dettPratica, "localita") %>
    -
    +
    <%= LanguageUtil.get(pageContext, "dp-dc-via") %>
    -
    - <%=BeanPropertiesUtil.getString(dettPratica, "via") %> +
    + <%= BeanPropertiesUtil.getString(dettPratica, "via") %>
    @@ -390,14 +429,13 @@ <%= LanguageUtil.get(pageContext, "dc-foglio") %>
    - <%=BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %> -
    + <%= BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %> +
    <%= LanguageUtil.get(pageContext, "dc-allegato") %>
    - - <%=BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %> + <%= BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %>
    @@ -406,26 +444,27 @@
    <% - String[] particelle= BeanPropertiesUtil.getString(dettPratica, "dcParticelle").split(Pattern.quote("|")); + String[] particelle= BeanPropertiesUtil.getString(dettPratica, "dcParticelle").split( + Pattern.quote(StringPool.PIPE)); %> -
    - <%=particelle.length>0?particelle[0]:StringPool.BLANK %> +
    + <%= particelle.length > 0 ? particelle[0] : StringPool.BLANK %>
    -
    - <%=particelle.length>1?particelle[1]:StringPool.BLANK %> +
    + <%= particelle.length > 1 ? particelle[1] : StringPool.BLANK %>
    -
    - <%=particelle.length>2?particelle[2]:StringPool.BLANK %> +
    + <%= particelle.length > 2 ? particelle[2] : StringPool.BLANK %>
    -
    - <%=particelle.length>3?particelle[3]:StringPool.BLANK %> +
    + <%= particelle.length > 3 ? particelle[3] : StringPool.BLANK %>
    <%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
    - <%=BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %> + <%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %>
    @@ -438,56 +477,40 @@
    -
    <%= LanguageUtil.get(pageContext, "contesto-paesaggistico") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico")) %>
    -
    <%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela")) %>
    -
    <%= LanguageUtil.get(pageContext, "vincoli") %>
    - <%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %> + <%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "vincoli")) %>
    - -
    -
    - <% - String[] geolocalization = BeanPropertiesUtil.getString(dettPratica, "localizzazioneGeografica","").split(Pattern.quote("|")); - %> -
    - -
    -
    - -
    - - + <%-- Integrazione geoportal --%> +
    +
    + <%-- /Integrazione geoportal --%>
    - -
    \ No newline at end of file +
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java index 2c58a81f..f53a33f9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java @@ -139,7 +139,6 @@ public class FirmaGetUtil { risposta.setObj(tokenTest); risposta.setRisposta(RispostaCostanti.OK); } else { - // TODO da migliorare per sicurezza e poi modificare a giro risposta.setObj(codiceFiscale); risposta.setRisposta(RispostaCostanti.OK); } @@ -156,8 +155,6 @@ public class FirmaGetUtil { String tokenTest = jxPortletPreferences.getValue("tokenTest", StringPool.BLANK); risposta.setObj(tokenTest); risposta.setRisposta(RispostaCostanti.OK); - } else { - // TODO } return risposta; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportTempisticheBean.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportTempisticheBean.java index e791e921..06dab967 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportTempisticheBean.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportTempisticheBean.java @@ -9,18 +9,14 @@ public class ReportTempisticheBean { private Date dtinviosignal; private Date dtinvio; private String tipoDocumento; - private Date dtavviso; + private Date dtavviso; private String statoPratica; - - - public ReportTempisticheBean() { - super(); - // TODO Auto-generated constructor stub - } - public ReportTempisticheBean(long intpraticaid, long avvisoId, - long classpk, Date dtinviosignal, Date dtinvio, - String tipoDocumento, Date dtavviso,String statoPratica) { - super(); + + public ReportTempisticheBean() {} + + public ReportTempisticheBean(long intpraticaid, long avvisoId, long classpk, Date dtinviosignal, Date dtinvio, + String tipoDocumento, Date dtavviso, String statoPratica) { + this.intpraticaid = intpraticaid; this.avvisoId = avvisoId; this.classpk = classpk; @@ -28,59 +24,91 @@ public class ReportTempisticheBean { this.dtinvio = dtinvio; this.tipoDocumento = tipoDocumento; this.dtavviso = dtavviso; - this.statoPratica=statoPratica; + this.statoPratica = statoPratica; } + public long getAvvisoId() { + return avvisoId; } + public void setAvvisoId(long avvisoId) { + this.avvisoId = avvisoId; } + public long getIntpraticaid() { + return intpraticaid; } + public void setIntpraticaid(long intpraticaid) { + this.intpraticaid = intpraticaid; } + public long getClasspk() { + return classpk; } + public void setClasspk(long classpk) { + this.classpk = classpk; } + public Date getDtinviosignal() { + return dtinviosignal; } + public void setDtinviosignal(Date dtinviosignal) { + this.dtinviosignal = dtinviosignal; } + public Date getDtinvio() { + return dtinvio; } + public void setDtinvio(Date dtinvio) { + this.dtinvio = dtinvio; } + public String getTipoDocumento() { + return tipoDocumento; } + public void setTipoDocumento(String tipoDocumento) { + this.tipoDocumento = tipoDocumento; } + public Date getDtavviso() { + return dtavviso; } + public void setDtavviso(Date dtavviso) { + this.dtavviso = dtavviso; } + @Override public int hashCode() { + final int prime = 31; int result = 1; result = prime * result + (int) (avvisoId ^ (avvisoId >>> 32)); return result; } + @Override public boolean equals(Object obj) { + if (this == obj) return true; if (obj == null) @@ -92,13 +120,14 @@ public class ReportTempisticheBean { return false; return true; } + public String getStatoPratica() { + return statoPratica; } + public void setStatoPratica(String statoPratica) { + this.statoPratica = statoPratica; } - - - } diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java index 7636fb92..2c19eaf7 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java @@ -1,5 +1,10 @@ package it.mwg.sismica.bo.shared.util; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +import com.liferay.portal.kernel.util.StringPool; + public class Generics { public static String capitalizeFull(String str) { @@ -19,4 +24,15 @@ public class Generics { return str == null ? null : str.replace("\n", "
    "); } + + public static String urlEncode(String str) { + + String encoded; + try { + encoded = URLEncoder.encode(str, StringPool.UTF8); + } catch (UnsupportedEncodingException e) { + encoded = str; + } + return encoded; + } }