Sfoglia il codice sorgente

spostati due campi in visualizzazione pratica

master
Mattia Gosetto 4 anni fa
parent
commit
6e1bf9a577
  1. 18
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
  2. 27
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
  3. 17
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
  4. 4
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

18
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>

27
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,27 +163,25 @@ 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"/>
</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="collaudoStatico"
label="collaudo-statico"/>
</div>
</div>
<div class="row row-padding-custom ">
<div class="col-xs-12">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="collaudoStatico"
label="collaudo-statico"/>
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
name="nominaCollaudatore"
label="nomina-collaudatore"/>
</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">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="normArt3com3" label="" />

17
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>

4
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
##

Caricamento…
Annulla
Salva