From f3629b289dbf1f941c24b65a87a7e3426b6fbb86 Mon Sep 17 00:00:00 2001
From: Salvatore La Manna <salvatore.lamanna@mwg.it>
Date: Tue, 14 Sep 2021 18:00:41 +0200
Subject: [PATCH] Organizzazioni

---
 .../docroot/WEB-INF/liferay-portlet.xml       |  2 +-
 .../docroot/WEB-INF/portlet.xml               |  1 +
 .../WEB-INF/src/content/Portal.properties     |  2 +-
 .../docroot/WEB-INF/src/service.properties    |  4 +-
 .../docroot/html/organigramma/view.jsp        | 37 ++++++++++++++-----
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml
index 4cedd60a..66fc6699 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml
@@ -146,7 +146,7 @@
 		<portlet-name>paesaggistica-organigramma</portlet-name>
 		<icon>/icon.png</icon>
 		<control-panel-entry-category>configuration</control-panel-entry-category>
-		<control-panel-entry-weight>1.9</control-panel-entry-weight>
+		<control-panel-entry-weight>2.5</control-panel-entry-weight>
 		<header-portlet-css>/css/main.css?v=1</header-portlet-css>
 		<footer-portlet-javascript>/js/main.js?v=2</footer-portlet-javascript>
 		<css-class-wrapper>paesaggistica-organigramma-portlet</css-class-wrapper>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml
index cc7a76ce..31dc6b78 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml
@@ -337,6 +337,7 @@
 			<mime-type>text/html</mime-type>
 			<portlet-mode>view</portlet-mode>
 		</supports>
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Organigramma</title>
 			<short-title>Organigramma</short-title>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
index b9cdf2a7..5e0f9aa5 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
@@ -1346,4 +1346,4 @@ mappe-openstreetmap = OpenStreetmap
 #tipo_procedura_Q19 = 9) Condono Edilizio
 
 sanatoria-edilizia = Sanatoria edilizia
-intervento-voce-p7 = L.R. 5/2019, art. 3, allegato B: intervento alla voce B
\ No newline at end of file
+intervento-voce-p7 = L.R. 5/2019, art. 3, allegato B: intervento alla voce B
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 fd6f2898..333470d0 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=3357
-    build.date=1631548540307
+    build.number=3358
+    build.date=1631629487673
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/organigramma/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/organigramma/view.jsp
index 35629115..f993d5fe 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/organigramma/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/organigramma/view.jsp
@@ -1,3 +1,8 @@
+<%@page import="com.liferay.portal.kernel.dao.orm.OrderFactoryUtil"%>
+<%@page import="com.liferay.portal.model.UserGroupRole"%>
+<%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%>
+<%@page import="com.liferay.portal.model.Role"%>
+<%@page import="javax.portlet.PortletURL"%>
 <%@page import="org.apache.commons.lang.StringUtils"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.UnitaOperativeUtil"%>
 <%@page import="com.liferay.portal.model.User"%>
@@ -7,10 +12,12 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="/html/init.jsp"%>
 <%
+PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
 long organizationId = ParamUtil.getLong(request, "organization", 0);
 Organization organization = null;
 if (organizationId != 0) {
 	organization = OrganizationLocalServiceUtil.fetchOrganization(organizationId);
+	iteratorURL.setParameter("organization", String.valueOf(organizationId));
 }
 %>
 <h2>
@@ -32,19 +39,31 @@ if (organizationId != 0) {
 	</aui:select>
 	<aui:button type="submit" value="show" />
 </aui:form>
-<h4>Risultati</h4>
-<liferay-ui:search-container emptyResultsMessage="no-entries-were-found">
+<liferay-ui:search-container emptyResultsMessage="no-users-were-found" delta="75" iteratorURL="<%= iteratorURL %>">
 	<liferay-ui:search-container-results
 			total="<%= UserLocalServiceUtil.getOrganizationUsersCount(organizationId) %>"
-			results="<%= UserLocalServiceUtil.getOrganizationUsers(organizationId, searchContainer.getStart(),
-					searchContainer.getEnd(), searchContainer.getOrderByComparator()) %>" />
+			results='<%= UserLocalServiceUtil.getOrganizationUsers(organizationId, searchContainer.getStart(),
+					searchContainer.getEnd(), OrderByComparatorFactoryUtil.create("user_", "LOWER(lastName)", true,
+							"firstName", true)) %>' />
 	<liferay-ui:search-container-row className="com.liferay.portal.model.User" modelVar="orgUser" >
-		<liferay-ui:search-container-column-text name="screenName" />
-		<liferay-ui:search-container-column-text name="firstName" />
-		<liferay-ui:search-container-column-text name="lastName" />
-		<liferay-ui:search-container-column-text name="Unità operative" value="<%= StringUtils.join(UnitaOperativeUtil
+		<liferay-ui:search-container-column-text property="screenName" name="Nome utente" />
+		<liferay-ui:search-container-column-text property="firstName" name="Nome" />
+		<liferay-ui:search-container-column-text property="lastName" name="Cognome" />
+		<liferay-ui:search-container-column-text name="Unità Operative" value="<%= StringUtils.join(UnitaOperativeUtil
 				.getUnitaOperative(orgUser), StringPool.COMMA_AND_SPACE) %>" />
+		<liferay-ui:search-container-column-text name="Ruoli">
+			<%
+			boolean first = true;
+			for (UserGroupRole groupRole : UserGroupRoleLocalServiceUtil.getUserGroupRoles(orgUser.getUserId())) {
+				if (first) {
+					first = false;
+				} else {
+					out.print(StringPool.COMMA_AND_SPACE);
+				}
+				out.print(groupRole.getRole().getName());
+			}
+			%>
+		</liferay-ui:search-container-column-text>
 	</liferay-ui:search-container-row>
 	<liferay-ui:search-iterator paginate="true" />
 </liferay-ui:search-container>
-<h4>/Risultati</h4>