diff --git a/liferay-plugins-sdk-6.2/build.ture.properties b/liferay-plugins-sdk-6.2/build.ture.properties index 301d707f..f4c5d948 100644 --- a/liferay-plugins-sdk-6.2/build.ture.properties +++ b/liferay-plugins-sdk-6.2/build.ture.properties @@ -1,3 +1,5 @@ +# Managed by Liferay IDE (remove this comment to prevent future updates) + app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext app.server.tomcat.deploy.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps app.server.parent.dir = /home/ture/liferay/portali/paesaggistica diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpclient.jar similarity index 100% rename from liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpclient.jar rename to liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpclient.jar diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpcore.jar similarity index 100% rename from liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpcore.jar rename to liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpcore.jar diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpmime.jar similarity index 100% rename from liferay-plugins-sdk-6.2/shared/portos-bo-shared/lib/httpmime.jar rename to liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/httpmime.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties index 5d24d0e4..c4168251 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_atti - build.number=29 - build.date=1632756642323 + build.number=30 + build.date=1632921863898 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp index d575a573..fa700aec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp @@ -1,5 +1,4 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@page import="it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti"%> @@ -541,7 +540,7 @@ RichiestaAccessoAtti accettoAtti = RichiestaAccessoAttiLocalServiceUtil.getRichi modelVar="soggetto" > <% - boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()); + boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath index 291054bb..8a8be4f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath @@ -2,11 +2,6 @@ - - - - - @@ -15,6 +10,15 @@ - + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..b196c64a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/form_navigator/page.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/form_navigator/page.jsp index 6c4ef8c8..ae70121f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/form_navigator/page.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/form_navigator/page.jsp @@ -66,7 +66,7 @@ if (Validator.isNotNull(historyKey)) { - + <%@ include file="/html/taglib/ui/form_navigator/sections.jspf" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index 21159b20..3683f047 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java index 643dd99d..c335c868 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java @@ -93,6 +93,10 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto( java.lang.String tipoSoggetto); @@ -101,6 +105,9 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public boolean isCollaudatorePresent() + throws com.liferay.portal.kernel.exception.SystemException; + public boolean isCollaudatoreRequired(); public boolean isRequiredTerna(java.lang.String codiceDoc, @@ -108,6 +115,15 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { java.util.List committenti) throws com.liferay.portal.kernel.exception.SystemException; + public boolean isSoggettoPrincipale(long soggettoId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public boolean isSoggettoPrincipale(java.lang.String codiceFiscale, + java.lang.String tipologiaSoggetto) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public java.util.List notCompletedSection( java.lang.String section) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java index ff55aa8e..a9547875 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java @@ -8556,6 +8556,30 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public boolean isSoggettoPrincipale(java.lang.String codiceFiscale, + java.lang.String tipologiaSoggetto) { + try { + String methodName = "isSoggettoPrincipale"; + + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.lang.String.class + }; + + Object[] parameterValues = new Object[] { + codiceFiscale, tipologiaSoggetto + }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public boolean allAsseverazioniCompleted() { try { @@ -8632,6 +8656,25 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public boolean isSoggettoPrincipale(long soggettoId) { + try { + String methodName = "isSoggettoPrincipale"; + + Class[] parameterTypes = new Class[] { long.class }; + + Object[] parameterValues = new Object[] { soggettoId }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public boolean isRequiredTerna(java.lang.String codiceDoc, java.util.List ditte, @@ -8811,6 +8854,25 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) { + try { + String methodName = "hasSoggettoPrincipale"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { tipologiaSoggetto }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public java.lang.String getMiddleDescription() { try { @@ -8925,6 +8987,26 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public boolean isAsseverazioneDomandaRequiredByTipoSoggetto( + java.lang.String tipoSoggetto) { + try { + String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto"; + + Class[] parameterTypes = new Class[] { java.lang.String.class }; + + Object[] parameterValues = new Object[] { tipoSoggetto }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public java.lang.String getFullDescription() { try { @@ -8945,14 +9027,13 @@ public class DettPraticaClp extends BaseModelImpl } @Override - public boolean isAsseverazioneDomandaRequiredByTipoSoggetto( - java.lang.String tipoSoggetto) { + public boolean isCollaudatorePresent() { try { - String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto"; + String methodName = "isCollaudatorePresent"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { }; - Object[] parameterValues = new Object[] { tipoSoggetto }; + Object[] parameterValues = new Object[] { }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java index 9a1c73df..a91d768b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java @@ -8345,6 +8345,13 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.hasRichiediAsseverazioni(userId); } + @Override + public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.hasSoggettoPrincipale(tipologiaSoggetto); + } + @Override public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto( java.lang.String tipoSoggetto) { @@ -8359,6 +8366,12 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.isAsseverazioneDomandaRequiredByTipoSoggetto(tipoSoggetto); } + @Override + public boolean isCollaudatorePresent() + throws com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.isCollaudatorePresent(); + } + @Override public boolean isCollaudatoreRequired() { return _dettPratica.isCollaudatoreRequired(); @@ -8372,6 +8385,22 @@ public class DettPraticaWrapper implements DettPratica, return _dettPratica.isRequiredTerna(codiceDoc, ditte, committenti); } + @Override + public boolean isSoggettoPrincipale(long soggettoId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.isSoggettoPrincipale(soggettoId); + } + + @Override + public boolean isSoggettoPrincipale(java.lang.String codiceFiscale, + java.lang.String tipologiaSoggetto) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _dettPratica.isSoggettoPrincipale(codiceFiscale, + tipologiaSoggetto); + } + @Override public java.util.List notCompletedSection( java.lang.String section) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java index e916ab52..5cefa30d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPratica.java @@ -94,6 +94,13 @@ public interface IntPratica extends IntPraticaModel, PersistedModel { it.tref.liferay.portos.bo.model.DocPratica docPratica) throws com.liferay.portal.kernel.exception.SystemException; + public boolean isCommittenteAndDitta() + throws com.liferay.portal.kernel.exception.SystemException; + + public boolean isTitolareInCommittenti() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + public boolean praticaCanAbort(long userId) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java index a6a3fd0c..2350c41d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java @@ -1603,6 +1603,25 @@ public class IntPraticaClp extends BaseModelImpl } } + @Override + public boolean isCommittenteAndDitta() { + try { + String methodName = "isCommittenteAndDitta"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public boolean praticaHasFineLavoriPaymentPending() { try { @@ -1736,6 +1755,25 @@ public class IntPraticaClp extends BaseModelImpl } } + @Override + public boolean isTitolareInCommittenti() { + try { + String methodName = "isTitolareInCommittenti"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public boolean praticaCanEditCollaudo(java.lang.String userScreenName) { try { @@ -1972,22 +2010,13 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean isAllRequiredValid(java.lang.String codiceDoc, - java.util.List signatures, - java.util.List tipologiaSoggetti, - it.tref.liferay.portos.bo.model.DocPratica docPratica) { + public boolean praticaCanAddCollaudo(java.lang.String userScreenName) { try { - String methodName = "isAllRequiredValid"; + String methodName = "praticaCanAddCollaudo"; - Class[] parameterTypes = new Class[] { - java.lang.String.class, java.util.List.class, - java.util.List.class, - it.tref.liferay.portos.bo.model.DocPratica.class - }; + Class[] parameterTypes = new Class[] { java.lang.String.class }; - Object[] parameterValues = new Object[] { - codiceDoc, signatures, tipologiaSoggetti, docPratica - }; + Object[] parameterValues = new Object[] { userScreenName }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); @@ -2000,13 +2029,22 @@ public class IntPraticaClp extends BaseModelImpl } @Override - public boolean praticaCanAddCollaudo(java.lang.String userScreenName) { + public boolean isAllRequiredValid(java.lang.String codiceDoc, + java.util.List signatures, + java.util.List tipologiaSoggetti, + it.tref.liferay.portos.bo.model.DocPratica docPratica) { try { - String methodName = "praticaCanAddCollaudo"; + String methodName = "isAllRequiredValid"; - Class[] parameterTypes = new Class[] { java.lang.String.class }; + Class[] parameterTypes = new Class[] { + java.lang.String.class, java.util.List.class, + java.util.List.class, + it.tref.liferay.portos.bo.model.DocPratica.class + }; - Object[] parameterValues = new Object[] { userScreenName }; + Object[] parameterValues = new Object[] { + codiceDoc, signatures, tipologiaSoggetti, docPratica + }; Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName, parameterTypes, parameterValues); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java index 064f01c4..f972ce99 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java @@ -1356,6 +1356,19 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { tipologiaSoggetti, docPratica); } + @Override + public boolean isCommittenteAndDitta() + throws com.liferay.portal.kernel.exception.SystemException { + return _intPratica.isCommittenteAndDitta(); + } + + @Override + public boolean isTitolareInCommittenti() + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _intPratica.isTitolareInCommittenti(); + } + @Override public boolean praticaCanAbort(long userId) 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/SoggettoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java index 0f9bad01..1df614e4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java @@ -763,6 +763,11 @@ public interface SoggettoLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public boolean isCommittenteAndDitta( + java.util.List committenti, + java.util.List ditte); + public void updatePrincipale(long dettPraticaId, java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java index 08836d77..4e8fb7ed 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java @@ -541,50 +541,56 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { _methodParameterTypes90 = new String[] { "long" }; - _methodName91 = "updatePrincipale"; + _methodName91 = "isCommittenteAndDitta"; _methodParameterTypes91 = new String[] { - "long", "java.lang.String", "java.lang.String" + "java.util.List", "java.util.List" }; - _methodName92 = "completeInvalidation"; + _methodName92 = "updatePrincipale"; - _methodParameterTypes92 = new String[] { "long" }; + _methodParameterTypes92 = new String[] { + "long", "java.lang.String", "java.lang.String" + }; - _methodName93 = "getSoggettiSostituitiIds"; + _methodName93 = "completeInvalidation"; _methodParameterTypes93 = new String[] { "long" }; - _methodName94 = "validaSoggetto"; + _methodName94 = "getSoggettiSostituitiIds"; - _methodParameterTypes94 = new String[] { "long", "long" }; + _methodParameterTypes94 = new String[] { "long" }; - _methodName95 = "invalidaSoggetto"; + _methodName95 = "validaSoggetto"; _methodParameterTypes95 = new String[] { "long", "long" }; - _methodName96 = "invalidaESostituisciSoggetto"; + _methodName96 = "invalidaSoggetto"; + + _methodParameterTypes96 = new String[] { "long", "long" }; - _methodParameterTypes96 = new String[] { "long", "long", "long" }; + _methodName97 = "invalidaESostituisciSoggetto"; - _methodName97 = "allegaFileModifica"; + _methodParameterTypes97 = new String[] { "long", "long", "long" }; - _methodParameterTypes97 = new String[] { + _methodName98 = "allegaFileModifica"; + + _methodParameterTypes98 = new String[] { "long", "long", "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName98 = "getSoggettiByIntPraticaId_DtRimozioneNull"; + _methodName99 = "getSoggettiByIntPraticaId_DtRimozioneNull"; - _methodParameterTypes98 = new String[] { "long" }; + _methodParameterTypes99 = new String[] { "long" }; - _methodName99 = "getTipologieSoggetti"; + _methodName100 = "getTipologieSoggetti"; - _methodParameterTypes99 = new String[] { }; + _methodParameterTypes100 = new String[] { }; - _methodName100 = "getAmbitiProfessionali"; + _methodName101 = "getAmbitiProfessionali"; - _methodParameterTypes100 = new String[] { }; + _methodParameterTypes101 = new String[] { }; } @Override @@ -4267,14 +4273,44 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { return (java.util.List)ClpSerializer.translateOutput(returnObj); } + @Override + public boolean isCommittenteAndDitta( + java.util.List committenti, + java.util.List ditte) { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName91, + _methodParameterTypes91, + new Object[] { + ClpSerializer.translateInput(committenti), + + ClpSerializer.translateInput(ditte) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Boolean)returnObj).booleanValue(); + } + @Override public void updatePrincipale(long dettPraticaId, java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName91, - _methodParameterTypes91, + _invokableLocalService.invokeMethod(_methodName92, + _methodParameterTypes92, new Object[] { dettPraticaId, @@ -4308,8 +4344,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { public void completeInvalidation(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName92, - _methodParameterTypes92, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName93, + _methodParameterTypes93, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4335,8 +4371,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName93, - _methodParameterTypes93, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName94, + _methodParameterTypes94, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4365,8 +4401,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName94, - _methodParameterTypes94, + returnObj = _invokableLocalService.invokeMethod(_methodName95, + _methodParameterTypes95, new Object[] { soggettoId, dettPraticaId }); } catch (Throwable t) { @@ -4400,8 +4436,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName95, - _methodParameterTypes95, + returnObj = _invokableLocalService.invokeMethod(_methodName96, + _methodParameterTypes96, new Object[] { soggettoId, dettPraticaIdRimozione }); } catch (Throwable t) { @@ -4435,8 +4471,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName96, - _methodParameterTypes96, + returnObj = _invokableLocalService.invokeMethod(_methodName97, + _methodParameterTypes97, new Object[] { soggettoId, @@ -4478,8 +4514,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName97, - _methodParameterTypes97, + returnObj = _invokableLocalService.invokeMethod(_methodName98, + _methodParameterTypes98, new Object[] { soggettoId, @@ -4526,8 +4562,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName98, - _methodParameterTypes98, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName99, + _methodParameterTypes99, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4553,8 +4589,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName99, - _methodParameterTypes99, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName100, + _methodParameterTypes100, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4576,8 +4612,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName100, - _methodParameterTypes100, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName101, + _methodParameterTypes101, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4795,4 +4831,6 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { private String[] _methodParameterTypes99; private String _methodName100; private String[] _methodParameterTypes100; + private String _methodName101; + private String[] _methodParameterTypes101; } \ 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/SoggettoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java index e4cc69b2..5bf8846a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java @@ -1043,6 +1043,12 @@ public class SoggettoLocalServiceUtil { return getService().findIntPraticaBySoggettoId(soggettoId); } + public static boolean isCommittenteAndDitta( + java.util.List committenti, + java.util.List ditte) { + return getService().isCommittenteAndDitta(committenti, ditte); + } + public static void updatePrincipale(long dettPraticaId, java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java index 94487f5c..34d866d9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java @@ -1087,6 +1087,13 @@ public class SoggettoLocalServiceWrapper implements SoggettoLocalService, return _soggettoLocalService.findIntPraticaBySoggettoId(soggettoId); } + @Override + public boolean isCommittenteAndDitta( + java.util.List committenti, + java.util.List ditte) { + return _soggettoLocalService.isCommittenteAndDitta(committenti, ditte); + } + @Override public void updatePrincipale(long dettPraticaId, java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java deleted file mode 100644 index 86c68756..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/SoggettiUtil.java +++ /dev/null @@ -1,123 +0,0 @@ -package it.tref.liferay.portos.bo.util; - -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.Soggetto; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoServiceUtil; -import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; - -import java.util.List; - -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.model.User; -import com.liferay.portal.service.UserLocalServiceUtil; - -public class SoggettiUtil { - - public static boolean isCommittenteAndDitta(long intPraticaId) throws SystemException { - - List ditte = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(intPraticaId, - TipoSoggettoUtil.DITTA); - List committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(intPraticaId, - TipoSoggettoUtil.COMMITTENTE); - return isCommittenteAndDitta(committenti, ditte); - } - - public static boolean isCommittenteAndDitta(List committenti, List ditte) { - - for (Soggetto committente : committenti) { - for (Soggetto ditta : ditte) { - if (ditta.getCodiceFiscale().equalsIgnoreCase(committente.getCodiceFiscale())) { - return true; - } - } - } - return false; - } - - public static boolean isTitolareInCommittenti(long intPraticaId) throws SystemException, PortalException { - - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId()); - String codiceFiscaleTitolare = titolareUser.getScreenName(); - List committenti = SoggettoServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(intPraticaId, - TipoSoggettoUtil.COMMITTENTE); - for (Soggetto soggetto : committenti) { - if (codiceFiscaleTitolare.equalsIgnoreCase(soggetto.getCodiceFiscale())) { - return true; - } - } - return false; - } - - public static boolean isSoggettoPrincipale(long soggettoId, long dettPraticaId) throws PortalException, - SystemException { - - Soggetto soggetto = SoggettoServiceUtil.getSoggetto(soggettoId); - return isSoggettoPrincipale(soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto(), dettPraticaId); - } - - public static boolean isSoggettoPrincipale(String codiceFiscale, String tipologiaSoggetto, long dettPraticaId) - throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - switch (tipologiaSoggetto) { - case TipoSoggettoUtil.COMMITTENTE: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCommittente()); - case TipoSoggettoUtil.COLLAUDATORE: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCollaudatore()); - case TipoSoggettoUtil.DIRETTORE_LAVORI: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori()); - case TipoSoggettoUtil.PROGETTISTA: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleProgettista()); - case TipoSoggettoUtil.GEOLOGO: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleGeologo()); - case TipoSoggettoUtil.DITTA: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDitta()); - case TipoSoggettoUtil.ARCHEOLOGO: - return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleArcheologo()); - default: - return false; - } - } - - public static boolean hasSoggettoPrincipale(long dettPraticaId, String tipologiaSoggetto) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - switch (tipologiaSoggetto) { - case TipoSoggettoUtil.COMMITTENTE: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCommittente()); - case TipoSoggettoUtil.COLLAUDATORE: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore()); - case TipoSoggettoUtil.DIRETTORE_LAVORI: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori()); - case TipoSoggettoUtil.PROGETTISTA: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleProgettista()); - case TipoSoggettoUtil.GEOLOGO: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleGeologo()); - case TipoSoggettoUtil.DITTA: - return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDitta()); - default: - return false; - } - } - - public static boolean isCollaudatorePresent(long dettPraticaId) throws SystemException { - List soggettiInseriti = SoggettoLocalServiceUtil.findByDettPratica(dettPraticaId); - boolean collaudatorePresente = false; - for (Soggetto soggetto : soggettiInseriti) { - if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.COLLAUDATORE)) { - collaudatorePresente = true; - break; - } - } - return collaudatorePresente; - } -} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java index 94cad2e1..5079f643 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java @@ -17,7 +17,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.SoggettiUtil; import java.io.Serializable; import java.util.Locale; @@ -64,7 +63,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { } @Override - public String getModello() throws SystemException{ + public String getModello() throws SystemException { String modello = StringPool.BLANK; switch (this.getTipologia()) { @@ -99,7 +98,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { } @Override - public boolean hasCambioStatoAsseverazione(long userId) throws PortalException, SystemException { + public boolean hasCambioStatoAsseverazione(long userId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getDettPraticaId()); return dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT @@ -108,14 +107,14 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { } @Override - public boolean hasGestisciFileAsseverazione(long userId) throws PortalException, SystemException { + public boolean hasGestisciFileAsseverazione(long userId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getDettPraticaId()); return dettPratica.getUserId() == userId && dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT; } @Override - public String retrieveText(String codiceFiscale) throws PortalException, SystemException{ + public String retrieveText(String codiceFiscale) throws PortalException, SystemException { if (!codiceFiscale.equalsIgnoreCase(getCodiceFiscale())) { return StringPool.BLANK; @@ -140,8 +139,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { case TipoSoggettoUtil.DIRETTORE_LAVORI: params = new Object[] { soggetto.getDescrizioneCompleta(), - (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) - ? "Principale" : StringPool.BLANK) + (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale" : StringPool.BLANK) + (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto .getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto .getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-" @@ -153,8 +151,8 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { soggetto.getCodiceFiscale().toUpperCase() + " - " + soggetto.getLegaleRap(), soggetto.getDenominazione() + StringPool.SPACE - + (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), - dettPratica.getDettPraticaId()) ? "Principale" : StringPool.BLANK) + + (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale" + : StringPool.BLANK) + StringPool.SPACE + (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto .getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto @@ -168,8 +166,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); params = new Object[] { soggetto.getDescrizioneCompleta(), - (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId()) - ? "Principale" : StringPool.BLANK) + (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale" : StringPool.BLANK) + (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto .getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto .getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-" diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index 213a72d6..4ec8bd89 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -21,6 +21,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; +import it.tref.liferay.portos.bo.service.SoggettoServiceUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; @@ -28,7 +29,6 @@ import it.tref.liferay.portos.bo.shared.util.SezioniUtil; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.DelegheUtil; -import it.tref.liferay.portos.bo.util.SoggettiUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -559,6 +559,29 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { && getStatus() == WorkflowConstants.STATUS_DRAFT; } + @Override + public boolean hasSoggettoPrincipale(String tipologiaSoggetto) throws PortalException, SystemException { + + switch (tipologiaSoggetto) { + case TipoSoggettoUtil.ARCHEOLOGO: + return Validator.isNotNull(getCodiceFiscalePrincipaleArcheologo()); + case TipoSoggettoUtil.COMMITTENTE: + return Validator.isNotNull(getCodiceFiscalePrincipaleCommittente()); + case TipoSoggettoUtil.COLLAUDATORE: + return Validator.isNotNull(getCodiceFiscalePrincipaleCollaudatore()); + case TipoSoggettoUtil.DIRETTORE_LAVORI: + return Validator.isNotNull(getCodiceFiscalePrincipaleDirettoreLavori()); + case TipoSoggettoUtil.PROGETTISTA: + return Validator.isNotNull(getCodiceFiscalePrincipaleProgettista()); + case TipoSoggettoUtil.GEOLOGO: + return Validator.isNotNull(getCodiceFiscalePrincipaleGeologo()); + case TipoSoggettoUtil.DITTA: + return Validator.isNotNull(getCodiceFiscalePrincipaleDitta()); + default: + return false; + } + } + @Override public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto(String tipoSoggetto) { @@ -633,6 +656,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { return false; } + @Override + public boolean isCollaudatorePresent() throws SystemException { + + for (Soggetto soggetto : SoggettoLocalServiceUtil.findByDettPratica(getDettPraticaId())) { + if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.COLLAUDATORE)) { + return true; + } + } + return false; + } + @Override public boolean isCollaudatoreRequired() { @@ -644,16 +678,46 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { throws SystemException { if (codiceDoc.equals(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) { - if (SoggettiUtil.isCommittenteAndDitta(committenti, ditte) - && SoggettiUtil.isCollaudatorePresent(getDettPraticaId())) { + if (SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatorePresent()) { return true; - } else if (SoggettiUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatoreRequired()) { + } else if (SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatoreRequired()) { return true; } } return false; } + @Override + public boolean isSoggettoPrincipale(long soggettoId) throws PortalException, SystemException { + + Soggetto soggetto = SoggettoServiceUtil.getSoggetto(soggettoId); + return isSoggettoPrincipale(soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto()); + } + + @Override + public boolean isSoggettoPrincipale(String codiceFiscale, String tipologiaSoggetto) throws PortalException, + SystemException { + + switch (tipologiaSoggetto) { + case TipoSoggettoUtil.ARCHEOLOGO: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleArcheologo()); + case TipoSoggettoUtil.COMMITTENTE: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleCommittente()); + case TipoSoggettoUtil.COLLAUDATORE: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleCollaudatore()); + case TipoSoggettoUtil.DIRETTORE_LAVORI: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleDirettoreLavori()); + case TipoSoggettoUtil.PROGETTISTA: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleProgettista()); + case TipoSoggettoUtil.GEOLOGO: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleGeologo()); + case TipoSoggettoUtil.DITTA: + return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleDitta()); + default: + return false; + } + } + private List notCompletedAnagrafeSoggetti() throws PortalException, SystemException { long intPraticaId = getIntPraticaId(); @@ -702,7 +766,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { soggettiRichiesti.add(TipoSoggettoUtil.COMMITTENTE); break; } - boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId) + boolean isDelegaCommittente = intPratica.isTitolareInCommittenti() || Validator.isNotNull(getCodiceFiscaleDelegatoCommittente()); if (!isDelegaCommittente) { notCompleted.add("delega-committente"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java index 79fd8812..d712d172 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java @@ -34,6 +34,7 @@ import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil; import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; +import it.tref.liferay.portos.bo.service.SoggettoServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; @@ -57,6 +58,7 @@ import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.workflow.WorkflowConstants; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The extended model implementation for the IntPratica service. Represents a row in the @@ -317,6 +319,30 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { return true; } + @Override + public boolean isCommittenteAndDitta() throws SystemException { + + List ditte = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(getIntPraticaId(), + TipoSoggettoUtil.DITTA); + List committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto( + getIntPraticaId(), TipoSoggettoUtil.COMMITTENTE); + return SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte); + } + + @Override + public boolean isTitolareInCommittenti() throws PortalException, SystemException { + + String codiceFiscaleTitolare = UserLocalServiceUtil.getUserById(getUserId()).getScreenName(); + List committenti = SoggettoServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(getIntPraticaId(), + TipoSoggettoUtil.COMMITTENTE); + for (Soggetto soggetto : committenti) { + if (codiceFiscaleTitolare.equalsIgnoreCase(soggetto.getCodiceFiscale())) { + return true; + } + } + return false; + } + @Override public boolean praticaCanAbort(long userId) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java index 1ee1b3c5..41e06818 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SoggettoLocalServiceClpInvoker.java @@ -551,50 +551,56 @@ public class SoggettoLocalServiceClpInvoker { _methodParameterTypes248 = new String[] { "long" }; - _methodName249 = "updatePrincipale"; + _methodName249 = "isCommittenteAndDitta"; _methodParameterTypes249 = new String[] { - "long", "java.lang.String", "java.lang.String" + "java.util.List", "java.util.List" }; - _methodName250 = "completeInvalidation"; + _methodName250 = "updatePrincipale"; - _methodParameterTypes250 = new String[] { "long" }; + _methodParameterTypes250 = new String[] { + "long", "java.lang.String", "java.lang.String" + }; - _methodName251 = "getSoggettiSostituitiIds"; + _methodName251 = "completeInvalidation"; _methodParameterTypes251 = new String[] { "long" }; - _methodName252 = "validaSoggetto"; + _methodName252 = "getSoggettiSostituitiIds"; - _methodParameterTypes252 = new String[] { "long", "long" }; + _methodParameterTypes252 = new String[] { "long" }; - _methodName253 = "invalidaSoggetto"; + _methodName253 = "validaSoggetto"; _methodParameterTypes253 = new String[] { "long", "long" }; - _methodName254 = "invalidaESostituisciSoggetto"; + _methodName254 = "invalidaSoggetto"; - _methodParameterTypes254 = new String[] { "long", "long", "long" }; + _methodParameterTypes254 = new String[] { "long", "long" }; - _methodName255 = "allegaFileModifica"; + _methodName255 = "invalidaESostituisciSoggetto"; - _methodParameterTypes255 = new String[] { + _methodParameterTypes255 = new String[] { "long", "long", "long" }; + + _methodName256 = "allegaFileModifica"; + + _methodParameterTypes256 = new String[] { "long", "long", "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName256 = "getSoggettiByIntPraticaId_DtRimozioneNull"; + _methodName257 = "getSoggettiByIntPraticaId_DtRimozioneNull"; - _methodParameterTypes256 = new String[] { "long" }; + _methodParameterTypes257 = new String[] { "long" }; - _methodName257 = "getTipologieSoggetti"; + _methodName258 = "getTipologieSoggetti"; - _methodParameterTypes257 = new String[] { }; + _methodParameterTypes258 = new String[] { }; - _methodName258 = "getAmbitiProfessionali"; + _methodName259 = "getAmbitiProfessionali"; - _methodParameterTypes258 = new String[] { }; + _methodParameterTypes259 = new String[] { }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -1389,45 +1395,51 @@ public class SoggettoLocalServiceClpInvoker { if (_methodName249.equals(name) && Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { - SoggettoLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], (java.lang.String)arguments[2]); - - return null; + return SoggettoLocalServiceUtil.isCommittenteAndDitta((java.util.List)arguments[0], + (java.util.List)arguments[1]); } if (_methodName250.equals(name) && Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { - SoggettoLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue()); + SoggettoLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1], (java.lang.String)arguments[2]); return null; } if (_methodName251.equals(name) && Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { - return SoggettoLocalServiceUtil.getSoggettiSostituitiIds(((Long)arguments[0]).longValue()); + SoggettoLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue()); + + return null; } if (_methodName252.equals(name) && Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { - return SoggettoLocalServiceUtil.validaSoggetto(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); + return SoggettoLocalServiceUtil.getSoggettiSostituitiIds(((Long)arguments[0]).longValue()); } if (_methodName253.equals(name) && Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { - return SoggettoLocalServiceUtil.invalidaSoggetto(((Long)arguments[0]).longValue(), + return SoggettoLocalServiceUtil.validaSoggetto(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName254.equals(name) && Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { + return SoggettoLocalServiceUtil.invalidaSoggetto(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue()); + } + + if (_methodName255.equals(name) && + Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { return SoggettoLocalServiceUtil.invalidaESostituisciSoggetto(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); } - if (_methodName255.equals(name) && - Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { + if (_methodName256.equals(name) && + Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { return SoggettoLocalServiceUtil.allegaFileModifica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), (byte[])arguments[3], @@ -1435,18 +1447,18 @@ public class SoggettoLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[6]); } - if (_methodName256.equals(name) && - Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { - return SoggettoLocalServiceUtil.getSoggettiByIntPraticaId_DtRimozioneNull(((Long)arguments[0]).longValue()); - } - if (_methodName257.equals(name) && Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { - return SoggettoLocalServiceUtil.getTipologieSoggetti(); + return SoggettoLocalServiceUtil.getSoggettiByIntPraticaId_DtRimozioneNull(((Long)arguments[0]).longValue()); } if (_methodName258.equals(name) && Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { + return SoggettoLocalServiceUtil.getTipologieSoggetti(); + } + + if (_methodName259.equals(name) && + Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) { return SoggettoLocalServiceUtil.getAmbitiProfessionali(); } @@ -1657,4 +1669,6 @@ public class SoggettoLocalServiceClpInvoker { private String[] _methodParameterTypes257; private String _methodName258; private String[] _methodParameterTypes258; + private String _methodName259; + private String[] _methodParameterTypes259; } \ 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/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 6a4bae58..5ed74797 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -9,6 +9,7 @@ package it.tref.liferay.portos.bo.service.impl; import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean; +import it.mwg.sismica.bo.shared.util.Generics; import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil; import it.mwg.sismica.bo.util.CarichiLavoroUtil; import it.mwg.sismica.bo.util.SismicaUtil; @@ -39,6 +40,8 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.commons.lang.StringUtils; + import com.liferay.portal.NoSuchWorkflowInstanceLinkException; import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil; import com.liferay.portal.kernel.dao.orm.DynamicQuery; @@ -419,8 +422,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); int unitaOperativa = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId()) .getUnitaOperativa(); - long companyId = controlloPratica.getCompanyId(); - long roleId = RoleLocalServiceUtil.getRole(companyId, Constants.ROLE_NAME_ISTRUTTORE).getRoleId(); + long roleId = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE) + .getRoleId(); List userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole( controlloPratica.getGroupId(), roleId); List istruttori = new ArrayList<>(); @@ -443,9 +446,13 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi Map ordinati = new TreeMap<>(); for (UserGroupRole userGroupRole : userGroupRoles) { User user = userGroupRole.getUser(); - if (UnitaOperativeUtil.getUnitaOperative(user).contains(unitaOperativa)) { + List uo = UnitaOperativeUtil.getUnitaOperative(user); + if ((unitaOperativa == 0) || uo.contains(unitaOperativa)) { JSONObject istruttore = JSONFactoryUtil.createJSONObject(); - istruttore.put("label", user.getFullName().toUpperCase()); + istruttore.put( + "label", + Generics.capitalizeFull(user.getFullName()) + " (u.o. " + + StringUtils.join(uo, StringPool.COMMA_AND_SPACE) + StringPool.CLOSE_PARENTHESIS); istruttore.put("value", user.getUserId()); istruttore.put("default", false); ordinati.put((user.getLastName() + user.getFirstName()).toUpperCase(), istruttore); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java index 8f243895..c0e98e2d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java @@ -16,7 +16,6 @@ import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.SoggettiUtil; import java.util.Collections; import java.util.Date; @@ -143,7 +142,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { soggetto.setSoggettoSostituitoId(soggettoSostituitoId); soggetto.setTmp(tmp); soggetto = soggettoPersistence.update(soggetto); - if (!SoggettiUtil.hasSoggettoPrincipale(dettPraticaId, soggetto.getTipologiaSoggetto())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) { updatePrincipale(soggetto.getDettPraticaId(), soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto()); } return soggetto; @@ -1103,8 +1103,9 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { } @Override - public int countByUserId_CodiceFiscale_TipologiaSoggetto(long userId, String codiceFiscale, String tipologiaSoggetto) - throws SystemException { + public int + countByUserId_CodiceFiscale_TipologiaSoggetto(long userId, String codiceFiscale, String tipologiaSoggetto) + throws SystemException { return soggettoPersistence.countByUserId_CodiceFiscale_TipologiaSoggetto(userId, codiceFiscale, tipologiaSoggetto); @@ -1122,6 +1123,18 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuerySoggetti); } + public boolean isCommittenteAndDitta(List committenti, List ditte) { + + for (Soggetto committente : committenti) { + for (Soggetto ditta : ditte) { + if (ditta.getCodiceFiscale().equalsIgnoreCase(committente.getCodiceFiscale())) { + return true; + } + } + } + return false; + } + @Override public void updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { @@ -1163,7 +1176,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { Soggetto soggetto = soggettoPersistence.findByPrimaryKey(soggettoId); soggetto.setDettPraticaIdRimozione(0L); - if (!SoggettiUtil.hasSoggettoPrincipale(dettPraticaId, soggetto.getTipologiaSoggetto())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) { updatePrincipale(dettPraticaId, soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto()); } return updateSoggetto(soggetto); @@ -1176,7 +1190,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { Soggetto soggetto = soggettoPersistence.findByPrimaryKey(soggettoId); // setto solo il dettPraticaRimozione. La rimozione diventa definitiva al completamento della variante soggetto.setDettPraticaIdRimozione(dettPraticaIdRimozione); - if (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPraticaIdRimozione)) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaIdRimozione); + if (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId())) { updatePrincipale(dettPraticaIdRimozione, StringPool.BLANK, soggetto.getTipologiaSoggetto()); } return updateSoggetto(soggetto); @@ -1211,7 +1226,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { invalidaESostituisciSoggetto(soggetto.getSoggettoSostituitoId(), soggetto.getDettPraticaId(), soggetto.getSoggettoId()); } - if (!SoggettiUtil.hasSoggettoPrincipale(soggetto.getDettPraticaId(), soggetto.getTipologiaSoggetto())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(soggetto.getDettPraticaId()); + if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) { updatePrincipale(soggetto.getDettPraticaId(), soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto()); } soggetto = updateSoggetto(soggetto); 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 415c23e9..d29c918f 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=3429 - build.date=1632908453878 + build.number=3435 + build.date=1632930765406 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp index 5d34b887..f465d5df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/doc_aggiuntiva/view.jsp @@ -1,214 +1,197 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> -<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> -<%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> -<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> +<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@ include file="/html/doc_aggiuntiva/init.jsp" %> - +<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> +<%@page import="java.util.ArrayList"%> +<%@include file="/html/doc_aggiuntiva/init.jsp"%> <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); - boolean inBO = ParamUtil.getBoolean(request,"inBO"); - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); +boolean inBO = ParamUtil.getBoolean(request,"inBO"); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - - - +
-
- +
+ - - - + + +
- - - - + - + - + - + - + -
<% - List resultList = new ArrayList(); - int count = 0; - if(inBO){ - resultList = DocAggiuntivaLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - count = DocAggiuntivaLocalServiceUtil.countByIntPratica(intPraticaId); - } else { - resultList = DocAggiuntivaLocalServiceUtil.findByIntPraticaFeVisible(intPraticaId, true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - count = DocAggiuntivaLocalServiceUtil.countByIntPraticaFeVisible(intPraticaId, true); - } + List resultList = new ArrayList(); + int count = 0; + if (inBO) { + resultList = DocAggiuntivaLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + count = DocAggiuntivaLocalServiceUtil.countByIntPratica(intPraticaId); + } else { + resultList = DocAggiuntivaLocalServiceUtil.findByIntPraticaFeVisible(intPraticaId, true, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + count = DocAggiuntivaLocalServiceUtil.countByIntPraticaFeVisible(intPraticaId, true); + } %> - - - - - - - + + + + <% - String clazz = StringPool.BLANK; - if(docAggiuntiva.getFeVisible()){ - clazz = "fa fa-check-square txt-green"; - } + String clazz = StringPool.BLANK; + if (docAggiuntiva.getFeVisible()) { + clazz = "fa fa-check-square txt-green"; + } %> - - <% - boolean showExpanded = false; - if(!inBO){ - showExpanded = true; - } - %> - + <% - if(Validator.isNotNull(docAggiuntiva.getFileEntryId())){ + if (Validator.isNotNull(docAggiuntiva.getFileEntryId())) { %> - - - + + + - +
- +
<% - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(docAggiuntiva.getFileEntryId()); - String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), themeDisplay, "&download=true"); + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(docAggiuntiva.getFileEntryId()); + String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), + themeDisplay, "&download=true"); %>
- +
- - +
- +
- - - A.one('<%="#"+renderResponse.getNamespace()+"delete_"+docAggiuntiva.getDocAggiuntivaId() %>').on( - 'click', - function(event) { - event.preventDefault(); - if(confirm("Sei sicuro di voler elminare il file?")){ - A.io.request( - '<%=deleteUrl%>', - { - on: { - failure: function() { - alert('impossibile rimuovere il documento!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('doc_aggiuntiva-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - } - } - ); - } - } - ); - - - + + A.one('<%= "#" + renderResponse.getNamespace() + "delete_" + docAggiuntiva.getDocAggiuntivaId() %>').on( + 'click', + function (event) { + event.preventDefault(); + if (confirm("Sei sicuro di voler elminare il file?")) { + A.io.request('<%=deleteUrl%>', { + on: { + failure: function () { + alert('impossibile rimuovere il documento!'); + }, + success: function (event, id, obj) { + window.parent.Liferay.fire('doc_aggiuntiva-open'); + Liferay.Portlet.refresh("#p_p_id"); + }, + }, + }); + } + }); + <% - } + } %> - - -
- Liferay.fire('doc_aggiuntiva-ready'); + Liferay.fire('doc_aggiuntiva-ready'); - - - - - +
- +
- - \ No newline at end of file + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_dati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_dati.jsp index e90c1ce9..ca0e34f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_dati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_dati.jsp @@ -1,56 +1,37 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@ include file="/html/fascicolo/init.jsp" %> - -

- + +

<% - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); - long intPraticaId = intPratica.getIntPraticaId(); +IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica"); +long intPraticaId = intPratica.getIntPraticaId(); %> - - - + - - - - - - - - + results="<%= CollaudoLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null) %>" + total="<%= CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" /> + + + + - - + - + - - - - - - - + + + - - - - \ No newline at end of file + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp index 3b9d308d..3e37ac38 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp @@ -1,65 +1,42 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> -<%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@ include file="/html/fascicolo/init.jsp" %> - - -

- +<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> +<%@include file="/html/fascicolo/init.jsp"%> + +

<% - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); - long intPraticaId = intPratica.getIntPraticaId(); +IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica"); +long intPraticaId = intPratica.getIntPraticaId(); %> - - - + - - - - - - - - + results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>" + total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" /> + + + + - - + - - + + - - - - - - - - - + + + + - - - \ No newline at end of file + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp index 4e398fd7..aa478d9b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp @@ -1,56 +1,38 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@ include file="/html/fascicolo/init.jsp" %> - -

- + +

<% - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); - long intPraticaId = intPratica.getIntPraticaId(); +IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica"); +long intPraticaId = intPratica.getIntPraticaId(); %> - - - + - - - - - - - - + results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>" + total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" /> + + + + - - + - + - - - - - - - + + + - - - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp index 65e29dde..df3f2b3c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp @@ -1,84 +1,63 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> -<%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@ include file="/html/fascicolo/init.jsp" %> - - -

- +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> +<%@include file="/html/fascicolo/init.jsp"%> + +

<% - IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); - long intPraticaId = intPratica.getIntPraticaId(); +IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica"); +long intPraticaId = intPratica.getIntPraticaId(); %> - - - + - - - - - - - + results="<%= DettPraticaServiceUtil.findCompletedByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))%>" + total="<%= DettPraticaServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) %>" /> + + + + - <% + <% StringBuilder builder = new StringBuilder(); - List committenti = SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE); - for(Soggetto committente : committenti){ - builder.append(committente.getDescrizioneCompleta()) - .append(StringPool.COMMA_AND_SPACE).append("
"); + List committenti = SoggettoServiceUtil + .getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE); + for (Soggetto committente : committenti) { + if (builder.length() > 0) { + builder.append(",
"); + } + builder.append(committente.getDescrizioneCompleta()); } - if(builder.length()>0) - builder.setLength(builder.length()-6); - out.print(builder.toString()); - %> - - + %> + <% - String buttonId = "allegatoInButton_"+index; - String contentId = "allegatoInContent_"+index; - String titleId = "Allegati Integrazione #"+integrazione.getDettPraticaId(); + String buttonId = "allegatoInButton_" + index; + String contentId = "allegatoInContent_" + index; + String titleId = "Allegati Integrazione #" + integrazione.getDettPraticaId(); %> - - + - - - - + + - - - - - - \ No newline at end of file + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp index 2c3999e8..bcc62bbf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/task_miei_ruoli.jsp @@ -46,67 +46,58 @@ request.setAttribute("tabs1", "Tab_TaskMieiRuoli"); %> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + -
- +
- - - <% - List listaControlloPratica = new ArrayList(); - Hits hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(request, user, searchContainer.getStart(), searchContainer.getEnd()); - - for (Document doc : hits.toList()) { - - String controlloPraticaId = doc.get("controlloPraticaId"); - if (Validator.isNotNull(controlloPraticaId)) { - - ControlloPratica controlloPratica = - ControlloPraticaLocalServiceUtil.fetchControlloPratica(GetterUtil.getLong(controlloPraticaId)); - if (Validator.isNotNull(controlloPratica)) { + + <% + List listaControlloPratica = new ArrayList(); + Hits hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(request, user, searchContainer.getStart(), + searchContainer.getEnd()); + for (Document doc : hits.toList()) { + String controlloPraticaId = doc.get("controlloPraticaId"); + if (Validator.isNotNull(controlloPraticaId)) { + ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil + .fetchControlloPratica(GetterUtil.getLong(controlloPraticaId)); + if (Validator.isNotNull(controlloPratica)) { listaControlloPratica.add(controlloPratica); - }else{ + } else { Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); indexer.delete(company.getCompanyId(), doc.getUID()); - } - } - - } - - searchContainer.setTotal(hits.getLength()); - + } + } + } + searchContainer.setTotal(hits.getLength()); %> - - <%@ include file="/html/gestioneattivita/view_columns.jspf" %> + + <%@include file="/html/gestioneattivita/view_columns.jspf"%> - \ No newline at end of file + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties index 5c283396..56aced8c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_calendar_appointments - build.number=176 - build.date=1631535776275 + build.number=177 + build.date=1632921903647 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties index 06e4866b..f2bb7f16 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=DA - build.number=11 - build.date=1631869742186 + build.number=12 + build.date=1632922531750 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld deleted file mode 100644 index 98efa6a6..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.2 core library - JSTL core - 1.2 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - com.liferay.taglib.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - com.liferay.taglib.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - com.liferay.taglib.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - com.liferay.taglib.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/ValidazionePraticaConstants.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/util/ValidazionePraticaUtil.java similarity index 97% rename from liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/ValidazionePraticaConstants.java rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/util/ValidazionePraticaUtil.java index 85d6c726..4fdca2ae 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/ValidazionePraticaConstants.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/util/ValidazionePraticaUtil.java @@ -1,4 +1,4 @@ -package it.mwg.sismica.bo.shared.util; +package it.mwg.sismica.fe.util; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; @@ -32,9 +32,9 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Company; import com.liferay.portal.service.CompanyLocalServiceUtil; -public class ValidazionePraticaConstants { +public class ValidazionePraticaUtil { - private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaConstants.class); + private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class); private static Set extractSigns(long companyId, String fileName, byte[] fileBytes) throws IOException, PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index a6e41869..cecdf55c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -1,7 +1,7 @@ package it.tref.liferay.portos.fe.portlet; import it.mwg.sismica.bo.shared.util.AsseverazioniUtil; -import it.mwg.sismica.bo.shared.util.ValidazionePraticaConstants; +import it.mwg.sismica.fe.util.ValidazionePraticaUtil; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.Comune; @@ -39,7 +39,6 @@ import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.bo.util.MailUtil; -import it.tref.liferay.portos.bo.util.SoggettiUtil; import it.tref.liferay.portos.fe.util.ReportFascicoloUtil; import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment; import it.tref.liferay.portos.report.shared.constants.ReportConstants; @@ -1310,7 +1309,8 @@ public class FascicoloFePortlet extends MVCPortlet { DettPratica dettCheck = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId); boolean disabledCollaudoStatico = false; if (dettCheck != null) { - disabledCollaudoStatico = SoggettiUtil.isCommittenteAndDitta(dettCheck.getIntPraticaId()); + IntPratica intCheck = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + disabledCollaudoStatico = intCheck.isCommittenteAndDitta(); } boolean collaudoStatico = ParamUtil.getBoolean(request, "collaudoStatico"); if (disabledCollaudoStatico) { @@ -1754,7 +1754,7 @@ public class FascicoloFePortlet extends MVCPortlet { } else { jsonFirmatari = FirmeUtil.serialize(firmeBean); } - boolean isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjects(sourceFileName, content, + boolean isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjects(sourceFileName, content, serviceContext.getCompanyId(), codiciFiscaliValidi, jsonFirmatari); if (isSigned) { IntPraticaLocalServiceUtil.allegaFileAnnullamento(intPraticaId, content, sourceFileName, @@ -1823,7 +1823,7 @@ public class FascicoloFePortlet extends MVCPortlet { } if (SessionErrors.isEmpty(request)) { byte[] content = FileUtil.getBytes(file); - boolean isSignedByTitolare = ValidazionePraticaConstants.isAsseverazioneSignedByOwner(sourceFileName, + boolean isSignedByTitolare = ValidazionePraticaUtil.isAsseverazioneSignedByOwner(sourceFileName, content, serviceContext.getCompanyId(), asseverazione.getCodiceFiscale(), StringPool.BLANK); if (isSignedByTitolare) { AsseverazioneServiceUtil.allegaFileAsseverazione(asseverazioneId, content, sourceFileName, @@ -1831,7 +1831,7 @@ public class FascicoloFePortlet extends MVCPortlet { } else { SessionErrors.add(request, "error.geniocivilefe.asseverazione.allegato.firma.valid"); // Impostazione parametri di rendering per messaggio di errore. - List firmatari = ValidazionePraticaConstants.gatherSignatures(sourceFileName, content, + List firmatari = ValidazionePraticaUtil.gatherSignatures(sourceFileName, content, serviceContext.getCompanyId(), StringPool.BLANK); String firme = StringUtils.join(firmatari, StringPool.COMMA_AND_SPACE).toLowerCase(); dettagliFirme = "
Firma richiesta [" + asseverazione.getCodiceFiscale() + "]
Firme trovate [" diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/SoggettiPraticaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/SoggettiPraticaPortlet.java index a79b4a01..9e3b5fed 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/SoggettiPraticaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/SoggettiPraticaPortlet.java @@ -1,6 +1,6 @@ package it.tref.liferay.portos.fe.portlet; -import it.mwg.sismica.bo.shared.util.ValidazionePraticaConstants; +import it.mwg.sismica.fe.util.ValidazionePraticaUtil; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.DocPratica; @@ -276,7 +276,7 @@ public class SoggettiPraticaPortlet extends MVCPortlet { // quella del TITOLARE DIGITALE DELLA PRATICA. if (TipoSoggettoUtil.COMMITTENTE.equals(soggetto.getTipologiaSoggetto())) { String[] titolare = new String[] { dettPratica.getCodiceFiscaleDelegatoCommittente() }; - isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjects(sourceFileName, content, + isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjects(sourceFileName, content, serviceContext.getCompanyId(), Arrays.asList(titolare), jsonFirmatari); } else { List soggettiValidi = SoggettoServiceUtil.getValidTmpByIntPratica(intPraticaId); @@ -287,7 +287,7 @@ public class SoggettiPraticaPortlet extends MVCPortlet { codiciFiscaliValidi.add(valido.getCodiceFiscale()); } } - isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjectsAndPerson(sourceFileName, content, + isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjectsAndPerson(sourceFileName, content, serviceContext.getCompanyId(), codiciFiscaliValidi, soggetto.getCodiceFiscale(), jsonFirmatari); } if (!isSigned) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf index efe02151..5216c02a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf @@ -266,10 +266,6 @@ String script = - <% - System.out.println("##### dettPratica.hasAsseverazioneAttiva(" + user.getUserId() + ") = " - + dettPratica.hasAsseverazioneAttiva(user.getUserId())); - %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index 9755a189..e7a28d03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -4,7 +4,6 @@ <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> @@ -36,7 +35,7 @@ request.setAttribute("bean.dettPratica",dettPratica); boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) || TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()) || TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione()); -boolean disabledCollaudoStatico = SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId()); +boolean disabledCollaudoStatico = intPratica.isCommittenteAndDitta(); boolean isGeoEditable = TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) || TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()); boolean enabledByIntegrazione = dettPratica.hasDelegaCompilazioneDomanda(user.getUserId()) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp index ef4dcdbd..46aa724b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp @@ -22,7 +22,6 @@ <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%> <%@page import="java.text.DateFormat"%> <%@page import="java.util.ArrayList"%> <%@page import="java.util.HashMap"%> @@ -86,8 +85,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto"); <% - boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), - dettPratica.getDettPraticaId()); + boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()); %> <% @@ -358,8 +356,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto"); <% - boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), - dettPratica.getDettPraticaId()); + boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()); %> @@ -515,7 +512,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto"); } %> - + <% User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId()); %> @@ -714,7 +711,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
Liferay.fire('soggetti-ready', { - isCommittenteAndDitta: <%= SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId()) %>, + isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>, }); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp index 2ddde0b7..8cdfd04a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp @@ -48,8 +48,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); <% - boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), - dettPratica.getDettPraticaId()); + boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()); %> <% @@ -213,8 +212,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); <% - boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), - dettPratica.getDettPraticaId()); + boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()); %> @@ -306,8 +304,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); } %> - + <% User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId()); %> @@ -507,6 +504,6 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); Liferay.fire('soggetti-ready', { - isCommittenteAndDitta: <%= SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId()) %>, + isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>, }); \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar index 8af45610..970c9891 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar index 16ed0d16..99715b6a 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar index fe2cf8e3..b631ceb4 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties index 93f0bd20..df702aff 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_kaleo_controller - build.number=13 - build.date=1631285439550 + build.number=14 + build.date=1632922613931 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index 21159b20..3683f047 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties index d8b962c8..54416d69 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Kaleo - build.number=20 - build.date=1631718661033 + build.number=21 + build.date=1632922646927 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index e6d10c1c..5860dd06 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=87 - build.date=1632402791172 + build.number=88 + build.date=1632922791272 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties index 63cc7323..d7415bae 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_maintenance - build.number=43 - build.date=1631870287519 + build.number=44 + build.date=1632922838322 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/tld/c.tld deleted file mode 100644 index 98efa6a6..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/tld/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.2 core library - JSTL core - 1.2 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - com.liferay.taglib.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - com.liferay.taglib.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - com.liferay.taglib.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - com.liferay.taglib.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index 36c9b920..3683f047 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath index 5bbbbb94..20efb31a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath @@ -1,6 +1,7 @@ + @@ -8,12 +9,8 @@ - - - - - - + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..f4beb943 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,9 +1,9 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/PortosReportConstant.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/PortosReportConstant.java index 10f5f261..54432e10 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/PortosReportConstant.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/PortosReportConstant.java @@ -16,5 +16,4 @@ public class PortosReportConstant { public static final String CMD_PDF = "pdf"; public static final String CMD_EXCEL = "excel"; public static final String CMD_WORD = "word"; - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java index c05aaed5..04a92f4a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java @@ -1,7 +1,5 @@ package it.tref.portos.report.engine.util; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; - import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -13,7 +11,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.liferay.portal.kernel.exception.SystemException; +import org.omg.CORBA.SystemException; + import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -31,7 +30,6 @@ public class ReportEngineServiceUtil { } /** - * * Pratiche aperte alla data in input * * @param dateMax @@ -54,8 +52,9 @@ public class ReportEngineServiceUtil { String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, groupId, - type); + // returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, + // groupId, + // type); for (Object[] tmp : returnedList) { if (tmp.length == 8) { Long avvisoid = (Long) tmp[0]; @@ -154,13 +153,12 @@ public class ReportEngineServiceUtil { throws SystemException { Map> map = new HashMap>(); Map returnedMap = new HashMap(); - List returnedList; + List returnedList = new ArrayList<>(); boolean co = type.equalsIgnoreCase("Depositi a controllo obbligatorio"); - String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, - dateMax, groupId, type); + // returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, + // dateMax, groupId, type); for (Object[] tmp : returnedList) { if (tmp.length == 7) { Long avvisoid = (Long) tmp[0]; @@ -494,7 +492,6 @@ public class ReportEngineServiceUtil { } /** - * * @param dataEnd * @param dataStart * @return diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties index 70af90e4..dfaf62c7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_report - build.number=24 - build.date=1630407095253 + build.number=27 + build.date=1632924679303 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties index d91f8d93..eaf1bf4c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_rep - build.number=34 - build.date=1631888828391 + build.number=35 + build.date=1632924732787 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath index f3578aa3..687ac6c4 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath @@ -6,8 +6,5 @@ - - - diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java new file mode 100644 index 00000000..bf5e680a --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java @@ -0,0 +1,17 @@ +package it.mwg.sismica.bo.shared.util; + +public class Generics { + + public static String capitalizeFull(String str) { + + int length = str.length(); + StringBuilder sb = new StringBuilder(length); + boolean capital = true; + for (int i = 0; i < length; i++) { + char c = str.charAt(i); + sb.append(capital ? Character.toTitleCase(c) : Character.toLowerCase(c)); + capital = (c == ' '); + } + return sb.toString(); + } +} diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UnitaOperativeUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UnitaOperativeUtil.java index dae7ca63..ff7b8759 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UnitaOperativeUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UnitaOperativeUtil.java @@ -8,6 +8,7 @@ import java.util.List; import com.liferay.portal.model.User; public class UnitaOperativeUtil { + public static List getUnitaOperative(User user) { List ret = new ArrayList<>(); diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java index 0479692f..71942df6 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java @@ -36,11 +36,11 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final String PROCEDURA_Q8 = "Q8"; public static final String PROCEDURA_Q9 = "Q9"; public static final String PROCEDURA_Q10 = "Q10"; - + public static final String TIPO_PRATICA_DEPOSITO = "01"; public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02"; public static final String TIPO_PRATICA_SANATORIA = "03"; - + public static final int BENI_MOBILI = 1; public static final int BENI_IMMOBILI = 2; public static final int VIARCH = 3; @@ -51,7 +51,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final int COMPAT_PAESAGGISTICA = 8; public static final int SANATORIE = 9; public static final int VINCOLI = 10; - + @SuppressWarnings("serial") public static final Map PRATICA_ZONE = new HashMap() { { @@ -66,7 +66,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { put(PROCEDURA_P8, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_P9, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_P10, TIPO_PRATICA_AUTORIZZAZIONE); - + put(PROCEDURA_Q1, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_Q2, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_Q3, TIPO_PRATICA_AUTORIZZAZIONE); diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index 21159b20..3683f047 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index c1e2b7a0..ed119428 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=65 - build.date=1632757654758 + build.number=66 + build.date=1632922684894 build.auto.upgrade=true ##