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

ultime modifiche

master
Mattia Gosetto 4 anni fa
parent
ce935dd843
commit
d67d5a9397
6 ha cambiato i file con 100 aggiunte e 123 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. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  2. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
  3. 36
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/action_button.jsp
  4. 51
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/view_columns.jspf
  5. 102
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
  6. 20
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp

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=2858
build.date=1611666327615
build.number=2859
build.date=1611736407928
build.auto.upgrade=true
##

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
Unescape Vedi File

@ -51,7 +51,7 @@ List<ParereGeologo> pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPrati
<strong>Tecnico istruttore: </strong> <%= tecnicoIstruttore!=null?tecnicoIstruttore.getFullName(): "Nessun istruttore" %>
</p>
</div>
</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"/>

36
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/action_button.jsp
Unescape Vedi File

@ -42,6 +42,24 @@
IntPratica intPratica = (IntPratica) row.getObject();
List<ControlloPratica> controlliPratica = ControlloPraticaLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId());
ControlloPratica controlloPratica = null;
if(controlliPratica.size() > 0)
controlloPratica = controlliPratica.get(controlliPratica.size()-1);
Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL);
long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(),true);
WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(
controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey());
List<WorkflowTask> listaTask = null;
if (workflowInstanceLink == null) {
listaTask = new ArrayList<WorkflowTask>();
} else {
listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null,
workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
}
%>
<liferay-ui:icon-menu icon="" showWhenSingleIcon="false" showExpanded="true" cssClass="menu_button_activity">
@ -52,6 +70,24 @@
message=""
url="<%=FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()) %>" />
</div>
<c:if test="<%= !listaTask.isEmpty() %>">
<%
PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS,controlPanelPlid, PortletRequest.RENDER_PHASE);
workflowTaskURL.setParameter("struts_action",
"/my_workflow_tasks/edit_workflow_task");
workflowTaskURL.setParameter("workflowTaskId",String.valueOf(listaTask.get(0).getWorkflowTaskId()));
workflowTaskURL.setPortletMode(PortletMode.VIEW);
workflowTaskURL.setWindowState(LiferayWindowState.POP_UP);
%>
<div title='<%=LanguageUtil.get(pageContext,"workflow-action-manage") %>' class="tooltip-info">
<liferay-ui:icon useDialog="true"
iconCssClass="fa fa-list-ol"
linkCssClass="btn btn-action"
message=""
url='<%=workflowTaskURL.toString()+"&controlPanelCategory=my" %>' />
</div>
</c:if>
</liferay-ui:icon-menu>

51
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/view_columns.jspf
Unescape Vedi File

@ -27,6 +27,7 @@ Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompany
List<Soggetto> committenti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPratica.getIntPraticaId(), TipoSoggettoUtil.COMMITTENTE);
List<Soggetto> direttoreLavori = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPratica.getIntPraticaId(), TipoSoggettoUtil.DIRETTORE_LAVORI);
List<Soggetto> collaudatori = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPratica.getIntPraticaId(), TipoSoggettoUtil.COLLAUDATORE);
List<Soggetto> progettisti = SoggettoLocalServiceUtil.findByIntPratica_TipologiaSoggetto(intPratica.getIntPraticaId(), TipoSoggettoUtil.PROGETTISTA);
boolean completata = intPratica.isChiusa();
@ -36,11 +37,6 @@ if(collaudatori != null && !collaudatori.isEmpty()){
collaudoPrevisto = true;
}
%>
<liferay-ui:search-container-column-text name="tipoPratica">
<liferay-ui:message key='<%="tipo-pratica-"+intPratica.getTipoPratica() %>'/>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text property="numeroProgetto" name="Numero Progetto" />
<liferay-ui:search-container-column-text name="Data Vidimazione" value="<%= intPratica.getDtPratica() == null ? \"\" : dateFormatDate.format(intPratica.getDtPratica()) %>" />
@ -49,10 +45,6 @@ if(collaudatori != null && !collaudatori.isEmpty()){
<%=comune.getDenominazione() %>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="provincia">
<%=provincia.getProvincia() %>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Stato Pratica">
<%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId())) %>
</liferay-ui:search-container-column-text>
@ -67,50 +59,13 @@ if(collaudatori != null && !collaudatori.isEmpty()){
%>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Direttore Lavori">
<liferay-ui:search-container-column-text name="Progettista">
<%
for(Soggetto soggetto : direttoreLavori){
for(Soggetto soggetto : progettisti){
%>
<%= soggetto.getDescrizioneCompleta() %>
<%
}
%>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Tipologia Intervento">
<c:if test="<%=lastDettPratica != null %>">
<c:if test="<%=lastDettPratica.getTcNuovaCostruzione() %>">
Nuova Costruzione
</c:if>
<c:if test="<%=lastDettPratica.getTcAdeguamentoSismico() %>">
Adeguamento Sismico
</c:if>
<c:if test="<%=lastDettPratica.getTcMiglioramentoSismico() %>">
Miglioramento Sismico
</c:if>
<c:if test="<%=lastDettPratica.getTcRiparazioneInterventoLocale() %>">
Riparazione Intervento Locale
</c:if>
</c:if>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Chiusa">
<c:if test="<%=completata %>">
SI
</c:if>
<c:if test="<%=!completata %>">
NO
</c:if>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Collaudo Previsto">
<c:if test="<%=collaudoPrevisto %>">
SI
</c:if>
<c:if test="<%=!collaudoPrevisto %>">
NO
</c:if>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-date property="statusDate" name="Ultimo aggiornamento" />
<liferay-ui:search-container-column-jsp path="/html/gestioneattivitaistruttore/action_button.jsp" align="right" cssClass="text-center"/>

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

@ -105,75 +105,29 @@
<%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %>
</div>
</div>
<c:if test="<%= intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) %>">
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-sensi") %></div>
<div class="col-sm-12">
<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "sanatoria-edilizia") %></div>
</div>
</div>
<div class="row">
<c:if test="<%= AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) %>">
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr01Dep") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dpr01-dep") %>
<div class="col-sm-12">
<strong><span class='<%=dettPratica.getSanatoriaEdilizia47() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-47") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr02Dep") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dpr02-dep") %>
<div class="col-sm-12">
<strong><span class='<%=dettPratica.getSanatoriaEdilizia724() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-724") %>
</div>
</c:if>
<c:if test="<%= AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId()) %>">
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr01Aut") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dpr01-aut") %>
<div class="col-sm-12">
<strong><span class='<%=dettPratica.getSanatoriaEdilizia326() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-326") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr02Aut") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dpr02-aut") %>
</div>
</c:if>
</div>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-rispetto") %></div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm2018") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dm2018") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm01") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dm01") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm02") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dm02") %>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-normativa") %>:</div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm03") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dm03") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDprg01") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dprg01") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDprg02") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-dprg02") %>
</div>
<div class="col-sm-6 col-md-6">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normAnr") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%= LanguageUtil.get(pageContext, "norm-anr") %>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="fascicolo_header_row"></div>
@ -188,6 +142,10 @@
<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") %>
</div>
<div class="col-sm-6 col-md-6">
<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-6 col-md-6">
<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") %>
@ -200,6 +158,10 @@
<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-6 col-md-6">
<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="container-regolamento">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normArt3com3") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>' style="margin-right: 10px;"></span></strong>
@ -412,22 +374,34 @@
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzionePertinenza") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
</div>
<div class="col-sm-12">
<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-rest-dem") %>
</div>
<div class="col-sm-12">
<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">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcViarch") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-viarch") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcOperaA25") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-opera-a25") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcAltriInterventi") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-altro-intervento") %>
</div>
<div class="col-sm-12">
<%=BeanPropertiesUtil.getString(dettPratica, "tcAltriInterventiDesc") %>
</div>

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

@ -180,22 +180,34 @@
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzionePertinenza") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
</div>
<div class="col-sm-12">
<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-rest-dem") %>
</div>
<div class="col-sm-12">
<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">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcViarch") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-viarch") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcOperaA25") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-opera-a25") %>
</div>
<div class="col-sm-12">
<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcAltriInterventi") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
<%=LanguageUtil.get(pageContext, "tc-altro-intervento") %>
</div>
<div class="col-sm-12">
<%=BeanPropertiesUtil.getString(dettPratica, "tcAltriInterventiDesc") %>
</div>

Scrivi Anteprima
Caricamento…
Annulla
Salva