fixes vari

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
-</classpath>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>portos-bo-portlet</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1672831492376</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
-  <fixed facet="wst.jsdt.web"/>
-  <fixed facet="java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="liferay.portlet" version="6.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
-</faceted-project>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore

@@ -1,10 +0,0 @@
-/.ant-targets-build.xml
-/.classpath
-/.project
-/.settings/
-/.tern-project
-/build.xml
-/docroot/
-/ivy.xml
-/ivy.xml.MD5
-/test/

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore

@@ -1 +1,2 @@
 /classes/
+/service-classes/

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(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL1");
-			put("FL2", "conf.geniocivile.avviso.template.id.finelavori.FL2");
+			put(FINE_LAVORI_AVVISO_FINE_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL2");
 		}
 	};
 

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

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());

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);

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;

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);

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.number=2860
-    build.date=1678097661105
+    build.date=1678457427172
     build.auto.upgrade=true
 
 ##

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,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp

@@ -29,7 +29,7 @@
 		modelVar="avviso"
 	>
 	
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data" value="<%= dateFormatDate.format(avviso.getDtAvviso()) %>" />
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data" value="<%= Validator.isNotNull(avviso.getDtAvviso()) ?dateFormatDate.format(avviso.getDtAvviso()):StringPool.BLANK %>" />
 		<liferay-ui:search-container-column-text name="Tipo Documento">
 			<%= avviso.getFullDescription() %>
 		</liferay-ui:search-container-column-text>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore

@@ -1 +1,2 @@
 /classes/
+/classes/

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 curFineLavori = FineLavoriLocalServiceUtil.fetchByProtocollo(serviceContext.getCompanyId(),
-			FineLavori fineLavori = FineLavoriServiceUtil
+				serviceContext.getScopeGroupId(), dettPratica.getProtocollo());
-					.addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext);
+		if(Validator.isNull(curFineLavori) || (curFineLavori.isCompletata() && curFineLavori.isParziale())){
-			successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId",
+			try {
-					String.valueOf(fineLavori.getFineLavoriId()));
+				FineLavori fineLavori = FineLavoriServiceUtil
-			/*
+						.addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext);
-			 * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing
+				successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId",
-			 */
+						String.valueOf(fineLavori.getFineLavoriId()));
-			response.sendRedirect(successURL);
+				/*
-		} catch (PortalException | SystemException e) {
+				 * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing
-			successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath",
+				 */
-					"/html/fascicolofe/view.jsp");
+				response.sendRedirect(successURL);
-
+			} catch (PortalException | SystemException e) {
-			response.sendRedirect(successURL);
+				successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath",
-			_log.error(e, e);
+						"/html/fascicolofe/view.jsp");
-			throw e;
+				
+				response.sendRedirect(successURL);
+				_log.error(e, e);
+				throw e;
+			}
 		}
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp

@@ -224,8 +224,8 @@ for (String codiceDoc : tipologiaAllegati) {
 %>
 		<div class="allegati_wrapper row">
 			<span class='num_allegati <%=docPraticas.size()>0 ? "green" : "orange"%>'><%=docPraticas.size()%></span>
-			<liferay-ui:panel extended="false" defaultState="close" collapsible="true" title='<%= nomeAllegato %>'
+			<liferay-ui:panel extended="false" defaultState="open" collapsible="true" title='<%= nomeAllegato %>'
-					id='<%=codiceDoc+"_panel_allegati_"+comingFrom%>' persistState="true">
+					id='<%=codiceDoc+"_panel_allegati_"+comingFrom%>' persistState="true" >
 				<%
 				if (docPraticas.isEmpty()) {
 				%>