From bf5a1da9702ce383f80f13934816f468e0f75462 Mon Sep 17 00:00:00 2001
From: Salvatore La Manna <salvatore@manifatturaweb.it>
Date: Fri, 15 Jan 2021 11:28:51 +0100
Subject: [PATCH] fix di presentazione

---
 .../docroot/html/asset/controllopratica/full_content.jsp  | 8 ++++----
 .../html/portlet/workflow_tasks/workflow_task_action.jsp  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
index 0739c0cd..add4dc99 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
@@ -45,10 +45,13 @@ List<ParereGeologo> pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPrati
 	<div class="container_header_text_attivita">
 		<liferay-ui:icon url="<%=carichiDiLavoro %>" useDialog="true" message="visualizza-carichi-di-lavoro" linkCssClass="btn btn-rounded" iconCssClass="icon-bar-chart"/>
 		<p class="text_attivita">
+			<c:if test="<%= intPratica.getUnitaOperativa() > 0 %>">
+				<strong>Unità Operativa: </strong><%= intPratica.getUnitaOperativa() %> -
+			</c:if>
 			<strong>Tecnico istruttore: </strong> <%= tecnicoIstruttore!=null?tecnicoIstruttore.getFullName(): "Nessun istruttore" %>
 		</p>	
 	</div>
-	
+
 <div>
 	<div class="container_header_text_attivita">
 		<liferay-ui:icon url="<%=carichiDiLavoroGeologo %>" useDialog="true" message="visualizza-carichi-di-lavoro" linkCssClass="btn btn-rounded" iconCssClass="icon-bar-chart"/>
@@ -69,9 +72,6 @@ List<ParereGeologo> pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPrati
 		<li>
 			<strong>
 				<%= geologo.getFullName()%>
-				<c:if test="<%= intPratica.getUnitaOperativa() > 0 %>">
-					&nbsp;U.O. <%= intPratica.getUnitaOperativa() %>
-				</c:if>
 			</strong>: 
 			<c:if test="<%= Validator.isNull(parereGeologo.getParere()) %>">
 				Parere non espresso
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp
index aec7131e..2bf96676 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp
@@ -204,7 +204,7 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
 			iconCssClass="icon-remove"
 			linkCssClass='<%= "workflow-task-" + randomId + " task-remove-assign-uo-link btn btn-large button_custom btn-action" %>'
 			id='<%= randomId + "taskRemoveAssignUOLink" %>'
-			message="remove-uo"
+			message="change-uo"
 			method="get"
 			url="<%= removeUOURL %>"
 		/>