From ffa0b44a2c2ec690c27ae1970d9b4ad7750f7917 Mon Sep 17 00:00:00 2001
From: Marco Alderighi <m.alderighi@nextmind.it>
Date: Wed, 27 Nov 2024 16:02:45 +0100
Subject: [PATCH] fix cambio istruttore e label

---
 .../portos/bo/model/impl/DettPraticaImpl.java |  2 +-
 .../impl/IntPraticaLocalServiceImpl.java      |  4 +--
 .../html/gestioneattivita/action_button.jsp   | 34 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

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 15bd986d..06219689 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
@@ -1282,7 +1282,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 				notCompleted.add("destinazione");
 			}
 			if (Validator.isNull(getVia())) {
-				notCompleted.add("via");
+				notCompleted.add("Indirizzo mancante");
 			}
 			if (Validator.isNull(getLocalizzazioneGeografica()) || getLocalizzazioneGeografica().startsWith("||")) {
 				notCompleted.add("Localizzazione geografica mancante");
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 e7baee7e..79d4a685 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
@@ -943,7 +943,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId);
 		WorkflowTask lastTask = WorkflowUtil.getLastTask(controlloPratica.getCompanyId(),
 				controlloPratica.getGroupId(), null, controlloPratica);
-		if(lastTask.getName().equalsIgnoreCase("assegnazione")){
+//		if(lastTask.getName().equalsIgnoreCase("assegnazione")){
 			
 			IntPratica intPratica = getIntPratica(intPraticaId);
 			intPratica.setStatusByUserId(istruttoreId);
@@ -980,7 +980,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 			} catch (Exception e) {
 				_log.error(e, e);
 			}
-		}
+//		}
 	}
 
 	@Override
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp
index ec1459aa..8552a3b0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp
@@ -98,24 +98,22 @@ long territorioGroupId = territorio.getGroupId();
 				}
 				%>
 			</c:if>
-			<c:if test ='<%= listaTask.get(0).getName().equalsIgnoreCase("assegnazione") %>'>
-				<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId,
-						ActionKeys.CAMBIO_ISTRUTTORE) %>">
-					<c:if test="<%= Validator.isNotNull(intPratica.getStatusByUserId()) %>">
-						<liferay-util:include page="/html/gestioneattivita/actions/action_cambio_istruttore.jsp"
-								servletContext="<%= application %>" >
-							<liferay-util:param name="intPraticaId"
-									value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
-							<liferay-util:param name="controlloPraticaId"
-									value="<%= String.valueOf(controlloPratica.getControlloPraticaId()) %>" />
-							<liferay-util:param name="buttonIdCambioIstruttore" value="<%= buttonIdCambioIstruttore %>" />
-						</liferay-util:include>
-						<div title='<%= LanguageUtil.get(pageContext, "workflow-action-cambia-istruttore") %>'
-								class="tooltip-info">
-							<liferay-ui:icon id="<%= buttonIdCambioIstruttore %>" iconCssClass="fa fa-user-circle"
-									linkCssClass="btn btn-action" message="" url="#" />
-							</div>
-					</c:if>
+			<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId,
+					ActionKeys.CAMBIO_ISTRUTTORE) %>">
+				<c:if test="<%= Validator.isNotNull(intPratica.getStatusByUserId()) %>">
+					<liferay-util:include page="/html/gestioneattivita/actions/action_cambio_istruttore.jsp"
+							servletContext="<%= application %>" >
+						<liferay-util:param name="intPraticaId"
+								value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
+						<liferay-util:param name="controlloPraticaId"
+								value="<%= String.valueOf(controlloPratica.getControlloPraticaId()) %>" />
+						<liferay-util:param name="buttonIdCambioIstruttore" value="<%= buttonIdCambioIstruttore %>" />
+					</liferay-util:include>
+					<div title='<%= LanguageUtil.get(pageContext, "workflow-action-cambia-istruttore") %>'
+							class="tooltip-info">
+						<liferay-ui:icon id="<%= buttonIdCambioIstruttore %>" iconCssClass="fa fa-user-circle"
+								linkCssClass="btn btn-action" message="" url="#" />
+						</div>
 				</c:if>
 			</c:if>
 			<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId,