diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component index c5992424..46a12de8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component @@ -9,12 +9,6 @@ uses - - uses - - - uses - uses diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index b28e91d7..ec005abc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -45,28 +45,22 @@ public class AvvisoUtil { put(StatoPraticaConstants.CONFORME, "label.admingeniocivile.avviso.tipoDocumento.conforme"); put(StatoPraticaConstants.NON_CONFORME, "label.admingeniocivile.avviso.tipoDocumento.nonconforme"); put(StatoPraticaConstants.AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.autorizzata"); - put(StatoPraticaConstants.NON_AUTORIZZATA, - "label.admingeniocivile.avviso.tipoDocumento.nonautorizzata"); - put(StatoPraticaConstants.INTEGRAZIONE, - "label.admingeniocivile.avviso.tipoDocumento.integrazione"); + put(StatoPraticaConstants.NON_AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.nonautorizzata"); + put(StatoPraticaConstants.INTEGRAZIONE, "label.admingeniocivile.avviso.tipoDocumento.integrazione"); put(StatoPraticaConstants.PREAVVISO_CONTRARIO, "label.admingeniocivile.avviso.tipoDocumento.preavvisocontrario"); put(StatoPraticaConstants.NO_PARERE, "label.admingeniocivile.avviso.tipoDocumento.noparere"); put(StatoPraticaConstants.VIDIMATA, "label.admingeniocivile.avviso.tipoDocumento.vidimata"); - put(StatoPraticaConstants.FINE_LAVORI, - "label.admingeniocivile.avviso.tipoDocumento.vidimata.finelavori"); - put(StatoPraticaConstants.COLLAUDO, - "label.admingeniocivile.avviso.tipoDocumento.vidimata.collaudo"); + put(StatoPraticaConstants.FINE_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.vidimata.finelavori"); + put(StatoPraticaConstants.COLLAUDO, "label.admingeniocivile.avviso.tipoDocumento.vidimata.collaudo"); put(StatoPraticaConstants.RIFIUTATA, "label.admingeniocivile.avviso.tipoDocumento.rifiutata"); put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "label.admingeniocivile.avviso.tipoDocumento.sottopostaparere"); put(StatoPraticaConstants.ANNULLATA, "label.admingeniocivile.avviso.tipoDocumento.annullata"); - put(StatoPraticaConstants.ANNULLA_ISTANZA, - "label.admingeniocivile.avviso.tipoDocumento.annullaistanza"); + put(StatoPraticaConstants.ANNULLA_ISTANZA, "label.admingeniocivile.avviso.tipoDocumento.annullaistanza"); put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata"); - put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, - "label.admingeniocivile.avviso.tipoDocumento.cambioistruttore"); + put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "label.admingeniocivile.avviso.tipoDocumento.cambioistruttore"); } }; @@ -78,16 +72,13 @@ public class AvvisoUtil { put(StatoPraticaConstants.AUTORIZZATA, "conf.geniocivile.avviso.folder.id.autorizzata"); put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.folder.id.non_autorizzata"); put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.folder.id.integrazione"); - put(StatoPraticaConstants.PREAVVISO_CONTRARIO, - "conf.geniocivile.avviso.folder.id.preavvisocontrario"); + put(StatoPraticaConstants.PREAVVISO_CONTRARIO, "conf.geniocivile.avviso.folder.id.preavvisocontrario"); put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.folder.id.noparere"); put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.folder.id.rifiutata"); - put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, - "conf.geniocivile.avviso.folder.id.sottopostaparere"); + put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "conf.geniocivile.avviso.folder.id.sottopostaparere"); put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.folder.id.annullata"); put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.folder.id.annullaistanza"); - put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, - "conf.geniocivile.avviso.folder.id.integrazioneaccettata"); + put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "conf.geniocivile.avviso.folder.id.integrazioneaccettata"); put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.folder.id.cambioistruttore"); put("AS", "conf.geniocivile.avviso.folder.id.doc_asseverazione"); put("AIF", "conf.geniocivile.avviso.folder.id.doc_annullamento"); @@ -99,8 +90,7 @@ public class AvvisoUtil { private final static Map allTipoDocumentoFileTemplateProps = new LinkedHashMap() { { - put(StatoPraticaConstants.VARIAZIONE_SOGGETTI, - "conf.geniocivile.avviso.template.id.variazionesoggetti"); + put(StatoPraticaConstants.VARIAZIONE_SOGGETTI, "conf.geniocivile.avviso.template.id.variazionesoggetti"); put(StatoPraticaConstants.FINE_LAVORI, "conf.geniocivile.avviso.template.id.vidimata.finelavori"); put(StatoPraticaConstants.COLLAUDO, "conf.geniocivile.avviso.template.id.vidimata.collaudo"); put(StatoPraticaConstants.CONFORME, "conf.geniocivile.avviso.template.id.conforme"); @@ -108,20 +98,15 @@ public class AvvisoUtil { put(StatoPraticaConstants.AUTORIZZATA, "conf.geniocivile.avviso.template.id.autorizzata"); put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.template.id.non_autorizzata"); put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.template.id.integrazione"); - // put(StatoPraticaConstants.VIDIMATA, - // "label.admingeniocivile.avviso.tipoDocumento.vidimata"); - put(StatoPraticaConstants.PREAVVISO_CONTRARIO, - "conf.geniocivile.avviso.template.id.preavvisocontrario"); + put(StatoPraticaConstants.PREAVVISO_CONTRARIO, "conf.geniocivile.avviso.template.id.preavvisocontrario"); put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.template.id.noparere"); put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.template.id.rifiutata"); - put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, - "conf.geniocivile.avviso.template.id.sottopostaparere"); + put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "conf.geniocivile.avviso.template.id.sottopostaparere"); put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.template.id.annullata"); put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.template.id.annullaistanza"); put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "conf.geniocivile.avviso.template.id.integrazioneaccettata"); - put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, - "conf.geniocivile.avviso.template.id.cambioistruttore"); + put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.template.id.cambioistruttore"); put("AS", "conf.geniocivile.avviso.template.id.doc_asseverazione"); put("AIF", "conf.geniocivile.avviso.template.id.doc_annullamento"); put("PG", "conf.geniocivile.avviso.template.id.doc_pagamento"); @@ -141,6 +126,8 @@ public class AvvisoUtil { put("DPB2", "conf.geniocivile.avviso.template.id.deposito.B2"); put("DPVNS", "conf.geniocivile.avviso.template.id.deposito.VNS"); + put("VIARCH1", "conf.geniocivile.avviso.template.id.deposito.VIARCH1"); + put("VIARCH2", "conf.geniocivile.avviso.template.id.deposito.VIARCH2"); } }; @@ -182,8 +169,8 @@ public class AvvisoUtil { IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(dettPratica.getIntPraticaId()); if (Validator.isNull(dettPratica.getTipoIntegrazione()) - || (Validator.isNotNull(dettPratica.getTipoIntegrazione()) && dettPratica - .getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) { + || (Validator.isNotNull(dettPratica.getTipoIntegrazione()) && dettPratica.getTipoIntegrazione() + .equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) { if (Validator.isNotNull(intPratica.getDtSorteggio())) { sorteggiata = true; } @@ -209,7 +196,6 @@ public class AvvisoUtil { } public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) { - // TODO: In attesa di specifiche su stati validi return getAllTipoDocumento().containsKey(statoPratica); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties index 8c95efc3..6817a527 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties @@ -184,6 +184,8 @@ conf.geniocivile.avviso.template.id.deposito.B1 = Template Ricevuta Deposito mod conf.geniocivile.avviso.template.id.deposito.C = Template Ricevuta Deposito mod. C conf.geniocivile.avviso.template.id.deposito.B2 = Template Ricevuta Deposito mod. B2 conf.geniocivile.avviso.template.id.deposito.VNS = Template Ricevuta Variante Non Sostanziale +conf.geniocivile.avviso.template.id.deposito.VIARCH1 = Template VIArch attivazione +conf.geniocivile.avviso.template.id.deposito.VIARCH2 = Template VIArch conclusione #Configurazione Allegati conf.geniocivile.attachment.folder.id = Folder Allegati diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java index d5d93728..c81b99c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java @@ -218,35 +218,35 @@ public class ControlloPraticaLocalServiceClpInvoker { _methodParameterTypes237 = new String[] { "long", "java.util.Map" }; - _methodName239 = "addPraticheAlControllo"; + _methodName240 = "addPraticheAlControllo"; - _methodParameterTypes239 = new String[] { "long", "long" }; + _methodParameterTypes240 = new String[] { "long", "long" }; - _methodName240 = "addPraticheAlControlloVarianti"; + _methodName241 = "addPraticheAlControlloVarianti"; - _methodParameterTypes240 = new String[] { + _methodParameterTypes241 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName241 = "getReturnValueScriptIniziale"; - - _methodParameterTypes241 = new String[] { "long" }; - - _methodName242 = "getTipoEsito"; + _methodName242 = "getReturnValueScriptIniziale"; _methodParameterTypes242 = new String[] { "long" }; - _methodName243 = "findByIntPratica"; + _methodName243 = "getTipoEsito"; _methodParameterTypes243 = new String[] { "long" }; - _methodName244 = "calculateDateAvvioProcedimento"; + _methodName244 = "findByIntPratica"; _methodParameterTypes244 = new String[] { "long" }; - _methodName245 = "gestioneWFVarianti"; + _methodName245 = "calculateDateAvvioProcedimento"; + + _methodParameterTypes245 = new String[] { "long" }; - _methodParameterTypes245 = new String[] { + _methodName246 = "gestioneWFVarianti"; + + _methodParameterTypes246 = new String[] { "it.tref.liferay.portos.bo.model.ControlloPratica" }; } @@ -498,41 +498,41 @@ public class ControlloPraticaLocalServiceClpInvoker { (java.util.Map)arguments[1]); } - if (_methodName239.equals(name) && - Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControllo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue()); - } - if (_methodName242.equals(name) && Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue()); } if (_methodName243.equals(name) && Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); } if (_methodName244.equals(name) && Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); + return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } if (_methodName245.equals(name) && Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); + } + + if (_methodName246.equals(name) && + Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { ControlloPraticaLocalServiceUtil.gestioneWFVarianti((it.tref.liferay.portos.bo.model.ControlloPratica)arguments[0]); return null; @@ -619,8 +619,6 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes236; private String _methodName237; private String[] _methodParameterTypes237; - private String _methodName239; - private String[] _methodParameterTypes239; private String _methodName240; private String[] _methodParameterTypes240; private String _methodName241; @@ -633,4 +631,6 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes244; private String _methodName245; private String[] _methodParameterTypes245; + private String _methodName246; + private String[] _methodParameterTypes246; } \ No newline at end of file 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 8886a0cf..109e5a95 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=2913 - build.date=1615991433242 + build.number=2915 + build.date=1616068476446 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp index f0bc524a..d2c3daf8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp @@ -1,263 +1,139 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%> +<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> +<%@page import="com.liferay.portlet.documentlibrary.model.DLFolder"%> +<%@page import="com.liferay.portlet.documentlibrary.model.DLFolderConstants"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.model.DLFolder"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil"%> -<%@ include file="/html/init.jsp"%> -<%@page import="com.liferay.portlet.documentlibrary.model.DLFolderConstants"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> -<%@page import="com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryUtil"%> -<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> -<%@page import="com.liferay.portal.kernel.util.CalendarFactoryUtil"%> - -<%@page import="java.util.Collection"%> -<%@page import="java.util.Calendar"%> - +<%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%> <%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%> - +<%@page import="java.util.Collection"%> +<%@ include file="/html/init.jsp"%> <% - long companyId = company.getCompanyId(); - String tabs1 = "parametri"; - String redirect = "/html/amministrazione/tabs/view.jps"; - - String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.SCHEDULER_VERSIONING); - String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO); - String schedulerFirmaDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO); - String schedulerInvioDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO); - String schedulerIris = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.SCHEDULER_IRIS); - - boolean schedulerVersioningBoolean = Boolean.parseBoolean(schedulerVersioning); - boolean schedulerGeneraDocumentoBoolean = Boolean.parseBoolean(schedulerGeneraDocumento); - boolean schedulerFirmaDocumentoBoolean = Boolean.parseBoolean(schedulerFirmaDocumento); - boolean schedulerInvioDocumentoBoolean = Boolean.parseBoolean(schedulerInvioDocumento); - boolean schedulerIrisBoolean = Boolean.parseBoolean(schedulerIris); - - String irisVerificaPagamentiURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL); - - String protocollazioneServiceURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL); - - String protocollazioneExportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL); - - String protocollazioneImportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL); - - String irisComunicazioniDebitorieURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL); - - String irisGenerazioneIUVURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL); - - String importobollo = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.IMPORTO_BOLLO); - - int dayOfWeekSorteggio = -1; - String dayOfWeekSorteggioString = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO); - if (Validator.isNotNull(dayOfWeekSorteggioString)) { - dayOfWeekSorteggio = Integer.parseInt(dayOfWeekSorteggioString); - } - - String hourOfDaySorteggioString = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO); - if (Validator.isNull(hourOfDaySorteggioString)) { - hourOfDaySorteggioString = LanguageUtil.get(pageContext, - ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO_DEFAULT); - } - int hourOfDaySorteggio = Integer.parseInt(hourOfDaySorteggioString); - - int dayOfWeekPubblicazione = -1; - String dayOfWeekPubblicazioneString = ConfigurazioneLocalServiceUtil.findByC_ChiaveString( - companyId, ConfigurazioneConstants.DAY_OF_WEEK_PUBBLICAZIONE); - if (Validator.isNotNull(dayOfWeekPubblicazioneString)) { - dayOfWeekPubblicazione = Integer.parseInt(dayOfWeekPubblicazioneString); - } - - int startDaySorteggio = -1; - String startDaySorteggioString = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, - ConfigurazioneConstants.START_DAY_SORTEGGIO); - if (Validator.isNotNull(startDaySorteggioString)) { - startDaySorteggio = Integer.parseInt(startDaySorteggioString); - } +long companyId = company.getCompanyId(); +String tabs1 = "parametri"; +String redirect = "/html/amministrazione/tabs/view.jps"; +String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.SCHEDULER_VERSIONING); +String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO); +String schedulerFirmaDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO); +String schedulerInvioDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO); +String schedulerIris = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_IRIS); +boolean schedulerVersioningBoolean = Boolean.parseBoolean(schedulerVersioning); +boolean schedulerGeneraDocumentoBoolean = Boolean.parseBoolean(schedulerGeneraDocumento); +boolean schedulerFirmaDocumentoBoolean = Boolean.parseBoolean(schedulerFirmaDocumento); +boolean schedulerInvioDocumentoBoolean = Boolean.parseBoolean(schedulerInvioDocumento); +boolean schedulerIrisBoolean = Boolean.parseBoolean(schedulerIris); +String irisVerificaPagamentiURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL); +String protocollazioneServiceURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL); +String protocollazioneExportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL); +String protocollazioneImportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL); +String irisComunicazioniDebitorieURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL); +String irisGenerazioneIUVURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL); +String importobollo = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.IMPORTO_BOLLO); %> - - +
- - - + + - - - - - - + + + + - - - - + + + - - - - + + + - - - - + + +
- - - + + + - - - - - - - - - -
- - - <% - int days[] = new int[] { Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, - Calendar.THURSDAY, Calendar.FRIDAY, Calendar.SATURDAY, Calendar.SUNDAY }; - Format dayFormat = FastDateFormatFactoryUtil.getSimpleDateFormat("EEEE", locale); - Calendar cal = CalendarFactoryUtil.getCalendar(); - cal.set(Calendar.DATE, 1); - for (int day : days) { - cal.set(Calendar.DAY_OF_WEEK, day); - String dayString = dayFormat.format(cal); - %> - - <% - } - %> - - - - - <% - for (int i = 0; i < 24; i++) { - %> - - <% - } - %> - - - - - <% - int days[] = new int[] { Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, - Calendar.THURSDAY, Calendar.FRIDAY, Calendar.SATURDAY, Calendar.SUNDAY }; - Format dayFormat = FastDateFormatFactoryUtil.getSimpleDateFormat("EEEE", locale); - Calendar cal = CalendarFactoryUtil.getCalendar(); - cal.set(Calendar.DATE, 1); - for (int day : days) { - cal.set(Calendar.DAY_OF_WEEK, day); - String dayString = dayFormat.format(cal); - %> - - <% - } - %> - - - + + + + + + +
- - - <% - List rootfolders = DLFolderServiceUtil.getFolders(portletGroupId, - DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - long templateFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, - ConfigurazioneConstants.TEMPLATE_FOLDER_ID); +List rootfolders = DLFolderServiceUtil.getFolders(portletGroupId, + DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); +long templateFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, ConfigurazioneConstants.TEMPLATE_FOLDER_ID); %> - - + + - +
- - - + + <% - for (DLFolder dlFolder : rootfolders) { + for (DLFolder dlFolder : rootfolders) { %> <%=dlFolder.getName()%> + selected="<%= dlFolder.getFolderId() == templateFolderId %>"><%= dlFolder.getName() %> <% - } + } %> - + <% - DLFolder dlFolder = DLFolderLocalServiceUtil.getFolder(templateFolderId); - List fileList = DLAppServiceUtil.getFileEntries(dlFolder.getRepositoryId(), templateFolderId); - Collection keyColl = AvvisoUtil.getUniqueTipoDocumentoFileTemplateProps(); - for (String key : keyColl) { + DLFolder dlFolder = DLFolderLocalServiceUtil.getFolder(templateFolderId); + List fileList = DLAppServiceUtil.getFileEntries(dlFolder.getRepositoryId(), templateFolderId); + Collection keyColl = AvvisoUtil.getUniqueTipoDocumentoFileTemplateProps(); + for (String key : keyColl) { %> - + <% - for (FileEntry fileEntry : fileList) { - long currentFileId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key); + for (FileEntry fileEntry : fileList) { + long currentFileId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key); %> - <%=fileEntry.getTitle()%> + <%= fileEntry.getTitle() %> <% - } + } %> <% - } + } %> @@ -265,66 +141,65 @@
- -
- + <% - Collection keyColl = AvvisoUtil.getAllTipoDocumentoFolderProps().values(); - for (String key : keyColl) { + Collection keyColl = AvvisoUtil.getAllTipoDocumentoFolderProps().values(); + for (String key : keyColl) { %> - + <% - for (DLFolder fd : rootfolders) { - long currentFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong( - companyId, key); - String parentFolderName = StringPool.BLANK; - DLFolder parentFolder = fd.getParentFolder(); - if (parentFolder != null) - parentFolderName = parentFolder.getName(); + for (DLFolder fd : rootfolders) { + long currentFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, key); + String parentFolderName = StringPool.BLANK; + DLFolder parentFolder = fd.getParentFolder(); + if (parentFolder != null) + parentFolderName = parentFolder.getName(); %> - <%=parentFolderName.equals(StringPool.BLANK) ? fd.getName() - : parentFolderName + StringPool.MINUS + fd.getName()%> + + <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName() + : parentFolderName + StringPool.MINUS + fd.getName() %> <% - } + } %> <% - } + } %>
- +
- + <% - String key = ConfigurazioneConstants.ATTACHMENT_FOLDER_ID; + String key = ConfigurazioneConstants.ATTACHMENT_FOLDER_ID; %> - + <% - for (DLFolder fd : rootfolders) { - long currentFolderId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong( - companyId, key); - String parentFolderName = StringPool.BLANK; - DLFolder parentFolder = fd.getParentFolder(); - if (parentFolder != null) - parentFolderName = parentFolder.getName(); + for (DLFolder fd : rootfolders) { + long currentFolderId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key); + String parentFolderName = StringPool.BLANK; + DLFolder parentFolder = fd.getParentFolder(); + if (parentFolder != null) { + parentFolderName = parentFolder.getName(); + } %> - <%=parentFolderName.equals(StringPool.BLANK) ? fd.getName() - : parentFolderName + StringPool.MINUS + fd.getName()%> + + <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName() + : parentFolderName + StringPool.MINUS + fd.getName()%> <% - } + } %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf index cc0ed900..02711ffa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf @@ -1,228 +1,182 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> -<%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> -<%@page import="com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil"%> -<%@page import="com.liferay.portal.workflow.kaleo.model.KaleoInstance"%> -<%@page import="java.text.DateFormat"%> +<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> <%@page import="com.liferay.portal.kernel.util.StringPool"%> -<%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl"%> -<%@page import="it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstance"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil"%> <%@page import="com.liferay.portal.model.User"%> -<%@page import="java.util.concurrent.TimeUnit"%> -<%@page import="java.util.Date"%> -<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> -<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> +<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Comune"%> +<%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> <%@page import="it.tref.liferay.portos.bo.model.Territorio"%> -<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> +<%@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="com.liferay.portal.kernel.dao.orm.QueryUtil"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%> +<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%> <%@page import="java.util.List"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstance"%> -<%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%> -<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> -<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> <% - String rowUrl = StringPool.BLANK; - - //ADT - BUG-12 Aggiunta colonna Data Esito - String currentTab = (String)request.getAttribute("tabs1"); -%> - -<% +String rowUrl = StringPool.BLANK; +//ADT - BUG-12 Aggiunta colonna Data Esito +String currentTab = (String)request.getAttribute("tabs1"); //Informazioni relative alla pratica IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId()); DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); %> <% - ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); - + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); - - if(controlloPratica.getStatus() == 0 || controlloPratica.getStatus() == 4 || controlloPratica.getStatus() == 6){ - - } + //Informazioni relative al workflow WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( - controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey()); - + controlloPratica.getCompanyId(), controlloPratica.getGroupId(), ControlloPratica.class.getName(), + controlloPratica.getPrimaryKey()); + List listaTask = null; WorkflowInstance workflowInstance = null; if (workflowInstanceLink != null) { long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId(); - workflowInstance = - WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId); - + workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId); listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, - workflowInstance.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + workflowInstance.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); } WorkflowTask task = null; - - if(listaTask != null && !listaTask.isEmpty()){ - task = listaTask.get(0); + if (listaTask != null && !listaTask.isEmpty()) { + task = listaTask.get(0); } - %> - - - + <% - String taskName = StringPool.BLANK; - if(task!=null){ - User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); - taskName = LanguageUtil.get(pageContext,task.getName()); - if(userTask!=null){ - taskName += " ("+userTask.getFullName()+")"; - } - }else if (workflowInstance != null){ - taskName = LanguageUtil.get(pageContext, workflowInstance.getState()); + String taskName = StringPool.BLANK; + if (task != null) { + User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); + taskName = LanguageUtil.get(pageContext,task.getName()); + if (userTask != null) { + taskName += " (" + userTask.getFullName() + StringPool.CLOSE_PARENTHESIS; } - - if(lastDettPratica != null){ - - if (lastDettPratica.getTipoIntegrazione() != null) { - //BUG BO ID=14: NOME TASK SEZIONE ATTIVITA' - if(lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)){ - taskName = taskName + " - Integrazione #" + (lastDettPratica.getIntegrazione()); - } else if(lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)){ - taskName = taskName + " - Variante #" + (lastDettPratica.getVarianteNumero()); - } - + } else if (workflowInstance != null) { + taskName = LanguageUtil.get(pageContext, workflowInstance.getState()); + } + if (lastDettPratica != null) { + if (lastDettPratica.getTipoIntegrazione() != null) { + //BUG BO ID=14: NOME TASK SEZIONE ATTIVITA' + if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) { + taskName += " - Integrazione #" + lastDettPratica.getIntegrazione(); + } else if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { + taskName += " - Variante #" + lastDettPratica.getVarianteNumero(); } } - - out.print(taskName); + } + out.print(taskName); %> - <% - String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId()); - out.print(tipoEsito); - %> + String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId()); + out.print(LanguageUtil.get(pageContext, tipoEsito)); + %> - - <%-- ADT - BUG-12 Aggiunta colonna Data Esito --%> - <%-- Bug 33264 --%> + <%-- ADT - BUG-12 Aggiunta colonna Data Esito --%> - + - - <%-- - <% - /*boolean sorteggiata = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId())!=null; - String clazz = StringPool.BLANK; - if(sorteggiata){ - out.print(""); - }*/ - %> - --%> - <% - - - if(lastDettPratica != null){ - long lastDettPraticaId = lastDettPratica.getDettPraticaId(); - if(lastDettPraticaId != controlloPratica.getDettPraticaId()){ - String messageLabel = LanguageUtil.get(pageContext, "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio"); - if(controlloPratica.getStatus() == WorkflowConstants.STATUS_APPROVED || controlloPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE || controlloPratica.getStatus() == WorkflowConstants.STATUS_DENIED){ - messageLabel = LanguageUtil.get(pageContext, "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio-closed"); - } - - %> - - - - <%=messageLabel %> - - - - <% + if (lastDettPratica != null) { + long lastDettPraticaId = lastDettPratica.getDettPraticaId(); + if (lastDettPraticaId != controlloPratica.getDettPraticaId()) { + String messageLabel = LanguageUtil.get(pageContext, + "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio"); + if (controlloPratica.getStatus() == WorkflowConstants.STATUS_APPROVED + || controlloPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE + || controlloPratica.getStatus() == WorkflowConstants.STATUS_DENIED) { + messageLabel = LanguageUtil.get(pageContext, + "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio-closed"); } + %> + + <%= messageLabel %> + + <% } + } %> <%= intPratica.getTitle(locale, true) %> - <%= Validator.isNull(intPratica.getTipoProcedura()) ? - "" : - "
" + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) + "" %> + <%= Validator.isNull(intPratica.getTipoProcedura()) ? StringPool.BLANK + : "
" + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) + + "" %> - - + <% - User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); - if (tecnico != null) { - out.print(tecnico.getFullName()); - } else { - out.print(" [" + intPratica.getStatusByUserId() + "]"); - } + User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); + if (tecnico != null) { + out.print(tecnico.getFullName()); + } else { + out.print(" [" + intPratica.getStatusByUserId() + StringPool.CLOSE_BRACKET); + } %> - + - - <%= intPratica.getUnitaOperativa() > 0 ? String.valueOf(intPratica.getUnitaOperativa()) : StringPool.BLANK %> - <% - WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(),controlloPratica.getGroupId(), null, controlloPratica); + WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(), + controlloPratica.getGroupId(), null, controlloPratica); %> - + <% - User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId()); - if(approvatore!=null){ - out.print(approvatore.getFullName()); - }else{ - if(workflowTask.getAssigneeUserId()==-1){ - out.print( " [Portos 1]"); - } else { - out.print( " ["+workflowTask.getAssigneeUserId()+"]"); - } + User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId()); + if (approvatore!=null) { + out.print(approvatore.getFullName()); + } else { + if (workflowTask.getAssigneeUserId() == -1) { + out.print( " [Portos 1]"); + } else { + out.print( " [" + workflowTask.getAssigneeUserId() + StringPool.CLOSE_BRACKET); } - out.print(" ("+workflowTask.getName()+")"); + } + out.print(" (" + workflowTask.getName() + StringPool.CLOSE_PARENTHESIS); %> - + - - - - + - <%=provincia.getProvincia()+" - "+comune.getDenominazione() %> + <%= provincia.getProvincia() + " - " + comune.getDenominazione() %> - <% - long days = ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); + long days = ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); %> - <%=days %> + <%= days %> - - - - + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp index 965ae9fd..cc1c767a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp @@ -95,6 +95,8 @@ for (Entry p : parameters.entrySet()) { html = html.replaceAll("(]*>[^<]*)", "$1" + HtmlUtil.escape(p.getValue().toString()) + ""); } -html = html.replaceAll("(?s)
.*?", ""); +// Rimozione valori non utilizzati +html = html.replaceAll("(?s)]*?value=\"Value[0-9]\"[^>]*>.*?", ""); +html = html.replaceAll("(?s)]*>[ \t\r\n]*", ""); %> <%= html %> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java index d7ba9d57..b821dc6a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchActionException; import com.liferay.portal.workflow.kaleo.model.KaleoAction; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java index 8a53a412..67825a03 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchConditionException; import com.liferay.portal.workflow.kaleo.model.KaleoCondition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java index ec133caa..7b518a17 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchDefinitionException; import com.liferay.portal.workflow.kaleo.model.KaleoDefinition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java index 7a81a480..0ac20c87 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java index 6c526317..b0115dda 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java index e9e4c818..9ade21a4 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchLogException; import com.liferay.portal.workflow.kaleo.model.KaleoLog; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java index dfad2b8c..005b6749 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNodeException; import com.liferay.portal.workflow.kaleo.model.KaleoNode; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java index 0932f643..02168960 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationException; import com.liferay.portal.workflow.kaleo.model.KaleoNotification; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java index d8c0fb51..0cd7db55 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationRecipientException; import com.liferay.portal.workflow.kaleo.model.KaleoNotificationRecipient; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index fd427cf1..eb7c922f 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignmentInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java index 8e52911f..a2a99f9b 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignment; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java index 032e8512..8ab6fafe 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java index 9a339c6a..2749e5fe 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskException; import com.liferay.portal.workflow.kaleo.model.KaleoTask; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java index 1400f6a2..725af5ed 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTimerInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java index a2e69d22..653aca47 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerException; import com.liferay.portal.workflow.kaleo.model.KaleoTimer; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java index 5c157fbc..79172e1a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTransitionException; import com.liferay.portal.workflow.kaleo.model.KaleoTransition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java index 11d17242..cd4d8c53 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java @@ -57,8 +57,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.kernel.workflow.WorkflowException; -import com.liferay.portal.kernel.workflow.WorkflowInstance; -import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowLog; import com.liferay.portal.kernel.workflow.WorkflowLogManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; @@ -101,6 +99,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { add(StatoPraticaConstants.NON_CONFORME); add(StatoPraticaConstants.NO_PARERE); add(StatoPraticaConstants.PREAVVISO_CONTRARIO); + add(StatoPraticaConstants.VIARCH); } }; @@ -109,36 +108,26 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { String cmd = ParamUtil.getString(actionRequest, Constants.CMD); - if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) { - try { - if (cmd.equals(Constants.SAVE)) { completeTask(actionRequest); } else if (cmd.equals(Constants.RESET)) { relaseTask(actionRequest); } - String redirect = ParamUtil.getString(actionRequest, "redirect"); String closeRedirect = ParamUtil.getString(actionRequest, "closeRedirect"); - if (Validator.isNotNull(closeRedirect)) { redirect = HttpUtil.setParameter(redirect, "closeRedirect", closeRedirect); - SessionMessages.add(actionRequest, PortalUtil.getPortletId(actionRequest) + SessionMessages.KEY_SUFFIX_CLOSE_REDIRECT, closeRedirect); } - sendRedirect(actionRequest, actionResponse, redirect); - } catch (Exception e) { if (e instanceof WorkflowTaskDueDateException) { SessionErrors.add(actionRequest, e.getClass()); } else if (e instanceof PrincipalException || e instanceof WorkflowException) { - SessionErrors.add(actionRequest, e.getClass()); - setForward(actionRequest, "portlet.workflow_tasks.error"); } else { throw e; @@ -147,8 +136,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { } else if (cmd.equals("removeUO")) { removeUO(actionRequest); } else { - originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig, - actionRequest, actionResponse); + originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig, actionRequest, + actionResponse); } } @@ -161,50 +150,47 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId"); String comment = ParamUtil.getString(actionRequest, "comment"); - WorkflowTaskManagerUtil.assignWorkflowTaskToUser(themeDisplay.getCompanyId(), - themeDisplay.getUserId(), workflowTaskId, assigneeUserId, comment, null, null); + WorkflowTaskManagerUtil.assignWorkflowTaskToUser(themeDisplay.getCompanyId(), themeDisplay.getUserId(), + workflowTaskId, assigneeUserId, comment, null, null); } protected void completeTask(ActionRequest actionRequest) throws Exception { ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); - long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId"); - String transitionName = ParamUtil.getString(actionRequest, "transitionName"); String comment = ParamUtil.getString(actionRequest, "comment"); boolean aggiorna = true; - // ADT: bug mancata problema assegnazione WF checkPresenzaIstruttore(transitionName, workflowTaskId); - // ADT: BUG ANOMALIA REGISTRA ESITO + _log.info("transitionName = " + transitionName); if (transitionName.equalsIgnoreCase("registra-esito")) { HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil .getHttpServletRequest(actionRequest)); - String esito = httpServletRequest.getParameter("kaleo--esito--") != null ? httpServletRequest - .getParameter("kaleo--esito--").trim() : ""; + String esito = httpServletRequest.getParameter("kaleo--esito--") != null ? httpServletRequest.getParameter( + "kaleo--esito--").trim() : ""; String testoDocumento = httpServletRequest.getParameter("kaleo--testo_del_documento--") != null ? httpServletRequest .getParameter("kaleo--testo_del_documento--") : ""; - + if (esito.equals(StatoPraticaConstants.VIARCH)) { + aggiorna = false; + } if (!valoriAmmessi.contains(esito) || ((esito.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE) || esito - .equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO)) && testoDocumento - .isEmpty())) { + .equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO)) && testoDocumento.isEmpty())) { _log.error("controllo validazione completamento task registra-esito = " + workflowTaskId - + " non riuscito - esito non valorizzato o esito " - + StatoPraticaConstants.INTEGRAZIONE + StringPool.SLASH - + StatoPraticaConstants.PREAVVISO_CONTRARIO + " con testo del documento vuoto"); - throw new PortalException( - "controllo validazione completamento task registra-esito non riuscito"); + + " non riuscito - esito non valorizzato o esito " + StatoPraticaConstants.INTEGRAZIONE + + StringPool.SLASH + StatoPraticaConstants.PREAVVISO_CONTRARIO + + " con testo del documento vuoto"); + throw new PortalException("controllo validazione completamento task registra-esito non riuscito"); } } else if (transitionName.equalsIgnoreCase("Riassegna") || transitionName.equalsIgnoreCase("assegna")) { HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil .getHttpServletRequest(actionRequest)); String istruttore = httpServletRequest.getParameter("kaleo--istruttore--"); if (Validator.isNull(istruttore)) { - _log.error("controllo validazione completamento task = " + transitionName + " -" - + workflowTaskId + " non riuscito - istruttore non presente nel workflow"); + _log.error("controllo validazione completamento task = " + transitionName + " -" + workflowTaskId + + " non riuscito - istruttore non presente nel workflow"); throw new PortalException("controllo validazione completamento task riassegna non riuscito"); } if (istruttore.startsWith("--UO--")) { @@ -215,21 +201,19 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId(); int uo = Integer.parseInt(istruttore.substring(6)); - WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, themeDisplay.getUserId(), - workflowTaskId, roleId, "Trasferito all'UO " + uo - + " per assegnazione all'istruttore.\n" + comment, null, + WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, themeDisplay.getUserId(), workflowTaskId, + roleId, "Trasferito all'UO " + uo + " per assegnazione all'istruttore.\n" + comment, null, WorkflowUtil.getWorkflowContext(controllo)); pratica.setUnitaOperativa(uo); IntPraticaLocalServiceUtil.updateIntPratica(pratica); } } - if (aggiorna) { Map workflowContext = new HashMap(); workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName); WorkflowUtil.updateWorkflowContextWithTaskFormParameters(actionRequest, workflowContext); - WorkflowTaskManagerUtil.completeWorkflowTask(themeDisplay.getCompanyId(), - themeDisplay.getUserId(), workflowTaskId, transitionName, comment, workflowContext); + WorkflowTaskManagerUtil.completeWorkflowTask(themeDisplay.getCompanyId(), themeDisplay.getUserId(), + workflowTaskId, transitionName, comment, workflowContext); } } @@ -245,11 +229,11 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { Map workflowContext = WorkflowUtil.getWorkflowContext(controllo); long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId(); - WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, workflowTaskId, userId, - StringPool.BLANK, null, workflowContext); - WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, userId, workflowTaskId, roleId, - "Rimosso dalla unità operativa " + pratica.getUnitaOperativa() + ".\n" + comment, null, - workflowContext); + WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, workflowTaskId, userId, StringPool.BLANK, + null, workflowContext); + WorkflowTaskManagerUtil + .assignWorkflowTaskToRole(companyId, userId, workflowTaskId, roleId, "Rimosso dalla unità operativa " + + pratica.getUnitaOperativa() + ".\n" + comment, null, workflowContext); pratica.setUnitaOperativa(0); IntPraticaLocalServiceUtil.updateIntPratica(pratica); } @@ -263,8 +247,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId"); String comment = ParamUtil.getString(actionRequest, "comment"); - WorkflowTaskManagerUtil.assignWorkflowTaskToRole(themeDisplay.getCompanyId(), assigneeUserId, - workflowTaskId, 0L, comment, null, null); + WorkflowTaskManagerUtil.assignWorkflowTaskToRole(themeDisplay.getCompanyId(), assigneeUserId, workflowTaskId, + 0L, comment, null, null); } protected boolean isCheckMethodOnProcessAction() { @@ -294,8 +278,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { Date dueDate = PortalUtil.getDate(dueDateMonth, dueDateDay, dueDateYear, dueDateHour, dueDateMinute, WorkflowTaskDueDateException.class); - WorkflowTaskManagerUtil.updateDueDate(themeDisplay.getCompanyId(), themeDisplay.getUserId(), - workflowTaskId, comment, dueDate); + WorkflowTaskManagerUtil.updateDueDate(themeDisplay.getCompanyId(), themeDisplay.getUserId(), workflowTaskId, + comment, dueDate); } private static final boolean _CHECK_METHOD_ON_PROCESS_ACTION = false; @@ -307,8 +291,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { } protected void sendRedirect(PortletConfig portletConfig, ActionRequest actionRequest, - ActionResponse actionResponse, String redirect, String closeRedirect) throws IOException, - SystemException { + ActionResponse actionResponse, String redirect, String closeRedirect) throws IOException, SystemException { if (isDisplaySuccessMessage(actionRequest)) { addSuccessMessage(actionRequest, actionResponse); @@ -396,8 +379,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { protected void addSuccessMessage(ActionRequest actionRequest, ActionResponse actionResponse) { - PortletConfig portletConfig = (PortletConfig) actionRequest - .getAttribute(JavaConstants.JAVAX_PORTLET_CONFIG); + PortletConfig portletConfig = (PortletConfig) actionRequest.getAttribute(JavaConstants.JAVAX_PORTLET_CONFIG); boolean addProcessActionSuccessMessage = GetterUtil.getBoolean( portletConfig.getInitParameter("add-process-action-success-action"), true); @@ -436,12 +418,10 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId"); WorkflowTask workflowTask = null; if (workflowTaskId > 0) { - workflowTask = WorkflowTaskManagerUtil.getWorkflowTask(themeDisplay.getCompanyId(), - workflowTaskId); + workflowTask = WorkflowTaskManagerUtil.getWorkflowTask(themeDisplay.getCompanyId(), workflowTaskId); } - String valoreTransizioneEsito = getTransitionValue(workflowTask.getWorkflowInstanceId(), - "registra-esito"); + String valoreTransizioneEsito = getTransitionValue(workflowTask.getWorkflowInstanceId(), "registra-esito"); String valoreTransizioneAssegna = getTransitionValue(workflowTask.getWorkflowInstanceId(), "assegna"); renderRequest.setAttribute("registra-esito-value", valoreTransizioneEsito); @@ -451,10 +431,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { ControlloPratica controllo = getControlloPratica(workflowTask.getWorkflowInstanceId()); // ADT BUG BO ID=33 - renderRequest.setAttribute( - "historyWorkflowEsitiLogs", - getHistoryWorkfloLogs(themeDisplay, workflowTask.getWorkflowInstanceId(), renderRequest, - controllo)); + renderRequest.setAttribute("historyWorkflowEsitiLogs", + getHistoryWorkfloLogs(themeDisplay, workflowTask.getWorkflowInstanceId(), renderRequest, controllo)); Group group = GroupLocalServiceUtil.getGroup(controllo.getGroupId()); User user = themeDisplay.getUser(); @@ -466,8 +444,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { org.getGroupId(), "portos_assegnatore") && (unitaOperativeUtente.contains(unitaOperativa) || unitaOperativeUtente.contains(0)); - KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(workflowTask - .getWorkflowInstanceId()); + KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(workflowTask.getWorkflowInstanceId()); KaleoInstanceToken rootToken = KaleoInstanceTokenLocalServiceUtil.getKaleoInstanceToken(instance .getRootKaleoInstanceTokenId()); @@ -485,8 +462,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { SystemException { ClassLoader classLoaderKaleoLog = (ClassLoader) PortletBeanLocatorUtil.locate( - it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), - "portletClassLoader"); + it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader"); DynamicQuery dqKaleoLog = DynamicQueryFactoryUtil.forClass(FormLog.class, classLoaderKaleoLog); dqKaleoLog.add(RestrictionsFactoryUtil.eq("workflowInstanceId", taskInstanceId)); @@ -498,8 +474,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { JSONObject json = JSONFactoryUtil.createJSONObject(formLog.getFormParameters()); KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId); - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil - .getControlloPratica(kaleoInstance.getClassPK()); + ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(kaleoInstance + .getClassPK()); if (json.has("esito")) { String tipoEsito = StringPool.BLANK; @@ -524,8 +500,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { PortletBeanLocatorUtil.locate(ClpSerializer.getServletContextName(), "portletClassLoader"); KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId); - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil - .getControlloPratica(kaleoInstance.getClassPK()); + ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(kaleoInstance + .getClassPK()); return controlloPratica; } @@ -541,8 +517,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { logTypes.add(WorkflowLog.TASK_UPDATE); logTypes.add(WorkflowLog.TRANSITION); List workflowLogs = WorkflowLogManagerUtil.getWorkflowLogsByWorkflowInstance( - themeDisplay.getCompanyId(), workflowInstanceId, logTypes, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, WorkflowComparatorFactoryUtil.getLogCreateDateComparator(true)); + themeDisplay.getCompanyId(), workflowInstanceId, logTypes, QueryUtil.ALL_POS, QueryUtil.ALL_POS, + WorkflowComparatorFactoryUtil.getLogCreateDateComparator(true)); for (WorkflowLog workflowLog : workflowLogs) { try { WorkflowTask wfTask = null; @@ -558,12 +534,9 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { if (json.has("esito")) { String tipoEsito = StringPool.BLANK; if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) { - tipoEsito = StatoPraticaConstants.getEsitoDeposito(json - .getString("esito")); - } else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica - .getIntPraticaId())) { - tipoEsito = StatoPraticaConstants.getEsitoAutorizzazione(json - .getString("esito")); + tipoEsito = StatoPraticaConstants.getEsitoDeposito(json.getString("esito")); + } else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) { + tipoEsito = StatoPraticaConstants.getEsitoAutorizzazione(json.getString("esito")); } esitiMapByWorkflowLogID.put(workflowLog.getWorkflowLogId(), tipoEsito); } @@ -582,8 +555,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { /** * ADT: check congruenza WF - presenza dell'istruttore - * - * + * + * * @param transitionName * @param workflowTaskId */ @@ -592,8 +565,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { try { KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil .getKaleoTaskInstanceToken(workflowTaskId); - ControlloPratica controlloPratica = getControlloPratica(kaleoTaskInstanceToken - .getKaleoInstanceId()); + ControlloPratica controlloPratica = getControlloPratica(kaleoTaskInstanceToken.getKaleoInstanceId()); Map wfParameters = it.tref.liferay.portos.bo.util.WorkflowUtil .getFormParameters(controlloPratica); String istruttore = (String) wfParameters.get("istruttore"); @@ -602,8 +574,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { if (istruttore == null) { _log.info("checkPresenzaIstruttore - rilevata incongrueza WF - istruttore non presente per controlloPratica = " + controlloPratica.getControlloPraticaId()); - long istruttoreId = IntPraticaLocalServiceUtil.getIntPratica( - controlloPratica.getIntPraticaId()).getStatusByUserId(); + long istruttoreId = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId()) + .getStatusByUserId(); if (istruttoreId > 0) { String jsonFormParameters = null; Map parametri = new HashMap(); @@ -625,8 +597,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { } } catch (Exception e) { - _log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" - + e.getMessage() + " , " + e.getCause() + "]"); + _log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" + e.getMessage() + + " , " + e.getCause() + "]"); } } } diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 2a843095..a191b6b3 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=27 - build.date=1613390393243 + build.number=28 + build.date=1616063088077 build.auto.upgrade=true ##