From 6e1bf9a577d27f07ce1a300a0873c0dd6b6f6094 Mon Sep 17 00:00:00 2001
From: Mattia Gosetto <mattia@manifatturaweb.it>
Date: Tue, 11 May 2021 16:12:59 +0200
Subject: [PATCH] spostati due campi in visualizzazione pratica

---
 .../navigator/page_dettagli_principali.jsp    | 18 +++++++------
 .../domanda/page_dettagli_principali.jsp      | 27 ++++++++++---------
 .../fascicolofe/view_fascicolo_dettagli.jsp   | 17 ++++++------
 .../docroot/WEB-INF/src/service.properties    |  4 +--
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
index a6e973af..0ae4b253 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
@@ -94,6 +94,10 @@
 								<br />
 								<%=BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %>
 							</div>
+							<div class="col-sm-12 col-md-12">
+								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteBollo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
+							</div>
 							<div class="col-sm-12 col-md-12">
 								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteSpese") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
@@ -125,18 +129,16 @@
 								<%= LanguageUtil.get(pageContext, "no-collaudo") %>
 							</div>
 							<div class="col-sm-12 col-md-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaCollaudatore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "nomina-collaudatore") %>
+								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "collaudoStatico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "collaudo-statico") %>
 							</div>
 							<div class="col-sm-12 col-md-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteBollo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
+								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaCollaudatore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "nomina-collaudatore") %>
 							</div>
+							
 
-							<div class="col-sm-12 col-md-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "collaudoStatico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "collaudo-statico") %>
-							</div>	
+								
 						</div>
 					</div>
 				</liferay-ui:panel>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
index 09a70fbf..f1803b43 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
@@ -109,7 +109,12 @@ boolean enabledByIntegrazione = DelegheUtil.hasDelegaCompilazioneDomanda(user.ge
 														<aui:input type="textarea" name="intervFinPubDesc" disabled="<%=!dettPratica.getIntervFinPub() || disabledInput %>" label=""></aui:input>
 													</div>
 												</div>
-
+                                               <div class="row row-padding-custom ">
+                                                   <div class="col-xs-12">
+                                                       <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="normEsenteBollo"
+                                                                  label="norm-esente-bollo"/>
+                                                   </div>
+                                               </div>
                                                <div class="row row-padding-custom ">
                                                    <div class="col-xs-12">
                                                        <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="normEsenteSpese"
@@ -158,26 +163,24 @@ boolean enabledByIntegrazione = DelegheUtil.hasDelegaCompilazioneDomanda(user.ge
                                                                   label="no-collaudo"/>
                                                    </div>
                                                </div>
+                                               
                                                <div class="row row-padding-custom ">
                                                    <div class="col-xs-12">
-                                                       <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  
-                                                                  name="nominaCollaudatore"
-                                                                  label="nomina-collaudatore"/>
+                                                       <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="collaudoStatico"
+                                                                  label="collaudo-statico"/>
                                                    </div>
                                                </div>
+                                               
                                                <div class="row row-padding-custom ">
                                                    <div class="col-xs-12">
-                                                       <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="normEsenteBollo"
-                                                                  label="norm-esente-bollo"/>
+                                                       <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  
+                                                                  name="nominaCollaudatore"
+                                                                  label="nomina-collaudatore"/>
                                                    </div>
                                                </div>
 
-                                               <div class="row row-padding-custom ">
-                                                   <div class="col-xs-12">
-                                                       <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="collaudoStatico"
-                                                                  label="collaudo-statico"/>
-                                                   </div>
-                                               </div>
+
+
 
                                                <div class="row  row-padding-custom" style="display:none;">
 													<div class="col-xs-1  col-sm-1 col-md-1 col-lg-1">
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
index de594434..a425852c 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
@@ -127,6 +127,10 @@
 								<br />
 								<%=BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %>
 							</div>
+							<div class="col-sm-12 col-md-12">
+								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteBollo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
+							</div>
 							<div class="col-sm-12 col-md-12">
 								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteSpese") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
@@ -157,19 +161,14 @@
 								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "noCollaudo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "no-collaudo") %>
 							</div>
-							<div class="col-sm-12 col-md-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaCollaudatore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "nomina-collaudatore") %>
-							</div>
-							<div class="col-sm-12 col-md-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteBollo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
-							</div>
-
 							<div class="col-sm-12 col-md-12">
 								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "collaudoStatico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "collaudo-statico") %>
 							</div>
+							<div class="col-sm-12 col-md-12">
+								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaCollaudatore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "nomina-collaudatore") %>
+							</div>
 						</div>
 					</div>
 				</liferay-ui:panel>
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
index f1d9575b..2d82ff5a 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
 ##
 
     build.namespace=Kaleo
-    build.number=45
-    build.date=1620643289652
+    build.number=46
+    build.date=1620737685752
     build.auto.upgrade=true
 
 ##