Salvatore La Manna 4 anni fa
parent
commit
43c7107685
  1. 11
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
  2. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  3. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
  4. 56
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp
  5. 7
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/verify_ok.jsp
  6. 13
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp
  7. 19
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp
  8. 134
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp
  9. 26
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp
  10. 1
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/init.jsp
  11. 31
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp
  12. 1021
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp
  13. 7
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto_modal.jsp
  14. 17
      liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project

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

@ -11,6 +11,7 @@ import it.tref.liferay.portos.bo.model.Territorio;
import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil;
import it.tref.liferay.portos.bo.service.CollaudoServiceUtil;
import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil;
import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
@ -77,10 +78,12 @@ public class ValidazionePraticaUtil {
}
public static boolean praticaIsCompleta(long dettPraticaId) throws SystemException, PortalException {
return isDettagliPrincipaliCompleta(dettPraticaId) && isAnagrafeSoggettiCompleta(dettPraticaId)
&& isDescrizioneEdificioCompleta(dettPraticaId) && isSezioneGeologicaCompleta(dettPraticaId)
&& isSezioneAllegatiCompleta(dettPraticaId);
DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
return isDettagliPrincipaliCompleta(dettPraticaId)
&& isAnagrafeSoggettiCompleta(dettPraticaId)
&& isDescrizioneEdificioCompleta(dettPraticaId)
&& isSezioneGeologicaCompleta(dettPraticaId)
&& ((dettPratica.getStatus() != WorkflowConstants.STATUS_DRAFT) || isSezioneAllegatiCompleta(dettPraticaId));
}
public static boolean canEditPratica(long intPraticaId) throws PortalException, SystemException {

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

@ -13,8 +13,8 @@
##
build.namespace=portos_bo
build.number=2548
build.date=1611828850885
build.number=2552
build.date=1614942025006
build.auto.upgrade=true
##

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

@ -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"/>

56
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp

@ -1,18 +1,9 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.SessionUtil"%>
<%@page import="com.liferay.portal.kernel.util.HttpUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%>
<%@page import="it.tref.liferay.portos.bo.model.Delega"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
<%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.SessionUtil"%>
<%@include file="/html/fascicolofe/init.jsp"%>
<%
String backURL = ParamUtil.getString(request, "backURL");
@ -107,7 +98,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
formName="fmDomande"
jspPath="/html/fascicolofe/navigator/domanda/"
htmlBottom="<%= htmlBottom %>"
showButtons="<%=false %>"
showButtons="false"
htmlTop="<%= htmlTop %>" />
</aui:form>
@ -121,13 +112,11 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
<portlet:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>" />
</portlet:renderURL>
<aui:script use="aui-base">
Liferay.Util.openWindow(
{
Liferay.Util.openWindow({
id: '<portlet:namespace />openVerificaFascicolo',
title: 'Verifica Domanda',
uri: '<%= verifyRenderURL %>'
}
);
});
</aui:script>
</c:if>
<c:if test='<%= "verifyDeleghe".equalsIgnoreCase(verifyArea) %>'>
@ -139,13 +128,11 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
<liferay-portlet:param name="backVisible" value="false" />
</liferay-portlet:renderURL>
<aui:script use="aui-base">
Liferay.Util.openWindow(
{
Liferay.Util.openWindow({
id: '<portlet:namespace />openVerificaDeleghe',
title: 'Gestione Deleghe',
uri: '<%= verifyDelegheRenderURL %>'
}
);
});
</aui:script>
</c:if>
</c:if>
@ -156,13 +143,11 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
<portlet:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>" />
</portlet:renderURL>
<aui:script use="aui-base">
Liferay.Util.openWindow(
{
Liferay.Util.openWindow({
id: '<portlet:namespace />openVerificaFascicolo',
title: 'Verifica Cambio Soggetti',
uri: '<%= verifyRenderURL %>'
}
);
});
</aui:script>
</c:if>
</c:if>
@ -177,13 +162,11 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
<liferay-portlet:param name="backURL" value="<%= currentURL %>" />
</liferay-portlet:renderURL>
<aui:script use="aui-base">
Liferay.Util.openWindow(
{
Liferay.Util.openWindow({
id: '<portlet:namespace />openVerificaFascicolo',
title: 'Gestione Pagamenti',
uri: '<%= verifyPagamentiRenderURL %>'
}
);
});
</aui:script>
</c:if>
</c:if>
@ -197,7 +180,6 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
<aui:script use="aui-base">
var verifyPopupReady = false;
Liferay.on('popupReady',function(event) {
var modalName = event._event.details[0].windowName;
var modalWin = Liferay.Util.Window.getById(modalName);
@ -209,6 +191,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
}
Loading.end();
});
modalWin.after('hide', function(event) {
console.log('HIDE');
Loading.start();
@ -217,6 +200,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
}
Loading.end();
});
modalWin.after('destroy', function(event) {
console.log('DESTROY');
Loading.start();
@ -230,9 +214,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
verifyPopupReady = true;
});
</aui:script>
<script type="text/javascript">
Liferay.provide(
window,
'saveDettPratica',
@ -247,7 +229,7 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
},
['aui-base']
);
// ADT BUG FE ID = 14
Liferay.on(
'portletReady',
function(event) {
@ -264,14 +246,11 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
var saveAndVerify = "false";
for (var property in queryParams) {
if (queryParams.hasOwnProperty(property) &&
property.toString().endsWith("saveAndVerify")) {
if (queryParams.hasOwnProperty(property) && property.toString().endsWith("saveAndVerify")) {
saveAndVerify = queryParams[property];
}
}
if (saveAndVerify === "true") {
//$("[name='bodyVerifyPopUp']").show();
$("#isTopBar").show();
$("#isBottomBar").hide();
$('[id*="_portosfeportlet_verificaDiv_"]').show();
@ -286,9 +265,10 @@ String[] _CATEGORY_NAMES = { "cat_dati_domanda" };
var nodeObject = event.currentTarget;
A.one('#<portlet:namespace/>current_tab').set('value', nodeObject.attr('data-sectionid'));
},
'li.tab');
var current_tab = '<%=current_tab%>';
'li.tab'
);
var current_tab = '<%= current_tab %>';
if (current_tab != '' && document.location.hash == '') {
document.location.hash = '_1_WAR_portosfeportlet_tab=<%= current_tab %>';
}

7
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/verify_ok.jsp

@ -9,7 +9,6 @@
String label = ParamUtil.getString(request, "label");
String dialogId = renderResponse.getNamespace()+"openVerificaFascicolo";
%>
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
@ -31,13 +30,9 @@ Liferay.provide(
window,
'<portlet:namespace/>closePopup',
function() {
Liferay.fire(
'closeWindow',
{
id: '<%= dialogId %>'
}
{ id: '<%= dialogId %>' }
);
},
['aui-base','liferay-util-window']

13
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_allegati.jsp

@ -6,7 +6,6 @@
<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
<%@ include file="/html/fascicolofe/init.jsp" %>
<%
String comingFrom = ParamUtil.getString(request,"comingFrom", "page_allegati");
DettPratica dettPratica = (DettPratica)request.getAttribute("bean.dettPratica");
@ -18,9 +17,9 @@ if (dettPratica == null) {
}
String tipoIntegrazione = (String)request.getAttribute("bean.tipoIntegrazione");
%>
<aui:script use="aui-base">
var allegatiEdit = false;
Liferay.on('popupReady', function(event) {
var modalName = event._event.details[0].windowName;
var modalWin = Liferay.Util.Window.getById(modalName);
@ -54,13 +53,15 @@ String tipoIntegrazione = (String)request.getAttribute("bean.tipoIntegrazione");
document.location.hash = '_1_WAR_portosfeportlet_tab=_1_WAR_portosfeportlet_<%=comingFrom%>';
allegatiEdit = false;
}
});
</aui:script>
<c:if test="<%= TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione) %>">
<liferay-portlet:runtime portletName='<%=PortletKeys.ALLEGATI+"_INSTANCE_"+comingFrom %>' queryString='<%="&classPk="+dettPratica.getDettPraticaId()+"&className="+DettPratica.class.getName()+"&comingFrom="+comingFrom+"&disabled=true"%>' ></liferay-portlet:runtime>
<liferay-portlet:runtime portletName='<%= PortletKeys.ALLEGATI + "_INSTANCE_" + comingFrom %>'
queryString='<%= "&classPk=" + dettPratica.getDettPraticaId() + "&className="
+ DettPratica.class.getName() + "&comingFrom=" + comingFrom + "&disabled=true" %>' />
</c:if>
<c:if test="<%= !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione) %>">
<liferay-portlet:runtime portletName='<%=PortletKeys.ALLEGATI+"_INSTANCE_"+comingFrom %>' queryString='<%="&classPk="+dettPratica.getDettPraticaId()+"&className="+DettPratica.class.getName()+"&comingFrom="+comingFrom%>' ></liferay-portlet:runtime>
<liferay-portlet:runtime portletName='<%= PortletKeys.ALLEGATI + "_INSTANCE_" + comingFrom %>'
queryString='<%= "&classPk=" + dettPratica.getDettPraticaId() + "&className="
+ DettPratica.class.getName()+"&comingFrom="+comingFrom%>' />
</c:if>

19
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_asseverazioni_riepilogo.jsp

@ -21,22 +21,19 @@ boolean hasDelegaCompilazioneDomanda = (Boolean) SessionUtil.getDettPraticaObjec
boolean disabledInput = !hasDelegaCompilazioneDomanda;
Soggetto soggettoDelegato = (Soggetto) SessionUtil.getDettPraticaObject(request, dettPraticaId, "soggettoDelegato");
%>
<liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%= application %>">
<liferay-util:param name="disabledInput" value="<%= String.valueOf(disabledInput) %>"/>
<c:if test="<%= soggettoDelegato != null %>">
<liferay-util:param name="soggettoId" value="<%= String.valueOf(soggettoDelegato.getSoggettoId()) %>"/>
</c:if>
</liferay-util:include>
<aui:model-context bean="<%=dettPratica %>" model="<%=DettPratica.class %>"></aui:model-context>
<aui:model-context bean="<%= dettPratica %>" model="<%= DettPratica.class %>" />
<%
String orderByCol = ParamUtil.getString(renderRequest, "ORDER_BY_ASSEVERAZIONE_COL", "asseverazioneId");
String orderByType = ParamUtil.getString(renderRequest, "ORDER_BY_ASSEVERAZIONE_TYPE", "asc");
OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create("portos_bo_Asseverazione", "asseverazioneId", "asc".equals(orderByType));
DisplayTerms displayTerms = new DisplayTerms(renderRequest);
%>
<div class="container-fluid">
<div class="row">
<div class="col-sm-12 col-md-12">
@ -45,9 +42,7 @@ Soggetto soggettoDelegato = (Soggetto) SessionUtil.getDettPraticaObject(request,
<div class="container-fluid container_tab_asseverazioni">
<div class="row">
<div class="col-md-12">
<liferay-ui:search-container displayTerms="<%= displayTerms %>" emptyResultsMessage="no-entries-were-found" orderByCol="<%=orderByCol %>" orderByType="<%=orderByType %>" orderByColParam="ORDER_BY_ASSEVERAZIONE_COL" orderByTypeParam="ORDER_BY_ASSEVERAZIONE_TYPE">
<liferay-ui:search-container-results>
<%
// Search by keyfascicolofe works only with the indexer enabled
@ -55,14 +50,10 @@ Soggetto soggettoDelegato = (Soggetto) SessionUtil.getDettPraticaObject(request,
total = AsseverazioneServiceUtil.countByDettPratica_InEsito(dettPraticaId,new String[]{AsseverazioniUtil.STATO_ASSEGNATA,AsseverazioniUtil.STATO_ESEGUITA});
pageContext.setAttribute("results", results);
pageContext.setAttribute("total", total);
%>
</liferay-ui:search-container-results>
<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Asseverazione" keyProperty="asseverazioneId" modelVar="asseverazione">
<liferay-ui:search-container-column-text name="persona" >
<%
if (SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(intPraticaId, asseverazione.getCodiceFiscale()) == 0) {
out.print("<div class ='alert alert-danger'> Non esistono soggetti nella pratica abbinato al codice fiscale </div>");
@ -74,12 +65,7 @@ Soggetto soggettoDelegato = (Soggetto) SessionUtil.getDettPraticaObject(request,
if (!soggetti.isEmpty()) {
out.print("<div>" + soggetti.get(0).getDescrizioneCompleta() + "</div>");
}
/* List<Soggetto> soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId, asseverazione.getCodiceFiscale());
for(Soggetto soggetto:soggetti){
out.print("<div>"+soggetto.getDescrizioneCompleta()+" "+LanguageUtil.get(pageContext, "gc-soggetto-"+soggetto.getTipologiaSoggetto())+"</div>");
} */
}
%>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="tipologia" orderable="true" >
@ -94,12 +80,9 @@ Soggetto soggettoDelegato = (Soggetto) SessionUtil.getDettPraticaObject(request,
request.setAttribute("comingFrom", "riepilogo");
%>
<liferay-ui:search-container-column-jsp path="/html/fascicolofe/asseverazione_actions.jsp" name="actions"/>
</liferay-ui:search-container-row>
<liferay-ui:search-iterator paginate="false" />
</liferay-ui:search-container>
</div>
</div>
</div>

134
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp

@ -1,38 +1,28 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="java.util.HashMap"%>
<%@page import="java.util.Map"%>
<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.SezioniUtil"%>
<%@page import="com.liferay.portal.kernel.util.UniqueList"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%>
<%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
<%@page import="java.util.ArrayList"%>
<%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.AsseverazioniUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.DocPratica"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
<%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
<%@page import="it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.SezioniUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%>
<%@ include file="/html/fascicolofe/init.jsp" %>
<%
long intPraticaId = ParamUtil.getLong(request, "intPraticaId",0l);
long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId",0l);
long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L);
long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0L);
IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
if (dettPratica == null) {
dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId);
if (dettPratica == null) {
@ -40,7 +30,6 @@
}
}
%>
<liferay-portlet:renderURL var="verifyURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/verify_fascicolo.jsp"/>
<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
@ -208,7 +197,9 @@
if (!notCompleted.isEmpty()) {
tooltipSection.append("<ul class='list-body-modal'>");
for (String incomplete : notCompleted) {
tooltipSection.append("<li class='item-body-modal'>"+LanguageUtil.get(pageContext, incomplete)+"</li>");
tooltipSection.append("<li class='item-body-modal'>")
.append(LanguageUtil.get(pageContext, incomplete))
.append("</li>");
}
tooltipSection.append("</ul>");
}
@ -286,8 +277,8 @@
String[] esiti_complete = {AsseverazioniUtil.STATO_ESEGUITA};
String[] esiti_incomplete = {AsseverazioniUtil.STATO_ASSEGNATA};
for (String tipoSoggetto : tipologiaSoggetti) {
String clazz = "";
String title = "";
String clazz = StringPool.BLANK;
String title = StringPool.BLANK;
List<Asseverazione> asseverazioniCompletate = AsseverazioneLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipoSoggetto, esiti_complete , QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
List<Asseverazione> asseverazioniMancanti = AsseverazioneLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipoSoggetto, esiti_incomplete , QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
@ -319,27 +310,22 @@
.append(clazz)
.append(" tooltip-info\" title=\"")
.append(title)
.append("\">");
content.append("<sub class=\"txt-bold\">")
.append(asseverazioniCompletate.size()>0 ? asseverazioniCompletate.size() : StringPool.BLANK)
.append("</sub>");
content.append("</span>");
} else if(
!TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) &&
!TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) &&
TipoSoggettoUtil.GEOLOGO.equalsIgnoreCase(tipoSoggetto) &&
DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(intPraticaId, new String[]{DelegheUtil.TIPO_GEOLOGO}, new String[]{DelegheUtil.STATO_ESEGUITA})>0
){
.append("\"><sub class=\"txt-bold\">");
if (asseverazioniCompletate.size() > 0) {
content.append(asseverazioniCompletate.size());
}
content.append("</sub></span>");
} else if (!TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
&& !TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
&& TipoSoggettoUtil.GEOLOGO.equalsIgnoreCase(tipoSoggetto)
&& DelegaLocalServiceUtil.countByDettPratica_Tipologia_InEsito(intPraticaId, new String[]{DelegheUtil.TIPO_GEOLOGO}, new String[]{DelegheUtil.STATO_ESEGUITA}) > 0) {
clazz = "icon-asseverazioni fa fa-check txt-green";
content.append("<span class=\"").append(clazz).append("\">").append("</span>");
content.append("<span class=\"").append(clazz).append("\"></span>");
} else {
content.append("<span>-</span>");
}
%>
<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
<div class="col-xs-2">
<%= content.toString() %>
</div>
<%
@ -351,17 +337,18 @@
for (String codiceDoc:tipologiaAllegati) {
%>
<div class="row asseverazioni-title">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="col-xs-12">
<liferay-ui:message key='<%= "label-documenti-tipologia-" + codiceDoc %>'/>
</div>
</div>
<%
List<DocPratica> docPraticas = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
List<DocPratica> docPraticas = DocPraticaLocalServiceUtil
.getValidTmpByIntPratica_Tipologia(intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
if (docPraticas.isEmpty()) {
%>
<div class="row asseverazioni-section">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<div class="col-xs-6">
Nessun allegato presente per la tipologia
</div>
</div>
@ -370,10 +357,10 @@
for (DocPratica docPratica : docPraticas) {
%>
<div class="row asseverazioni-section">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<div class="col-xs-6">
<i class="fa fa-file-o file-icon" aria-hidden="true"></i><%= docPratica.getDescLong() %>
</div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 asserazioni-body-title text-center">
<div class="col-xs-6 asserazioni-body-title text-center">
<%
FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
List<String> signatures = firme.allSignatures();
@ -385,8 +372,8 @@
StringBuilder tooltipTitle = new StringBuilder();
List<String> signaturesPerSubject = new UniqueList<String>();
for (String sign : signatures) {
List<Soggetto> soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(intPraticaId, sign, docPratica.getClassPk());
List<Soggetto> soggetti = SoggettoLocalServiceUtil
.getValidTmpByIntPratica_CodiceFiscale(intPraticaId, sign, docPratica.getClassPk());
for (Soggetto soggetto: soggetti) {
if (soggetto.getTipologiaSoggetto().equals(tipoSoggetto)){
signaturesPerSubject.add(sign);
@ -396,11 +383,10 @@
if (signaturesPerSubject.size() > 0) {
tooltipTitle.append("Firme:<ul>");
for (String firma : signaturesPerSubject) {
tooltipTitle.append("<li>"+firma+"</li>");
tooltipTitle.append("<li>").append(firma).append("</li>");
}
tooltipTitle.append("</ul>");
}
if (isEnoughOne) {
clazz += " icon-asseverazioni fa ";
if (signatures.isEmpty()) {
@ -418,7 +404,6 @@
} else {
isValid = true;
}
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += "fa-check txt-green";
@ -436,11 +421,6 @@
} else {
isValid = true;
}
// if(!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)){
// isValid = true;
// }
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += "fa-check txt-green";
@ -468,11 +448,6 @@
} else {
isValid = true;
}
// if(!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)){
// isValid = true;
// }
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += " fa-check txt-green";
@ -490,11 +465,9 @@
} else {
isValid = true;
}
if (!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)) {
isValid = true;
}
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += "fa-check txt-green";
@ -502,18 +475,15 @@
clazz += "fa-close txt-red";
}
}
} else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09)) {
boolean isValid = false;
if( (tipoSoggetto.equals(TipoSoggettoUtil.PROGETTISTA) || tipoSoggetto.equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) ){
if (tipoSoggetto.equals(TipoSoggettoUtil.PROGETTISTA) || tipoSoggetto.equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) {
if (dettPratica.getNormArt3com4() || !signaturesPerSubject.isEmpty()) {
isValid = true;
}
if (!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)) {
isValid = true;
}
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += "fa-check txt-green";
@ -521,33 +491,30 @@
clazz += "fa-close txt-red";
}
}
} else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) {
boolean isValid = true;
if (signatures.isEmpty()) {
boolean isRequired = AsseverazioniUtil.isRequiredTerna(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17, dettPratica);
if(isRequired)
if (isRequired) {
isValid = false;
}
}
clazz += " icon-asseverazioni fa ";
if (isValid) {
clazz += "fa-check txt-green";
} else {
clazz += "fa-close txt-red";
}
} else {
boolean isRequired = AsseverazioniUtil.isAsseverazioneRequiredByCodiceDoc(codiceDoc, tipoSoggetto);
boolean isRecommended = AsseverazioniUtil.isAsseverazioneRecommendedByCodiceDoc(codiceDoc, tipoSoggetto);
boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici();
if(tipoSoggetto.equalsIgnoreCase(TipoSoggettoUtil.DIRETTORE_LAVORI) && signaturesPerSubject.size() == 0){
if (tipoSoggetto.equalsIgnoreCase(TipoSoggettoUtil.DIRETTORE_LAVORI)
&& signaturesPerSubject.size() == 0) {
isRequired = false;
}
if (isRequired || isRecommended) {
clazz += " icon-asseverazioni fa ";
if (isRequired) {
@ -561,12 +528,10 @@
}
}
}
%>
<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
<span class='<%=clazz%> <%= !clazz.isEmpty() && tooltipTitle.length() > 0 ? "tooltip-info" : "" %>' title='<%= tooltipTitle.toString() %>'>
<sub class="txt-bold"><%= !clazz.isEmpty() && signaturesPerSubject.size()>0 ? signaturesPerSubject.size() : "" %></sub>
<span class='<%= clazz %> <%= !clazz.isEmpty() && tooltipTitle.length() > 0 ? "tooltip-info" : StringPool.BLANK %>' title='<%= tooltipTitle.toString() %>'>
<sub class="txt-bold"><%= !clazz.isEmpty() && signaturesPerSubject.size() > 0 ? signaturesPerSubject.size() : StringPool.BLANK %></sub>
</span>
</div>
<%
@ -586,19 +551,16 @@
YUI().use(
'aui-tooltip',
function(Y) {
new Y.TooltipDelegate(
{
new Y.TooltipDelegate({
trigger: '.tooltip-info',
position: 'top',
cssClass: 'tooltip-help',
html: true,
opacity: 1
}
);
});
}
);
</script>
<aui:script use="aui-base">
window.parent.Liferay.fire('verifyPopup-ready');
</aui:script>

26
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp

@ -1,25 +1,12 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%>
<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Avviso"%>
<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Avviso"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
<%@page import="javax.portlet.ResourceURL"%>
<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%>
<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%>
<%@page import="java.util.Iterator"%>
<%@page import="com.liferay.portal.kernel.util.StringPool"%>
<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
<%@page import="org.apache.jasper.tagplugins.jstl.core.ForEach"%>
<%@page import="com.liferay.portal.kernel.util.Validator"%>
<%@page import="com.liferay.portal.kernel.util.HttpUtil"%>
<%@page import="java.util.List"%>
<%@page import="com.liferay.portal.kernel.util.StringUtil"%>
<%@page import="com.liferay.portal.kernel.util.ParamUtil"%>
<%@include file="/html/ricercapratiche/init.jsp"%>
<%
String uuid = ParamUtil.getString(renderRequest, "uuid");
String numeroProgetto = ParamUtil.getString(renderRequest, "numeroProgetto");
@ -30,13 +17,10 @@
String title = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId).getTitle(locale);
%>
<liferay-ui:header
backURL="<%= redirect %>"
title='<%= title %>'
/>
<%
Avviso avviso = AvvisoLocalServiceUtil.getAvviso(avvisoId);
FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(avviso.getFileEntryIdInvio());
@ -47,7 +31,6 @@
resourceURL.setParameter("uuid", uuid);
resourceURL.setParameter("numeroProgetto", numeroProgetto);
%>
<div style="font-weight: bold;">
<liferay-ui:message key="label.admingeniocivile.ricercaavvisi.link.avviso" />
&nbsp;
@ -57,7 +40,6 @@
url="<%= resourceURL.toString() %>"
/>
</div>
<c:if test="<%= DettPratica.class.getName().equals(avviso.getClassName()) %>">
<liferay-util:include page="/html/fascicolofe/view_fascicolo_dettagli.jsp" servletContext="<%= application %>">
<liferay-util:param name="intPraticaId" value="<%= String.valueOf(avviso.getIntPraticaId()) %>"/>

1
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/init.jsp

@ -1,6 +1,5 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/html/init.jsp"%>
<%
Long dettPraticaId = (Long) request.getAttribute("dettPraticaId");
boolean workflow = false;

31
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp

@ -1,46 +1,33 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="com.liferay.portal.kernel.util.Validator"%>
<%@page import="com.liferay.portal.kernel.util.ParamUtil"%>
<%@include file="/html/ricercapratiche/init.jsp"%>
<portlet:actionURL name="processAvvisi" var="searchURL" >
<portlet:param name="backURL" value="<%= currentURL %>"/>
<portlet:param name="mvcPath" value="/html/ricercapratiche/dett_pratica.jsp"/>
</portlet:actionURL>
<liferay-ui:error key="no-entries-were-found" message="no-entries-were-found" />
<div class="container-fluid">
<aui:form action="<%= searchURL %>" method="post" name="fm">
<div class="row">
<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8" >
<aui:input name="uuid" label="ricercapratiche.uuid"
size="40" maxlength="75" />
<div class="col-xs-8" >
<aui:input name="uuid" label="ricercapratiche.uuid" size="40" maxlength="75" />
</div>
<div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
<aui:input name="numeroProgetto" label="ricercapratiche.numeroProgetto"
size="15" maxlength="75" />
<div class="col-xs-4 col-sm-3">
<aui:input name="numeroProgetto" label="ricercapratiche.numeroProgetto" size="15" maxlength="75" />
</div>
<div class="col-xs-12 col-sm-1 col-md-1 col-lg-1" >
<div class="col-xs-12 col-sm-1" >
<aui:button type="submit" value="search" />
</div>
</div>
</aui:form>
</div>
<aui:script use="aui-form-validator">
new A.FormValidator(
{
new A.FormValidator({
boundingBox: document.<portlet:namespace/>fm,
validateOnBlur: false,
rules: {
<portlet:namespace/>uuid: {
required: true
},
<portlet:namespace/>numeroProgetto: {
required: true
}
}
<portlet:namespace/>uuid: { required: true },
<portlet:namespace/>numeroProgetto: { required: true }
}
);
});
</aui:script>

1021
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp

File diff soppresso perché troppo grande Load Diff

7
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto_modal.jsp

@ -2,16 +2,12 @@
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
<%@ include file="/html/soggettipratica/init.jsp" %>
<%
long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
long soggettoId = ParamUtil.getLong(renderRequest, "soggettoId");
Soggetto soggetto = SoggettoLocalServiceUtil.getSoggetto(soggettoId);
%>
<liferay-portlet:renderURL var="editSoggettoURL">
<liferay-portlet:param name="mvcPath" value="/html/soggettipratica/edit_soggetto.jsp" />
@ -50,7 +46,7 @@
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="allegato-file-modifica" >
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 container-message">
<liferay-util:include page="/html/common/help_message.jsp" servletContext="<%= application %>">
<liferay-util:param name="message" value="help_message_allegato_variazione_soggetti"></liferay-util:param>
<liferay-util:param name="message" value="help_message_allegato_variazione_soggetti" />
</liferay-util:include>
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 container-file-chooser">
@ -59,7 +55,6 @@
showRequiredLabel="<%= !TipoSoggettoUtil.COMMITTENTE.equals(soggetto.getTipologiaSoggetto()) %>"/>
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 container-checkbox-edit-allegato">
<!-- ADT BUG ID=27 -->
<aui:input type="checkbox" name="applicaFirma" label="label.firma-doc" value="false" />
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 container-button">

17
liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tref-mapit-shared</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Caricamento…
Annulla
Salva