From 8e86eb57d5a047372005f5d0e3d4cbdd00cbd3e2 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Mon, 18 Jan 2021 14:36:22 +0100 Subject: [PATCH] Fix per pratiche con molti allegati --- .../liferay/portos/bo/util/DelegheUtil.java | 13 +- .../docroot/WEB-INF/src/service.properties | 4 +- ...legati_action.jsp => allegati_action.jspf} | 59 ++---- .../docroot/html/allegatipratica/view.jsp | 188 +++++++++--------- .../html/fascicolofe/edit_fascicolo.jsp | 1 - .../domanda/page_dettagli_principali.jsp | 1 - .../navigator/domanda/page_soggetti.jsp | 2 +- 7 files changed, 127 insertions(+), 141 deletions(-) rename liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/{allegati_action.jsp => allegati_action.jspf} (79%) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java index c20b4b7e..a481248b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java @@ -51,13 +51,24 @@ public class DelegheUtil { private final static Log _log = LogFactoryUtil.getLog(DelegheUtil.class); + private static int cntPraticaIsEditable = 0; + public static boolean hasDelegaFirma(long userId, long docPraticaId, boolean sezioneGeologica) throws PortalException, SystemException { + return hasDelegaFirma(userId, docPraticaId, sezioneGeologica, null); + } + + public static boolean hasDelegaFirma(long userId, long docPraticaId, boolean sezioneGeologica, + Boolean praticaIsEditable) throws PortalException, SystemException { DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId); boolean controllo = true; if (DettPratica.class.getName().equals(docPratica.getClassName())) { - controllo = ValidazionePraticaUtil.praticaIsEditable(docPratica.getClassPk()); + if (null == praticaIsEditable) { + controllo = ValidazionePraticaUtil.praticaIsEditable(docPratica.getClassPk()); + } else { + controllo = praticaIsEditable; + } } if (controllo) { User user = UserLocalServiceUtil.getUser(userId); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 7a67df93..79db15b6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/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=2533 - build.date=1608199554355 + build.number=2537 + build.date=1610976073338 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf similarity index 79% rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf index 52abdb9a..19601e88 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf @@ -1,45 +1,16 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@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.DocPratica"%> -<%@page import="it.tref.liferay.portos.bo.service.DocPraticaServiceUtil"%> -<%@page import="com.liferay.portal.security.permission.ActionKeys"%> -<%@page import="com.liferay.portal.kernel.util.WebKeys"%> -<%@page import="com.liferay.portal.kernel.dao.search.SearchContainer"%> -<%@page import="java.util.Map"%> -<%@page import="java.util.HashMap"%> -<%@page import="com.liferay.portal.kernel.util.StringUtil"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> -<%@include file="/html/allegatipratica/init.jsp"%> - <% -String redirect = ParamUtil.getString(request, "backUrl"); -String comingFrom = ParamUtil.getString(request, "comingFrom"); -long classPk = ParamUtil.getLong(request, "classPk"); -String className = ParamUtil.getString(request, "className"); - -String refresh="Liferay.fire('allegati-"+comingFrom+"-open');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_allegati_');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_geologica_');"; - -long docPraticaId = ParamUtil.getLong(request, "docPraticaId"); -DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId); -FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); - -boolean disabledInput = ParamUtil.getBoolean(request,"disabledInput", false); - -boolean hasDelegaFirma = DelegheUtil.hasDelegaFirma(user.getUserId(), docPraticaId, "page_geologica".equalsIgnoreCase(comingFrom)); -boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma; +boolean hasDelegaFirma = DelegheUtil.hasDelegaFirma( + user.getUserId(), + docPratica.getDocPraticaId(), + comingFromGeologica, + praticaIsEditable +); +String refreshAll = "Liferay.fire('allegati-"+comingFrom+"-open');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_allegati_');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_geologica_');"; +long docPraticaId = docPratica.getDocPraticaId(); +boolean canSignGeoDocsAll = comingFromGeologica && hasDelegaFirma; %> - - - + <% if (firme.firmaIsPresent(user.getScreenName())) { if (firme.firmaIsAnnullabile(user.getScreenName())) { @@ -69,7 +40,7 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel success: function(event, id, obj) { window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> + <%=refreshAll%> }else{ Liferay.fire('allegati-"+comingFrom+"-open'); Liferay.Portlet.refresh("#p_p_id"); @@ -114,7 +85,7 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel success: function(event, id, obj) { window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> + <%=refreshAll%> }else{ Liferay.fire('allegati-"+comingFrom+"-open'); Liferay.Portlet.refresh("#p_p_id"); @@ -178,7 +149,7 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel success: function(event, id, obj) { window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> + <%=refreshAll%> }else{ Liferay.fire('allegati-"+comingFrom+"-open'); Liferay.Portlet.refresh("#p_p_id"); @@ -227,7 +198,7 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel success: function(event, id, obj) { window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> + <%=refreshAll%> }else{ Liferay.fire('allegati-"+comingFrom+"-open'); Liferay.Portlet.refresh("#p_p_id"); @@ -273,7 +244,7 @@ boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDel success: function(event, id, obj) { window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> + <%=refreshAll%> }else{ Liferay.fire('allegati-"+comingFrom+"-open'); Liferay.Portlet.refresh("#p_p_id"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 352b204f..1e8388b5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.SessionUtil"%> <%@page import="java.util.HashMap"%> <%@page import="java.util.Map"%> @@ -41,19 +42,27 @@ String comingFrom = ParamUtil.getString( "comingFrom", GetterUtil.getString(PortalUtil.getOriginalServletRequest(request).getParameter("comingFrom"), "page_allegati") ); +boolean comingFromGeologica = comingFrom.equalsIgnoreCase("page_geologica"); +boolean comingFromAllegati = comingFrom.equalsIgnoreCase("page_allegati"); +boolean comingFromFineLavori = comingFrom.equalsIgnoreCase("page_fine_lavori"); +boolean comingFromCollaudo = comingFrom.equalsIgnoreCase("page_collaudo"); long classPk = ParamUtil.getLong(request, "classPk"); String className = ParamUtil.getString(request, "className"); +boolean isDettPratica = DettPratica.class.getName().equalsIgnoreCase(className); +boolean isFineLavori = FineLavori.class.getName().equalsIgnoreCase(className); +boolean isCollaudo = Collaudo.class.getName().equalsIgnoreCase(className); long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); -if (FineLavori.class.getName().equalsIgnoreCase(className)) { +boolean praticaIsEditable = false; +if (isFineLavori) { FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(classPk); intPraticaId = fineLavori.getIntPraticaId(); -} else if (Collaudo.class.getName().equalsIgnoreCase(className)) { +} else if (isCollaudo) { Collaudo collaudo = CollaudoServiceUtil.getCollaudo(classPk); intPraticaId = collaudo.getIntPraticaId(); } else { - DettPratica dettPratica = (DettPratica)request.getAttribute("bean.dettPratica"); + DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica"); HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(request); if (dettPratica == null) { long dettPraticaIdParam = ParamUtil.getLong(request, "classPk"); @@ -65,7 +74,7 @@ if (FineLavori.class.getName().equalsIgnoreCase(className)) { if (dettPratica == null) { dettPratica = DettPraticaServiceUtil.getDettPratica(classPk); } - + praticaIsEditable = ValidazionePraticaUtil.praticaIsEditable(dettPratica.getDettPraticaId()); request.setAttribute("bean.dettPratica", dettPratica); classPk = dettPratica.getDettPraticaId(); intPraticaId = dettPratica.getIntPraticaId(); @@ -86,7 +95,7 @@ boolean disabledInput = true; boolean canSignGeoDocs = false; if (Validator.isNotNull(request.getParameter("disabled"))) { disabledInput = disabled; -} else if ("page_allegati".equalsIgnoreCase(comingFrom)) { +} else if (comingFromAllegati) { Boolean hasDelegaCompilazioneDomanda = (Boolean) SessionUtil.getDettPraticaObject(request, classPk, "hasDelegaCompilazioneDomanda"); if (null == hasDelegaCompilazioneDomanda) { hasDelegaCompilazioneDomanda = DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(),classPk); @@ -94,18 +103,18 @@ if (Validator.isNotNull(request.getParameter("disabled"))) { disabledInput = !hasDelegaCompilazioneDomanda && !DelegheUtil.hasDelegaFirmaAllegati(user.getUserId(),classPk); soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(classPk); -} else if ("page_geologica".equalsIgnoreCase(comingFrom)) { +} else if (comingFromGeologica) { disabledInput = !DelegheUtil.hasDelegaCompilazioneSezioneGeologica(user.getUserId(),classPk); soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneSezioneGeologica(classPk); canSignGeoDocs = true; -} else if ("page_fine_lavori".equalsIgnoreCase(comingFrom)) { +} else if (comingFromFineLavori) { disabledInput = disabled; -} else if ("page_collaudo".equalsIgnoreCase(comingFrom)) { +} else if (comingFromCollaudo) { disabledInput = disabled; } %> - + @@ -135,7 +144,7 @@ String refresh = "Liferay.fire('allegati-" + comingFrom + "-open');Liferay.Portl
- +

Allegati Geologici

 @@ -165,13 +174,13 @@ String refresh = "Liferay.fire('allegati-" + comingFrom + "-open');Liferay.Portl <% List tipologiaAllegati = new ArrayList(); -if ("page_geologica".equals(comingFrom)) { +if (comingFromGeologica) { tipologiaAllegati = DocumentiPraticaUtil.getDocGeologo(); -}else if ("page_allegati".equals(comingFrom)) { +} else if (comingFromAllegati) { tipologiaAllegati = DocumentiPraticaUtil.getDocDomanda(); -}else if ("page_fine_lavori".equals(comingFrom)) { +} else if (comingFromFineLavori) { tipologiaAllegati = DocumentiPraticaUtil.getDocFineLavori(); -}else if ("page_collaudo".equals(comingFrom)) { +} else if (comingFromCollaudo) { tipologiaAllegati = DocumentiPraticaUtil.getDocCollaudo(); } %> @@ -198,14 +207,14 @@ if ("page_geologica".equals(comingFrom)) {
- +
Descrizione
Firme presenti
Azioni
 - +
Descrizione
Provenienza
@@ -218,10 +227,10 @@ if ("page_geologica".equals(comingFrom)) { <% -for (String codiceDoc:tipologiaAllegati) { - List docPraticas = new ArrayList(); +for (String codiceDoc : tipologiaAllegati) { + List docPraticas = null; - if(FineLavori.class.getName().equals(className) || Collaudo.class.getName().equals(className)) { + if (isFineLavori || isCollaudo) { docPraticas = DocPraticaServiceUtil.findByClassPk_Tipologia(classPk, codiceDoc, QueryUtil.ALL_POS,QueryUtil.ALL_POS); } else { docPraticas = DocPraticaServiceUtil.findByIntPratica_ClassPk_Tipologia(intPraticaId, classPk, codiceDoc, QueryUtil.ALL_POS,QueryUtil.ALL_POS); @@ -242,63 +251,63 @@ for (String codiceDoc:tipologiaAllegati) { <% } else { for (DocPratica docPratica : docPraticas) { - FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); + FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); StringBuilder title = new StringBuilder(); String cssIcon = StringPool.BLANK; - String cssColor= StringPool.BLANK; + String cssColor = StringPool.BLANK; String testoFirme = "Non ci sono firme sul file"; if (firme.getFirmeDigitali().size() > 0) { cssIcon = "fa-check"; - cssColor= "txt-green"; + cssColor = "txt-green"; testoFirme = StringPool.BLANK; - } else if (docPratica.getStatus() == 1) { - cssIcon= "fa-cog fa-spin"; - cssColor= "txt-orange"; - testoFirme = "Estrazione firme in corso"; - } else if (docPratica.getStatus() == 4) { - cssIcon= "fa-alert"; - cssColor= "txt-red"; - testoFirme = "Errore nell'estrazione delle firme"; - } else { - cssIcon = "fa-close"; - testoFirme = "Nessuna firma digitale rilevata"; - if (firme.numeroFirme() > 0) { - cssColor= "txt-green"; - } - } + } else if (docPratica.getStatus() == 1) { + cssIcon= "fa-cog fa-spin"; + cssColor = "txt-orange"; + testoFirme = "Estrazione firme in corso"; + } else if (docPratica.getStatus() == 4) { + cssIcon= "fa-alert"; + cssColor = "txt-red"; + testoFirme = "Errore nell'estrazione delle firme"; + } else { + cssIcon = "fa-close"; + testoFirme = "Nessuna firma digitale rilevata"; if (firme.numeroFirme() > 0) { - cssIcon = "fa-check"; + cssColor= "txt-green"; } - title.append("Firma sul file:
    "); - title.append("
  • " + testoFirme + "
    • "); - if (!firme.getFirmeDigitali().isEmpty()) { - for (FirmeDetail firma: firme.getFirmeDigitali()) { - if (cfNome.containsKey(firma.getCfFirmatario())) { - title.append("
  • " + cfNome.get(firma.getCfFirmatario()) + "
    • "); - } - title.append("
  • " + firma.getCfFirmatario()); - if (Validator.isNotNull(firma.getDtFirma())) { - title.append(" del " + dateFormatDate.format(firma.getDtFirma())); - } - title.append("
    • "); + } + if (firme.numeroFirme() > 0) { + cssIcon = "fa-check"; + } + title.append("Firma sul file:
      "); + title.append("
    • " + testoFirme + "
      • "); + if (!firme.getFirmeDigitali().isEmpty()) { + for (FirmeDetail firma: firme.getFirmeDigitali()) { + if (cfNome.containsKey(firma.getCfFirmatario())) { + title.append("
    • " + cfNome.get(firma.getCfFirmatario()) + "
      • "); + } + title.append("
    • " + firma.getCfFirmatario()); + if (Validator.isNotNull(firma.getDtFirma())) { + title.append(" del " + dateFormatDate.format(firma.getDtFirma())); } + title.append("
      • "); } - title.append("
    "); - if (!firme.getFirmeApplicativo().isEmpty()) { - title.append("Firme da applicativo:
      "); - for (FirmeDetail firma: firme.getFirmeApplicativo()) { - if (cfNome.containsKey(firma.getCfFirmatario())) { - title.append("
    • " + cfNome.get(firma.getCfFirmatario()) + "
      • "); - } - title.append("
    • "+firma.getCfFirmatario()); - if (Validator.isNotNull(firma.getDtFirma())) { - title.append(" del "+dateFormatDate.format(firma.getDtFirma())); - } - title.append("
      • "); + } + title.append("
    "); + if (!firme.getFirmeApplicativo().isEmpty()) { + title.append("Firme da applicativo:
      "); + for (FirmeDetail firma: firme.getFirmeApplicativo()) { + if (cfNome.containsKey(firma.getCfFirmatario())) { + title.append("
    • " + cfNome.get(firma.getCfFirmatario()) + "
      • "); + } + title.append("
    • "+firma.getCfFirmatario()); + if (Validator.isNotNull(firma.getDtFirma())) { + title.append(" del "+dateFormatDate.format(firma.getDtFirma())); } - title.append("
    "); + title.append(""); } + title.append("
"); + } %>
@@ -309,7 +318,7 @@ for (String codiceDoc:tipologiaAllegati) { <% String color = "txt-red"; - if (Validator.isNull(docPratica.getDettPraticaIdRimozione())) { + if (Validator.isNull(docPratica.getDettPraticaIdRimozione())) { color = "txt-green"; } %> @@ -319,16 +328,15 @@ for (String codiceDoc:tipologiaAllegati) {
<% - String adding = StringPool.BLANK; - if (FineLavori.class.getName().equals(className)) { + if (isFineLavori) { FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(docPratica.getClassPk()); if (fineLavori != null) { - adding = fineLavori.getFullDescription(); + out.print(fineLavori.getFullDescription()); } - } else if (Collaudo.class.getName().equalsIgnoreCase(className)) { + } else if (isCollaudo) { Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk()); if (collaudo != null) { - adding = collaudo.getFullDescription(); + out.print(collaudo.getFullDescription()); } } else { long pk = docPratica.getClassPk(); @@ -337,17 +345,16 @@ for (String codiceDoc:tipologiaAllegati) { } DettPratica dettPratica = dettPraticas.get(pk); if (Validator.isNotNull(dettPratica)) { - adding = dettPratica.getFullDescription(); + out.print(dettPratica.getFullDescription()); } } - out.print(adding); %>
<% //Lasciato solo dettpratica perche' fine lavori e collaudo non possono rimuovere gli allegati - long pk = docPratica.getDettPraticaIdRimozione(); + long pk = docPratica.getDettPraticaIdRimozione(); if (0 != pk) { if (!dettPraticas.containsKey(pk)) { dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk)); @@ -360,11 +367,11 @@ for (String codiceDoc:tipologiaAllegati) { %>
- +
<% - if (className.equals(DettPratica.class.getName())) { + if (isDettPratica) { pk = docPratica.getClassPk(); if (!dettPraticas.containsKey(pk)) { dettPraticas.put(pk, DettPraticaLocalServiceUtil.fetchDettPratica(pk)); @@ -389,7 +396,7 @@ for (String codiceDoc:tipologiaAllegati) { - +
@@ -403,14 +410,14 @@ for (String codiceDoc:tipologiaAllegati) {
- - + + <%= firme.numeroFirme() %>
- + @@ -421,7 +428,7 @@ for (String codiceDoc:tipologiaAllegati) {
- + - - - - - - - - - - - + + <%@ include file="/html/allegatipratica/allegati_action.jspf" %> + <%-- + + + + + + + --%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp index cfb1a8a8..60242405 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp @@ -15,7 +15,6 @@ <%@ include file="/html/fascicolofe/init.jsp" %> <% - String backURL = ParamUtil.getString(request, "backURL"); long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l); long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index 5d182129..1eb289dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -26,7 +26,6 @@ <%@ include file="/html/fascicolofe/init.jsp"%> <% - DettPratica dettPratica = (DettPratica) request.getAttribute("bean.dettPratica"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp index 210dc1c1..3b80db1d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_soggetti.jsp @@ -93,4 +93,4 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); } }); - + \ No newline at end of file