- aggiunto impersonamento per i soggetti

- revisione grafica

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/build.xml

@@ -2,5 +2,6 @@
 <!DOCTYPE project>
 
 <project name="portos-advanced-operation-portlet" basedir="." default="deploy">
+	<property name="import.shared" value="portos-report-shared" />
 	<import file="../build-common-portlet.xml" />
 </project>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/css/main.css

@@ -0,0 +1,10 @@
+
+
+.title-text{
+	font-weight: bold;
+}
+
+
+#impersonaSoggettiBtn{
+	cursor: pointer;
+}

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp

@@ -1,3 +1,8 @@
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
+<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
+<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
 <%@page import="com.liferay.portal.kernel.util.DateFormatFactoryUtil"%>
 <%@page import="java.util.Date"%>
 <%@page import="com.liferay.portal.util.PortalUtil"%>
@@ -66,21 +71,15 @@
 		<aui:row style="margin-top: 10px" id="praticaAdminDiv">
 			<aui:row id="praticaRecapDiv">
 				<aui:row>
-					<liferay-security:doAsURL 
-						doAsUserId="<%= intPratica.getUserId() %>"
-						var="impersonateUserURL">
-					</liferay-security:doAsURL>
 					<aui:col span="3">
 						<p style="font-size: 30px; margin: 20px 0;">
 							<b>Pratica:</b>  <%= intPraticaId %> 
-							<liferay-ui:icon 
-								image="impersonate_user"
-								target="_blank"
-								url="<%= impersonateUserURL %>">
-							</liferay-ui:icon>
 						</p>
 					</aui:col>
 				</aui:row>
+				<aui:row>
+					<div class="module-group">
+						<liferay-ui:panel title="DETTAGLI" collapsible="false" extended="true"> 
 							<aui:row>
 								<aui:col span="2">
 									<p><b>Numero Progetto:</b>  <%= intPratica.getNumeroProgetto() %></p>
@@ -130,9 +129,10 @@
 									%>
 									<aui:form action="<%= cambiaDataInizioLavoriURL %>" method="post" name="cambiaDataInizioLavori">
 										<div style="display:flex;">
+											<p><b>Data inizio Lavori Opera:</b></p>
 											<aui:input 
 												name="dataInizioLavoriOperaInput" 
-									label="Data inizio Lavori Opera"
+												label=""
 												inlineLabel="left"
 												type="date"
 												value='<%= DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd").format(dataInizioLavoriOpera) %>'>
@@ -150,10 +150,11 @@
 							 	</aui:row>
 						 	<% } %>
 						 	<aui:row>
+						 		<div style="display:flex;">
 									<% if(AdvancedOperationUtil.hasDettPratica(intPraticaId)){ 
 											boolean normLavoriInProprioFlag = AdvancedOperationUtil.getNormLavoriInProprioFlag(intPraticaId);
 									%>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixNormLavoriInProprio" 
 											var="fixNormLavoriInProprioURL" >
@@ -172,13 +173,13 @@
 												value="<%= AdvancedOperationUtil.getLavoriInEconomiaBtnLabel(normLavoriInProprioFlag) %>" 
 												onClick='<%= functionLavori %>'/>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.hasDettPratica(intPraticaId)){ 
 											boolean collaudoStaticoFlag = AdvancedOperationUtil.getCollaudoStaticoFlag(intPraticaId);
 									%>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixCollaudoStatico" 
 											var="fixCollaudoStaticoURL" >
@@ -197,11 +198,11 @@
 												value="<%= AdvancedOperationUtil.getCollaudoStaticoBtnLabel(collaudoStaticoFlag) %>" 
 												onClick='<%= functionCollaudoStatico %>'/>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.isStatoPraticaIN(intPratica)){ %>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixStatusPratica" 
 											var="fixStatusPraticaURL" >
@@ -221,11 +222,11 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.isPraticaAnnullata(intPratica)){ %>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="ripristinaPraticaVidimata" 
 											var="ripristinaPraticaVidimataURL" >
@@ -245,8 +246,8 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
+									</div>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="ripristinaPraticaConforme" 
 											var="ripristinaPraticaConformeURL" >
@@ -266,11 +267,91 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
+								</div>
 							</aui:row>
+						</liferay-ui:panel>
+					</div>
+					<div class="module-group">
+					 	<liferay-ui:panel title="IMPERSONAMENTO" extended="true" collapsible="false">
+							<aui:row>
+								<div style="display:flex;">
+									<liferay-security:doAsURL 
+										doAsUserId="<%= intPratica.getUserId() %>"
+										var="impersonateUserURL">
+									</liferay-security:doAsURL>
+									<div style=" margin-right: 15px;">
+										<p><b>Impersona titolare:</b></p>
+									</div>
+									<liferay-ui:icon 
+										image="impersonate_user"
+										target="_blank"
+										url="<%= impersonateUserURL %>">
+									</liferay-ui:icon>
+								</div>
+							</aui:row>
+							<% if(SoggettoLocalServiceUtil.countByIntPratica(intPraticaId) > 1){ %>
+								<aui:row>
+									<div style="display:flex;">
+										<div style=" margin-right: 15px;">
+											<p><b>Impersona soggetti:</b></p>
+										</div>
+										<liferay-ui:icon 
+											id="impersonaSoggettiBtn"
+											image="team_icon"
+											target="_blank"
+											>
+										</liferay-ui:icon>
+									</div>
+								</aui:row>
+								<aui:row>
+									<div id="sc-soggetti-da-impersonare" class="hide">
+										<liferay-ui:search-container emptyResultsMessage="Nessun soggetto disponibile">
+											<liferay-ui:search-container-results
+												results="<%= SoggettoLocalServiceUtil.findByIntPratica(intPraticaId) %>"
+												total="<%= SoggettoLocalServiceUtil.countByIntPratica(intPraticaId) %>"
+											/>
+											<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto" modelVar="soggetto">
+												<liferay-security:doAsURL 
+													doAsUserId="<%= soggetto.getUserId() %>"
+													var="impersonateSoggettoURL">
+												</liferay-security:doAsURL>
+												<liferay-ui:search-container-column-text name="RUOLO">
+													<%= soggetto.getFullTipologiaSoggetto() %>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="DENOMINAZIONE">
+													<%= soggetto.getDescrizioneCompleta() %>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="AGGIUNTO DA">
+													<%
+													DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(soggetto.getDettPraticaId());
+													if (adding != null) {
+														out.print(adding.getFullDescription());
+													}
+													%>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="IMPERSONA" cssClass="text-center text-nowrap">
+													<liferay-ui:icon 
+														image="impersonate_user"
+														message="Impersona Soggetto"
+														target="_blank"
+														url="<%= impersonateSoggettoURL %>" 
+													>
+													</liferay-ui:icon>
+												</liferay-ui:search-container-column-text>
+											</liferay-ui:search-container-row>
+											<liferay-ui:search-iterator paginate="false" />
+										</liferay-ui:search-container>
+									</div>
+								</aui:row>
+							<% } %>
+						</liferay-ui:panel>
+					</div>
 				</aui:row>
 				<aui:row id="docPraticaDiv">
+					<div class="module-group">
+						<liferay-ui:panel title="DOCUMENTI ORFANI" collapsible="false" extended="true"> 
 						<% 
 							List<DocPratica> docPraticaList = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId);
 						%>
@@ -339,11 +420,14 @@
 									</aui:button-row>
 								</aui:form>
 							</aui:row>
+						</liferay-ui:panel>
+					</div>
 					<%
 						}
 					%>
 				</aui:row>
 			</aui:row>
+		</aui:row>
 	<% } %>
 </aui:container>
 
@@ -357,6 +441,16 @@
 
 <aui:script use="event-valuechange,aui-modal,aui-io-request">
 
+	A.one('#impersonaSoggettiBtn').on('click', function(){
+		var soggettoDiv = A.one('#sc-soggetti-da-impersonare');
+		if(soggettoDiv.hasClass('hide')){
+			soggettoDiv.show();
+		} else {
+			soggettoDiv.hide();
+		}
+		
+	});
+
 	A.one('#<portlet:namespace />intPraticaId').on('valuechange', function(e){
 		if(e.newVal <= 0 ){
 			A.one('#<portlet:namespace />numeroProgetto').attr('disabled', false);

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

@@ -3,9 +3,6 @@
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
-        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>