From 88caa473b201d9fa8b6faf004ae7b11713d4489f Mon Sep 17 00:00:00 2001
From: Salvatore La Manna <salvatore@manifatturaweb.it>
Date: Mon, 14 Dec 2020 16:53:28 +0100
Subject: [PATCH] Workflow

---
 .../liferay/portos/bo/model/impl/IntPraticaImpl.java |  7 +------
 .../bo/service/impl/IntPraticaLocalServiceImpl.java  | 12 +++++++-----
 .../docroot/WEB-INF/src/service.properties           |  4 ++--
 .../fascicolofe/view_fascicolo_columns_generic.jspf  |  2 +-
 .../html/fascicolofe/view_fascicolo_riepilogo.jsp    |  2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

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 335e9936..b704dbfc 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
@@ -36,6 +36,7 @@ import com.liferay.portal.kernel.util.Validator;
  *
  * @author Davide Barbagallo, 3F Consulting
  */
+@SuppressWarnings("serial")
 public class IntPraticaImpl extends IntPraticaBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods
@@ -49,12 +50,6 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 
 	}
 
-	@Override
-	public void setStatoPratica(String statoPratica) {
-		_log.info("Progetto " + getNumeroProgetto() + " - setStatoPratica(\"" + statoPratica + "\")");
-		super.setStatoPratica(statoPratica);
-	}
-
 	public String getTitle(Locale locale, boolean completed) {
 
 		DettPratica dettPratica = null;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
index 1ab9e9cf..67999ccd 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
@@ -1005,11 +1005,13 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 			intPratica.setStatoPratica(StatoPraticaConstants.VIDIMATA);
 		} else if (status == WorkflowConstants.STATUS_DENIED) {
 			intPratica.setStatus(status);
-			if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) {
-				intPratica.setStatoPratica(StatoPraticaConstants.NON_AUTORIZZATA);
-			} else {
-				// SANATORIA (da capire)
-				intPratica.setStatoPratica(StatoPraticaConstants.NON_CONFORME);
+			if (!intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.NO_PARERE)) {
+				if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) {
+					intPratica.setStatoPratica(StatoPraticaConstants.NON_AUTORIZZATA);
+				} else {
+					// SANATORIA (da capire)
+					intPratica.setStatoPratica(StatoPraticaConstants.NON_CONFORME);
+				}
 			}
 		} else if (status == WorkflowConstants.STATUS_PENDING) {
 			intPratica.setStatus(WorkflowConstants.STATUS_PENDING);
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 b66c3a6b..7519944d 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=2800
-    build.date=1607692123061
+    build.number=2804
+    build.date=1607702639855
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
index a1398bdc..7783af58 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
@@ -112,7 +112,7 @@
 	</liferay-ui:search-container-column-text>
 	
 	<liferay-ui:search-container-column-text name="Stato Pratica" cssClass="text-nowrap text-center middle-aligned">
-		<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %></strong>
+		<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId())) %></strong>
 		<span class="text-center display-block" style="margin-top:5px">
 			<c:if test="<%= !lastDettPratica.isApproved() && !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(lastDettPratica.getTipoIntegrazione())%>">
 				
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp
index fb358c17..ac3157a8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp
@@ -112,7 +112,7 @@
 								Stato:
 							</div>
 							<div class="col-sm-4 col-md-4">
-								<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %></strong>
+								<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPraticaId)) %></strong>
 							</div>
 						</div>
 					</div>