From 3150fd472cd85dc8fd8a2dddb6492f43d8417fee Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Wed, 19 May 2021 11:45:51 +0200 Subject: [PATCH] Merge --- .../bo/service/DettPraticaLocalService.java | 27 +- .../service/DettPraticaLocalServiceClp.java | 135 ++-- .../service/DettPraticaLocalServiceUtil.java | 37 +- .../DettPraticaLocalServiceWrapper.java | 37 +- .../portos/bo/service/DettPraticaService.java | 28 +- .../bo/service/DettPraticaServiceClp.java | 128 ++-- .../bo/service/DettPraticaServiceUtil.java | 37 +- .../bo/service/DettPraticaServiceWrapper.java | 40 +- .../bo/util/ValidazionePraticaUtil.java | 10 - .../it/mwg/sismica/bo/util/SismicaUtil.java | 1 + .../portos/bo/portlet/FascicoloPortlet.java | 16 - .../bo/scheduler/SchedulerPratiche.java | 29 - .../DettPraticaLocalServiceClpInvoker.java | 54 +- .../base/DettPraticaServiceClpInvoker.java | 42 +- .../service/http/DettPraticaServiceSoap.java | 688 ------------------ .../impl/DettPraticaLocalServiceImpl.java | 238 ++++-- .../service/impl/DettPraticaServiceImpl.java | 115 +-- .../AllegatoManualePersistenceImpl.java | 1 + .../AsseverazionePersistenceImpl.java | 1 + .../persistence/AvvisoPersistenceImpl.java | 1 + .../persistence/CollaudoPersistenceImpl.java | 1 + .../persistence/ComunePersistenceImpl.java | 1 + .../ComunicazionePersistenceImpl.java | 1 + .../ConfigurazionePersistenceImpl.java | 1 + .../ControlloPraticaPersistenceImpl.java | 1 + .../persistence/DelegaPersistenceImpl.java | 1 + .../DettPraticaPersistenceImpl.java | 1 + .../DocAggiuntivaPersistenceImpl.java | 1 + .../DocPraticaPersistenceImpl.java | 1 + .../FineLavoriPersistenceImpl.java | 1 + .../HistoryWorkflowActionPersistenceImpl.java | 1 + .../IntPraticaPersistenceImpl.java | 1 + .../persistence/PagamentoPersistenceImpl.java | 1 + .../ParereGeologoPersistenceImpl.java | 1 + .../persistence/ProvinciaPersistenceImpl.java | 1 + .../persistence/SoggettoPersistenceImpl.java | 1 + .../persistence/SorteggioPersistenceImpl.java | 1 + ...StoricoSoggettoPraticaPersistenceImpl.java | 1 + .../TempisticaPersistenceImpl.java | 1 + .../TerritorioPersistenceImpl.java | 1 + .../resource/asseverazioni/progettista_c.html | 16 + .../docroot/WEB-INF/src/service.properties | 4 +- .../fascicolo/navigator/page_versioning.jsp | 201 +++-- .../portos-bo-portlet/docroot/js/main.js | 115 +-- .../html/fascicolofe/edit_modal_fascicolo.jsp | 82 +-- .../EmailAttachmentPersistence.java | 11 +- .../persistence/EmailAttachmentUtil.java | 11 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../bo/shared/util/TipoSoggettoUtil.java | 1 - 49 files changed, 724 insertions(+), 1406 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java index 6e22b661..4e6b25e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java @@ -848,26 +848,23 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public void sendToVersioning(long dettPraticaId, java.lang.String url) - throws java.lang.Exception; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.util.List getDettPraticaFields(); @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public int getNumeroDiVersioni(java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.lang.String getVersionNumber(java.lang.String url, int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public boolean isNumber(java.lang.String field); - public com.liferay.portal.kernel.json.JSONArray callForChanges( - java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public java.lang.String format(java.lang.String field, + java.io.Serializable value); public int countVariateByIntPratica(long intPraticaId) 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/DettPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java index 12a31aa9..8805db97 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java @@ -490,29 +490,35 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "long", "java.lang.String", "java.lang.String" }; - _methodName76 = "sendToVersioning"; + _methodName76 = "getDettPraticaFields"; - _methodParameterTypes76 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes76 = new String[] { }; - _methodName77 = "getNumeroDiVersioni"; + _methodName77 = "getVersioni"; - _methodParameterTypes77 = new String[] { "java.lang.String" }; + _methodParameterTypes77 = new String[] { "long" }; - _methodName78 = "getVersionNumber"; + _methodName78 = "callForChanges"; - _methodParameterTypes78 = new String[] { "java.lang.String", "int" }; + _methodParameterTypes78 = new String[] { "long" }; - _methodName79 = "callForChanges"; + _methodName79 = "isNumber"; _methodParameterTypes79 = new String[] { "java.lang.String" }; - _methodName80 = "countVariateByIntPratica"; + _methodName80 = "format"; - _methodParameterTypes80 = new String[] { "long" }; + _methodParameterTypes80 = new String[] { + "java.lang.String", "java.io.Serializable" + }; - _methodName81 = "getFirstCompletedByIntPratica"; + _methodName81 = "countVariateByIntPratica"; _methodParameterTypes81 = new String[] { "long" }; + + _methodName82 = "getFirstCompletedByIntPratica"; + + _methodParameterTypes82 = new String[] { "long" }; } @Override @@ -4160,20 +4166,16 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } @Override - public void sendToVersioning(long dettPraticaId, java.lang.String url) - throws java.lang.Exception { + public java.util.List getDettPraticaFields() { + Object returnObj = null; + try { - _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, - new Object[] { dettPraticaId, ClpSerializer.translateInput(url) }); + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); - if (t instanceof java.lang.Exception) { - throw (java.lang.Exception)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -4182,35 +4184,27 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { " is not a valid exception"); } } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public int getNumeroDiVersioni(java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, - new Object[] { ClpSerializer.translateInput(url) }); + _methodParameterTypes77, new Object[] { intPraticaId }); } 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 java.io.IOException) { - throw (java.io.IOException)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -4220,36 +4214,26 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } } - return ((Integer)returnObj).intValue(); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.lang.String getVersionNumber(java.lang.String url, int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, - new Object[] { ClpSerializer.translateInput(url), version }); + _methodParameterTypes78, new Object[] { intPraticaId }); } 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 java.io.IOException) { - throw (java.io.IOException)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -4259,36 +4243,49 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } } - return (java.lang.String)ClpSerializer.translateOutput(returnObj); + return (java.util.List>)ClpSerializer.translateOutput(returnObj); } @Override - public com.liferay.portal.kernel.json.JSONArray callForChanges( - java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public boolean isNumber(java.lang.String field) { Object returnObj = null; try { returnObj = _invokableLocalService.invokeMethod(_methodName79, _methodParameterTypes79, - new Object[] { ClpSerializer.translateInput(url) }); + new Object[] { ClpSerializer.translateInput(field) }); } 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 RuntimeException) { + throw (RuntimeException)t; } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); } + } - if (t instanceof java.io.IOException) { - throw (java.io.IOException)t; - } + return ((Boolean)returnObj).booleanValue(); + } + + @Override + public java.lang.String format(java.lang.String field, + java.io.Serializable value) { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, + new Object[] { + ClpSerializer.translateInput(field), + + ClpSerializer.translateInput(value) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); if (t instanceof RuntimeException) { throw (RuntimeException)t; @@ -4299,7 +4296,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } } - return (com.liferay.portal.kernel.json.JSONArray)ClpSerializer.translateOutput(returnObj); + return (java.lang.String)ClpSerializer.translateOutput(returnObj); } @Override @@ -4308,8 +4305,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4337,8 +4334,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName81, - _methodParameterTypes81, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName82, + _methodParameterTypes82, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4522,4 +4519,6 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { private String[] _methodParameterTypes80; private String _methodName81; private String[] _methodParameterTypes81; + private String _methodName82; + private String[] _methodParameterTypes82; } \ 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/DettPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java index 9dbbfa74..449ac335 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java @@ -1144,32 +1144,29 @@ public class DettPraticaLocalServiceUtil { tipologiaSoggetto); } - public static void sendToVersioning(long dettPraticaId, java.lang.String url) - throws java.lang.Exception { - getService().sendToVersioning(dettPraticaId, url); + public static java.util.List getDettPraticaFields() { + return getService().getDettPraticaFields(); } - public static int getNumeroDiVersioni(java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().getNumeroDiVersioni(url); + public static java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().getVersioni(intPraticaId); } - public static java.lang.String getVersionNumber(java.lang.String url, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().getVersionNumber(url, version); + public static java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().callForChanges(intPraticaId); } - public static com.liferay.portal.kernel.json.JSONArray callForChanges( - java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().callForChanges(url); + public static boolean isNumber(java.lang.String field) { + return getService().isNumber(field); + } + + public static java.lang.String format(java.lang.String field, + java.io.Serializable value) { + return getService().format(field, value); } public static int countVariateByIntPratica(long intPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java index dcb8629d..b0cf3709 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java @@ -1212,34 +1212,33 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, } @Override - public void sendToVersioning(long dettPraticaId, java.lang.String url) - throws java.lang.Exception { - _dettPraticaLocalService.sendToVersioning(dettPraticaId, url); + public java.util.List getDettPraticaFields() { + return _dettPraticaLocalService.getDettPraticaFields(); } @Override - public int getNumeroDiVersioni(java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaLocalService.getNumeroDiVersioni(url); + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPraticaLocalService.getVersioni(intPraticaId); } @Override - public java.lang.String getVersionNumber(java.lang.String url, int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaLocalService.getVersionNumber(url, version); + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPraticaLocalService.callForChanges(intPraticaId); } @Override - public com.liferay.portal.kernel.json.JSONArray callForChanges( - java.lang.String url) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaLocalService.callForChanges(url); + public boolean isNumber(java.lang.String field) { + return _dettPraticaLocalService.isNumber(field); + } + + @Override + public java.lang.String format(java.lang.String field, + java.io.Serializable value) { + return _dettPraticaLocalService.format(field, value); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java index f6cd4f43..b8ae4f2d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java @@ -323,24 +323,20 @@ public interface DettPraticaService extends BaseService, InvokableService { com.liferay.portal.kernel.exception.SystemException; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public int getNumeroDiVersioni(long intPraticaId, long companyId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public java.util.List getDettPraticaFields(); @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.lang.String getJsonVersion(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; - public java.lang.String callForChanges(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException; + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public boolean isNumber(java.lang.String field); - public void sendToVersioning(long dettPraticaId, long companyId) - throws java.lang.Exception; + public java.lang.String format(java.lang.String field, + java.io.Serializable value); } \ 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/DettPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java index 98a0e8d8..989542fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java @@ -186,21 +186,27 @@ public class DettPraticaServiceClp implements DettPraticaService { "long", "java.lang.String", "java.lang.String" }; - _methodName23 = "getNumeroDiVersioni"; + _methodName23 = "getDettPraticaFields"; - _methodParameterTypes23 = new String[] { "long", "long" }; + _methodParameterTypes23 = new String[] { }; - _methodName24 = "getJsonVersion"; + _methodName24 = "getVersioni"; - _methodParameterTypes24 = new String[] { "long", "long", "int" }; + _methodParameterTypes24 = new String[] { "long" }; _methodName25 = "callForChanges"; - _methodParameterTypes25 = new String[] { "long", "long", "int" }; + _methodParameterTypes25 = new String[] { "long" }; - _methodName26 = "sendToVersioning"; + _methodName26 = "isNumber"; - _methodParameterTypes26 = new String[] { "long", "long" }; + _methodParameterTypes26 = new String[] { "java.lang.String" }; + + _methodName27 = "format"; + + _methodParameterTypes27 = new String[] { + "java.lang.String", "java.io.Serializable" + }; } @Override @@ -1620,32 +1626,16 @@ public class DettPraticaServiceClp implements DettPraticaService { } @Override - public int getNumeroDiVersioni(long intPraticaId, long companyId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public java.util.List getDettPraticaFields() { Object returnObj = null; try { returnObj = _invokableService.invokeMethod(_methodName23, - _methodParameterTypes23, - new Object[] { intPraticaId, companyId }); + _methodParameterTypes23, new Object[] { }); } 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 java.io.IOException) { - throw (java.io.IOException)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -1655,37 +1645,26 @@ public class DettPraticaServiceClp implements DettPraticaService { } } - return ((Integer)returnObj).intValue(); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.lang.String getJsonVersion(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableService.invokeMethod(_methodName24, - _methodParameterTypes24, - new Object[] { intPraticaId, companyId, version }); + _methodParameterTypes24, new Object[] { intPraticaId }); } 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 java.io.IOException) { - throw (java.io.IOException)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -1695,37 +1674,26 @@ public class DettPraticaServiceClp implements DettPraticaService { } } - return (java.lang.String)ClpSerializer.translateOutput(returnObj); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.lang.String callForChanges(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableService.invokeMethod(_methodName25, - _methodParameterTypes25, - new Object[] { intPraticaId, companyId, version }); + _methodParameterTypes25, new Object[] { intPraticaId }); } 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 java.io.IOException) { - throw (java.io.IOException)t; - } - if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -1735,23 +1703,49 @@ public class DettPraticaServiceClp implements DettPraticaService { } } - return (java.lang.String)ClpSerializer.translateOutput(returnObj); + return (java.util.List>)ClpSerializer.translateOutput(returnObj); } @Override - public void sendToVersioning(long dettPraticaId, long companyId) - throws java.lang.Exception { + public boolean isNumber(java.lang.String field) { + Object returnObj = null; + try { - _invokableService.invokeMethod(_methodName26, - _methodParameterTypes26, - new Object[] { dettPraticaId, companyId }); + returnObj = _invokableService.invokeMethod(_methodName26, + _methodParameterTypes26, + new Object[] { ClpSerializer.translateInput(field) }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); - if (t instanceof java.lang.Exception) { - throw (java.lang.Exception)t; + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); } + } + + return ((Boolean)returnObj).booleanValue(); + } + + @Override + public java.lang.String format(java.lang.String field, + java.io.Serializable value) { + Object returnObj = null; + + try { + returnObj = _invokableService.invokeMethod(_methodName27, + _methodParameterTypes27, + new Object[] { + ClpSerializer.translateInput(field), + + ClpSerializer.translateInput(value) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); if (t instanceof RuntimeException) { throw (RuntimeException)t; @@ -1761,6 +1755,8 @@ public class DettPraticaServiceClp implements DettPraticaService { " is not a valid exception"); } } + + return (java.lang.String)ClpSerializer.translateOutput(returnObj); } private InvokableService _invokableService; @@ -1816,4 +1812,6 @@ public class DettPraticaServiceClp implements DettPraticaService { private String[] _methodParameterTypes25; private String _methodName26; private String[] _methodParameterTypes26; + private String _methodName27; + private String[] _methodParameterTypes27; } \ 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/DettPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java index 040e9731..11d8f895 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java @@ -459,32 +459,29 @@ public class DettPraticaServiceUtil { tipologiaSoggetto); } - public static int getNumeroDiVersioni(long intPraticaId, long companyId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().getNumeroDiVersioni(intPraticaId, companyId); + public static java.util.List getDettPraticaFields() { + return getService().getDettPraticaFields(); } - public static java.lang.String getJsonVersion(long intPraticaId, - long companyId, int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().getJsonVersion(intPraticaId, companyId, version); + public static java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().getVersioni(intPraticaId); } - public static java.lang.String callForChanges(long intPraticaId, - long companyId, int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return getService().callForChanges(intPraticaId, companyId, version); + public static java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().callForChanges(intPraticaId); + } + + public static boolean isNumber(java.lang.String field) { + return getService().isNumber(field); } - public static void sendToVersioning(long dettPraticaId, long companyId) - throws java.lang.Exception { - getService().sendToVersioning(dettPraticaId, companyId); + public static java.lang.String format(java.lang.String field, + java.io.Serializable value) { + return getService().format(field, value); } public static void clearService() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java index 8cb3e0e4..88e6ff94 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java @@ -464,37 +464,33 @@ public class DettPraticaServiceWrapper implements DettPraticaService, } @Override - public int getNumeroDiVersioni(long intPraticaId, long companyId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaService.getNumeroDiVersioni(intPraticaId, companyId); + public java.util.List getDettPraticaFields() { + return _dettPraticaService.getDettPraticaFields(); } @Override - public java.lang.String getJsonVersion(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaService.getJsonVersion(intPraticaId, companyId, - version); + public java.util.List getVersioni( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPraticaService.getVersioni(intPraticaId); } @Override - public java.lang.String callForChanges(long intPraticaId, long companyId, - int version) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException, - java.io.IOException { - return _dettPraticaService.callForChanges(intPraticaId, companyId, - version); + public java.util.List> callForChanges( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPraticaService.callForChanges(intPraticaId); + } + + @Override + public boolean isNumber(java.lang.String field) { + return _dettPraticaService.isNumber(field); } @Override - public void sendToVersioning(long dettPraticaId, long companyId) - throws java.lang.Exception { - _dettPraticaService.sendToVersioning(dettPraticaId, companyId); + public java.lang.String format(java.lang.String field, + java.io.Serializable value) { + return _dettPraticaService.format(field, value); } /** diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index c02bf4eb..94150575 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -122,16 +122,6 @@ public class ValidazionePraticaUtil { public static boolean canEditUsers(long intPraticaId) throws PortalException, SystemException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - - _log.info("isSospesa" + intPratica.isSospesa()); - _log.info("isAnnullata" + intPratica.isAnnullata()); - _log.info("canEditPratica" + canEditPratica(intPraticaId)); - _log.info("praticaHasVarianteInProgress" + praticaHasVarianteInProgress(intPraticaId)); - _log.info("praticaHasRichiestaIntegrazioneAttiva" + praticaHasRichiestaIntegrazioneAttiva(intPraticaId)); - _log.info("praticaHasIntegrazioneInProgress" + praticaHasIntegrazioneInProgress(intPraticaId)); - _log.info("praticaHasFineLavoriInProgress" + praticaHasFineLavoriInProgress(intPraticaId)); - _log.info("praticaHasCollaudoInProgress" + praticaHasCollaudoInProgress(intPraticaId)); - return !intPratica.isSospesa() && !intPratica.isAnnullata() && !canEditPratica(intPraticaId) && !praticaHasVarianteInProgress(intPraticaId) && !praticaHasRichiestaIntegrazioneAttiva(intPraticaId) && !praticaHasIntegrazioneInProgress(intPraticaId) && !praticaHasFineLavoriInProgress(intPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index 62fd103f..f5034302 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -194,6 +194,7 @@ public class SismicaUtil { int scadute = 0; DynamicQuery dynamicQuery = IntPraticaLocalServiceUtil.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("statoPratica", StatoPraticaConstants.INTEGRAZIONE)); + @SuppressWarnings("unchecked") List pratiche = IntPraticaLocalServiceUtil.dynamicQuery(dynamicQuery); for (IntPratica pratica : pratiche) { Date dtUltimoAvviso = null; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index 2ee9e31c..0665d2d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -11,7 +11,6 @@ import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.search.IntPraticaAdvancedSearch; import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; @@ -306,26 +305,11 @@ public class FascicoloPortlet extends MVCPortlet { actionResponse.setRenderParameter("ordinaTipo", ordinaTipo); } - public void versiona(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { - - long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId", 0L); - long companyId = ParamUtil.getLong(actionRequest, "companyId"); - try { - DettPraticaServiceUtil.sendToVersioning(dettPraticaId, companyId); - } catch (PortalException | SystemException | IOException | NoSuchFieldException | SecurityException e) { - _log.error("error-versioning", e); - SessionErrors.add(actionRequest, "error-versioning"); - } - PortalUtil.copyRequestParameters(actionRequest, actionResponse); - } - @Override public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, PortletException { String id = resourceRequest.getResourceID(); - ServiceContext serviceContext; try { - serviceContext = ServiceContextFactory.getInstance(resourceRequest); if ("downloadAllDocPratica".equals(id)) { long intPraticaId = ParamUtil.getLong(resourceRequest, "intPraticaId"); long classPk = ParamUtil.getLong(resourceRequest, "classPk"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index 33cc99c0..8328760c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -11,11 +11,9 @@ import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; @@ -36,13 +34,11 @@ import com.liferay.portal.kernel.messaging.MessageListener; import com.liferay.portal.kernel.messaging.MessageListenerException; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.portal.security.auth.PrincipalThreadLocal; import com.liferay.portal.security.permission.PermissionChecker; import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; import com.liferay.portal.security.permission.PermissionThreadLocal; -import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; @@ -221,31 +217,6 @@ public class SchedulerPratiche implements MessageListener { } } } - // versionamento - count = DettPraticaLocalServiceUtil.countPraticheCompletateNonversionate(); - if (count > 0) { - for (Company company : CompanyLocalServiceUtil.getCompanies()) { - String condition = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(company.getCompanyId(), - ConfigurazioneConstants.SCHEDULER_VERSIONING); - if (Boolean.parseBoolean(condition)) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - List dettPratiche = DettPraticaLocalServiceUtil - .findPraticheCompletateNonVersionate(cursor, cursor + SIZE); - for (DettPratica dettPratica : dettPratiche) { - try { - DettPraticaServiceUtil.sendToVersioning(dettPratica.getDettPraticaId(), - dettPratica.getCompanyId()); - } catch (Exception e) { - _log.error("Error", e); - } finally { - PermissionThreadLocal.setPermissionChecker(null); - PrincipalThreadLocal.setName(null); - } - } - } - } - } - } } catch (SystemException e) { _log.error("Error", e); } finally { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java index ee5bd341..c8031fe5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java @@ -499,29 +499,35 @@ public class DettPraticaLocalServiceClpInvoker { "long", "java.lang.String", "java.lang.String" }; - _methodName277 = "sendToVersioning"; + _methodName277 = "getDettPraticaFields"; - _methodParameterTypes277 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes277 = new String[] { }; - _methodName278 = "getNumeroDiVersioni"; + _methodName278 = "getVersioni"; - _methodParameterTypes278 = new String[] { "java.lang.String" }; + _methodParameterTypes278 = new String[] { "long" }; - _methodName279 = "getVersionNumber"; + _methodName279 = "callForChanges"; - _methodParameterTypes279 = new String[] { "java.lang.String", "int" }; + _methodParameterTypes279 = new String[] { "long" }; - _methodName281 = "callForChanges"; + _methodName280 = "isNumber"; - _methodParameterTypes281 = new String[] { "java.lang.String" }; + _methodParameterTypes280 = new String[] { "java.lang.String" }; + + _methodName281 = "format"; + + _methodParameterTypes281 = new String[] { + "java.lang.String", "java.io.Serializable" + }; _methodName282 = "countVariateByIntPratica"; _methodParameterTypes282 = new String[] { "long" }; - _methodName283 = "getFirstCompletedByIntPratica"; + _methodName284 = "getFirstCompletedByIntPratica"; - _methodParameterTypes283 = new String[] { "long" }; + _methodParameterTypes284 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -1384,26 +1390,28 @@ public class DettPraticaLocalServiceClpInvoker { if (_methodName277.equals(name) && Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { - DettPraticaLocalServiceUtil.sendToVersioning(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1]); - - return null; + return DettPraticaLocalServiceUtil.getDettPraticaFields(); } if (_methodName278.equals(name) && Arrays.deepEquals(_methodParameterTypes278, parameterTypes)) { - return DettPraticaLocalServiceUtil.getNumeroDiVersioni((java.lang.String)arguments[0]); + return DettPraticaLocalServiceUtil.getVersioni(((Long)arguments[0]).longValue()); } if (_methodName279.equals(name) && Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { - return DettPraticaLocalServiceUtil.getVersionNumber((java.lang.String)arguments[0], - ((Integer)arguments[1]).intValue()); + return DettPraticaLocalServiceUtil.callForChanges(((Long)arguments[0]).longValue()); + } + + if (_methodName280.equals(name) && + Arrays.deepEquals(_methodParameterTypes280, parameterTypes)) { + return DettPraticaLocalServiceUtil.isNumber((java.lang.String)arguments[0]); } if (_methodName281.equals(name) && Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { - return DettPraticaLocalServiceUtil.callForChanges((java.lang.String)arguments[0]); + return DettPraticaLocalServiceUtil.format((java.lang.String)arguments[0], + (java.io.Serializable)arguments[1]); } if (_methodName282.equals(name) && @@ -1411,8 +1419,8 @@ public class DettPraticaLocalServiceClpInvoker { return DettPraticaLocalServiceUtil.countVariateByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName283.equals(name) && - Arrays.deepEquals(_methodParameterTypes283, parameterTypes)) { + if (_methodName284.equals(name) && + Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { return DettPraticaLocalServiceUtil.getFirstCompletedByIntPratica(((Long)arguments[0]).longValue()); } @@ -1579,10 +1587,12 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes278; private String _methodName279; private String[] _methodParameterTypes279; + private String _methodName280; + private String[] _methodParameterTypes280; private String _methodName281; private String[] _methodParameterTypes281; private String _methodName282; private String[] _methodParameterTypes282; - private String _methodName283; - private String[] _methodParameterTypes283; + private String _methodName284; + private String[] _methodParameterTypes284; } \ 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/base/DettPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java index 529b14a6..afcc858d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java @@ -186,21 +186,27 @@ public class DettPraticaServiceClpInvoker { "long", "java.lang.String", "java.lang.String" }; - _methodName214 = "getNumeroDiVersioni"; + _methodName214 = "getDettPraticaFields"; - _methodParameterTypes214 = new String[] { "long", "long" }; + _methodParameterTypes214 = new String[] { }; - _methodName215 = "getJsonVersion"; + _methodName215 = "getVersioni"; - _methodParameterTypes215 = new String[] { "long", "long", "int" }; + _methodParameterTypes215 = new String[] { "long" }; _methodName216 = "callForChanges"; - _methodParameterTypes216 = new String[] { "long", "long", "int" }; + _methodParameterTypes216 = new String[] { "long" }; - _methodName217 = "sendToVersioning"; + _methodName217 = "isNumber"; - _methodParameterTypes217 = new String[] { "long", "long" }; + _methodParameterTypes217 = new String[] { "java.lang.String" }; + + _methodName218 = "format"; + + _methodParameterTypes218 = new String[] { + "java.lang.String", "java.io.Serializable" + }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -563,30 +569,28 @@ public class DettPraticaServiceClpInvoker { if (_methodName214.equals(name) && Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { - return DettPraticaServiceUtil.getNumeroDiVersioni(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); + return DettPraticaServiceUtil.getDettPraticaFields(); } if (_methodName215.equals(name) && Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { - return DettPraticaServiceUtil.getJsonVersion(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - ((Integer)arguments[2]).intValue()); + return DettPraticaServiceUtil.getVersioni(((Long)arguments[0]).longValue()); } if (_methodName216.equals(name) && Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { - return DettPraticaServiceUtil.callForChanges(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - ((Integer)arguments[2]).intValue()); + return DettPraticaServiceUtil.callForChanges(((Long)arguments[0]).longValue()); } if (_methodName217.equals(name) && Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { - DettPraticaServiceUtil.sendToVersioning(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); + return DettPraticaServiceUtil.isNumber((java.lang.String)arguments[0]); + } - return null; + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + return DettPraticaServiceUtil.format((java.lang.String)arguments[0], + (java.io.Serializable)arguments[1]); } throw new UnsupportedOperationException(); @@ -644,4 +648,6 @@ public class DettPraticaServiceClpInvoker { private String[] _methodParameterTypes216; private String _methodName217; private String[] _methodParameterTypes217; + private String _methodName218; + private String[] _methodParameterTypes218; } \ 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/http/DettPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java index 7ddc1711..e69de29b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java @@ -1,688 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -package it.tref.liferay.portos.bo.service.http; - -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; - -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; - -import java.rmi.RemoteException; - -/** - * Provides the SOAP utility for the - * {@link it.tref.liferay.portos.bo.service.DettPraticaServiceUtil} service utility. The - * static methods of this class calls the same methods of the service utility. - * However, the signatures are different because it is difficult for SOAP to - * support certain types. - * - *

- * ServiceBuilder follows certain rules in translating the methods. For example, - * if the method in the service utility returns a {@link java.util.List}, that - * is translated to an array of {@link it.tref.liferay.portos.bo.model.DettPraticaSoap}. - * If the method in the service utility returns a - * {@link it.tref.liferay.portos.bo.model.DettPratica}, that is translated to a - * {@link it.tref.liferay.portos.bo.model.DettPraticaSoap}. Methods that SOAP cannot - * safely wire are skipped. - *

- * - *

- * The benefits of using the SOAP utility is that it is cross platform - * compatible. SOAP allows different languages like Java, .NET, C++, PHP, and - * even Perl, to call the generated services. One drawback of SOAP is that it is - * slow because it needs to serialize all calls into a text format (XML). - *

- * - *

- * You can see a list of services at http://localhost:8080/api/axis. Set the - * property axis.servlet.hosts.allowed in portal.properties to configure - * security. - *

- * - *

- * The SOAP utility is only generated for remote services. - *

- * - * @author Davide Barbagallo, 3F Consulting - * @see DettPraticaServiceHttp - * @see it.tref.liferay.portos.bo.model.DettPraticaSoap - * @see it.tref.liferay.portos.bo.service.DettPraticaServiceUtil - * @generated - */ -public class DettPraticaServiceSoap { - public static it.tref.liferay.portos.bo.model.DettPraticaSoap getDettPratica( - long dettPraticaId) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap addDettPratica( - long territorioId, java.lang.String tipoProcedura, - com.liferay.portal.service.ServiceContext serviceContext) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.addDettPratica(territorioId, - tipoProcedura, serviceContext); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap addDettPraticaToIntPratica( - long intPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.addDettPraticaToIntPratica(intPraticaId, - serviceContext); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap addDettPraticaClonedToIntPratica( - long intPraticaId, long dettPraticaToCloneId, - java.lang.String tipoIntegrazione, - com.liferay.portal.service.ServiceContext serviceContext) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica(intPraticaId, - dettPraticaToCloneId, tipoIntegrazione, serviceContext); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap getLastEditableByIntPratica( - long intPraticaId) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap deleteDettPratica( - it.tref.liferay.portos.bo.model.DettPraticaSoap dettPratica) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.deleteDettPratica(it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl.toModel( - dettPratica)); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap deleteDettPratica( - long dettPraticaId) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.deleteDettPratica(dettPraticaId); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updateDettPraticaSoggetti( - long userId, long dettPraticaId, long intPraticaId, - java.lang.String codiceFiscaleDelegatoCommittente, - java.lang.String codiceFiscaleDelegatoFineLavori, - java.lang.String codiceFiscaleDelegatoCollaudo, - com.liferay.portal.service.ServiceContext serviceContext) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updateDettPraticaSoggetti(userId, - dettPraticaId, intPraticaId, - codiceFiscaleDelegatoCommittente, - codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, serviceContext); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updateDettPratica( - long userId, long dettPraticaId, long intPraticaId, long integrazione, - java.lang.String protocollo, java.lang.String tipoIntegrazione, - boolean completa, boolean gestita, java.lang.String codicePagamento, - java.lang.String causalePagamento, java.lang.String mezzoPagamento, - java.lang.String importoBolli, - java.lang.String importoSpeseIstruttoria, - java.util.Date dataEffettuazione, int statusTask, - boolean workflowForzato, long soggettoSostituitoId, - java.lang.String destinazione, java.lang.String ag, - java.lang.String descLongIntervento, java.lang.String via, - java.lang.String localita, java.lang.String estremiCatastali, - java.lang.String estremiPratCom, long variataDa, long varianteNumero, - boolean varianteSostanziale, boolean operaConforme, - boolean collaudoStatico, - java.lang.String codiceFiscaleDelegatoCommittente, - java.lang.String codiceFiscaleDelegatoFineLavori, - java.lang.String codiceFiscaleDelegatoCollaudo, - java.lang.String codiceRuoloDelegato, - boolean lavoriInEconomiaCommittente, - boolean inizioLavoriContestualeOpera, - java.util.Date dataInizioLavoriOpera, - java.util.Date dataInizioEsecuzioneOpera, - java.util.Date dataFineEsecuzioneOpera, java.lang.String metratura, - boolean lavoriPubblici, long pagamentoId, - int lavoriPubbliciPercentuale, java.lang.String numeroCivico, - java.lang.String dcParticelle, java.lang.String dcFoglio, - java.lang.String dcAllegato, java.lang.String dePiani, - java.lang.String deAltezza, java.lang.String deInterrati, - java.lang.String deSuperficie, java.lang.String deCostruzione, - java.lang.String deRistrutturazione, java.lang.String deUso, - java.lang.String dePubblica, java.lang.String dePrivata, - java.lang.String deUtilizzazione, java.lang.String dePosizioneEdificio, - boolean deInfStradalePonte, boolean deInfStradaleStrada, - boolean deInfStradaleAltro, boolean deInfIdraulicaLong, - boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, - boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, - boolean deInfOperaAccAltro, boolean deInfAltraInfrastruttura, - boolean deInfAltro, java.lang.String deInfAltroDesc, - java.lang.String dccFondazioni, - boolean dccStruttureEleMuraturePietrame, - boolean dccStruttureEleMuratureLaterizio, - boolean dccStruttureEleMuratureMisto, - boolean dccStruttureEleMuratureStoriche, - java.lang.String dccStruttureEleAcciaio, - java.lang.String dccStruttureEleCA, - java.lang.String dccStruttureEleLegno, boolean dccStruttureEleMistoCA, - boolean dccStruttureEleMistoAcciaio, - boolean dccStruttureEleMistoMuratura, - boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - java.lang.String dccStruttureEleAltroDescrizione, - boolean dccOrizzontamentiCAAcciaio, boolean dccOrizzontamentiLegno, - boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, - boolean dccOrizzontamentiVolte, boolean dccOrizzontamentiAltro, - java.lang.String dccOrizzontamentiAltroDescrizione, - java.lang.String dccCopertura, boolean dccCoperturaCAAcciaio, - boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, - boolean dccCoperturaAltro, - java.lang.String dccCoperturaAltroDesrizione, - boolean dccElemNonStrutLaterizio, boolean dccElemNonStrutCartongesso, - boolean dccElemNonStrutCalcestruzzo, boolean dccElemNonStrutLegno, - boolean dccElemNonStrutAltro, - java.lang.String dccElemNonStrutAltroDescrizione, - boolean dccOpereDiRinforzoInsCatene, - boolean dccOpereDiRinforzoInsCordoli, - boolean dccOpereDiRinforzoIniArmate, - boolean dccOpereDiRinforzoPlaccaggi, - boolean dccOpereDiRinforzoIrrSolai, - boolean dccOpereDiRinforzoRinforziFRP, - boolean dccOpereDiRinforzoTelaiECerchiature, - boolean dccOpereDiRinforzoInsRompitratta, - boolean dccOpereDiRinforzoAltro, - java.lang.String dccOpereDiRinforzoAltroDescrizione, - java.lang.String geoClasseIndagine, - java.lang.String geoCategoriaSottosuolo, - java.lang.String geoCategoriaTopografica, - java.lang.String geoConsolidamento, - java.lang.String geoPericolositaGeologica, - java.lang.String geoRischioGeomorfologicoPai, - java.lang.String geoPericolositaIdraulicaPai, - java.lang.String geoRischioIdraulicoPai, - java.lang.String geoPericolositaSismica, - java.lang.String geoPericolositaIdraulica, - java.lang.String geoPericolositaGeomorfica, - java.lang.String geoFattibilitaGeologica, - java.lang.String geoFattibilitaSismica, - java.lang.String geoFattibilitaIdraulica, - java.lang.String geoOperaRilevante, - java.lang.String geoOpereDiSostegno, - java.lang.String geoOpereInSotterranea, - java.lang.String geoPresenzaPrescrizioni, - java.lang.String geoNotePrescrizioni, java.lang.String geoNoteIndagini, - java.lang.String geoEvidenzeGeomorfiche, - java.lang.String geoEvidenzeGeologiche, java.util.Date geoDtRelazione, - boolean pagNuoveCostruzioni, int pagAdeguamentoSismico, - int pagMiglioramentoSismico, boolean pagRiparazioneInterventoLocale, - int pagNuovaCostruzione, boolean pagVarianti, int pagAltro, - boolean pagMiglioramentoSismicoSicilia, - java.lang.String pagCalcolatoAdeguamentoSismico, - java.lang.String pagCalcolatoMiglioramentoSismico, - java.lang.String pagCalcolatoRiparazioneInterventoLocale, - java.lang.String pagCalcolatoOperaNonQuantificabile, - java.lang.String pagEffettivoAdeguamentoSismico, - java.lang.String pagEffettivoMiglioramentoSismico, - java.lang.String pagEffettivoRiparazioneInterventoLocale, - java.lang.String pagEffettivoOperaNonQuantificabile, - java.lang.String pagNoteUtente, java.lang.String note, - java.lang.String noteUfficio, - java.lang.String localizzazioneGeografica, boolean tcNuovaCostruzione, - boolean tcAdeguamentoSismico, boolean tcMiglioramentoSismico, - boolean tcRiparazioneInterventoLocale, boolean tcInCA, - boolean tcInOpera, boolean tcPrefabbricato, boolean tcInAcciaio, - boolean tcMista, boolean tcInMuratura, boolean tcInMuraturaOrdinaria, - boolean tcInMuraturaArmata, boolean tcInMuraturaMista, - boolean tcInLegno, boolean tcAltro, - java.lang.String tcAltroDescrizione, boolean tcConDispositivi, - boolean normLavoriInProprio, boolean normEsenteBollo, - boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, - boolean normDpr01Aut, boolean normDpr02Aut, boolean normDm01, - boolean normDm02, boolean normDm03, boolean normDm2018, - boolean normDprg01, boolean normDprg02, boolean normAnr, - boolean normArt3com3, boolean normArt3com4, boolean normOrd01, - boolean normDm04, boolean normDm05, boolean normCI01, - boolean normLTC01, boolean suap, boolean normSismaBonus, - java.lang.String clRischioPreInt, java.lang.String clRischioPostInt, - boolean intervFinPub, java.lang.String intervFinPubDesc, - boolean tcNuovaCostruzioneComplessa, - com.liferay.portal.service.ServiceContext serviceContext, - boolean bozza, boolean disabledSubmit, boolean geoDisabledSubmit) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updateDettPratica(userId, - dettPraticaId, intPraticaId, integrazione, protocollo, - tipoIntegrazione, completa, gestita, codicePagamento, - causalePagamento, mezzoPagamento, importoBolli, - importoSpeseIstruttoria, dataEffettuazione, statusTask, - workflowForzato, soggettoSostituitoId, destinazione, ag, - descLongIntervento, via, localita, estremiCatastali, - estremiPratCom, variataDa, varianteNumero, - varianteSostanziale, operaConforme, collaudoStatico, - codiceFiscaleDelegatoCommittente, - codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, - lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, - dataInizioLavoriOpera, dataInizioEsecuzioneOpera, - dataFineEsecuzioneOpera, metratura, lavoriPubblici, - pagamentoId, lavoriPubbliciPercentuale, numeroCivico, - dcParticelle, dcFoglio, dcAllegato, dePiani, deAltezza, - deInterrati, deSuperficie, deCostruzione, - deRistrutturazione, deUso, dePubblica, dePrivata, - deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, - deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, - deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, - dccFondazioni, dccStruttureEleMuraturePietrame, - dccStruttureEleMuratureLaterizio, - dccStruttureEleMuratureMisto, - dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - dccStruttureEleCA, dccStruttureEleLegno, - dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, - dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, - dccStruttureEleAltroDescrizione, - dccOrizzontamentiCAAcciaio, dccOrizzontamentiLegno, - dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, - dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, - dccCoperturaCAAcciaio, dccCoperturaLegno, - dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, - dccCoperturaPannelli, dccCoperturaPVCTelonati, - dccCoperturaLeggere, dccCoperturaAltro, - dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, - dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, - dccElemNonStrutLegno, dccElemNonStrutAltro, - dccElemNonStrutAltroDescrizione, - dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, - dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, - dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, - dccOpereDiRinforzoAltroDescrizione, geoClasseIndagine, - geoCategoriaSottosuolo, geoCategoriaTopografica, - geoConsolidamento, geoPericolositaGeologica, - geoRischioGeomorfologicoPai, geoPericolositaIdraulicaPai, - geoRischioIdraulicoPai, geoPericolositaSismica, - geoPericolositaIdraulica, geoPericolositaGeomorfica, - geoFattibilitaGeologica, geoFattibilitaSismica, - geoFattibilitaIdraulica, geoOperaRilevante, - geoOpereDiSostegno, geoOpereInSotterranea, - geoPresenzaPrescrizioni, geoNotePrescrizioni, - geoNoteIndagini, geoEvidenzeGeomorfiche, - geoEvidenzeGeologiche, geoDtRelazione, pagNuoveCostruzioni, - pagAdeguamentoSismico, pagMiglioramentoSismico, - pagRiparazioneInterventoLocale, pagNuovaCostruzione, - pagVarianti, pagAltro, pagMiglioramentoSismicoSicilia, - pagCalcolatoAdeguamentoSismico, - pagCalcolatoMiglioramentoSismico, - pagCalcolatoRiparazioneInterventoLocale, - pagCalcolatoOperaNonQuantificabile, - pagEffettivoAdeguamentoSismico, - pagEffettivoMiglioramentoSismico, - pagEffettivoRiparazioneInterventoLocale, - pagEffettivoOperaNonQuantificabile, pagNoteUtente, note, - noteUfficio, localizzazioneGeografica, tcNuovaCostruzione, - tcAdeguamentoSismico, tcMiglioramentoSismico, - tcRiparazioneInterventoLocale, tcInCA, tcInOpera, - tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, - tcInMuraturaOrdinaria, tcInMuraturaArmata, - tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, - tcConDispositivi, normLavoriInProprio, normEsenteBollo, - normEsenteSpese, normDpr01Dep, normDpr02Dep, normDpr01Aut, - normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, - normDprg01, normDprg02, normAnr, normArt3com3, - normArt3com4, normOrd01, normDm04, normDm05, normCI01, - normLTC01, suap, normSismaBonus, clRischioPreInt, - clRischioPostInt, intervFinPub, intervFinPubDesc, - tcNuovaCostruzioneComplessa, serviceContext, bozza, - disabledSubmit, geoDisabledSubmit); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap fetchDettPratica( - long dettPraticaId) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.fetchDettPratica(dettPraticaId); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap getLastCompletedByIntPratica( - long intPraticaId) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap getLastdByIntPraticaAndTipoPratica( - long intPraticaId, java.util.List tipoPratiche) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.getLastdByIntPraticaAndTipoPratica(intPraticaId, - tipoPratiche); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap getLastEditabledByIntPraticaAndTipoPratica( - long intPraticaId, java.util.List tipoPratiche) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, - tipoPratiche); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap[] findCompletedByIntPraticaAndTipoPratica( - long intPraticaId, java.util.List tipoPratiche) - throws RemoteException { - try { - java.util.List returnValue = - DettPraticaServiceUtil.findCompletedByIntPraticaAndTipoPratica(intPraticaId, - tipoPratiche); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModels(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static int countCompletedByIntPraticaAndTipoPratica( - long intPraticaId, java.util.List tipoPratiche) - throws RemoteException { - try { - int returnValue = DettPraticaServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, - tipoPratiche); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap pagaInvia( - long dettPraticaId, int pagAdeguamentoSismico, int pagAltro, - int pagMiglioramentoSismico, int pagNuovaCostruzione, - boolean pagNuoveCostruzioni, boolean pagRiparazioneInterventoLocale, - boolean pagVarianti, java.lang.String importoSpeseIstruttoria, - boolean pagMiglioramentoSismicoSicilia, - java.lang.String pagCalcolatoAdeguamentoSismico, - java.lang.String pagCalcolatoMiglioramentoSismico, - java.lang.String pagCalcolatoRiparazioneInterventoLocale, - java.lang.String pagCalcolatoOperaNonQuantificabile, - java.lang.String pagEffettivoAdeguamentoSismico, - java.lang.String pagEffettivoMiglioramentoSismico, - java.lang.String pagEffettivoRiparazioneInterventoLocale, - java.lang.String pagEffettivoOperaNonQuantificabile, - java.lang.String pagNoteUtente, - java.lang.String codiceFiscaleCommittente, java.lang.String currentURL, - com.liferay.portal.service.ServiceContext serviceContext) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.pagaInvia(dettPraticaId, - pagAdeguamentoSismico, pagAltro, pagMiglioramentoSismico, - pagNuovaCostruzione, pagNuoveCostruzioni, - pagRiparazioneInterventoLocale, pagVarianti, - importoSpeseIstruttoria, pagMiglioramentoSismicoSicilia, - pagCalcolatoAdeguamentoSismico, - pagCalcolatoMiglioramentoSismico, - pagCalcolatoRiparazioneInterventoLocale, - pagCalcolatoOperaNonQuantificabile, - pagEffettivoAdeguamentoSismico, - pagEffettivoMiglioramentoSismico, - pagEffettivoRiparazioneInterventoLocale, - pagEffettivoOperaNonQuantificabile, pagNoteUtente, - codiceFiscaleCommittente, currentURL, serviceContext); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updateCheckPagamenti( - long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) - throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updateCheckPagamenti(dettPraticaId, - normEsenteSpese, normEsenteBollo); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updateEsito( - long dettPraticaId, int stato) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updateEsito(dettPraticaId, - stato); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updateEsitoIntegrazione( - long dettPraticaId, int stato) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updateEsitoIntegrazione(dettPraticaId, - stato); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.DettPraticaSoap updatePrincipale( - long dettPraticaId, java.lang.String codiceFiscale, - java.lang.String tipologiaSoggetto) throws RemoteException { - try { - it.tref.liferay.portos.bo.model.DettPratica returnValue = DettPraticaServiceUtil.updatePrincipale(dettPraticaId, - codiceFiscale, tipologiaSoggetto); - - return it.tref.liferay.portos.bo.model.DettPraticaSoap.toSoapModel(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static int getNumeroDiVersioni(long intPraticaId, long companyId) - throws RemoteException { - try { - int returnValue = DettPraticaServiceUtil.getNumeroDiVersioni(intPraticaId, - companyId); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static java.lang.String getJsonVersion(long intPraticaId, - long companyId, int version) throws RemoteException { - try { - java.lang.String returnValue = DettPraticaServiceUtil.getJsonVersion(intPraticaId, - companyId, version); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static java.lang.String callForChanges(long intPraticaId, - long companyId, int version) throws RemoteException { - try { - java.lang.String returnValue = DettPraticaServiceUtil.callForChanges(intPraticaId, - companyId, version); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static void sendToVersioning(long dettPraticaId, long companyId) - throws RemoteException { - try { - DettPraticaServiceUtil.sendToVersioning(dettPraticaId, companyId); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - private static Log _log = LogFactoryUtil.getLog(DettPraticaServiceSoap.class); -} \ 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/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 138a02a2..1c030279 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 @@ -12,7 +12,6 @@ package it.tref.liferay.portos.bo.service.impl; -import it.mwg.sismica.bo.util.HttpServiceUtil; import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.ControlloPratica; @@ -23,6 +22,7 @@ import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Tempistica; +import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.DettPraticaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; @@ -32,18 +32,20 @@ import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.bo.util.PagamentiUtil; -import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.TempisticaConstants; import it.tref.liferay.portos.bo.util.WorkflowConstants; import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.io.IOException; +import java.io.Serializable; import java.math.BigDecimal; +import java.sql.Types; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; - -import javax.servlet.http.HttpServletResponse; +import java.util.Map; import com.liferay.portal.kernel.dao.orm.Disjunction; import com.liferay.portal.kernel.dao.orm.DynamicQuery; @@ -53,9 +55,10 @@ import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONArray; +import com.liferay.portal.kernel.json.JSONDeserializer; 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; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -70,8 +73,6 @@ import com.liferay.portal.kernel.search.SearchContext; import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; import com.liferay.portal.kernel.util.GetterUtil; -import com.liferay.portal.kernel.util.Http.Options; -import com.liferay.portal.kernel.util.HttpUtil; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; @@ -1610,16 +1611,15 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List findByPagamentoId(long pagamentoId) throws SystemException { DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); - Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); disjunction.add(RestrictionsFactoryUtil.eq("pagamentoIdOneri", pagamentoId)); disjunction.add(RestrictionsFactoryUtil.eq("pagamentoIdBolli", pagamentoId)); dynamicQuery.add(disjunction); - return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery); } @@ -1653,70 +1653,188 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPratica; } + private static final List dettPraticaFields; + private static final Map dettPraticaFieldsTypes; + static { + @SuppressWarnings("serial") + List hiddenFields = new ArrayList() { + { + add("causalePagamentoBolli"); + add("causalePagamentoOneri"); + add("codiceFiscaleDelegato"); + add("codicePagamentoBolli"); + add("codicePagamentoOneri"); + add("codiceRuoloDelegato"); + add("companyId"); + add("completa"); + add("createDate"); + add("dataEffettuazione"); + add("dettPraticaId"); + add("dtInvioSignal"); + add("dtProtocollo"); + add("geoDtRelazione"); + add("gestita"); + add("groupId"); + add("importoBolli"); + add("importoSpeseIstruttoria"); + add("integrazione"); + add("intPraticaId"); + add("mezzoPagamentoBolli"); + add("mezzoPagamentoOneri"); + add("modifiedDate"); + add("pagAdeguamentoSismico"); + add("pagAltro"); + add("pagamentoIdBolli"); + add("pagamentoIdOneri"); + add("pagCalcolatoAdeguamentoSismico"); + add("pagCalcolatoMiglioramentoSismico"); + add("pagCalcolatoOperaNonQuantificabile"); + add("pagCalcolatoRiparazioneInterventoLocale"); + add("pagEffettivoAdeguamentoSismico"); + add("pagEffettivoMiglioramentoSismico"); + add("pagEffettivoOperaNonQuantificabile"); + add("pagEffettivoRiparazioneInterventoLocale"); + add("pagMiglioramentoSismico"); + add("pagMiglioramentoSismicoSicilia"); + add("pagNoteUtente"); + add("pagNuovaCostruzione"); + add("pagOperaNonQuantificabile"); + add("pagRiparazioneInterventoLocale"); + add("pagVarianti"); + add("protocollo"); + add("soggettoSostituitoId"); + add("status"); + add("statusByUserId"); + add("statusByUserName"); + add("statusDate"); + add("statusTask"); + add("tipoIntegrazione"); + add("uuid_"); + add("userId"); + add("userName"); + add("varianteNumero"); + add("varianteSostanziale"); + add("variataDa"); + add("version"); + add("versionata"); + add("workflowForzato"); + } + }; + dettPraticaFields = new ArrayList<>(); + dettPraticaFieldsTypes = new HashMap<>(); + for (int i = 0; i < DettPraticaImpl.TABLE_COLUMNS.length; i++) { + String field = (String) DettPraticaImpl.TABLE_COLUMNS[i][0]; + if (!hiddenFields.contains(field)) { + dettPraticaFields.add(field); + } + dettPraticaFieldsTypes.put(field, (int) DettPraticaImpl.TABLE_COLUMNS[i][1]); + } + } + @Override - public void sendToVersioning(long dettPraticaId, String url) throws Exception { + public List getDettPraticaFields() { - DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); - String jsonToVersioning = dettPratica.serializeToVersioning(); - JSONObject response = HttpServiceUtil.postJson(url, jsonToVersioning); - int version = response.getInt("version"); - dettPratica.setVersion(version); - dettPratica.setVersionata(true); - dettPraticaLocalService.updateDettPratica(dettPratica); + return dettPraticaFields; } @Override - public int getNumeroDiVersioni(String url) throws IOException, PortalException, SystemException { - - Options options = new Options(); - options.setLocation(url); - options.setPost(false); - String responseBody = HttpUtil.URLtoString(options); - if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK) { - return Integer.parseInt(responseBody); - } else { - _log.error(options.getLocation() + ": " + options.getResponse().getResponseCode()); - } - return 0; + @SuppressWarnings("unchecked") + public List getVersioni(long intPraticaId) throws SystemException { + + DynamicQuery query = queryVersioning(intPraticaId); + query.addOrder(OrderFactoryUtil.asc("dettPraticaId")); + return dettPraticaPersistence.findWithDynamicQuery(query); } @Override - public String getVersionNumber(String url, int version) throws IOException, PortalException, SystemException { - - String response = callToVersion(url); - JSONObject jsonObjectResponse = JSONFactoryUtil.createJSONObject(response); - JSONObject snapshot = jsonObjectResponse.getJSONObject("Snapshot"); - int responseVersion = snapshot.getInt("version"); - if (responseVersion != version) { - _log.error("Le versioni non corrispondono " + responseVersion + StringPool.FORWARD_SLASH + version); + public List> callForChanges(long intPraticaId) throws SystemException { + + DynamicQuery query = queryVersioning(intPraticaId); + query.addOrder(OrderFactoryUtil.asc("dettPraticaId")); + @SuppressWarnings("unchecked") + List lista = dettPraticaPersistence.findWithDynamicQuery(query); + int size = lista.size(); + List> versions = new ArrayList<>(size); + List> changes = new ArrayList<>(size); + JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer(); + JSONDeserializer> deserializer = JSONFactoryUtil.createJSONDeserializer(); + for (int i = 0; i < size; i++) { + versions.add(deserializer.deserialize(serializer.serialize(lista.get(i)))); + changes.add(new HashMap()); } - JSONObject jsonFields = snapshot.getJSONObject("fields"); - for (String hiddenField : PraticaUtil.getDettPraticaHiddenFields()) { - jsonFields.remove(hiddenField); + for (String field : dettPraticaFields) { + Serializable v0 = null == versions.get(0).get(field) ? StringPool.BLANK : versions.get(0).get(field); + boolean changed = false; + for (int i = 1; i < size; i++) { + Serializable v1 = null == versions.get(i).get(field) ? StringPool.BLANK : versions.get(i).get(field); + if (!v1.equals(v0)) { + changed = true; + break; + } + } + if (changed) { + for (int i = 0; i < versions.size(); i++) { + Serializable v = null == versions.get(i).get(field) ? StringPool.BLANK : versions.get(i).get(field); + changes.get(i).put(field, v); + } + } } - return jsonFields.toString(); + return changes; } - private String callToVersion(String versioningURL) throws IOException { + @Override + public boolean isNumber(String field) { - Options options = new Options(); - options.setLocation(versioningURL); - options.setPost(false); - String responseBody = HttpUtil.URLtoString(options); - if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK) { - return responseBody; - } else { - _log.error(options.getLocation() + ": " + options.getResponse().getResponseCode()); + switch (dettPraticaFieldsTypes.get(field)) { + case Types.BOOLEAN: + case Types.TIMESTAMP: + return false; + case Types.VARCHAR: + switch (field) { + case "importoSpeseIstruttoria": + return true; + } + return false; + case Types.BIGINT: + case Types.DOUBLE: + case Types.INTEGER: + return true; + default: + _log.info(dettPraticaFieldsTypes.get(field)); } - return StringPool.BLANK; + return true; } @Override - public JSONArray callForChanges(String url) throws IOException, PortalException, SystemException { - - String response = callToVersion(url); - JSONArray jsonArray = JSONFactoryUtil.createJSONObject(response).getJSONArray("values"); - return jsonArray; + public String format(String field, Serializable value) { + + switch (dettPraticaFieldsTypes.get(field)) { + case Types.BOOLEAN: + return (Boolean) value ? "Sì" : "No"; + case Types.TIMESTAMP: + Date dt; + if (value instanceof Long) { + dt = new Date((Long) value); + } else if (value instanceof String) { + String s = (String) value; + if (s.isEmpty()) { + return s; + } + dt = new Date(Long.parseLong(s)); + } else { + return "{{{{{{{" + value + "}}}}}}}"; + } + return FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(dt); + case Types.VARCHAR: + return (String) value; + case Types.BIGINT: + case Types.DOUBLE: + case Types.INTEGER: + return NumberFormat.getInstance().format(value); + default: + _log.info(dettPraticaFieldsTypes.get(field)); + return "XXXXXXXXXXXXX"; + } } @Override @@ -1725,6 +1843,14 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione(intPraticaId, TipoIntegrazioneUtil.VARIANTE); } + private DynamicQuery queryVersioning(long intPraticaId) { + DynamicQuery query = dynamicQuery(); + query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + query.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_APPROVED)); + query.add(RestrictionsFactoryUtil.ne("tipoIntegrazione", TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); + return query; + } + // ADT: nuovo metodo per stampa fascicolo @Override public DettPratica getFirstCompletedByIntPratica(long intPraticaId) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 1ea652fd..4a244e4a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -19,21 +19,17 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.DettPraticaServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.DettPraticaEntryPermission; import it.tref.liferay.portos.bo.service.permission.DettPraticaPermission; -import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.util.DelegheUtil; -import it.tref.liferay.portos.bo.util.PraticaUtil; import java.io.IOException; +import java.io.Serializable; import java.util.Date; import java.util.List; +import java.util.Map; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONArray; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.model.Company; import com.liferay.portal.security.permission.ActionKeys; -import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.ServiceContext; /** @@ -61,12 +57,14 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { * access the dett pratica remote service. */ + @Override public DettPratica getDettPratica(long dettPraticaId) throws PortalException, SystemException { DettPraticaEntryPermission.check(getPermissionChecker(), dettPraticaId, ActionKeys.VIEW); return dettPraticaLocalService.getDettPratica(dettPraticaId); } + @Override public DettPratica addDettPratica(long territorioId, String tipoProcedura, ServiceContext serviceContext) throws PortalException, SystemException { @@ -75,17 +73,20 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.addDettPratica(territorioId, tipoProcedura, serviceContext); } + @Override public DettPratica addDettPraticaToIntPratica(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { return dettPraticaLocalService.addDettPraticaToIntPratica(intPraticaId, serviceContext); } + @Override public DettPratica addDettPraticaClonedToIntPratica(long intPraticaId, long dettPraticaToCloneId, String tipoIntegrazione, ServiceContext serviceContext) throws PortalException, SystemException { return dettPraticaLocalService.addDettPraticaClonedToIntPratica(intPraticaId, dettPraticaToCloneId, tipoIntegrazione, serviceContext); } + @Override public DettPratica getLastEditableByIntPratica(long intPraticaId) throws PortalException, SystemException { DettPratica dettPratica = dettPraticaLocalService.getLastEditableByIntPratica(intPraticaId); @@ -96,16 +97,19 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPratica; } + @Override public DettPratica deleteDettPratica(DettPratica dettPratica) throws PortalException, SystemException { return dettPraticaLocalService.deleteDettPratica(dettPratica); } + @Override public DettPratica deleteDettPratica(long dettPraticaId) throws PortalException, SystemException { return dettPraticaLocalService.deleteDettPratica(dettPraticaId); } + @Override public DettPratica updateDettPraticaSoggetti(long userId, long dettPraticaId, long intPraticaId, String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, ServiceContext serviceContext) throws PortalException, @@ -116,6 +120,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { codiceFiscaleDelegatoCollaudo, serviceContext); } + @Override public DettPratica updateDettPratica(long userId, long dettPraticaId, long intPraticaId, long integrazione, String protocollo, String tipoIntegrazione, boolean completa, boolean gestita, String codicePagamento, String causalePagamento, String mezzoPagamento, String importoBolli, @@ -244,33 +249,39 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPratica; } + @Override public DettPratica fetchDettPratica(long dettPraticaId) throws SystemException { // TODO permessi return dettPraticaLocalService.fetchDettPratica(dettPraticaId); } + @Override public DettPratica getLastCompletedByIntPratica(long intPraticaId) throws SystemException { return dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId); } + @Override public DettPratica getLastdByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.getLastdByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } + @Override public DettPratica getLastEditabledByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } + @Override public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.findCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } + @Override public int countCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.countCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); @@ -294,6 +305,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { // } // } + @Override public DettPratica pagaInvia(long dettPraticaId, int pagAdeguamentoSismico, int pagAltro, int pagMiglioramentoSismico, int pagNuovaCostruzione, boolean pagNuoveCostruzioni, boolean pagRiparazioneInterventoLocale, boolean pagVarianti, String importoSpeseIstruttoria, @@ -316,11 +328,13 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { } + @Override public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) throws SystemException, PortalException { return dettPraticaLocalService.updateCheckPagamenti(dettPraticaId, normEsenteSpese, normEsenteBollo); } + @Override public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); @@ -328,6 +342,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.updateEsito(dettPraticaId, stato); } + @Override public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); @@ -335,92 +350,38 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.updateEsitoIntegrazione(dettPraticaId, stato); } - // public void sostituisciPagamento(long pagamentoId, long dettPraticaId, - // String - // codiceFiscaleCommittente, String mezzo, - // String url, ServiceContext serviceContext) throws PortalException, - // SystemException { - // - // DettPratica dettPratica = - // dettPraticaLocalService.getDettPratica(dettPraticaId); - // if (getUserId() == dettPratica.getUserId()) { - // dettPraticaLocalService.sostituisciPagamento(pagamentoId, dettPraticaId, - // codiceFiscaleCommittente, mezzo, url, - // serviceContext); - // } else { - // throw new - // SystemException("pagamento aggiornabile solo da titolare del dettPratica"); - // } - // - // } - + @Override public DettPratica updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { return dettPraticaLocalService.updatePrincipale(dettPraticaId, codiceFiscale, tipologiaSoggetto); } - public int getNumeroDiVersioni(long intPraticaId, long companyId) throws IOException, PortalException, - SystemException { - Company company = CompanyLocalServiceUtil.getCompany(companyId); - String shapshotsCountURL = (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT, false); - - shapshotsCountURL += intPraticaId; + @Override + public List getDettPraticaFields() { - return dettPraticaLocalService.getNumeroDiVersioni(shapshotsCountURL); + return dettPraticaLocalService.getDettPraticaFields(); } - public String getJsonVersion(long intPraticaId, long companyId, int version) throws PortalException, - SystemException, IOException { - - Company company = CompanyLocalServiceUtil.getCompany(companyId); - String shapshotsURL = (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS, false); - - shapshotsURL += intPraticaId + StringPool.FORWARD_SLASH + version; - - return dettPraticaLocalService.getVersionNumber(shapshotsURL, version); - + @Override + public List getVersioni(long intPraticaId) throws SystemException { + return dettPraticaLocalService.getVersioni(intPraticaId); } - public String callForChanges(long intPraticaId, long companyId, int version) throws IOException, - PortalException, SystemException { - Company company = CompanyLocalServiceUtil.getCompany(companyId); - String changesURL = (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES, false); - - changesURL += intPraticaId + StringPool.FORWARD_SLASH + "from" + StringPool.FORWARD_SLASH - + (version + 1); - - JSONArray changes = dettPraticaLocalService.callForChanges(changesURL); - - StringBuilder sb = new StringBuilder(); - sb.append(StringPool.OPEN_BRACKET); - - for (int i = 0; i < changes.length(); i++) { - - if (!PraticaUtil.getDettPraticaHiddenFields().contains( - changes.getJSONObject(i).getString("property"))) { - sb.append(StringPool.QUOTE).append(changes.getJSONObject(i).getString("property")) - .append(StringPool.QUOTE).append(StringPool.COMMA); - } - - } - if (sb.length() > 1) { - sb.setLength(sb.length() - 1); - } - sb.append(StringPool.CLOSE_BRACKET); - return sb.toString(); + @Override + public List> callForChanges(long intPraticaId) throws SystemException { + return dettPraticaLocalService.callForChanges(intPraticaId); } - public void sendToVersioning(long dettPraticaId, long companyId) throws Exception { + @Override + public boolean isNumber(String field) { - Company company = CompanyLocalServiceUtil.getCompany(companyId); - String commitURL = (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT, false); + return dettPraticaLocalService.isNumber(field); + } - dettPraticaLocalService.sendToVersioning(dettPraticaId, commitURL); + @Override + public String format(String field, Serializable value) { + return dettPraticaLocalService.format(field, value); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index b040f227..5c96356f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index b95c271d..38e33edc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 0b546e1a..02dcaba3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b0b64b21..4a23bffd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index 0b7f9ee2..f5b8166f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66507dd0..32809343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 48cf51eb..a4fa6f91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index 402cecd0..8c56fb32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index bf34f897..f35bff1b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 649a5476..c25ae1dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 42630357..255330f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 41c1b2be..15f0504f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index ad50d7ea..f80406ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 97842225..bb4019f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 8dbf29df..ee3b3b9b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..e4133c60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 29c4a390..ef2db5f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index ec8a983f..fc566b28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 78333501..0c095d3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 720078c4..252fc452 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index a9c7f7d5..c8e0dee9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/progettista_c.html b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/progettista_c.html index 97fd9b38..b74cc036 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/progettista_c.html +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/progettista_c.html @@ -54,6 +54,22 @@ «privi di rilevanza» nei riguardi della pubblica incolumità ai sensi dell’art. 94- bis, comma 1, lettera C; +##anteprima +
  • + ai sensi dell'art. 1, comma 9 lettera “e”, della legge n° 190/2012:
    + [{{!coniugio}}] di non trovarsi in rapporti di coniugio, parentela o affinità, del coniuge o del + convivente, entro il 2° grado, con i dirigenti e i dipendenti dell'Ufficio del Genio Civile deputati alla + trattazione del procedimento;
    + [{{coniugio}}] di trovarsi in rapporti di coniugio, parentela o affinità entro il 2° grado con i seguenti + dipendenti dell'Ufficio del Genio Civile: {{relazioni}} +
    • +## +##lavoripubblici +
  • + ai sensi dell'art. 36, comma 2, della L.R. 1/2019, che le spettanze correlate al proprio incarico sono state + regolarmente liquidate dal committente secondo quanto concordato in sede di affidamento dell'incarico; +
    • +##
  • di essere informato, ai sensi dell’art. 13 del Regolamento UE 2016/679, recepito con D.Lgs. 101/2018, circa le modalità di trattamento e l'utilizzo dei 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 051d88f5..9f018a2f 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=2600 - build.date=1620227802640 + build.number=2606 + build.date=1621003317014 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp index 4d504763..af247a96 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_versioning.jsp @@ -1,75 +1,144 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="com.liferay.portal.kernel.json.JSONArray"%> -<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> -<%@page import="com.liferay.portal.kernel.json.JSONObject"%> -<%@page import="com.liferay.portal.kernel.json.JSONFactoryUtil"%> -<%@page import="com.liferay.portal.kernel.json.JSONSerializer"%> -<%@ include file="/html/fascicolo/init.jsp" %> - -

    - +<%@include file="/html/fascicolo/init.jsp"%> +<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="java.io.Serializable"%> +<%@page import="java.util.ArrayList"%> +<%@page import="java.util.HashMap"%> +<%@page import="java.util.Map"%> + +

    <% - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l); - DettPratica dettPratica; - if(Validator.isNotNull(dettPraticaId)) { - dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - } else { - dettPratica = (DettPratica)request.getAttribute("bean.dettPratica.lastData"); - } - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); - if(intPratica == null){ - intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - } - -%> +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0L); +DettPratica dettPratica; +if (Validator.isNull(dettPraticaId)) { + dettPratica = (DettPratica) request.getAttribute("bean.dettPratica.lastData"); +} else { + dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); +} +IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica"); +if (Validator.isNull(intPratica)) { + intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); +} +long intPraticaId = intPratica.getIntPraticaId(); +List dps = DettPraticaServiceUtil.getVersioni(intPraticaId); +int size = dps.size(); +List> changes = DettPraticaServiceUtil.callForChanges(intPraticaId); +SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); +%>
    - -

    -
    -
    - -
    +
    + + + + + <% + for (int i = 0; i < size; i++) { + String tipoIntegrazione = dps.get(i).getTipoIntegrazione(); + %> + + <% + } + %> + + + + <% + if (size == 0) { + %> + + <% + } else { + for (String item : DettPraticaLocalServiceUtil.getDettPraticaFields()) { + if (changes.get(0).containsKey(item)) { + %> + + + <% + Serializable precedente = null; + for (Map values : changes) { + Serializable value = values.get(item); + String style = (precedente == null ? value == null : precedente.equals(value)) ? "color:#AAA" + : StringPool.BLANK; + %> + + <% + precedente = value; + } + %> + <% + } + } + } + %> + <% - JSONObject jsonObjectResponse = JSONFactoryUtil.createJSONObject(dettPratica.serializeToVersioningPage()); - JSONArray jsonFields = jsonObjectResponse.getJSONArray("fields"); - StringBuilder sb = new StringBuilder(); - for(int i=0;i") - .append(LanguageUtil.get(pageContext, item.replaceAll("([A-Z])", "-$1").toLowerCase())) - .append(": "); + Map> liste = new HashMap>(); + for (String codice : DocumentiPraticaUtil.getDocDomanda()) { + liste.clear(); + int nDocs = 0; + for (DocPratica doc : DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(intPraticaId, codice, QueryUtil.ALL_POS, + QueryUtil.ALL_POS)) { + if (doc.getClassName().equals(DettPratica.class.getName())) { + long classPk = doc.getClassPk(); + if (!liste.containsKey(classPk)) { + liste.put(classPk, new ArrayList()); + } + liste.get(classPk).add(doc); + nDocs++; + } } + if (nDocs > 0) { %> -
    -
    -

    Version #

    -
    -
    - <%= sb.toString() %> -
    -
    -
    -
    -

    Versione Corrente

    -
    -
    - <%= sb.toString() %> -
    -
    +     + + <% + for (DettPratica dp : dps) { + List lista = liste.get(dp.getDettPraticaId()); + %> + + <% + } + %> + + <% + } + } + %> +
    <%= tipoIntegrazione.isEmpty() ? "Pratica" + : LanguageUtil.get(pageContext, "label-integrazione-" + tipoIntegrazione) %>
    + del <%= sdf.format(dps.get(i).getDtProtocollo()) %>
    Nessuna differenza
    <%= LanguageUtil.get(pageContext, item.replaceAll("([A-Z])", "-$1").toLowerCase()) %><%= DettPraticaServiceUtil.format(item, value) %>
    <%= LanguageUtil.get(pageContext, "label-documenti-tipologia-" + codice) %> + <% + if (Validator.isNotNull(lista)) { + boolean separatore = false; + for (DocPratica doc : liste.get(dp.getDettPraticaId())) { + if (separatore) { + out.print("
    "); + } + %> + <%= doc.getFileName() %> + +
    + + + + + + +     +
    + <% + separatore = true; + } + } + %> +
    -
    - - - Liferay.Service( - '/portos-bo-portlet.dettpratica/get-numero-di-versioni', - { - intPraticaId: <%= intPratica.getIntPraticaId() %>, - companyId : <%= company.getCompanyId() %> - }, - function(obj) { - sliderVersion.init(obj, <%= intPratica.getIntPraticaId() %>, <%= company.getCompanyId() %>); - } - ); - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js index 04d12e7d..7068cde4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js @@ -1,114 +1 @@ -var versionamento = { - changes : [], - init:function(idPratica, company, lastVersion, currentVersion){ - var scope = this; -// console.log("lastVersion: "+lastVersion); -// console.log("currentVersion: "+currentVersion); - this.loadJsonVersion(idPratica, company, lastVersion, true); - if(currentVersion > 0){ - this.loadJsonVersion(idPratica, company, currentVersion, false); - setTimeout(function(){ - scope.getChanges(idPratica, company, currentVersion); - }, 300) - } else { - $('#_1_WAR_portosboportlet_version_number .version_body').html("

    Nessuna Versione precedente all'attuale

    ") - } - }, - sliderChange:function(idPratica, company, currentVersion){ - var scope = this; - this.loadJsonVersion(idPratica, company, currentVersion, false); - setTimeout(function(){ - scope.getChanges(idPratica, company, currentVersion); - }, 300) - }, - loadJsonVersion: function(idPratica, company, versionNumber, last) { - var scope = this; - Liferay.Service( - '/portos-bo-portlet.dettpratica/get-json-version', - { - intPraticaId: idPratica, - companyId : company, - version: versionNumber - }, - function(obj) { - var item = last ? "_1_WAR_portosboportlet_version_last" : "_1_WAR_portosboportlet_version_number"; - scope.updateHTML(JSON.parse(obj), item, last ? false : versionNumber); - } - ); - }, - getChanges: function(idPratica, company, versionNumber) { - var scope = this; - Liferay.Service( - '/portos-bo-portlet.dettpratica/call-for-changes', - { - intPraticaId: idPratica, - companyId : company, - version: versionNumber - }, - function(obj) { - var arr = JSON.parse(obj); - $("#_1_WAR_portosboportlet_version_number .version_item").removeClass("background-red") - $("#_1_WAR_portosboportlet_version_last .version_item").removeClass("background-green") - for( index in arr){ - var key = arr[index]; - var left = $("#_1_WAR_portosboportlet_version_number .item_"+key), - right = $("#_1_WAR_portosboportlet_version_last .item_"+key); - left.addClass("background-red") - right.addClass("background-green") - - var heights = [left,right].map(function (item) - { - return $(item).outerHeight(); - }); - - left.css('height', Math.max.apply(null, heights)); - right.css('height', Math.max.apply(null, heights)); - } - - } - ); - }, - updateHTML: function(obj, containerId, versionNumber) { - var scope = this; - var version_container = $('#'+containerId); - if(versionNumber){ - version_container.find(".number").html(versionNumber); - } - for( item in obj ){ - var item_value=obj[item].replace(/</g,"<").replace(/>/g,">").replace(/"/g,"\""); - version_container.find('.item_'+item+" .item_value") - .html(""+item_value+"") - } - } -} - -var sliderVersion = { - init:function(val, idPratica, company){ - /*alert('Slider INIT');*/ - var initialValue = val, min = 1, maxValue = (val-1) > 0 ? (val-1) : 0; - versionamento.init(idPratica, company, val, maxValue); - $("#label-slider").text(maxValue); - if(maxValue <= 1) { - $("#label-slider").css("margin-left", '0'); - } - $( function() { - $( "#slider" ).slider({ - value: val, - min: 1, - max: maxValue, - step: 1, - slide: function( event, ui ) { - $("#label-slider").text(ui.value); - if(maxValue == 0) { - $("#label-slider").css("margin-left", '0'); - }else { - $("#label-slider").css("margin-left", (ui.value-min)/(maxValue-min)*100+'%'); - } - $("#label-slider").css("left", "-15px"); - versionamento.sliderChange(idPratica, company, ui.value); - } - }); - }); - }, - -} \ No newline at end of file +/**/ \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp index ae5df796..0e889e6b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp @@ -8,33 +8,28 @@
    - - - +
    - - +
    - - +
    - +
    - + - -<%-- --%> - + +
    @@ -43,11 +38,9 @@
    - - var defaultFormValidator = A.config.FormValidator; var procedure = {}; @@ -149,36 +142,31 @@ ); }; - new Liferay.DynamicSelect( - [ - { - select: 'provincia', - selectData: getProvince, - selectDesc: 'descLong', - selectId: 'provinciaId', - selectSort: true, - selectVal: '0' - - }, - { - select: 'comune', - selectData: getComuni, - selectDesc: 'descLong', - selectId: 'comuneId', - selectSort: true, - selectVal: '0' - - }, - { - select: 'territorioId', - selectData: getZoneFasce, - selectDesc: 'descLong', - selectId: 'territorioId', - selectVal: '0' - } - - ] - ); + new Liferay.DynamicSelect([ + { + select: 'provincia', + selectData: getProvince, + selectDesc: 'descLong', + selectId: 'provinciaId', + selectSort: true, + selectVal: '0' + }, + { + select: 'comune', + selectData: getComuni, + selectDesc: 'descLong', + selectId: 'comuneId', + selectSort: true, + selectVal: '0' + }, + { + select: 'territorioId', + selectData: getZoneFasce, + selectDesc: 'descLong', + selectId: 'territorioId', + selectVal: '0' + } + ]); $('.add-new-project__provincia select').change(function(){ var val = $(this).val(); @@ -210,12 +198,6 @@ $('.add-new-project__procedura div').removeClass('success'); }else if(val !== 0) { $('.add-new-project__procedura input').prop('disabled', false).removeClass('disabled').parent().css('display', 'block'); -// if ('<%= Constants.PROCEDURA_B %>' == procedure[val]) -// $('#tipo_procedura_<%= Constants.PROCEDURA_B1 %>').prop('disabled', 'disabled').prop('checked', false).parent().css('display', 'none'); -// else -// $('#tipo_procedura_<%= Constants.PROCEDURA_B %>').prop('disabled', 'disabled').prop('checked', false).parent().css('display', 'none'); -// $('#tipo_procedura_<%= Constants.PROCEDURA_C %>').prop('disabled', 'disabled').prop('checked', false); } }); - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java index 28d02bce..95c932ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistence.java @@ -151,7 +151,8 @@ public interface EmailAttachmentPersistence extends BasePersistence allSubjects = new ArrayList() {