bbcc
/
paesaggistica
5
0
Forka 0
Codice Problemi Pull Requests Progetti Rilasci Wiki Attività
Sfoglia il codice sorgente

Merge

master
Salvatore La Manna 3 anni fa
parent
22b6e0a672 4a1b9c6571
commit
418ab2a0a2
13 ha cambiato i file con 279 aggiunte e 238 eliminazioni
Spazi bianchi
Visualizza tutti i cambiamenti Ignora spazi bianchi quando confronti le linee Ignora cambiamenti di quantità di spazi bianchi Ignora cambiamenti di spazi bianchi alla fine delle linee
Visualizzazione separata
Opzioni Diff
Mostra statistiche Scarica il file Patch Scarica il file Diff
  1. 6
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
  2. 14
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
  3. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
  4. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java
  5. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  6. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/css/main.css
  7. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
  8. 60
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
  9. 16
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp
  10. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
  11. 38
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
  12. 53
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
  13. 20
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp

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

@ -12,12 +12,6 @@
<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>
<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>
<property name="context-root" value="portos-bo-portlet"/>
<property name="java-output-path" value="/portos-bo-portlet/docroot/WEB-INF/classes"/>
</wb-module>

14
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
Unescape Vedi File

@ -250,13 +250,17 @@ public class DocumentiPraticaUtil {
/*
* if (dettPratica.getNormLavoriInProprio()) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A29); }
*/
if (!dettPratica.getTcNoOpereEscavazione()
&& (!intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8)
|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8)
|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9)
|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)
|| !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || !intPratica
.getTipoProcedura().equals(Constants.PROCEDURA_P10))) {
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1)
)) {
docObbligatori.add(TIPOLOGIA_ALLEGATO_A10);
}
if (richiestoA24(dettPratica)) {

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
Unescape Vedi File

@ -491,7 +491,7 @@ public class ValidazionePraticaUtil {
}
boolean tipologiaCostruttiva = dettPratica.getTcNuovaCostruzione()
|| dettPratica.getTcNuovaCostruzionePertinenza() || dettPratica.getTcCostruzioniEsistenti()
|| dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi();
|| dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi() || dettPratica.getTcNoOpereEscavazione();
if (!tipologiaCostruttiva && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1)
&& !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1)) {
notCompleted.add("Tipologia intervento mancante");

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java
Unescape Vedi File

@ -252,7 +252,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
}
// Dichiarazioni del titolare digitale
boolean a27 = dettPratica.getNoCollaudo();
boolean a27bis = dettPratica.getCollaudoStatico();
boolean a27bis = dettPratica.getNominaCollaudatore();
boolean a29 = dettPratica.getNormLavoriInProprio();
boolean a29bis = dettPratica.getNominaImpresa();
boolean a30 = dettPratica.getNormLavoriNoDirettore();

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
Unescape Vedi File

@ -13,8 +13,8 @@
##
build.namespace=portos_bo
build.number=3310
build.date=1631007735211
build.number=3313
build.date=1630941534079
build.auto.upgrade=true
##

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/css/main.css
Unescape Vedi File

@ -26,3 +26,7 @@
-webkit-transform: translate3d(-50%, 60%, 0);
transform: translate3d(-50%, 60%, 0);
}
.hideSection{
display:none !important;
}

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
Unescape Vedi File

@ -15,6 +15,8 @@ DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica.l
IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
long groupId = GroupLocalServiceUtil.getGroup(intPratica.getCompanyId(), "Portos").getGroupId();
long plidNew = PortalUtil.getPlidFromPortletId(groupId, true, PortletKeys.FASCICOLOFE);
%>
<liferay-ui:header title="<%= dettPratica.getTitle(locale) %>" localizeTitle="false" backURL="<%= backURL %>" />
<div class="container-fluid fascicolo-header">

60
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
Unescape Vedi File

@ -25,12 +25,19 @@ Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
boolean isDisabledMap = ParamUtil.getBoolean(request, "isDisabledMap", false);
String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : "");
String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : "");
String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : "");
String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : "");
String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : "");
%>
<c:if test="<%= Validator.isNull(dettPraticaId) %>">
<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
</c:if>
<div class="container-fluid">
<div class="row">
<div class="row <%= hide8 %> <%= hide10 %>">
<div class="col-sm-12">
<div class="module-group">
<c:if test="<%= AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId()) && TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) %>">
@ -73,7 +80,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
</c:if>
<div class="<%= hide9 %>">
<c:if test="<%= intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA %>">
<div class="row">
<div class="col-sm-12">
@ -82,7 +89,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</c:if>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "lavoriPubblici") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "lavori-pubblici") %>
@ -94,17 +101,17 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<%=BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %>
</div>
</div>
<div class="row">
<div class="row <%= hide3 %> <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"></div>
</div>
</div>
<div class="row">
<div class="row <%= hide3 %> <%= hide1 %>">
<div class="col-sm-12">
<strong><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide3 %> <%= hide1 %>">
<div class="col-sm-12">
<strong><span class='<%=dettPratica.getIntervInAreaDiInteresse() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "interv-in-area-di-interesse") %>
@ -133,46 +140,47 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
</div>
<c:if test='<%= !dettPratica.getEstremiPratCom().equalsIgnoreCase("") %>'>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %>">
<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
<%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %>
</div>
</c:if>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriInProprio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-lavori-in-proprio") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaImpresa") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "nomina-impresa") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriNoDirettore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-lavori-no-direttore") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaDirettoreLavori") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "nomina-direttore-lavori") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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>
</div>
</liferay-ui:panel>
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide10 %>">
<div class="col-sm-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
@ -217,7 +225,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<strong><%= dettPratica.getVia() %></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dc-foglio") %>
</div>
@ -231,7 +239,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<strong><%= dettPratica.getDcAllegato() %></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dc-particelle") %>
</div>
@ -252,7 +260,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-xs-12 cont_maps">
<% String[] geolocalization = dettPratica.getLocalizzazioneGeografica().split(Pattern.quote("|")); %>
<aui:input name="lat" label="" type="hidden"
@ -288,7 +296,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
</c:if>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
@ -306,6 +314,12 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<div class="col-sm-6 col-md-6">
<%= dettPratica.getPaesaggioLocale() %>
</div>
<div class="col-sm-6 col-md-6">
<%= LanguageUtil.get(pageContext, "vincoli") %>
</div>
<div class="col-sm-6 col-md-6">
<%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %>
</div>
</div>
</div>
</liferay-ui:panel>
@ -313,7 +327,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="destinazione" >
@ -343,7 +357,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>" >
<div class="col-sm-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
@ -365,7 +379,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
<strong><span class='<%=dettPratica.getTcManutOrdStraord() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-manut-ord-straord") %>
</div>
<div class="col-xs-12">
<div class="col-xs-12 <%= hide8 %> <%= hide9 %>">
<strong><span class='<%=dettPratica.getTcNoOpereEscavazione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-no-opere-escavazione") %>
</div>
@ -382,7 +396,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_tipologia_costruttiva" >

16
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp
Unescape Vedi File

@ -30,6 +30,14 @@ int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intP
int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
List<HistoryWorkflowAction> historyWorkflowActions = HistoryWorkflowActionLocalServiceUtil.findByIntPratica(
intPraticaId, 0);
String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : "");
String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : "");
String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : "");
String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : "");
String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : "");
%>
<div class="container-fluid">
<div class="row">
@ -114,7 +122,7 @@ List<HistoryWorkflowAction> historyWorkflowActions = HistoryWorkflowActionLocalS
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
@ -126,7 +134,7 @@ List<HistoryWorkflowAction> historyWorkflowActions = HistoryWorkflowActionLocalS
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
@ -189,7 +197,7 @@ List<HistoryWorkflowAction> historyWorkflowActions = HistoryWorkflowActionLocalS
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
@ -221,7 +229,7 @@ List<HistoryWorkflowAction> historyWorkflowActions = HistoryWorkflowActionLocalS
"fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
</div>
<div class="col-sm-12">
<div class="col-sm-12 <%= hide8 %> <%= hide9 %>">
<strong><span class='<%= dettPratica.getTcNoOpereEscavazione() ?
"fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "tc-no-opere-escavazione") %>

4
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -2,10 +2,10 @@
<wb-module deploy-name="portos-fe-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-fe-portlet"/>

38
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
Unescape Vedi File

@ -69,7 +69,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali">
<div class="container-fluid">
<div class="col-sm-12 col-md-12">
<div class="module-group group_dati_catastali <%= hide1 %> <%= hide8 %> <%= hide10 %>">
<div class="module-group group_dati_catastali <%= hide8 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="Normativa">
<div class="row">
@ -109,24 +109,24 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
<c:if test="<%= (intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA) %>">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" type="text" name="interventoVoceP7" style="display:inline-block;width:80px;" label="intervento-voce-p7" />
</c:if>
<div class="row row-padding-custom ">
<div class="row row-padding-custom <%= hide1 %>">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput %>"
name="lavoriPubblici"
label="lavori-pubblici"/>
</div>
</div>
<div class="row row-padding-custom altro_check">
<div class="row row-padding-custom altro_check <%= hide1 %>">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput %>" name="intervFinPub" label="interv-fin-pub"/>
</div>
</div>
<div class="row altro_check">
<div class="row altro_check <%= hide1 %>">
<div class="col-xs-12">
<aui:input type="textarea" name="intervFinPubDesc" disabled="<%=!dettPratica.getIntervFinPub() || disabledInput %>" label=""></aui:input>
</div>
</div>
<div class="row row-padding-custom altro_check excludeOther <%= hide3 %>" data-cont="viarch">
<div class="row row-padding-custom altro_check excludeOther <%= hide3 %> <%= hide1 %>" data-cont="viarch">
<div class="col-md-12 col-lg-12">
<h4><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></h4>
</div>
@ -149,13 +149,13 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
</div>
</div>
<div class="row row-padding-custom ">
<div class="row row-padding-custom <%= hide1 %>">
<div class="col-xs-12 col-sm-6">
<aui:input disabled="<%=disabledInput %>" type="text" name="estremiPratCom"
label="estremi-prat-com"/>
</div>
</div>
<div class="excludeOther" data-cont="impresa">
<div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="impresa">
<div class="row row-padding-custom ">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -172,7 +172,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
</div>
</div>
</div>
<div class="excludeOther" data-cont="direttore_lavori">
<div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="direttore_lavori">
<div class="row row-padding-custom ">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -190,7 +190,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
</div>
</div>
</div>
<div class="excludeOther" data-cont="collaudo">
<div class="excludeOther <%= hide1 %> <%= hide3 %>" data-cont="collaudo">
<div class="row row-padding-custom ">
<div class="col-xs-12">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="noCollaudo"
@ -215,7 +215,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
</div>
</div>
<div class="row row-padding-custom" style="display:none;">
<div class="row row-padding-custom <%= hide1 %> <%= hide3 %>" style="display:none;">
<div class="col-xs-1 col-sm-1 col-md-1 col-lg-1">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="normArt3com3" label="" />
</div>
@ -231,7 +231,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
</div>
</div>
</div>
<div class="row row-padding-custom" style="display:none;">
<div class="row row-padding-custom <%= hide1 %> <%= hide3 %>" style="display:none;">
<div class="col-xs-1">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="normArt3com4" label=""/>
</div>
@ -252,7 +252,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
<div class="module-group group_dati_catastali">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp-dc">
<div class="dati_catastali">
<div class="col-xs-12 cont_maps">
<div class="col-xs-12 cont_maps <%= hide1 %>">
<liferay-ui:tabs names="mappe-bbcc,mappe-openstreetmap"
refresh="false" value="mappe-bbcc">
<liferay-ui:section>
@ -366,9 +366,9 @@ function messageListener(event) {
</div>
</div>
</div>
<div class="col-xs-12 col-md-6">
<div class="col-xs-12 col-md-6 <%= hide1 %>">
<div class="container-fluid">
<div class="row <%= hide1 %>" style="margin-bottom:20px;">
<div class="row" style="margin-bottom:20px;">
<div class="col-xs-12">
<aui:input disabled="<%= isDisabled %>" type="text" name="estremiCatastali" id="input_estremiCatastali"
label="estremi-catastali"/>
@ -558,16 +558,16 @@ function messageListener(event) {
<div class="col-xs-12">
<ul>
<li>
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNuovaCostruzione" label="tc-nuova-costruzione" id="tc-nuova-costruzione"/>
<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcNuovaCostruzione" label="tc-nuova-costruzione" id="tc-nuova-costruzione"/>
</li>
<li>
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNuovaCostruzionePertinenza" label="tc-nuova-costruzione-pertinenza" id="tc-nuova-costruzione-pertinenza"/>
<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcNuovaCostruzionePertinenza" label="tc-nuova-costruzione-pertinenza" id="tc-nuova-costruzione-pertinenza"/>
</li>
<li>
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcCostruzioniEsistenti" label="tc-costruzioni-esistenti" id="tc-costruzioni-esistenti"/>
<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcCostruzioniEsistenti" label="tc-costruzioni-esistenti" id="tc-costruzioni-esistenti"/>
</li>
<li>
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/>
<aui:input disabled="<%= (disabledInput && !enabledByIntegrazione) || !disableViarch %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/>
</li>
<li class="<%= hide8 %> <%= hide9 %>">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNoOpereEscavazione" label="tc-no-opere-escavazione" id="tc-no-opere-escavazione"/>
@ -577,7 +577,7 @@ function messageListener(event) {
<div class="col-xs-12">
<div class="row altro_check">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
<aui:input disabled="<%=disabledInput || !disableViarch %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
</div>
</div>
<div class="row altro_check">

53
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
Unescape Vedi File

@ -65,6 +65,13 @@
Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, true);
String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : "");
String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : "");
String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : "");
String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : "");
String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : "");
%>
<liferay-ui:error key="error-download-pdf-domanda" message="error-download-pdf-domanda" />
@ -79,7 +86,7 @@
<%-- </aui:form> --%>
<liferay-ui:panel-container extended="true" id="outerPanelContainer">
<div class="row">
<div class="row <%= hide8 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali" >
@ -112,6 +119,7 @@
</div>
</c:if>
<div class="<%= hide9 %>">
<c:if test="<%= intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA %>">
<div class="row">
<div class="col-sm-12">
@ -120,7 +128,7 @@
</div>
</c:if>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "lavoriPubblici") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "lavori-pubblici") %>
@ -132,17 +140,17 @@
<%=BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide3 %>">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"></div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide3 %>">
<div class="col-sm-12">
<strong><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide3 %> <%= hide1 %>">
<div class="col-sm-12">
<strong><span class='<%=dettPratica.getIntervInAreaDiInteresse() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "interv-in-area-di-interesse") %>
@ -156,7 +164,7 @@
<%= LanguageUtil.get(pageContext, "interv-non-assoggettabile") %>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"></div>
</div>
@ -176,42 +184,43 @@
<%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %>
</div>
</c:if>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriInProprio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-lavori-in-proprio") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaImpresa") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "nomina-impresa") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriNoDirettore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-lavori-no-direttore") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "nominaDirettoreLavori") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "nomina-direttore-lavori") %>
</div>
<div class="col-sm-12 col-md-12">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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">
<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
<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>
</div>
</liferay-ui:panel>
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
@ -269,7 +278,7 @@
<strong><%=BeanPropertiesUtil.getString(dettPratica, "via") %></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dc-foglio") %>
</div>
@ -277,7 +286,7 @@
<strong><strong><%=BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %></strong></strong>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dc-particelle") %>
</div>
@ -313,7 +322,7 @@
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 <%= hide1 %>">
<div class="container-fluid">
<div class="row cont_maps">
<%
@ -358,7 +367,7 @@
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
@ -403,7 +412,7 @@
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="destinazione" >
@ -435,7 +444,7 @@
</div>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
@ -457,7 +466,7 @@
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcManutOrdStraord") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-manut-ord-straord") %>
</div>
<div class="col-sm-12">
<div class="col-sm-12 <%= hide8 %> <%= hide9 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNoOpereEscavazione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-no-opere-escavazione") %>
</div>
@ -475,7 +484,7 @@
</div>
</div>
<div class="row">
<div class="row <%= hide1 %> <%= hide10 %>">
<div class="col-sm-12 col-md-12">
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_tipologia_costruttiva" >

20
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp
Unescape Vedi File

@ -63,6 +63,12 @@
int nCambioSoggetti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(new String[]{TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO}));
int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : "");
String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : "");
String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : "");
String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : "");
String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : "");
%>
<div class="container-fluid fascicolo-header">
@ -164,7 +170,7 @@
</liferay-ui:panel>
</div>
<div class="module-group">
<div class="module-group <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
<div class="prog-description">
<%=BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %>
@ -172,7 +178,7 @@
</liferay-ui:panel>
</div>
<div class="module-group">
<div class="module-group <%= hide1 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
<div class="container-fluid">
<div class="row">
@ -196,7 +202,7 @@
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInterventoOpereEscavazione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
</div>
<div class="col-sm-12">
<div class="col-sm-12 <%= hide8 %> <%= hide9 %>">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNoOpereEscavazione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-no-opere-escavazione") %>
</div>
@ -334,7 +340,7 @@
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_ubicazione" >
<div class="container-fluid">
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
</div>
@ -342,7 +348,7 @@
<%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<%= LanguageUtil.get(pageContext, "paesaggio-locale") %>
</div>
@ -350,7 +356,7 @@
<%= BeanPropertiesUtil.getString(dettPratica, "paesaggioLocale") %>
</div>
</div>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<%= LanguageUtil.get(pageContext, "vincoli") %>
</div>
@ -392,7 +398,7 @@
</div>
</div>
<hr>
<div class="row">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "estremi-catastali") %>
</div>

Scrivi Anteprima
Caricamento…
Annulla
Salva