fix asseverazione geologo, fix asseverazione costruttore

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component

@@ -8,6 +8,9 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="portos-accesso-atti-portlet"/>
         <property name="java-output-path" value="/portos-accesso-atti-portlet/docroot/WEB-INF/classes"/>
     </wb-module>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="src" output="service-classes" path="docroot/WEB-INF/service"/>
 	<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"/>

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

@@ -33,15 +33,4 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1701177106006</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.core.resources.prefs

@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-encoding//docroot/WEB-INF/src/content/Language.properties=UTF-8
-encoding//docroot/WEB-INF/src/content/Portal.properties=UTF-8
-encoding//docroot/html/amministrazione/tabs/territori/view.jsp=UTF-8
-encoding//docroot/html/common/import_all_window.jsp=UTF-8
-encoding//docroot/html/common/import_window.jsp=UTF-8
-encoding//docroot/html/fascicolo/actions/action_toggle_sospensione.jsp=UTF-8
-encoding//docroot/html/fascicolo/navigator/header.jsp=UTF-8
-encoding//docroot/html/fascicolo/soggetto_details.jsp=UTF-8
-encoding//docroot/html/gestioneattivita/advanced_search.jsp=UTF-8
-encoding//docroot/html/sismica_administration/init.jsp=UTF-8
-encoding//docroot/html/sismica_administration/view.jsp=UTF-8

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java

@@ -724,7 +724,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 				List<Soggetto> titolareDigitali = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(
 						getIntPraticaId(), titolaredigitaleUser.getScreenName(), 0);
 				for (Soggetto titolareDigitale : titolareDigitali) {
-					soggettiAsseveranti.add(titolareDigitale);
+					soggettiAsseveranti.add(titolareDigitale);  
 				}
 			} else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(getTipoIntegrazione())) {
 				String[] tipoSoggetti = new String[] { TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java

@@ -111,4 +111,5 @@ public class SchedulerEstrazioneFirme implements MessageListener {
 			}
 		}
 	}
+	
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java

@@ -225,6 +225,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 		} else {
 			ambito = LanguageUtil.get(Locale.ITALIAN, "label-ambito-" + ambito);
 		}
+		String name = soggetto.getNome();
 		String html = buffer.toString().replaceAll("##anteprima(.*?)##", anteprima ? StringPool.BLANK : "$1")
 				.replaceAll("##lavoripubblici(.*?)##", dettPratica.getLavoriPubblici() ? StringPool.BLANK : "$1")
 				.replace("{{agalto}}", agAlto ? CHECKED : StringPool.SPACE)
@@ -233,7 +234,8 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 				.replace("{{codicefiscale}}", soggetto.getCodiceFiscale())
 				.replace("{{cognome}}", soggetto.getCognome())
 				.replace("{{complesse}}", complesse ? CHECKED : StringPool.SPACE)
-				.replace("{{nome}}", soggetto.getNome()).replace("{{nuove}}", nuove ? CHECKED : StringPool.SPACE)
+				.replace("{{nome}}", !soggetto.getNome().isEmpty() ? soggetto.getNome() : soggetto.getDenominazione())
+				.replace("{{nuove}}", nuove ? CHECKED : StringPool.SPACE)
 				.replace("{{rilevanti}}", rilevanti ? CHECKED : StringPool.SPACE)
 				.replace("{{nonrilevanti}}", nonRilevanti ? CHECKED : StringPool.SPACE)
 				.replace("{{riparazioni}}", riparazioni ? CHECKED : StringPool.SPACE)

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=2932
+    build.number=2950
-    build.date=1705504502052
+    build.date=1706716023953
     build.auto.upgrade=true
 
 ##

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

@@ -33,15 +33,4 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1672831492473</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-fe-portlet/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.7

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component

@@ -5,9 +5,6 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="portos-fe-portlet"/>
         <property name="java-output-path" value="/portos-fe-portlet/docroot/WEB-INF/classes"/>
     </wb-module>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/asseverazione_actions.jsp

@@ -1,3 +1,5 @@
+<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
@@ -72,33 +74,35 @@ String random = StringUtil.randomId().toString();
 				</aui:script>
 			</span>
 			<span class="tooltip-info" title="Carica asseverazione">
-				<c:if test='<%= comingFrom.equals("verify") %>'>
+				<c:if test='<%=asseverazione.getTipologia().equals(TipoSoggettoUtil.DITTA) %>'>
-					<liferay-portlet:renderURL  var="caricaFileAsseverazioneURL">
+					<c:if test='<%= comingFrom.equals("verify") %>'>
-						<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
+						<liferay-portlet:renderURL  var="caricaFileAsseverazioneURL">
-						<liferay-portlet:param name="backUrl" value="<%=currentURL %>" />
+							<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
-						<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
+							<liferay-portlet:param name="backUrl" value="<%=currentURL %>" />
-						<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
+							<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
-					</liferay-portlet:renderURL>
+							<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
-					<liferay-ui:icon iconCssClass="fa fa-upload" url="<%=caricaFileAsseverazioneURL%>" linkCssClass="btn btn-action btn-primary"/>
+						</liferay-portlet:renderURL>
-				</c:if>
+						<liferay-ui:icon iconCssClass="fa fa-upload" url="<%=caricaFileAsseverazioneURL%>" linkCssClass="btn btn-action btn-primary"/>
-				<c:if test='<%= comingFrom.equals("riepilogo") %>'>
+					</c:if>
-					<%
+					<c:if test='<%= comingFrom.equals("riepilogo") %>'>
-						Map<String,Object> dataMap = new HashMap<String, Object>();
+						<%
-						dataMap.put("id", "dialogAllegaAsseverazione");
+							Map<String,Object> dataMap = new HashMap<String, Object>();
-						dataMap.put("title", "Allega file Asseverazione");
+							dataMap.put("id", "dialogAllegaAsseverazione");
-					%>
+							dataMap.put("title", "Allega file Asseverazione");
-					<liferay-portlet:renderURL var="caricaAsseverazioneRedirectURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
+						%>
-						<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
+						<liferay-portlet:renderURL var="caricaAsseverazioneRedirectURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
-						<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
+							<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
-					</liferay-portlet:renderURL>
+							<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
-					<liferay-portlet:renderURL  var="caricaFileAsseverazioneURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
+						</liferay-portlet:renderURL>
-						<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
+						<liferay-portlet:renderURL  var="caricaFileAsseverazioneURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
-						<liferay-portlet:param name="backUrl" value="<%= caricaAsseverazioneRedirectURL %>" />
+							<liferay-portlet:param name="asseverazioneId" value="<%= String.valueOf(asseverazione.getAsseverazioneId()) %>" />
-						<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
+							<liferay-portlet:param name="backUrl" value="<%= caricaAsseverazioneRedirectURL %>" />
-						<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
+							<liferay-portlet:param name="comingFrom" value="<%= comingFrom %>" />
-					</liferay-portlet:renderURL>
+							<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/add_file_asseverazione.jsp" />
-					<liferay-ui:icon iconCssClass="fa fa-upload" url="<%=caricaFileAsseverazioneURL%>" linkCssClass="btn btn-action btn-primary" 
+						</liferay-portlet:renderURL>
-									useDialog="true" data="<%= dataMap %>"/>
+						<liferay-ui:icon iconCssClass="fa fa-upload" url="<%=caricaFileAsseverazioneURL%>" linkCssClass="btn btn-action btn-primary" 
+										useDialog="true" data="<%= dataMap %>"/>
+					</c:if>
 				</c:if>
 			</span>
 		</c:if>	

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp

@@ -376,6 +376,9 @@
 									<div class="total-row__label">Totale importo</div>
 									<%
 										String speseIstruttoria = Validator.isNull(pagamentoOneri) ? "0,00" : pagamentoOneri.getImporto();
+										if(speseIstruttoria.length() == 2){
+										speseIstruttoria = speseIstruttoria + ",00";
+									}
 									%>
 									<div id="<portlet:namespace/>importoIstruttoria" class="total-row__value">
 										<strong>&euro; <%=speseIstruttoria%></strong>