diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index 17a80458..1e7ac734 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath deleted file mode 100644 index bc2c439b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project deleted file mode 100644 index 3f54558e..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project +++ /dev/null @@ -1,47 +0,0 @@ - - - portos-bo-portlet - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - - - 1672831492376 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index f256af25..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore deleted file mode 100644 index 98f66096..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/.ant-targets-build.xml -/.classpath -/.project -/.settings/ -/.tern-project -/build.xml -/docroot/ -/ivy.xml -/ivy.xml.MD5 -/test/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore index 840e7d31..3e1644af 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/service-classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 2d4f2679..89ae4284 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 17a80458..1e7ac734 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index 9e45a856..777fe321 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -56,6 +56,8 @@ public class AvvisoUtil { put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata"); put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "label.admingeniocivile.avviso.tipoDocumento.cambioistruttore"); + put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.avvisoInizioLavori"); + put(FINE_LAVORI_AVVISO_FINE_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.avvisoFineLavori"); } }; @@ -79,6 +81,8 @@ public class AvvisoUtil { put("MA", "conf.geniocivile.avviso.folder.id.manuale"); put("PG", "conf.geniocivile.avviso.folder.id.doc_pagamento"); put("DOM", "conf.geniocivile.avviso.folder.id.domanda_pdf"); + put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "conf.geniocivile.avviso.folder.id.finelavori.FL1"); + put(FINE_LAVORI_AVVISO_FINE_LAVORI, "conf.geniocivile.avviso.folder.id.finelavori.FL2"); } }; @@ -115,8 +119,8 @@ public class AvvisoUtil { put("DPPS", "conf.geniocivile.avviso.template.id.deposito.PS"); put("DPS", "conf.geniocivile.avviso.template.id.deposito.S"); - put("FL1", "conf.geniocivile.avviso.template.id.finelavori.FL1"); - put("FL2", "conf.geniocivile.avviso.template.id.finelavori.FL2"); + put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL1"); + put(FINE_LAVORI_AVVISO_FINE_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL2"); } }; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 6142b25b..615e015d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -1173,6 +1173,9 @@ label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata = Avviso di vi label.admingeniocivile.avviso.tipoDocumento.avvisomanuale = Avviso generico label.admingeniocivile.avviso.tipoDocumento.cambioistruttore = Avviso di cambio istruttore label.admingeniocivile.avviso.tipoDocumento.variazioneSoggetto = Avviso di variazione soggetto +label.admingeniocivile.avviso.tipoDocumento.avvisoInizioLavori = Avviso di Inizio Lavori +label.admingeniocivile.avviso.tipoDocumento.avvisoFineLavori = Avviso di Fine Lavori + label.admingeniocivile.avviso.documento.conforme = Conformità/Autorizzazione label.admingeniocivile.avviso.documento.nonconforme = Conformità negata diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index f763e89d..64371783 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -179,14 +179,20 @@ public class ReportAvvisoBeanBuilder { if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); bean.setDataPratica(fineLavori.getDtProtocollo()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo())); + if(Validator.isNotNull(fineLavori.getDtProtocollo())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo())); + } } else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); bean.setDataPratica(collaudo.getDtProtocollo()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo())); + if(Validator.isNotNull(collaudo.getDtProtocollo())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo())); + } } else { bean.setDataPratica(intPratica.getDtPratica()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica())); + if(Validator.isNotNull(intPratica.getDtPratica())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica())); + } } bean.setDataAvviso(avviso.getModifiedDate()); bean.setTipoPratica(intPratica.getTipoPratica()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java index 0ec55e1d..50fd7765 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java @@ -1,5 +1,33 @@ package it.tref.liferay.portos.bo.scheduler; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.json.JSONSerializer; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.messaging.Message; +import com.liferay.portal.kernel.messaging.MessageListener; +import com.liferay.portal.kernel.messaging.MessageListenerException; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; +import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.workflow.WorkflowException; +import com.liferay.portal.kernel.workflow.WorkflowInstance; +import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; +import com.liferay.portal.model.Company; +import com.liferay.portal.service.CompanyLocalServiceUtil; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.workflow.kaleo.model.KaleoInstance; +import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; +import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; +import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; + import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.Comune; @@ -47,34 +75,6 @@ import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.json.JSONSerializer; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.messaging.Message; -import com.liferay.portal.kernel.messaging.MessageListener; -import com.liferay.portal.kernel.messaging.MessageListenerException; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.util.ArrayUtil; -import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.workflow.WorkflowException; -import com.liferay.portal.kernel.workflow.WorkflowInstance; -import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; -import com.liferay.portal.model.Company; -import com.liferay.portal.service.CompanyLocalServiceUtil; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.workflow.kaleo.model.KaleoInstance; -import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; -import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; - public class SchedulerInvioDocumento implements MessageListener { private static final Log _log = LogFactoryUtil.getLog(SchedulerInvioDocumento.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index dbb26ed1..f961d8b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -1836,7 +1836,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl String className, ServiceContext serviceContext) throws SystemException, PortalException { String descLong = StringPool.BLANK; - Date dtAvviso = serviceContext.getModifiedDate(); + Date dtAvviso = serviceContext.getModifiedDate(new Date()); String tipoAvviso = AvvisoUtil.TIPO_AVVISO_DIRETTO; String tipoDocumento = AvvisoUtil.FINE_LAVORI_AVVISO_INIZIO_LAVORI; String propertiesTemplateType = AvvisoUtil.FINE_LAVORI_AVVISO_INIZIO_LAVORI; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index 88956e03..333b52d8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -175,7 +175,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { String tipoDocumento,ServiceContext serviceContext) throws SystemException, PortalException { String descLong = StringPool.BLANK; - Date dtAvviso = serviceContext.getModifiedDate(); + Date dtAvviso = serviceContext.getModifiedDate(new Date()); String tipoAvviso = AvvisoUtil.TIPO_AVVISO_DIRETTO; String propertiesTemplateType = tipoDocumento; String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(propertiesTemplateType); 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 8a2a37f1..86e1e9e0 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=2857 - build.date=1678097661105 + build.number=2860 + build.date=1678457427172 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp index f18412de..68cd1ef4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp @@ -17,7 +17,7 @@ <% long companyId = company.getCompanyId(); String tabs1 = "parametri"; -String redirect = "/html/amministrazione/tabs/view.jsp"; +String redirect = "/html/amministrazione/tabs/view.jps"; String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_VERSIONING); String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp index 16004128..77e5323c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp @@ -29,7 +29,7 @@ modelVar="avviso" > - + <%= avviso.getFullDescription() %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore index 840e7d31..22dde0b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 2d4f2679..89ae4284 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 17a80458..1e7ac734 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ 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 d45abb1a..a16c228b 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,5 +1,42 @@ package it.tref.liferay.portos.fe.portlet; +import com.liferay.portal.kernel.dao.orm.QueryUtil; +import com.liferay.portal.kernel.exception.NestableException; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONArray; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.json.JSONSerializer; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.servlet.SessionErrors; +import com.liferay.portal.kernel.upload.UploadPortletRequest; +import com.liferay.portal.kernel.util.ContentTypes; +import com.liferay.portal.kernel.util.DateFormatFactoryUtil; +import com.liferay.portal.kernel.util.FileUtil; +import com.liferay.portal.kernel.util.HttpUtil; +import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.util.WebKeys; +import com.liferay.portal.kernel.workflow.WorkflowConstants; +import com.liferay.portal.model.User; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.ServiceContextFactory; +import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.theme.ThemeDisplay; +import com.liferay.portal.util.PortalUtil; +import com.liferay.portlet.documentlibrary.model.DLFolder; +import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; +import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; +import com.liferay.portlet.documentlibrary.util.DLUtil; +import com.liferay.util.bridges.mvc.MVCPortlet; + import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.Comune; @@ -13,11 +50,9 @@ import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; @@ -39,7 +74,6 @@ import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AsseverazioniUtil; -import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.bo.util.MailUtil; @@ -82,43 +116,6 @@ import net.sf.jasperreports.engine.xml.JRXmlLoader; import org.apache.commons.lang.StringUtils; -import com.liferay.portal.kernel.dao.orm.QueryUtil; -import com.liferay.portal.kernel.exception.NestableException; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONArray; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.json.JSONSerializer; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.servlet.ServletResponseUtil; -import com.liferay.portal.kernel.servlet.SessionErrors; -import com.liferay.portal.kernel.upload.UploadPortletRequest; -import com.liferay.portal.kernel.util.ContentTypes; -import com.liferay.portal.kernel.util.DateFormatFactoryUtil; -import com.liferay.portal.kernel.util.FileUtil; -import com.liferay.portal.kernel.util.HttpUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portal.model.User; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.theme.ThemeDisplay; -import com.liferay.portal.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; -import com.liferay.util.bridges.mvc.MVCPortlet; - public class FascicoloFePortlet extends MVCPortlet { private static final Log _log = LogFactoryUtil.getLog(FascicoloFePortlet.class); @@ -584,22 +581,26 @@ public class FascicoloFePortlet extends MVCPortlet { if (dettPratica == null) { dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); } - try { - FineLavori fineLavori = FineLavoriServiceUtil - .addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext); - successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId", - String.valueOf(fineLavori.getFineLavoriId())); - /* - * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing - */ - response.sendRedirect(successURL); - } catch (PortalException | SystemException e) { - successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath", - "/html/fascicolofe/view.jsp"); - - response.sendRedirect(successURL); - _log.error(e, e); - throw e; + FineLavori curFineLavori = FineLavoriLocalServiceUtil.fetchByProtocollo(serviceContext.getCompanyId(), + serviceContext.getScopeGroupId(), dettPratica.getProtocollo()); + if(Validator.isNull(curFineLavori) || (curFineLavori.isCompletata() && curFineLavori.isParziale())){ + try { + FineLavori fineLavori = FineLavoriServiceUtil + .addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext); + successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId", + String.valueOf(fineLavori.getFineLavoriId())); + /* + * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing + */ + response.sendRedirect(successURL); + } catch (PortalException | SystemException e) { + successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath", + "/html/fascicolofe/view.jsp"); + + response.sendRedirect(successURL); + _log.error(e, e); + throw e; + } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 696125c7..394fbd73 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -224,8 +224,8 @@ for (String codiceDoc : tipologiaAllegati) { %>
<%=docPraticas.size()%> - + <% if (docPraticas.isEmpty()) { %>