From f521860820a834817447c10834c19feb103650be Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Mon, 21 Feb 2022 17:53:29 +0100 Subject: [PATCH] Modificata lunghezza massima testi di descrizione --- .../org.eclipse.wst.common.component | 7 +- .../liferay/portos/bo/model/DocPratica.java | 5 + .../portos/bo/model/DocPraticaClp.java | 24 +++ .../portos/bo/model/DocPraticaWrapper.java | 9 ++ .../liferay/portos/bo/model/IntPratica.java | 10 -- .../portos/bo/model/IntPraticaClp.java | 32 ---- .../portos/bo/model/IntPraticaWrapper.java | 14 -- .../bo/service/IntPraticaLocalService.java | 10 ++ .../bo/service/IntPraticaLocalServiceClp.java | 89 ++++++++-- .../service/IntPraticaLocalServiceUtil.java | 14 ++ .../IntPraticaLocalServiceWrapper.java | 15 ++ .../docroot/WEB-INF/sql/tables.sql | 2 +- .../src/META-INF/portlet-model-hints.xml | 4 +- .../WEB-INF/src/content/Portal.properties | 1 + .../portos/bo/model/impl/DettPraticaImpl.java | 11 +- .../bo/model/impl/DettPraticaModelImpl.java | 2 +- .../portos/bo/model/impl/DocPraticaImpl.java | 15 +- .../portos/bo/model/impl/IntPraticaImpl.java | 56 ------- .../bo/model/impl/ParereGeologoImpl.java | 69 ++++---- .../bo/scheduler/SchedulerInvioDocumento.java | 14 +- .../IntPraticaLocalServiceClpInvoker.java | 45 ++++-- .../impl/CollaudoLocalServiceImpl.java | 2 +- .../impl/ComunicazioneLocalServiceImpl.java | 6 +- .../impl/DettPraticaLocalServiceImpl.java | 35 +--- .../impl/FineLavoriLocalServiceImpl.java | 4 +- .../impl/IntPraticaLocalServiceImpl.java | 56 +++++++ .../impl/ParereGeologoLocalServiceImpl.java | 7 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../asset/controllopratica/full_content.jsp | 27 ++-- .../html/fascicolo/fascicolo_actions.jsp | 153 ++++++++---------- .../html/gestioneattivita/action_button.jsp | 9 +- .../actions/action_annulla_ric_geologo.jsp | 7 +- .../actions/action_seleziona_geologo.jsp | 8 +- .../html/gestioneattivita/view_columns.jspf | 3 +- .../org.eclipse.wst.common.component | 3 - .../portos/fe/portlet/FascicoloFePortlet.java | 14 +- .../html/allegatipratica/allegati_action.jsp | 6 +- .../docroot/html/allegatipratica/view.jsp | 54 ++++--- .../domanda/page_dettagli_principali.jsp | 4 +- .../html/pareregeologo/parericompletati.jsp | 2 + .../org.eclipse.wst.common.component | 3 - .../docroot/WEB-INF/src/service.properties | 4 +- .../org.eclipse.wst.common.component | 3 - .../bo/shared/util/StatoPraticaConstants.java | 1 + .../org.eclipse.wst.common.component | 3 - 45 files changed, 485 insertions(+), 381 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component index e3ae6044..e68706c1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component @@ -4,13 +4,10 @@ - - uses - - + uses - + uses diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java index 4bdafb42..ceeeb7dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPratica.java @@ -44,6 +44,11 @@ public interface DocPratica extends DocPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica, + boolean praticaIsEditable) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java index 481e8df0..c524fe26 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java @@ -872,6 +872,30 @@ public class DocPraticaClp extends BaseModelImpl } } + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica, + boolean praticaIsEditable) { + try { + String methodName = "hasDelegaFirma"; + + Class[] parameterTypes = new Class[] { + long.class, boolean.class, boolean.class + }; + + Object[] parameterValues = new Object[] { + userId, sezioneGeologica, praticaIsEditable + }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) { try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java index 335f1538..8f922135 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java @@ -904,6 +904,15 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper { return _docPratica.hasDelegaFirma(userId, sezioneGeologica); } + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica, + boolean praticaIsEditable) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _docPratica.hasDelegaFirma(userId, sezioneGeologica, + praticaIsEditable); + } + @Override public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java index 74e609c1..70012f0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java @@ -184,16 +184,6 @@ public interface IntPratica extends IntPraticaModel, PersistedModel { public boolean hasRichiestaIntegrazioneAttiva(); - public void invioMailNotifica(long dettPraticaId, long classPk, - java.lang.String className, java.lang.String[] to, - java.lang.String[] cc, java.lang.String[] ccn, - java.lang.String templateName, - com.liferay.portal.kernel.json.JSONObject templateVariables, - java.util.List allegati, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public boolean isAllowedAction(java.lang.String action) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java index 0910af5a..28804b05 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java @@ -2072,38 +2072,6 @@ public class IntPraticaClp extends BaseModelImpl } } - @Override - public void invioMailNotifica(long dettPraticaId, long classPk, - java.lang.String className, java.lang.String[] to, - java.lang.String[] cc, java.lang.String[] ccn, - java.lang.String templateName, - com.liferay.portal.kernel.json.JSONObject templateVariables, - java.util.List allegati, - com.liferay.portal.service.ServiceContext serviceContext) { - try { - String methodName = "invioMailNotifica"; - - Class[] parameterTypes = new Class[] { - long.class, long.class, java.lang.String.class, - java.lang.String.class, java.lang.String.class, - java.lang.String.class, java.lang.String.class, - com.liferay.portal.kernel.json.JSONObject.class, - java.util.List.class, - com.liferay.portal.service.ServiceContext.class - }; - - Object[] parameterValues = new Object[] { - dettPraticaId, classPk, className, to, cc, ccn, templateName, - templateVariables, allegati, serviceContext - }; - - invokeOnRemoteModel(methodName, parameterTypes, parameterValues); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - @Override public boolean praticaHasFineLavoriInProgress() { try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java index 4b7c481d..3d99233a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java @@ -1530,20 +1530,6 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { return _intPratica.hasRichiestaIntegrazioneAttiva(); } - @Override - public void invioMailNotifica(long dettPraticaId, long classPk, - java.lang.String className, java.lang.String[] to, - java.lang.String[] cc, java.lang.String[] ccn, - java.lang.String templateName, - com.liferay.portal.kernel.json.JSONObject templateVariables, - java.util.List allegati, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - _intPratica.invioMailNotifica(dettPraticaId, classPk, className, to, - cc, ccn, templateName, templateVariables, allegati, serviceContext); - } - @Override public boolean isAllowedAction(java.lang.String action) throws com.liferay.portal.kernel.exception.SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index 5984fb13..fbcc9603 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -546,6 +546,16 @@ public interface IntPraticaLocalService extends BaseLocalService, @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public boolean hasRichiestaIntegrazioneAttiva(long intPraticaId); + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public com.liferay.portal.kernel.search.Hits searchAltriProgetti( javax.servlet.http.HttpServletRequest request, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index a4d7d5b6..93ed39e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -354,26 +354,35 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { _methodParameterTypes69 = new String[] { "long" }; - _methodName70 = "searchAltriProgetti"; + _methodName70 = "invioMailNotifica"; _methodParameterTypes70 = new String[] { - "javax.servlet.http.HttpServletRequest", - "com.liferay.portal.model.User", "int", "int" + "long", "long", "java.lang.String", "java.lang.String[][]", + "java.lang.String[][]", "java.lang.String[][]", + "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", + "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName71 = "searchArchivioProgetti"; + _methodName71 = "searchAltriProgetti"; _methodParameterTypes71 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName72 = "searchMieiProgetti"; + _methodName72 = "searchArchivioProgetti"; _methodParameterTypes72 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; + + _methodName73 = "searchMieiProgetti"; + + _methodParameterTypes73 = new String[] { + "javax.servlet.http.HttpServletRequest", + "com.liferay.portal.model.User", "int", "int" + }; } @Override @@ -2719,6 +2728,62 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { return ((Boolean)returnObj).booleanValue(); } + @Override + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + try { + _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, + new Object[] { + dettPraticaId, + + classPk, + + ClpSerializer.translateInput(className), + + ClpSerializer.translateInput(to), + + ClpSerializer.translateInput(cc), + + ClpSerializer.translateInput(ccn), + + ClpSerializer.translateInput(templateName), + + ClpSerializer.translateInput(templateVariables), + + ClpSerializer.translateInput(allegati), + + ClpSerializer.translateInput(serviceContext) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + } + @Override public com.liferay.portal.kernel.search.Hits searchAltriProgetti( javax.servlet.http.HttpServletRequest request, @@ -2726,8 +2791,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { ClpSerializer.translateInput(request), @@ -2760,8 +2825,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { ClpSerializer.translateInput(request), @@ -2794,8 +2859,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + returnObj = _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { ClpSerializer.translateInput(request), @@ -2966,4 +3031,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes71; private String _methodName72; private String[] _methodParameterTypes72; + private String _methodName73; + private String[] _methodParameterTypes73; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index 31dbef0b..950fb217 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -678,6 +678,20 @@ public class IntPraticaLocalServiceUtil { return getService().hasRichiestaIntegrazioneAttiva(intPraticaId); } + public static void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + getService() + .invioMailNotifica(dettPraticaId, classPk, className, to, cc, ccn, + templateName, templateVariables, allegati, serviceContext); + } + public static com.liferay.portal.kernel.search.Hits searchAltriProgetti( javax.servlet.http.HttpServletRequest request, com.liferay.portal.model.User user, int start, int end) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 531264f2..940ab73d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -746,6 +746,21 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, return _intPraticaLocalService.hasRichiestaIntegrazioneAttiva(intPraticaId); } + @Override + public void invioMailNotifica(long dettPraticaId, long classPk, + java.lang.String className, java.lang.String[] to, + java.lang.String[] cc, java.lang.String[] ccn, + java.lang.String templateName, + com.liferay.portal.kernel.json.JSONObject templateVariables, + java.util.List allegati, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + _intPraticaLocalService.invioMailNotifica(dettPraticaId, classPk, + className, to, cc, ccn, templateName, templateVariables, allegati, + serviceContext); + } + @Override public com.liferay.portal.kernel.search.Hits searchAltriProgetti( javax.servlet.http.HttpServletRequest request, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index 9b451de4..44478cc8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -379,7 +379,7 @@ create table portos_bo_DettPratica ( tcViarch BOOLEAN, tcOperaA25 BOOLEAN, tcAltriInterventi BOOLEAN, - tcAltriInterventiDesc VARCHAR(75) null, + tcAltriInterventiDesc STRING null, tcInCA BOOLEAN, tcInOpera BOOLEAN, tcPrefabbricato BOOLEAN, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index 34c636b2..55152c98 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -469,7 +469,9 @@ - + + 4000 + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 38b44b98..85502fb4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -1127,6 +1127,7 @@ label.admingeniocivile.statopratica.sanzione.doc1 = Sanzione pecuniaria doc. 1 label.admingeniocivile.statopratica.sanzione.doc2 = Sanzione pecuniaria doc. 2 label.admingeniocivile.statopratica.decretosanzione = Decreto sanzione label.admingeniocivile.statopratica.periziasanzione = Perizia sanzione +label.admingeniocivile.statopratica.avvisomanuale = Avviso manuale label.firma-doc = Dichiaro di aver preso visione del documento, e di sottoscriverne il contenuto ai sensi del D.Lgs. 82/2005 label.cambio-soggetti-ok = Cambio Soggetti #{0} completato con successo 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 1771dbd5..e51de744 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 @@ -1336,18 +1336,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { if (getNormArt3com3() && !geologo) { return Collections.emptyList(); } - notCompleted.addAll(notCompletedDatiSezionGeologica()); + if (geologo) { + notCompleted.addAll(notCompletedDatiSezionGeologica()); + } String pericolositaGeomorfologicaPai = getGeoPericolositaGeomorfica(); String rischioGeomorfologicoPai = getGeoRischioGeomorfologicoPai(); String pericolositaIdraulicaPai = getGeoPericolositaIdraulicaPai(); String rischioIdraulicoPai = getGeoRischioIdraulicoPai(); if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(getIntPraticaId(), "A22", QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { - if (Validator.isNotNull(pericolositaGeomorfologicaPai) - && pericolositaGeomorfologicaPai.equalsIgnoreCase("NA") - && Validator.isNotNull(rischioGeomorfologicoPai) && rischioGeomorfologicoPai.equalsIgnoreCase("NA") - && Validator.isNotNull(pericolositaIdraulicaPai) && pericolositaIdraulicaPai.equalsIgnoreCase("NA") - && Validator.isNotNull(rischioIdraulicoPai) && rischioIdraulicoPai.equalsIgnoreCase("NA")) { + if ("NA".equalsIgnoreCase(pericolositaGeomorfologicaPai) && "NA".equalsIgnoreCase(rischioGeomorfologicoPai) + && "NA".equalsIgnoreCase(pericolositaIdraulicaPai) && "NA".equalsIgnoreCase(rischioIdraulicoPai)) { notCompleted.add("Nessun allegato per A22 - " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A22")); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java index 8db8a1a2..f6b7ff32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java @@ -296,7 +296,7 @@ public class DettPraticaModelImpl extends BaseModelImpl { "nominaDirettoreLavori", Types.BOOLEAN }, { "nominaCollaudatore", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_DettPratica (uuid_ VARCHAR(75) null,dettPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,integrazione LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,tipoIntegrazione VARCHAR(10) null,completa BOOLEAN,gestita BOOLEAN,beneDiocesi BOOLEAN,diocesiId LONG,importoSpeseIstruttoria VARCHAR(75) null,codicePagamentoOneri VARCHAR(75) null,causalePagamentoOneri VARCHAR(75) null,mezzoPagamentoOneri VARCHAR(75) null,importoBolli VARCHAR(75) null,codicePagamentoBolli VARCHAR(75) null,causalePagamentoBolli VARCHAR(75) null,mezzoPagamentoBolli VARCHAR(75) null,dataEffettuazione DATE null,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,dtInvioSignal DATE null,destinazione VARCHAR(10) null,ag VARCHAR(10) null,descLongIntervento STRING null,paesaggioLocale STRING null,livelloDiTutela STRING null,vincoli STRING null,via VARCHAR(75) null,localita VARCHAR(75) null,estremiCatastali STRING null,estremiPratCom STRING null,varianteNumero LONG,operaConforme BOOLEAN,collaudoStatico BOOLEAN,noCollaudo BOOLEAN,codiceFiscaleDelegato VARCHAR(16) null,codiceFiscaleDelegatoCommittente VARCHAR(75) null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,codiceFiscalePrincipaleCommittente VARCHAR(75) null,codiceFiscalePrincipaleCollaudatore VARCHAR(75) null,codiceFiscalePrincipaleProgettista VARCHAR(75) null,codiceFiscalePrincipaleDirettoreLavori VARCHAR(75) null,codiceFiscalePrincipaleDitta VARCHAR(75) null,codiceFiscalePrincipaleGeologo VARCHAR(75) null,codiceFiscalePrincipaleArcheologo VARCHAR(75) null,codiceFiscalePrincipaleRestauratore VARCHAR(75) null,codiceFiscalePrincipaleStoricoArte VARCHAR(75) null,sanatoriaEdilizia47 BOOLEAN,sanatoriaEdilizia724 BOOLEAN,sanatoriaEdilizia326 BOOLEAN,lavoriPubblici BOOLEAN,pagamentoIdOneri LONG,pagamentoIdBolli LONG,lavoriPubbliciPercentuale INTEGER,dcParticelle VARCHAR(75) null,dcFoglio VARCHAR(75) null,dcAllegato VARCHAR(75) null,dePiani VARCHAR(75) null,deAltezza VARCHAR(75) null,deInterrati VARCHAR(75) null,deSuperficie VARCHAR(75) null,deCostruzione VARCHAR(75) null,deRistrutturazione VARCHAR(75) null,deUso VARCHAR(75) null,dePubblica VARCHAR(75) null,dePrivata VARCHAR(75) null,deUtilizzazione VARCHAR(75) null,dePosizioneEdificio VARCHAR(75) null,deInfStradalePonte BOOLEAN,deInfStradaleStrada BOOLEAN,deInfStradaleAltro BOOLEAN,deInfIdraulicaLong BOOLEAN,deInfIdraulicaTrasv BOOLEAN,deInfIdraulicaAltro BOOLEAN,deInfOperaAccStradale BOOLEAN,deInfOperaAccIdraulica BOOLEAN,deInfOperaAccAltro BOOLEAN,deInfAltraInfrastruttura BOOLEAN,deInfAltro BOOLEAN,deInfAltroDesc STRING null,destinazioneAltroIntervento VARCHAR(75) null,dccStruttureEleMuraturePietrame BOOLEAN,dccStruttureEleMuratureLaterizio BOOLEAN,dccStruttureEleMuratureMisto BOOLEAN,dccStruttureEleMuratureStoriche BOOLEAN,dccStruttureEleMistoCA BOOLEAN,dccStruttureEleMistoAcciaio BOOLEAN,dccStruttureEleMistoMuratura BOOLEAN,dccStruttureEleMistoLegno BOOLEAN,dccStruttureElePrefabbricato BOOLEAN,dccStruttureEleAltro BOOLEAN,dccStruttureEleAltroDescrizione STRING null,dccOrizzontamentiCAAcciaio BOOLEAN,dccOrizzontamentiLegno BOOLEAN,dccOrizzontamentiLegnoCA BOOLEAN,dccOrizzontamentiLamieraGrecata BOOLEAN,dccOrizzontamentiVolte BOOLEAN,dccOrizzontamentiAltro BOOLEAN,dccOrizzontamentiAltroDescrizione STRING null,dccCoperturaCAAcciaio BOOLEAN,dccCoperturaLegno BOOLEAN,dccCoperturaLegnoCA BOOLEAN,dccCoperturaLamieraGrecata BOOLEAN,dccCoperturaPannelli BOOLEAN,dccCoperturaPVCTelonati BOOLEAN,dccCoperturaLeggere BOOLEAN,dccCoperturaAltro BOOLEAN,dccCoperturaAltroDesrizione STRING null,dccElemNonStrutLaterizio BOOLEAN,dccElemNonStrutCartongesso BOOLEAN,dccElemNonStrutCalcestruzzo BOOLEAN,dccElemNonStrutLegno BOOLEAN,dccElemNonStrutAltro BOOLEAN,dccElemNonStrutAltroDescrizione STRING null,dccOpereDiRinforzoInsCatene BOOLEAN,dccOpereDiRinforzoInsCordoli BOOLEAN,dccOpereDiRinforzoIniArmate BOOLEAN,dccOpereDiRinforzoPlaccaggi BOOLEAN,dccOpereDiRinforzoIrrSolai BOOLEAN,dccOpereDiRinforzoRinforziFRP BOOLEAN,dccOpereDiRinforzoTelaiECerchiature BOOLEAN,dccOpereDiRinforzoInsRompitratta BOOLEAN,dccOpereDiRinforzoAltro BOOLEAN,dccOpereDiRinforzoAltroDescrizione STRING null,geoClasseIndagine VARCHAR(75) null,geoCategoriaSottosuolo VARCHAR(75) null,geoCategoriaTopografica VARCHAR(75) null,geoConsolidamento VARCHAR(75) null,geoPericolositaGeologica VARCHAR(75) null,geoPericolositaSismica VARCHAR(75) null,geoPericolositaIdraulica VARCHAR(75) null,geoPericolositaGeomorfica VARCHAR(75) null,geoRischioGeomorfologicoPai VARCHAR(75) null,geoPericolositaIdraulicaPai VARCHAR(75) null,geoRischioIdraulicoPai VARCHAR(75) null,geoFattibilitaGeologica VARCHAR(75) null,geoFattibilitaSismica VARCHAR(75) null,geoFattibilitaIdraulica VARCHAR(75) null,geoOperaRilevante VARCHAR(75) null,geoOpereDiSostegno VARCHAR(75) null,geoOpereInSotterranea VARCHAR(75) null,geoPresenzaPrescrizioni VARCHAR(75) null,geoNotePrescrizioni STRING null,geoNoteIndagini STRING null,geoEvidenzeGeomorfiche VARCHAR(75) null,geoEvidenzeGeologiche VARCHAR(75) null,geoDtRelazione DATE null,pagSoggettiAdAutorizzazione DOUBLE,pagInterventiRestauroManufatti DOUBLE,pagAltriCasiCulturali DOUBLE,pagLottizzazioni DOUBLE,pagGrandiStrutture DOUBLE,pagCondotte DOUBLE,pagPalificazioni DOUBLE,pagImpiantiEolici DOUBLE,pagNuoveRealizzazioni DOUBLE,pagImmobiliPreesistenti DOUBLE,pagManifestiPubblicitari DOUBLE,pagPareriDiMassima DOUBLE,pagAltriCasiPaesaggistici DOUBLE,pagVariantiPareriResi DOUBLE,pagRilascioAttestazioni DOUBLE,pagConsultazioniArchivio DOUBLE,note STRING null,noteUfficio STRING null,localizzazioneGeografica VARCHAR(75) null,tcNuovaCostruzione BOOLEAN,tcNuovaCostruzioneComplessa BOOLEAN,tcAdeguamentoSismico BOOLEAN,tcMiglioramentoSismico BOOLEAN,tcRiparazioneInterventoLocale BOOLEAN,tcCostruzioniEsistenti BOOLEAN,tcManutOrdStraord BOOLEAN,tcNuovaCostruzionePertinenza BOOLEAN,tcInterventoOpereEscavazione BOOLEAN,tcNoOpereEscavazione BOOLEAN,tcViarch BOOLEAN,tcOperaA25 BOOLEAN,tcAltriInterventi BOOLEAN,tcAltriInterventiDesc VARCHAR(75) null,tcInCA BOOLEAN,tcInOpera BOOLEAN,tcPrefabbricato BOOLEAN,tcInAcciaio BOOLEAN,tcMista BOOLEAN,tcInMuratura BOOLEAN,tcInMuraturaOrdinaria BOOLEAN,tcInMuraturaArmata BOOLEAN,tcInMuraturaMista BOOLEAN,tcInLegno BOOLEAN,tcAltro BOOLEAN,tcAltroDescrizione STRING null,tcConDispositivi BOOLEAN,interventoVoceP7 VARCHAR(75) null,normLavoriInProprio BOOLEAN,normLavoriNoDirettore BOOLEAN,normEsenteBollo BOOLEAN,normEsenteSpese BOOLEAN,normDpr01Dep BOOLEAN,normDpr02Dep BOOLEAN,normDpr01Aut BOOLEAN,normDpr02Aut BOOLEAN,normDm2018 BOOLEAN,normAnr BOOLEAN,normArt3com3 BOOLEAN,normArt3com4 BOOLEAN,normSismaBonus BOOLEAN,intervFinPub BOOLEAN,intervFinPubDesc STRING null,intervInAreaDiInteresse BOOLEAN,intervNonModificante BOOLEAN,intervNonAssoggettabile BOOLEAN,suap BOOLEAN,nominaImpresa BOOLEAN,nominaDirettoreLavori BOOLEAN,nominaCollaudatore BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_DettPratica (uuid_ VARCHAR(75) null,dettPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,integrazione LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,tipoIntegrazione VARCHAR(10) null,completa BOOLEAN,gestita BOOLEAN,beneDiocesi BOOLEAN,diocesiId LONG,importoSpeseIstruttoria VARCHAR(75) null,codicePagamentoOneri VARCHAR(75) null,causalePagamentoOneri VARCHAR(75) null,mezzoPagamentoOneri VARCHAR(75) null,importoBolli VARCHAR(75) null,codicePagamentoBolli VARCHAR(75) null,causalePagamentoBolli VARCHAR(75) null,mezzoPagamentoBolli VARCHAR(75) null,dataEffettuazione DATE null,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,dtInvioSignal DATE null,destinazione VARCHAR(10) null,ag VARCHAR(10) null,descLongIntervento STRING null,paesaggioLocale STRING null,livelloDiTutela STRING null,vincoli STRING null,via VARCHAR(75) null,localita VARCHAR(75) null,estremiCatastali STRING null,estremiPratCom STRING null,varianteNumero LONG,operaConforme BOOLEAN,collaudoStatico BOOLEAN,noCollaudo BOOLEAN,codiceFiscaleDelegato VARCHAR(16) null,codiceFiscaleDelegatoCommittente VARCHAR(75) null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,codiceFiscalePrincipaleCommittente VARCHAR(75) null,codiceFiscalePrincipaleCollaudatore VARCHAR(75) null,codiceFiscalePrincipaleProgettista VARCHAR(75) null,codiceFiscalePrincipaleDirettoreLavori VARCHAR(75) null,codiceFiscalePrincipaleDitta VARCHAR(75) null,codiceFiscalePrincipaleGeologo VARCHAR(75) null,codiceFiscalePrincipaleArcheologo VARCHAR(75) null,codiceFiscalePrincipaleRestauratore VARCHAR(75) null,codiceFiscalePrincipaleStoricoArte VARCHAR(75) null,sanatoriaEdilizia47 BOOLEAN,sanatoriaEdilizia724 BOOLEAN,sanatoriaEdilizia326 BOOLEAN,lavoriPubblici BOOLEAN,pagamentoIdOneri LONG,pagamentoIdBolli LONG,lavoriPubbliciPercentuale INTEGER,dcParticelle VARCHAR(75) null,dcFoglio VARCHAR(75) null,dcAllegato VARCHAR(75) null,dePiani VARCHAR(75) null,deAltezza VARCHAR(75) null,deInterrati VARCHAR(75) null,deSuperficie VARCHAR(75) null,deCostruzione VARCHAR(75) null,deRistrutturazione VARCHAR(75) null,deUso VARCHAR(75) null,dePubblica VARCHAR(75) null,dePrivata VARCHAR(75) null,deUtilizzazione VARCHAR(75) null,dePosizioneEdificio VARCHAR(75) null,deInfStradalePonte BOOLEAN,deInfStradaleStrada BOOLEAN,deInfStradaleAltro BOOLEAN,deInfIdraulicaLong BOOLEAN,deInfIdraulicaTrasv BOOLEAN,deInfIdraulicaAltro BOOLEAN,deInfOperaAccStradale BOOLEAN,deInfOperaAccIdraulica BOOLEAN,deInfOperaAccAltro BOOLEAN,deInfAltraInfrastruttura BOOLEAN,deInfAltro BOOLEAN,deInfAltroDesc STRING null,destinazioneAltroIntervento VARCHAR(75) null,dccStruttureEleMuraturePietrame BOOLEAN,dccStruttureEleMuratureLaterizio BOOLEAN,dccStruttureEleMuratureMisto BOOLEAN,dccStruttureEleMuratureStoriche BOOLEAN,dccStruttureEleMistoCA BOOLEAN,dccStruttureEleMistoAcciaio BOOLEAN,dccStruttureEleMistoMuratura BOOLEAN,dccStruttureEleMistoLegno BOOLEAN,dccStruttureElePrefabbricato BOOLEAN,dccStruttureEleAltro BOOLEAN,dccStruttureEleAltroDescrizione STRING null,dccOrizzontamentiCAAcciaio BOOLEAN,dccOrizzontamentiLegno BOOLEAN,dccOrizzontamentiLegnoCA BOOLEAN,dccOrizzontamentiLamieraGrecata BOOLEAN,dccOrizzontamentiVolte BOOLEAN,dccOrizzontamentiAltro BOOLEAN,dccOrizzontamentiAltroDescrizione STRING null,dccCoperturaCAAcciaio BOOLEAN,dccCoperturaLegno BOOLEAN,dccCoperturaLegnoCA BOOLEAN,dccCoperturaLamieraGrecata BOOLEAN,dccCoperturaPannelli BOOLEAN,dccCoperturaPVCTelonati BOOLEAN,dccCoperturaLeggere BOOLEAN,dccCoperturaAltro BOOLEAN,dccCoperturaAltroDesrizione STRING null,dccElemNonStrutLaterizio BOOLEAN,dccElemNonStrutCartongesso BOOLEAN,dccElemNonStrutCalcestruzzo BOOLEAN,dccElemNonStrutLegno BOOLEAN,dccElemNonStrutAltro BOOLEAN,dccElemNonStrutAltroDescrizione STRING null,dccOpereDiRinforzoInsCatene BOOLEAN,dccOpereDiRinforzoInsCordoli BOOLEAN,dccOpereDiRinforzoIniArmate BOOLEAN,dccOpereDiRinforzoPlaccaggi BOOLEAN,dccOpereDiRinforzoIrrSolai BOOLEAN,dccOpereDiRinforzoRinforziFRP BOOLEAN,dccOpereDiRinforzoTelaiECerchiature BOOLEAN,dccOpereDiRinforzoInsRompitratta BOOLEAN,dccOpereDiRinforzoAltro BOOLEAN,dccOpereDiRinforzoAltroDescrizione STRING null,geoClasseIndagine VARCHAR(75) null,geoCategoriaSottosuolo VARCHAR(75) null,geoCategoriaTopografica VARCHAR(75) null,geoConsolidamento VARCHAR(75) null,geoPericolositaGeologica VARCHAR(75) null,geoPericolositaSismica VARCHAR(75) null,geoPericolositaIdraulica VARCHAR(75) null,geoPericolositaGeomorfica VARCHAR(75) null,geoRischioGeomorfologicoPai VARCHAR(75) null,geoPericolositaIdraulicaPai VARCHAR(75) null,geoRischioIdraulicoPai VARCHAR(75) null,geoFattibilitaGeologica VARCHAR(75) null,geoFattibilitaSismica VARCHAR(75) null,geoFattibilitaIdraulica VARCHAR(75) null,geoOperaRilevante VARCHAR(75) null,geoOpereDiSostegno VARCHAR(75) null,geoOpereInSotterranea VARCHAR(75) null,geoPresenzaPrescrizioni VARCHAR(75) null,geoNotePrescrizioni STRING null,geoNoteIndagini STRING null,geoEvidenzeGeomorfiche VARCHAR(75) null,geoEvidenzeGeologiche VARCHAR(75) null,geoDtRelazione DATE null,pagSoggettiAdAutorizzazione DOUBLE,pagInterventiRestauroManufatti DOUBLE,pagAltriCasiCulturali DOUBLE,pagLottizzazioni DOUBLE,pagGrandiStrutture DOUBLE,pagCondotte DOUBLE,pagPalificazioni DOUBLE,pagImpiantiEolici DOUBLE,pagNuoveRealizzazioni DOUBLE,pagImmobiliPreesistenti DOUBLE,pagManifestiPubblicitari DOUBLE,pagPareriDiMassima DOUBLE,pagAltriCasiPaesaggistici DOUBLE,pagVariantiPareriResi DOUBLE,pagRilascioAttestazioni DOUBLE,pagConsultazioniArchivio DOUBLE,note STRING null,noteUfficio STRING null,localizzazioneGeografica VARCHAR(75) null,tcNuovaCostruzione BOOLEAN,tcNuovaCostruzioneComplessa BOOLEAN,tcAdeguamentoSismico BOOLEAN,tcMiglioramentoSismico BOOLEAN,tcRiparazioneInterventoLocale BOOLEAN,tcCostruzioniEsistenti BOOLEAN,tcManutOrdStraord BOOLEAN,tcNuovaCostruzionePertinenza BOOLEAN,tcInterventoOpereEscavazione BOOLEAN,tcNoOpereEscavazione BOOLEAN,tcViarch BOOLEAN,tcOperaA25 BOOLEAN,tcAltriInterventi BOOLEAN,tcAltriInterventiDesc STRING null,tcInCA BOOLEAN,tcInOpera BOOLEAN,tcPrefabbricato BOOLEAN,tcInAcciaio BOOLEAN,tcMista BOOLEAN,tcInMuratura BOOLEAN,tcInMuraturaOrdinaria BOOLEAN,tcInMuraturaArmata BOOLEAN,tcInMuraturaMista BOOLEAN,tcInLegno BOOLEAN,tcAltro BOOLEAN,tcAltroDescrizione STRING null,tcConDispositivi BOOLEAN,interventoVoceP7 VARCHAR(75) null,normLavoriInProprio BOOLEAN,normLavoriNoDirettore BOOLEAN,normEsenteBollo BOOLEAN,normEsenteSpese BOOLEAN,normDpr01Dep BOOLEAN,normDpr02Dep BOOLEAN,normDpr01Aut BOOLEAN,normDpr02Aut BOOLEAN,normDm2018 BOOLEAN,normAnr BOOLEAN,normArt3com3 BOOLEAN,normArt3com4 BOOLEAN,normSismaBonus BOOLEAN,intervFinPub BOOLEAN,intervFinPubDesc STRING null,intervInAreaDiInteresse BOOLEAN,intervNonModificante BOOLEAN,intervNonAssoggettabile BOOLEAN,suap BOOLEAN,nominaImpresa BOOLEAN,nominaDirettoreLavori BOOLEAN,nominaCollaudatore BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_DettPratica"; public static final String ORDER_BY_JPQL = " ORDER BY dettPratica.dettPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_DettPratica.dettPraticaId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java index 801c0ec8..60f2928f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java @@ -93,11 +93,23 @@ public class DocPraticaImpl extends DocPraticaBaseImpl { @Override public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) throws PortalException, SystemException { + boolean praticaIsEditable = false; + if (DettPratica.class.getName().equals(getClassName())) { + DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(getClassPk()); + praticaIsEditable = dettPratica.praticaIsEditable(); + } + return hasDelegaFirma(userId, sezioneGeologica, praticaIsEditable); + } + + @Override + public boolean hasDelegaFirma(long userId, boolean sezioneGeologica, boolean praticaIsEditable) + throws PortalException, SystemException { + boolean controllo = true; DettPratica dettPratica = null; if (DettPratica.class.getName().equals(getClassName())) { dettPratica = DettPraticaServiceUtil.getDettPratica(getClassPk()); - controllo = dettPratica.praticaIsEditable(); + controllo = praticaIsEditable; } if (controllo) { User user = UserLocalServiceUtil.getUser(userId); @@ -134,6 +146,7 @@ public class DocPraticaImpl extends DocPraticaBaseImpl { return controllo; } + @Override public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) throws PortalException, SystemException { // TODO completare e controllare diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java index 03ace769..20e3d6ec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java @@ -41,8 +41,6 @@ import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; -import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; import java.util.ArrayList; import java.util.Arrays; @@ -55,8 +53,6 @@ import org.apache.commons.lang.StringUtils; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.HtmlUtil; @@ -68,7 +64,6 @@ import com.liferay.portal.model.Role; import com.liferay.portal.model.User; import com.liferay.portal.model.UserGroupRole; import com.liferay.portal.service.RoleLocalServiceUtil; -import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; @@ -597,57 +592,6 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { || StatoPraticaConstants.PERIZIA_SANZIONE.equals(stato); } - @Override - public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc, - String[] ccn, String templateName, JSONObject templateVariables, List allegati, - ServiceContext serviceContext) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - User titolaredigitaleUser = UserLocalServiceUtil.getUser(getUserId()); - List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(getIntPraticaId(), - titolaredigitaleUser.getScreenName()); - String titolareDigitale = StringPool.BLANK; - String titolareDigitaleMail = StringPool.BLANK; - String titolareDigitaleRoles = StringPool.BLANK; - if (!titolari.isEmpty()) { - titolareDigitale = titolari.get(0).getTitle(); - titolareDigitaleMail = titolari.get(0).getEmail(); - for (Soggetto titolare : titolari) { - titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN, - "gc-soggetto-" + titolare.getTipologiaSoggetto()) - + StringPool.SPACE; - } - } - String committenteTitle = StringPool.BLANK; - String descIntervento = StringPool.BLANK; - String tempId = StringPool.BLANK; - if (Validator.isNotNull(dettPratica)) { - tempId = dettPratica.getTitle(); - descIntervento = dettPratica.getDescLongIntervento(); - Soggetto committentePrincipale = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(getIntPraticaId(), - dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); - if (Validator.isNotNull(committentePrincipale)) { - committenteTitle = committentePrincipale.getTitle(); - } - } - templateVariables.put("tempId", tempId); - templateVariables.put("praticaNum", getNumeroProgetto()); - templateVariables.put("titolareDigitale", titolareDigitale); - templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles); - templateVariables.put("titolareDigitaleMail", titolareDigitaleMail); - templateVariables.put("intervento", descIntervento); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - templateVariables.put("committente", committenteTitle); - MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables, - allegati, serviceContext); - } - @Override public boolean isAllowedAction(String action) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java index f3b3b6b3..182443ae 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java @@ -94,14 +94,23 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()); String oggetto; String[] to; - if (Validator.isNotNull(getDtApprovazione())) { + // Le richieste precedenti l'aggiornamento hanno unitaOperativa = 0 + if (Validator.isNotNull(getDtApprovazione()) + || ((getUnitaOperativa() == 0) && Validator.isNotNull(getDtCompilazione()))) { // notifica parere espresso a istruttore - User istruttore = intPratica.recuperaTecnicoIstruttore(); + Set emails = new HashSet<>(); + emails.add(intPratica.recuperaTecnicoIstruttore().getEmailAddress()); + emails.add(UserLocalServiceUtil.getUser(getUserId()).getEmailAddress()); User geologo = UserLocalServiceUtil.getUser(getGeologoUserId()); - User approvatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId()); - to = new String[] { istruttore.getEmailAddress() }; - oggetto = "Parere endoprocedimentale espresso da " + Generics.capitalizeFull(geologo.getFullName()) - + ", approvato da " + Generics.capitalizeFull(approvatore.getFullName()); + User approvatore = null; + if (getApprovatoreUserId() != 0) { + approvatore = UserLocalServiceUtil.getUser(getApprovatoreUserId()); + } + to = emails.toArray(new String[emails.size()]); + oggetto = "Parere endoprocedimentale espresso da " + + Generics.capitalizeFull(geologo.getFullName()) + + (Validator.isNull(approvatore) ? StringPool.BLANK : ", approvato da " + + Generics.capitalizeFull(approvatore.getFullName())); } else if (Validator.isNotNull(getDtCompilazione())) { // notifica parere da approvare User approvatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId()); @@ -135,30 +144,32 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl { + Generics.capitalizeFull(getUserName()) + " a " + Generics.capitalizeFull(assegnatore.getFullName()); } - String[] cc = new String[0]; - String[] ccn = new String[0]; - String tipoPratica = StringPool.BLANK; - if (intPratica.isDeposito()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (intPratica.isAutorizzazione()) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + if (to != null) { + String[] cc = new String[0]; + String[] ccn = new String[0]; + String tipoPratica = StringPool.BLANK; + if (intPratica.isDeposito()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (intPratica.isAutorizzazione()) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", oggetto); + templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm") + .format(getDtCompilazione() != null ? getDtCompilazione() : new Date())); + templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + String className = ParereGeologo.class.getName(); + long classPk = getParereGeologoId(); + MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn, + templateVariables, null, serviceContext); } - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), - territorio.getCodiceProvincia()); - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", oggetto); - templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm") - .format(getDtCompilazione() != null ? getDtCompilazione() : new Date())); - templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); - templateVariables.put("provincia", provincia.getProvincia()); - templateVariables.put("comune", comune.getDenominazione()); - String className = ParereGeologo.class.getName(); - long classPk = getParereGeologoId(); - MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn, - templateVariables, null, serviceContext); } catch (PortalException | SystemException e) { _log.error("Errore invio mail al geologo - ParereGeologoId=" + getParereGeologoId(), e); } 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 cb98ce03..395bea88 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 @@ -286,8 +286,8 @@ public class SchedulerInvioDocumento implements MessageListener { serviceContext.setScopeGroupId(avviso.getGroupId()); serviceContext.setCompanyId(avviso.getCompanyId()); serviceContext.setUserId(avviso.getUserId()); - intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn, - "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext); + IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), + to, cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext); if (null != committentePrincipale) { to = new String[] { committentePrincipale.getEmail() }; List allegati = new ArrayList(); @@ -313,8 +313,9 @@ public class SchedulerInvioDocumento implements MessageListener { fileAttachment.generateFile(); allegati.add(fileAttachment); } - intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn, - "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati, serviceContext); + IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, + Avviso.class.getName(), to, cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati, + serviceContext); String[] suapEnabled = new String[] { StatoPraticaConstants.CONFORME, StatoPraticaConstants.NON_CONFORME }; if ((intPratica.isAutorizzazione() && ArrayUtil.contains(suapEnabled, avviso.getTipoDocumento())) || (StatoPraticaConstants.VIDIMATA.equals(avviso.getTipoDocumento()))) { @@ -334,8 +335,9 @@ public class SchedulerInvioDocumento implements MessageListener { FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format( intPratica.getDtPratica())); if (to.length > 0 && to[0] != StringPool.BLANK) { - intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, - cc, ccn, "INVIO-SUAP", templateVariables, allegati, serviceContext); + IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, + Avviso.class.getName(), to, cc, ccn, "INVIO-SUAP", templateVariables, allegati, + serviceContext); } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java index 08c79c8f..90aec51b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java @@ -363,26 +363,35 @@ public class IntPraticaLocalServiceClpInvoker { _methodParameterTypes231 = new String[] { "long" }; - _methodName232 = "searchAltriProgetti"; + _methodName232 = "invioMailNotifica"; _methodParameterTypes232 = new String[] { - "javax.servlet.http.HttpServletRequest", - "com.liferay.portal.model.User", "int", "int" + "long", "long", "java.lang.String", "java.lang.String[][]", + "java.lang.String[][]", "java.lang.String[][]", + "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", + "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName233 = "searchArchivioProgetti"; + _methodName233 = "searchAltriProgetti"; _methodParameterTypes233 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName234 = "searchMieiProgetti"; + _methodName234 = "searchArchivioProgetti"; _methodParameterTypes234 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; + + _methodName235 = "searchMieiProgetti"; + + _methodParameterTypes235 = new String[] { + "javax.servlet.http.HttpServletRequest", + "com.liferay.portal.model.User", "int", "int" + }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -837,22 +846,38 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName232.equals(name) && Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + IntPraticaLocalServiceUtil.invioMailNotifica(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue(), + (java.lang.String)arguments[2], + (java.lang.String[])arguments[3], + (java.lang.String[])arguments[4], + (java.lang.String[])arguments[5], + (java.lang.String)arguments[6], + (com.liferay.portal.kernel.json.JSONObject)arguments[7], + (java.util.List)arguments[8], + (com.liferay.portal.service.ServiceContext)arguments[9]); + + return null; + } + + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { return IntPraticaLocalServiceUtil.searchAltriProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return IntPraticaLocalServiceUtil.searchArchivioProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { return IntPraticaLocalServiceUtil.searchMieiProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), @@ -1010,4 +1035,6 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes233; private String _methodName234; private String[] _methodParameterTypes234; + private String _methodName235; + private String[] _methodParameterTypes235; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java index 1b6e79ea..b7def208 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java @@ -244,7 +244,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { serviceContext.setScopeGroupId(collaudo.getGroupId()); serviceContext.setCompanyId(collaudo.getCompanyId()); serviceContext.setUserId(collaudo.getUserId()); - intPratica.invioMailNotifica(0, collaudoId, Collaudo.class.getName(), to, cc, ccn, "NOTIFICA-BO", + intPraticaLocalService.invioMailNotifica(0, collaudoId, Collaudo.class.getName(), to, cc, ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java index 6cd4fa02..77708919 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneLocalServiceImpl.java @@ -146,7 +146,7 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase JSONObject templateVariable = JSONFactoryUtil.createJSONObject(); templateVariable.put("receiver", receiver); templateVariable.put("link", url); - intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, + intPraticaLocalService.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariable, null, serviceContext); } @@ -175,7 +175,7 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase serviceContext.setScopeGroupId(comunicazione.getGroupId()); serviceContext.setCompanyId(comunicazione.getCompanyId()); serviceContext.setUserId(comunicazione.getUserId()); - intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, "NOTIFICA-BO", - templateVariables, null, serviceContext); + intPraticaLocalService.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, + "NOTIFICA-BO", templateVariables, null, serviceContext); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index d8a6a029..bd177774 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -37,8 +37,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -437,13 +435,11 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private boolean getBoolean(ActionRequest request, String param) { - parameters.remove(param); return ParamUtil.getBoolean(request, param); } private Date getDate(ActionRequest request, String param, Date defaultValue) { - parameters.remove(param); if (request.getParameterMap().containsKey(param)) { return ParamUtil.getDate(request, param, DateFormatFactoryUtil.getDate(request.getLocale())); } @@ -457,7 +453,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private long getLong(ActionRequest request, String param, long defaultValue) { - parameters.remove(param); if (request.getParameterMap().containsKey(param)) { return ParamUtil.getLong(request, param); } @@ -471,37 +466,17 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private String getString(ActionRequest request, String param, String defaultValue) { - parameters.remove(param); if (request.getParameterMap().containsKey(param)) { return ParamUtil.getString(request, param); } return defaultValue; } - private Set parameters; - @Override @Indexable(type = IndexableType.REINDEX) public DettPratica aggiornaPratica(ActionRequest request, ActionResponse response) throws PortalException, SystemException { - parameters = new TreeSet<>(request.getParameterMap().keySet()); - parameters.remove("asseverazionesSearchContainerPrimaryKeys"); - parameters.remove("backURL"); - parameters.remove("backgroundTaskActive"); - parameters.remove("bozza"); - parameters.remove("cmd"); - parameters.remove("comune"); - parameters.remove("current_tab"); - parameters.remove("formDate"); - parameters.remove("geoDtRelazioneDay"); - parameters.remove("geoDtRelazioneMonth"); - parameters.remove("geoDtRelazioneYear"); - parameters.remove("javax.portlet.action"); - parameters.remove("modifiedSections"); - parameters.remove("provincia"); - parameters.remove("successURL"); - parameters.remove("verifyArea"); ServiceContext serviceContext = ServiceContextFactory.getInstance(request); long userId = serviceContext.getUserId(); long dettPraticaId = ParamUtilgetLong(request, "dettPraticaId"); @@ -641,7 +616,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dp.setVia(getString(request, "via", dp.getVia())); dp.setVincoli(getString(request, "vincoli", dp.getVincoli())); } - _log.info("geoDisabledSubmit = " + getBoolean(request, "geoDisabledSubmit")); if (dp.canSaveGeologia(userId) && !getBoolean(request, "geoDisabledSubmit")) { dp.setGeoCategoriaSottosuolo(getString(request, "geoCategoriaSottosuolo")); dp.setGeoCategoriaTopografica(getString(request, "geoCategoriaTopografica")); @@ -667,11 +641,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dp.setGeoRischioGeomorfologicoPai(getString(request, "geoRischioGeomorfologicoPai")); dp.setGeoRischioIdraulicoPai(getString(request, "geoRischioIdraulicoPai")); } - for (String param : parameters) { - if (!param.endsWith("Checkbox") && !param.startsWith("confirmClose_")) { - _log.info("Non gestito: " + param + " = " + ParamUtil.getString(request, param)); - } - } return updateDettPratica(dp); } @@ -852,8 +821,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl serviceContext.setScopeGroupId(dettPratica.getGroupId()); serviceContext.setCompanyId(dettPratica.getCompanyId()); serviceContext.setUserId(dettPratica.getUserId()); - intPratica.invioMailNotifica(dettPraticaId, dettPraticaId, DettPratica.class.getName(), to, cc, ccn, - "NOTIFICA-BO", templateVariables, null, serviceContext); + intPraticaLocalService.invioMailNotifica(dettPraticaId, dettPraticaId, DettPratica.class.getName(), to, cc, + ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index 099c11e9..5822a2f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -264,8 +264,8 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { serviceContext.setScopeGroupId(fineLavori.getGroupId()); serviceContext.setCompanyId(fineLavori.getCompanyId()); serviceContext.setUserId(fineLavori.getUserId()); - intPratica.invioMailNotifica(0, fineLavoriId, FineLavori.class.getName(), to, cc, ccn, "NOTIFICA-BO", - templateVariables, null, serviceContext); + intPraticaLocalService.invioMailNotifica(0, fineLavoriId, FineLavori.class.getName(), to, cc, ccn, + "NOTIFICA-BO", templateVariables, null, serviceContext); } private IntPratica updateIntPraticaStatus(FineLavori fineLavori, long intPraticaId) throws PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 81db729c..b3848a98 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 @@ -35,10 +35,13 @@ import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; +import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.Constants; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.WorkflowUtil; import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; +import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; import it.tref.liferay.portos.report.shared.constants.ReportConstants; import it.tref.liferay.portos.report.shared.dto.ReportDto; import it.tref.liferay.portos.report.shared.dto.ReportResultDto; @@ -74,6 +77,7 @@ 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.JSONObject; import com.liferay.portal.kernel.json.JSONSerializer; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; @@ -1204,6 +1208,58 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { return intPratica.hasRichiestaIntegrazioneAttiva(); } + @Override + public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc, + String[] ccn, String templateName, JSONObject templateVariables, List allegati, + ServiceContext serviceContext) throws PortalException, SystemException { + + DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); + long intPraticaId = dettPratica.getIntPraticaId(); + IntPratica intPratica = getIntPratica(intPraticaId); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); + Comune comune = comuneLocalService.getComune(territorio.getComuneId()); + Provincia provincia = provinciaLocalService.fetchByC_C(territorio.getCompanyId(), + territorio.getCodiceProvincia()); + User titolaredigitaleUser = userLocalService.getUser(intPratica.getUserId()); + List titolari = soggettoLocalService.getValidByIntPratica_CodiceFiscale(intPraticaId, + titolaredigitaleUser.getScreenName()); + String titolareDigitale = StringPool.BLANK; + String titolareDigitaleMail = StringPool.BLANK; + String titolareDigitaleRoles = StringPool.BLANK; + if (!titolari.isEmpty()) { + titolareDigitale = titolari.get(0).getTitle(); + titolareDigitaleMail = titolari.get(0).getEmail(); + for (Soggetto titolare : titolari) { + titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN, + "gc-soggetto-" + titolare.getTipologiaSoggetto()) + + StringPool.SPACE; + } + } + String committenteTitle = StringPool.BLANK; + String descIntervento = StringPool.BLANK; + String tempId = StringPool.BLANK; + if (Validator.isNotNull(dettPratica)) { + tempId = dettPratica.getTitle(); + descIntervento = dettPratica.getDescLongIntervento(); + Soggetto committentePrincipale = soggettoLocalService.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto( + intPraticaId, dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); + if (Validator.isNotNull(committentePrincipale)) { + committenteTitle = committentePrincipale.getTitle(); + } + } + templateVariables.put("tempId", tempId); + templateVariables.put("praticaNum", intPratica.getNumeroProgetto()); + templateVariables.put("titolareDigitale", titolareDigitale); + templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles); + templateVariables.put("titolareDigitaleMail", titolareDigitaleMail); + templateVariables.put("intervento", descIntervento); + templateVariables.put("provincia", provincia.getProvincia()); + templateVariables.put("comune", comune.getDenominazione()); + templateVariables.put("committente", committenteTitle); + MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables, + allegati, serviceContext); + } + @Override public Hits searchAltriProgetti(HttpServletRequest request, User user, int start, int end) { 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 1a9f153d..e635bdc5 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 @@ -76,7 +76,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase long geologoUserId = 0; long assegnatoreUserId = 0; if (unitaOperativa < 0) { - unitaOperativa = intPraticaLocalService.getIntPratica(intPraticaId).getUnitaOperativa(); + unitaOperativa = 0; assegnatoreUserId = serviceContext.getUserId(); geologoUserId = userId; } else { @@ -280,12 +280,15 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase DynamicQuery query = dynamicQuery(); Junction assegnataNonApprovata = RestrictionsFactoryUtil.conjunction(); + assegnataNonApprovata.add(RestrictionsFactoryUtil.ne("unitaOperativa", 0)); assegnataNonApprovata.add(RestrictionsFactoryUtil.isNotNull("dtAssegnazione")); assegnataNonApprovata.add(RestrictionsFactoryUtil.isNull("dtApprovazione")); Disjunction nonEspressoONonApprovato = RestrictionsFactoryUtil.disjunction(); nonEspressoONonApprovato.add(assegnataNonApprovata); - nonEspressoONonApprovato.add(RestrictionsFactoryUtil.isNull("dtCompilazione")); + // I pareri richiesti prima dell'aggiornamento hanno unitaOperativa = 0 + nonEspressoONonApprovato.add(RestrictionsFactoryUtil.eq("unitaOperativa", 0)); query.add(nonEspressoONonApprovato); + query.add(RestrictionsFactoryUtil.isNull("dtCompilazione")); query.add(RestrictionsFactoryUtil.isNull("dtAnnullamento")); return query; } 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 bbd7108a..17f41f6b 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=3600 - build.date=1643195768963 + build.number=3605 + build.date=1644937328845 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp index 17a6628b..3ef7b6d1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp @@ -82,8 +82,7 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in User approvatore = parere.getApprovatoreUserId() == 0 ? null : UserLocalServiceUtil.getUser(parere.getApprovatoreUserId()); boolean espresso = Validator.isNotNull(parere.getDtCompilazione()) - && (Validator.isNull(parere.getDtAssegnazione()) - || Validator.isNotNull(parere.getDtApprovazione())); + && (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione())); %>
  • @@ -102,14 +101,19 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in Richiesto da <%= Generics.capitalizeFull(richiedente.getFullName()) %> - - a <%= assegnatore == null ? "tutti gli assegnatori" - : "" + Generics.capitalizeFull(assegnatore.getFullName()) + "" %> - di U.O. <%= parere.getUnitaOperativa() %> - - - in data <%= dateFormatDateTime.format(parere.getDtRichista()) %> - + + + a <%= assegnatore == null ? "tutti gli assegnatori" + : "" + Generics.capitalizeFull(assegnatore.getFullName()) + "" %> + di U.O. <%= parere.getUnitaOperativa() %> + + in data <%= dateFormatDateTime.format(parere.getDtRichista()) %> + + + + a <%= Generics.capitalizeFull(geologo.getFullName()) %> + +
    @@ -137,7 +141,8 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
    - + Approvato da <%= Generics.capitalizeFull(approvatore.getFullName()) %> in data <%= dateFormatDateTime.format(parere.getDtApprovazione()) %>
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp index c10cadcf..38b00aaa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp @@ -14,109 +14,96 @@ <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> <%@include file="/html/fascicolo/init.jsp"%> - <% - SearchContainer searchContainer = (SearchContainer) request - .getAttribute("liferay-ui:search:searchContainer"); - String redirect = ParamUtil.getString(request, "backUrl"); - IntPratica intPratica = null; - - boolean showExpanded = true; - if (searchContainer != null) { - redirect = searchContainer.getIteratorURL().toString(); - - ResultRow row = (ResultRow) request - .getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); - - intPratica = (IntPratica) row.getObject(); - - showExpanded = false; - } else { - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - } - - String randomId = StringUtil.randomId(); - String buttonIdCambiaStato = "buttonIdCambiaStato_"+randomId; - String buttonIdToggleSospensione = "buttonIdToggleSospensione_"+randomId; - String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_"+randomId; - String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_"+randomId; - String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_"+randomId; - - DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); - Map changeMap = null; - if (lastDettPratica == null) { - changeMap = new HashMap(); - } else { - changeMap = PraticaUtil.getStatusChangeMap(lastDettPratica.getDettPraticaId()); - } - List statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica())); - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); +String redirect = ParamUtil.getString(request, "backUrl"); +IntPratica intPratica = null; +boolean showExpanded = true; +if (searchContainer != null) { + redirect = searchContainer.getIteratorURL().toString(); + ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); + intPratica = (IntPratica) row.getObject(); + showExpanded = false; +} else { + long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); + intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +} +String randomId = StringUtil.randomId(); +String buttonIdCambiaStato = "buttonIdCambiaStato_" + randomId; +String buttonIdToggleSospensione = "buttonIdToggleSospensione_" + randomId; +String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_" + randomId; +String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_" + randomId; +String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId; +DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); +Map changeMap = null; +if (lastDettPratica == null) { + changeMap = new HashMap(); +} else { + changeMap = PraticaUtil.getStatusChangeMap(lastDettPratica.getDettPraticaId()); +} +List statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica())); +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - - - - + - - <%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %> - - <%} %> - - + + - - + + + + + - - - - - - - - - - - <%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %> - - - - - <%} %> - - - - - - + + + + - - - - - + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp index 4204d191..8552a3b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp @@ -38,11 +38,10 @@ if (workflowInstanceLink == null) { } long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica( intPratica.getIntPraticaId()).getDettPraticaId(); -String randomId = StringUtil.randomId(); -String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + randomId; -String buttonIdRichiediParere = "buttonIdRichiediParere_" + randomId; -String buttonIdAnnullaParere = "buttonIdAnnullaParere_" + randomId; -String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + randomId; +String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + controlloPratica.getDettPraticaId(); +String buttonIdRichiediParere = "buttonIdRichiediParere_" + controlloPratica.getDettPraticaId(); +String buttonIdAnnullaParere = "buttonIdAnnullaParere_" + controlloPratica.getDettPraticaId(); +String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + controlloPratica.getDettPraticaId(); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); long territorioGroupId = territorio.getGroupId(); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp index 3a35aa09..459ef6f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp @@ -6,10 +6,9 @@ <% long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); -String buttonIdAnnullaRicGeologo = ParamUtil.getString(request, "buttonIdAnnullaRicGeologo"); -String randomId = StringUtil.randomId(); -String formNameAnnullaRicGeologo = "formNameAnnullaRicGeologo_" + randomId; -String divIdAnnullaRicGeologo = "divIdAnnullaRicGeologo_" + randomId; +String buttonIdAnnullaRicGeologo = ParamUtil.getString(request, "buttonId"); +String formNameAnnullaRicGeologo = "formNameAnnullaRicGeologo_" + dettPraticaId; +String divIdAnnullaRicGeologo = "divIdAnnullaRicGeologo_" + dettPraticaId; List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp index c020a757..1c5f3fa1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp @@ -8,7 +8,7 @@ <% long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); -String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonIdSelezionaGeologo"); +String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonId"); String randomId = StringUtil.randomId(); String formNameSelezionaGeologo = "formNameSelezionaGeologo_" + randomId; String divIdSelezionaGeologo = "divIdSelezionaGeologo_" + randomId; @@ -17,7 +17,9 @@ List geologi = UserLocalServiceUtil.getRoleUsers(role.getRoleId()); List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS); for (ParereGeologo parere : pareri) { - geologi.remove(UserLocalServiceUtil.getUser(parere.getGeologoUserId())); + if (parere.getGeologoUserId() != 0) { + geologi.remove(UserLocalServiceUtil.getUser(parere.getGeologoUserId())); + } } %> @@ -46,7 +48,7 @@ for (ParereGeologo parere : pareri) { - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf index fafe6d02..abd3ef75 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf @@ -215,8 +215,7 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP if (Validator.isNotNull(parere.getDtAnnullamento())) { annullati++; } else if (Validator.isNotNull(parere.getDtCompilazione()) - && (Validator.isNull(parere.getDtAssegnazione()) - || Validator.isNotNull(parere.getDtApprovazione()))) { + && (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione()))) { espressi++; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component index 2e318b34..26b0e067 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ uses - - uses - uses 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 1b2ab1c7..34daf6c1 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 @@ -1397,8 +1397,8 @@ public class FascicoloFePortlet extends MVCPortlet { templateVariablesExtra.put("delega", LanguageUtil.get(LocaleUtil.ITALIAN, "label-deleghe-tipologia-" + delega.getTipologia())); templateVariablesExtra.put("link", url); - intPratica.invioMailNotifica(delega.getDettPraticaId(), delegaId, Delega.class.getName(), to, cc, ccn, - "INVIO-DELEGA", templateVariablesExtra, null, serviceContext); + IntPraticaLocalServiceUtil.invioMailNotifica(delega.getDettPraticaId(), delegaId, Delega.class.getName(), + to, cc, ccn, "INVIO-DELEGA", templateVariablesExtra, null, serviceContext); } catch (Exception e) { _log.error(e, e); throw new SystemException(e); @@ -1433,7 +1433,7 @@ public class FascicoloFePortlet extends MVCPortlet { Soggetto soggetto = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale( asseverazione.getIntPraticaId(), asseverazione.getCodiceFiscale(), 0L).get(0); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(asseverazione.getIntPraticaId()); - _log.debug("Sending asseverazione mai to " + soggetto.getEmail()); + _log.debug("Sending asseverazione mail to " + soggetto.getEmail()); String[] to = { soggetto.getEmail() }; String[] cc = new String[0]; String[] ccn = new String[0]; @@ -1455,7 +1455,7 @@ public class FascicoloFePortlet extends MVCPortlet { fileAttachment.setFileEntryId(asseverazione.getFileEntryId()); fileAttachment.generateFile(); allegati.add(fileAttachment); - intPratica.invioMailNotifica(asseverazione.getDettPraticaId(), asseverazioneId, + IntPraticaLocalServiceUtil.invioMailNotifica(asseverazione.getDettPraticaId(), asseverazioneId, Asseverazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariablesExtra, allegati, serviceContext); } catch (Exception e) { @@ -1486,13 +1486,13 @@ public class FascicoloFePortlet extends MVCPortlet { } else { SessionErrors.add(request, "error.geniocivilefe.pagamento.allegato.is.request"); } - if (!SessionErrors.isEmpty(request)) { - PortalUtil.copyRequestParameters(request, response); - } else { + if (SessionErrors.isEmpty(request)) { String numeroBollettino = ParamUtil.getString(request, "numeroBollettino"); byte[] content = FileUtil.getBytes(file); PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext); + } else { + PortalUtil.copyRequestParameters(request, response); } } catch (Exception e) { PortalUtil.copyRequestParameters(request, response); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp index 0b8ce2b6..4b6b9c4e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp @@ -29,7 +29,9 @@ long docPraticaId = ParamUtil.getLong(request, "docPraticaId"); DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId); FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); boolean disabledInput = ParamUtil.getBoolean(request, "disabledInput", false); -boolean hasDelegaFirma = docPratica.hasDelegaFirma(user.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom)); +boolean praticaIsEditable = ParamUtil.getBoolean(request, "praticaIsEditable", false); +boolean hasDelegaFirma = docPratica.hasDelegaFirma(user.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom), + praticaIsEditable); boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma; %> @@ -260,4 +262,4 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel - \ No newline at end of file + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index c81f0bcd..7904b492 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -1,3 +1,8 @@ +<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> +<%@page import="com.liferay.portal.kernel.util.MapUtil"%> +<%@page import="java.util.Date"%> +<%@page import="java.util.HashMap"%> +<%@page import="java.util.Map"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> @@ -75,6 +80,11 @@ if (Validator.isNotNull(request.getParameter("disabled"))) { } else if ("page_collaudo".equalsIgnoreCase(comingFrom)) { disabledInput = disabled; } +Map soggetti = new HashMap(); +for (Soggetto soggetto : SoggettoLocalServiceUtil.findByIntPratica(intPraticaId)) { + soggetti.put(soggetto.getCodiceFiscale().toLowerCase(), soggetto.getNome() + ' ' + soggetto.getCognome()); +} +Map editables = new HashMap(); %> @@ -219,6 +229,13 @@ if ("page_geologica".equals(comingFrom)) { <% } else { for (DocPratica docPratica : docPraticas) { + if (!editables.containsKey(docPratica.getClassPk())) { + DettPratica dp = null; + if (DettPratica.class.getName().equals(docPratica.getClassName())) { + dp = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()); + } + editables.put(docPratica.getClassPk(), Validator.isNotNull(dp) && dp.praticaIsEditable()); + } FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); StringBuilder title = new StringBuilder(); String cssIcon = StringPool.BLANK; @@ -246,14 +263,12 @@ if ("page_geologica".equals(comingFrom)) { if (firme.numeroFirme() > 0) { cssIcon = "fa-check"; } - title.append("Firma sul file:
      ").append("
    • ").append(testoFirme).append("
      • "); + title.append("Firma sul file:
      • ").append(testoFirme).append("
        • "); if (!firme.getFirmeDigitali().isEmpty()) { for (FirmeDetail firma : firme.getFirmeDigitali()) { - List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale( - docPratica.getIntPraticaId(), firma.getCfFirmatario()); - if (soggetti.size() > 0) { - title.append("
      • ").append(soggetti.get(0).getNome()).append(StringPool.SPACE) - .append(soggetti.get(0).getCognome()).append("
        • "); + String nome = soggetti.get(firma.getCfFirmatario().toLowerCase()); + if (nome != null) { + title.append("
      • ").append(nome).append("
        • "); } title.append("
      • ").append(firma.getCfFirmatario()); if (Validator.isNotNull(firma.getDtFirma())) { @@ -266,11 +281,9 @@ if ("page_geologica".equals(comingFrom)) { if (!firme.getFirmeApplicativo().isEmpty()) { title.append("Firme da applicativo:
          "); for (FirmeDetail firma : firme.getFirmeApplicativo()) { - List soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale( - docPratica.getIntPraticaId(), firma.getCfFirmatario()); - if (soggetti.size() > 0) { - title.append("
        • ").append(soggetti.get(0).getNome()).append(StringPool.SPACE) - .append(soggetti.get(0).getCognome()).append("
          • "); + String nome = soggetti.get(firma.getCfFirmatario().toLowerCase()); + if (nome != null) { + title.append("
        • ").append(nome).append("
          • "); } title.append("
        • ").append(firma.getCfFirmatario()); if (Validator.isNotNull(firma.getDtFirma())) { @@ -284,38 +297,31 @@ if ("page_geologica".equals(comingFrom)) {
          <% - String color = StringPool.BLANK; - if (Validator.isNotNull(docPratica.getDettPraticaIdRimozione())) { - color = "txt-red"; - } else { - color = "txt-green"; - } + String color = docPratica.getDettPraticaIdRimozione() == 0 ? "txt-green" : "txt-red"; %> <%= docPratica.getDescLong() %>
          <% - String adding = StringPool.BLANK; if (FineLavori.class.getName().equalsIgnoreCase(className)) { FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori( docPratica.getClassPk()); if (fineLavori != null) { - adding = fineLavori.getFullDescription(); + out.print(fineLavori.getFullDescription()); } } else if (Collaudo.class.getName().equalsIgnoreCase(className)) { Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk()); if (collaudo != null) { - adding = collaudo.getFullDescription(); + out.print(collaudo.getFullDescription()); } } else { DettPratica dp = DettPraticaLocalServiceUtil.fetchDettPratica( docPratica.getClassPk()); if (dp != null) { - adding = dp.getFullDescription(); + out.print(dp.getFullDescription()); } } - out.print(adding); %>
          @@ -394,6 +400,8 @@ if ("page_geologica".equals(comingFrom)) { + @@ -415,7 +423,7 @@ if ("page_geologica".equals(comingFrom)) {
          - <% + <% } } %> 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 e27dbe49..fa8de951 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 @@ -562,12 +562,12 @@ function duplicati(input) {
          - +
          - +
          diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/parericompletati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/parericompletati.jsp index 824d7845..d4aad580 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/parericompletati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/parericompletati.jsp @@ -29,6 +29,8 @@ value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" /> + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component index 6088516f..7a047eaa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ uses - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties index eaf1bf4c..7b73e20d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_rep - build.number=35 - build.date=1632924732787 + build.number=36 + build.date=1645093778756 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component index d234eb69..26ffb99f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component @@ -6,9 +6,6 @@ uses - - uses - diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java index e6764d5e..8985f114 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java @@ -71,6 +71,7 @@ public class StatoPraticaConstants { put(SANZIONE_DOC2, "label.admingeniocivile.statopratica.sanzione.doc2"); put(PERIZIA_SANZIONE, "label.admingeniocivile.statopratica.periziasanzione"); put(DECRETO_SANZIONE, "label.admingeniocivile.statopratica.decretosanzione"); + put(INVIO_AVVISO_MANUALE, "label.admingeniocivile.statopratica.avvisomanuale"); } }; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component index 938e57ba..cfa57ce4 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component @@ -9,9 +9,6 @@ uses - - uses -