Sfoglia il codice sorgente

Inizio VIArch

master
Salvatore La Manna 4 anni fa
parent
commit
d295e23760
  1. 6
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
  2. 48
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java
  3. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties
  4. 54
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java
  5. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  6. 373
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp
  7. 248
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf
  8. 4
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp
  9. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java
  10. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java
  11. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java
  12. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java
  13. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java
  14. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java
  15. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java
  16. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java
  17. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java
  18. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java
  19. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java
  20. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java
  21. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java
  22. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java
  23. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java
  24. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java
  25. 134
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java
  26. 4
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

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

@ -9,12 +9,6 @@
<dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar"> <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar"> <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>

48
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.CONFORME, "label.admingeniocivile.avviso.tipoDocumento.conforme");
put(StatoPraticaConstants.NON_CONFORME, "label.admingeniocivile.avviso.tipoDocumento.nonconforme"); put(StatoPraticaConstants.NON_CONFORME, "label.admingeniocivile.avviso.tipoDocumento.nonconforme");
put(StatoPraticaConstants.AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.autorizzata"); put(StatoPraticaConstants.AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.autorizzata");
put(StatoPraticaConstants.NON_AUTORIZZATA, put(StatoPraticaConstants.NON_AUTORIZZATA, "label.admingeniocivile.avviso.tipoDocumento.nonautorizzata");
"label.admingeniocivile.avviso.tipoDocumento.nonautorizzata"); put(StatoPraticaConstants.INTEGRAZIONE, "label.admingeniocivile.avviso.tipoDocumento.integrazione");
put(StatoPraticaConstants.INTEGRAZIONE,
"label.admingeniocivile.avviso.tipoDocumento.integrazione");
put(StatoPraticaConstants.PREAVVISO_CONTRARIO, put(StatoPraticaConstants.PREAVVISO_CONTRARIO,
"label.admingeniocivile.avviso.tipoDocumento.preavvisocontrario"); "label.admingeniocivile.avviso.tipoDocumento.preavvisocontrario");
put(StatoPraticaConstants.NO_PARERE, "label.admingeniocivile.avviso.tipoDocumento.noparere"); put(StatoPraticaConstants.NO_PARERE, "label.admingeniocivile.avviso.tipoDocumento.noparere");
put(StatoPraticaConstants.VIDIMATA, "label.admingeniocivile.avviso.tipoDocumento.vidimata"); put(StatoPraticaConstants.VIDIMATA, "label.admingeniocivile.avviso.tipoDocumento.vidimata");
put(StatoPraticaConstants.FINE_LAVORI, put(StatoPraticaConstants.FINE_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.vidimata.finelavori");
"label.admingeniocivile.avviso.tipoDocumento.vidimata.finelavori"); put(StatoPraticaConstants.COLLAUDO, "label.admingeniocivile.avviso.tipoDocumento.vidimata.collaudo");
put(StatoPraticaConstants.COLLAUDO,
"label.admingeniocivile.avviso.tipoDocumento.vidimata.collaudo");
put(StatoPraticaConstants.RIFIUTATA, "label.admingeniocivile.avviso.tipoDocumento.rifiutata"); put(StatoPraticaConstants.RIFIUTATA, "label.admingeniocivile.avviso.tipoDocumento.rifiutata");
put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE,
"label.admingeniocivile.avviso.tipoDocumento.sottopostaparere"); "label.admingeniocivile.avviso.tipoDocumento.sottopostaparere");
put(StatoPraticaConstants.ANNULLATA, "label.admingeniocivile.avviso.tipoDocumento.annullata"); put(StatoPraticaConstants.ANNULLATA, "label.admingeniocivile.avviso.tipoDocumento.annullata");
put(StatoPraticaConstants.ANNULLA_ISTANZA, put(StatoPraticaConstants.ANNULLA_ISTANZA, "label.admingeniocivile.avviso.tipoDocumento.annullaistanza");
"label.admingeniocivile.avviso.tipoDocumento.annullaistanza");
put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA,
"label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata"); "label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata");
put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "label.admingeniocivile.avviso.tipoDocumento.cambioistruttore");
"label.admingeniocivile.avviso.tipoDocumento.cambioistruttore");
} }
}; };
@ -78,16 +72,13 @@ public class AvvisoUtil {
put(StatoPraticaConstants.AUTORIZZATA, "conf.geniocivile.avviso.folder.id.autorizzata"); put(StatoPraticaConstants.AUTORIZZATA, "conf.geniocivile.avviso.folder.id.autorizzata");
put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.folder.id.non_autorizzata"); put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.folder.id.non_autorizzata");
put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.folder.id.integrazione"); put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.folder.id.integrazione");
put(StatoPraticaConstants.PREAVVISO_CONTRARIO, put(StatoPraticaConstants.PREAVVISO_CONTRARIO, "conf.geniocivile.avviso.folder.id.preavvisocontrario");
"conf.geniocivile.avviso.folder.id.preavvisocontrario");
put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.folder.id.noparere"); put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.folder.id.noparere");
put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.folder.id.rifiutata"); put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.folder.id.rifiutata");
put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "conf.geniocivile.avviso.folder.id.sottopostaparere");
"conf.geniocivile.avviso.folder.id.sottopostaparere");
put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.folder.id.annullata"); put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.folder.id.annullata");
put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.folder.id.annullaistanza"); put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.folder.id.annullaistanza");
put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "conf.geniocivile.avviso.folder.id.integrazioneaccettata");
"conf.geniocivile.avviso.folder.id.integrazioneaccettata");
put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.folder.id.cambioistruttore"); put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.folder.id.cambioistruttore");
put("AS", "conf.geniocivile.avviso.folder.id.doc_asseverazione"); put("AS", "conf.geniocivile.avviso.folder.id.doc_asseverazione");
put("AIF", "conf.geniocivile.avviso.folder.id.doc_annullamento"); put("AIF", "conf.geniocivile.avviso.folder.id.doc_annullamento");
@ -99,8 +90,7 @@ public class AvvisoUtil {
private final static Map<String, String> allTipoDocumentoFileTemplateProps = new LinkedHashMap<String, String>() { private final static Map<String, String> allTipoDocumentoFileTemplateProps = new LinkedHashMap<String, String>() {
{ {
put(StatoPraticaConstants.VARIAZIONE_SOGGETTI, put(StatoPraticaConstants.VARIAZIONE_SOGGETTI, "conf.geniocivile.avviso.template.id.variazionesoggetti");
"conf.geniocivile.avviso.template.id.variazionesoggetti");
put(StatoPraticaConstants.FINE_LAVORI, "conf.geniocivile.avviso.template.id.vidimata.finelavori"); put(StatoPraticaConstants.FINE_LAVORI, "conf.geniocivile.avviso.template.id.vidimata.finelavori");
put(StatoPraticaConstants.COLLAUDO, "conf.geniocivile.avviso.template.id.vidimata.collaudo"); put(StatoPraticaConstants.COLLAUDO, "conf.geniocivile.avviso.template.id.vidimata.collaudo");
put(StatoPraticaConstants.CONFORME, "conf.geniocivile.avviso.template.id.conforme"); 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.AUTORIZZATA, "conf.geniocivile.avviso.template.id.autorizzata");
put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.template.id.non_autorizzata"); put(StatoPraticaConstants.NON_AUTORIZZATA, "conf.geniocivile.avviso.template.id.non_autorizzata");
put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.template.id.integrazione"); put(StatoPraticaConstants.INTEGRAZIONE, "conf.geniocivile.avviso.template.id.integrazione");
// put(StatoPraticaConstants.VIDIMATA, put(StatoPraticaConstants.PREAVVISO_CONTRARIO, "conf.geniocivile.avviso.template.id.preavvisocontrario");
// "label.admingeniocivile.avviso.tipoDocumento.vidimata");
put(StatoPraticaConstants.PREAVVISO_CONTRARIO,
"conf.geniocivile.avviso.template.id.preavvisocontrario");
put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.template.id.noparere"); put(StatoPraticaConstants.NO_PARERE, "conf.geniocivile.avviso.template.id.noparere");
put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.template.id.rifiutata"); put(StatoPraticaConstants.RIFIUTATA, "conf.geniocivile.avviso.template.id.rifiutata");
put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, put(StatoPraticaConstants.SOTTOPOSTA_A_PARERE, "conf.geniocivile.avviso.template.id.sottopostaparere");
"conf.geniocivile.avviso.template.id.sottopostaparere");
put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.template.id.annullata"); put(StatoPraticaConstants.ANNULLATA, "conf.geniocivile.avviso.template.id.annullata");
put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.template.id.annullaistanza"); put(StatoPraticaConstants.ANNULLA_ISTANZA, "conf.geniocivile.avviso.template.id.annullaistanza");
put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA,
"conf.geniocivile.avviso.template.id.integrazioneaccettata"); "conf.geniocivile.avviso.template.id.integrazioneaccettata");
put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "conf.geniocivile.avviso.template.id.cambioistruttore");
"conf.geniocivile.avviso.template.id.cambioistruttore");
put("AS", "conf.geniocivile.avviso.template.id.doc_asseverazione"); put("AS", "conf.geniocivile.avviso.template.id.doc_asseverazione");
put("AIF", "conf.geniocivile.avviso.template.id.doc_annullamento"); put("AIF", "conf.geniocivile.avviso.template.id.doc_annullamento");
put("PG", "conf.geniocivile.avviso.template.id.doc_pagamento"); 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("DPB2", "conf.geniocivile.avviso.template.id.deposito.B2");
put("DPVNS", "conf.geniocivile.avviso.template.id.deposito.VNS"); 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()); IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(dettPratica.getIntPraticaId());
if (Validator.isNull(dettPratica.getTipoIntegrazione()) if (Validator.isNull(dettPratica.getTipoIntegrazione())
|| (Validator.isNotNull(dettPratica.getTipoIntegrazione()) && dettPratica || (Validator.isNotNull(dettPratica.getTipoIntegrazione()) && dettPratica.getTipoIntegrazione()
.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) { .equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))) {
if (Validator.isNotNull(intPratica.getDtSorteggio())) { if (Validator.isNotNull(intPratica.getDtSorteggio())) {
sorteggiata = true; sorteggiata = true;
} }
@ -209,7 +196,6 @@ public class AvvisoUtil {
} }
public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) { public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) {
// TODO: In attesa di specifiche su stati validi // TODO: In attesa di specifiche su stati validi
return getAllTipoDocumento().containsKey(statoPratica); return getAllTipoDocumento().containsKey(statoPratica);
} }

2
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.C = Template Ricevuta Deposito mod. C
conf.geniocivile.avviso.template.id.deposito.B2 = Template Ricevuta Deposito mod. B2 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.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 #Configurazione Allegati
conf.geniocivile.attachment.folder.id = Folder Allegati conf.geniocivile.attachment.folder.id = Folder Allegati

54
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" }; _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" "long", "long", "com.liferay.portal.service.ServiceContext"
}; };
_methodName241 = "getReturnValueScriptIniziale"; _methodName242 = "getReturnValueScriptIniziale";
_methodParameterTypes241 = new String[] { "long" };
_methodName242 = "getTipoEsito";
_methodParameterTypes242 = new String[] { "long" }; _methodParameterTypes242 = new String[] { "long" };
_methodName243 = "findByIntPratica"; _methodName243 = "getTipoEsito";
_methodParameterTypes243 = new String[] { "long" }; _methodParameterTypes243 = new String[] { "long" };
_methodName244 = "calculateDateAvvioProcedimento"; _methodName244 = "findByIntPratica";
_methodParameterTypes244 = new String[] { "long" }; _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" "it.tref.liferay.portos.bo.model.ControlloPratica"
}; };
} }
@ -498,41 +498,41 @@ public class ControlloPraticaLocalServiceClpInvoker {
(java.util.Map<java.lang.String, java.io.Serializable>)arguments[1]); (java.util.Map<java.lang.String, java.io.Serializable>)arguments[1]);
} }
if (_methodName239.equals(name) && if (_methodName240.equals(name) &&
Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) {
return ControlloPraticaLocalServiceUtil.addPraticheAlControllo(((Long)arguments[0]).longValue(), return ControlloPraticaLocalServiceUtil.addPraticheAlControllo(((Long)arguments[0]).longValue(),
((Long)arguments[1]).longValue()); ((Long)arguments[1]).longValue());
} }
if (_methodName240.equals(name) && if (_methodName241.equals(name) &&
Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) {
return ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(((Long)arguments[0]).longValue(), return ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(((Long)arguments[0]).longValue(),
((Long)arguments[1]).longValue(), ((Long)arguments[1]).longValue(),
(com.liferay.portal.service.ServiceContext)arguments[2]); (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) && if (_methodName242.equals(name) &&
Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) {
return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue());
} }
if (_methodName243.equals(name) && if (_methodName243.equals(name) &&
Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) {
return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue());
} }
if (_methodName244.equals(name) && if (_methodName244.equals(name) &&
Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) {
return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue());
} }
if (_methodName245.equals(name) && if (_methodName245.equals(name) &&
Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { 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]); ControlloPraticaLocalServiceUtil.gestioneWFVarianti((it.tref.liferay.portos.bo.model.ControlloPratica)arguments[0]);
return null; return null;
@ -619,8 +619,6 @@ public class ControlloPraticaLocalServiceClpInvoker {
private String[] _methodParameterTypes236; private String[] _methodParameterTypes236;
private String _methodName237; private String _methodName237;
private String[] _methodParameterTypes237; private String[] _methodParameterTypes237;
private String _methodName239;
private String[] _methodParameterTypes239;
private String _methodName240; private String _methodName240;
private String[] _methodParameterTypes240; private String[] _methodParameterTypes240;
private String _methodName241; private String _methodName241;
@ -633,4 +631,6 @@ public class ControlloPraticaLocalServiceClpInvoker {
private String[] _methodParameterTypes244; private String[] _methodParameterTypes244;
private String _methodName245; private String _methodName245;
private String[] _methodParameterTypes245; private String[] _methodParameterTypes245;
private String _methodName246;
private String[] _methodParameterTypes246;
} }

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

@ -13,8 +13,8 @@
## ##
build.namespace=portos_bo build.namespace=portos_bo
build.number=2913 build.number=2915
build.date=1615991433242 build.date=1616068476446
build.auto.upgrade=true build.auto.upgrade=true
## ##

373
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 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.DLAppServiceUtil"%>
<%@page import="com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil"%>
<%@page import="com.liferay.portlet.documentlibrary.model.DLFolder"%>
<%@page import="com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil"%>
<%@ include file="/html/init.jsp"%> <%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%>
<%@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.util.AvvisoUtil"%> <%@page import="it.tref.liferay.portos.bo.util.AvvisoUtil"%>
<%@page import="java.util.Collection"%>
<%@ include file="/html/init.jsp"%>
<% <%
long companyId = company.getCompanyId(); long companyId = company.getCompanyId();
String tabs1 = "parametri"; String tabs1 = "parametri";
String redirect = "/html/amministrazione/tabs/view.jps"; String redirect = "/html/amministrazione/tabs/view.jps";
String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_VERSIONING);
ConfigurazioneConstants.SCHEDULER_VERSIONING); String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO);
ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO); String schedulerFirmaDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
String schedulerFirmaDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO);
ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO); String schedulerInvioDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
String schedulerInvioDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO);
ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO); String schedulerIris = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_IRIS);
String schedulerIris = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, boolean schedulerVersioningBoolean = Boolean.parseBoolean(schedulerVersioning);
ConfigurazioneConstants.SCHEDULER_IRIS); boolean schedulerGeneraDocumentoBoolean = Boolean.parseBoolean(schedulerGeneraDocumento);
boolean schedulerFirmaDocumentoBoolean = Boolean.parseBoolean(schedulerFirmaDocumento);
boolean schedulerVersioningBoolean = Boolean.parseBoolean(schedulerVersioning); boolean schedulerInvioDocumentoBoolean = Boolean.parseBoolean(schedulerInvioDocumento);
boolean schedulerGeneraDocumentoBoolean = Boolean.parseBoolean(schedulerGeneraDocumento); boolean schedulerIrisBoolean = Boolean.parseBoolean(schedulerIris);
boolean schedulerFirmaDocumentoBoolean = Boolean.parseBoolean(schedulerFirmaDocumento); String irisVerificaPagamentiURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
boolean schedulerInvioDocumentoBoolean = Boolean.parseBoolean(schedulerInvioDocumento); ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL);
boolean schedulerIrisBoolean = Boolean.parseBoolean(schedulerIris); String protocollazioneServiceURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL);
String irisVerificaPagamentiURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, String protocollazioneExportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL); ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL);
String protocollazioneImportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
String protocollazioneServiceURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL);
ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL); String irisComunicazioniDebitorieURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL);
String protocollazioneExportURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, String irisGenerazioneIUVURL = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL); ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL);
String importobollo = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.IMPORTO_BOLLO);
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);
}
%> %>
<liferay-ui:panel id='panel-scheduler' title="panel-scheduler-conf-geniocivile" collapsible='true' extended="false">
<liferay-ui:panel id='panel-scheduler' title="panel-scheduler-conf-geniocivile" collapsible='true'
extended="false">
<div class="container-fluid"> <div class="container-fluid">
<div class="row row-configScheduler"> <div class="row row-configScheduler">
<liferay-portlet:actionURL name="saveConfigScheduler" var="saveConfigSchedulerURL"> <liferay-portlet:actionURL name="saveConfigScheduler" var="saveConfigSchedulerURL">
<portlet:param name="redirect" value="<%=redirect%>" /> <portlet:param name="redirect" value="<%= redirect %>" />
<liferay-portlet:param name="tabs1" value="<%=tabs1%>" /> <liferay-portlet:param name="tabs1" value="<%= tabs1 %>" />
</liferay-portlet:actionURL> </liferay-portlet:actionURL>
<aui:form action="<%= saveConfigSchedulerURL %>" name="fmConfigurazioneScheduler">
<aui:form action="<%=saveConfigSchedulerURL%>" name="fmConfigurazioneScheduler"> <aui:select name='<%= ConfigurazioneConstants.SCHEDULER_VERSIONING %>'>
<aui:option value="true" selected="<%= schedulerVersioningBoolean %>" label="active" />
<aui:select name='<%=ConfigurazioneConstants.SCHEDULER_VERSIONING%>'> <aui:option value="false" selected="<%= !schedulerVersioningBoolean %>" label="inactive" />
<aui:option value='<%=Boolean.TRUE.toString()%>' selected="<%=schedulerVersioningBoolean%>"
label="active" />
<aui:option value='<%=Boolean.FALSE.toString()%>' selected="<%=!schedulerVersioningBoolean%>"
label="inactive" />
</aui:select> </aui:select>
<aui:select name='<%= ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO %>'>
<aui:select name='<%=ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO%>'> <aui:option value="true" selected="<%= schedulerGeneraDocumentoBoolean %>" label="active" />
<aui:option value='<%=Boolean.TRUE.toString()%>' selected="<%=schedulerGeneraDocumentoBoolean%>" <aui:option value="false" selected="<%= !schedulerGeneraDocumentoBoolean %>" label="inactive" />
label="active" />
<aui:option value='<%=Boolean.FALSE.toString()%>' selected="<%=!schedulerGeneraDocumentoBoolean%>"
label="inactive" />
</aui:select> </aui:select>
<aui:select name='<%= ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO %>'>
<aui:select name='<%=ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO%>'> <aui:option value="true" selected="<%= schedulerFirmaDocumentoBoolean %>" label="active" />
<aui:option value='<%=Boolean.TRUE.toString()%>' selected="<%=schedulerFirmaDocumentoBoolean%>" <aui:option value="false" selected="<%= !schedulerFirmaDocumentoBoolean %>" label="inactive" />
label="active" />
<aui:option value='<%=Boolean.FALSE.toString()%>' selected="<%=!schedulerFirmaDocumentoBoolean%>"
label="inactive" />
</aui:select> </aui:select>
<aui:select name='<%= ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO %>'>
<aui:select name='<%=ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO%>'> <aui:option value="true" selected="<%= schedulerInvioDocumentoBoolean %>" label="active" />
<aui:option value='<%=Boolean.TRUE.toString()%>' selected="<%=schedulerInvioDocumentoBoolean%>" <aui:option value="false" selected="<%= !schedulerInvioDocumentoBoolean %>" label="inactive" />
label="active" />
<aui:option value='<%=Boolean.FALSE.toString()%>' selected="<%=!schedulerInvioDocumentoBoolean%>"
label="inactive" />
</aui:select> </aui:select>
<div class="separator"></div> <div class="separator"></div>
<aui:select name='<%=ConfigurazioneConstants.SCHEDULER_IRIS%>'> <aui:select name='<%= ConfigurazioneConstants.SCHEDULER_IRIS %>'>
<aui:option value='<%=Boolean.TRUE.toString()%>' selected="<%=schedulerIrisBoolean%>" label="active" /> <aui:option value="true" selected="<%= schedulerIrisBoolean %>" label="active" />
<aui:option value='<%=Boolean.FALSE.toString()%>' selected="<%=!schedulerIrisBoolean%>" label="inactive" /> <aui:option value="false" selected="<%= !schedulerIrisBoolean %>" label="inactive" />
</aui:select> </aui:select>
<aui:input cssClass="span12" type="text" name="<%=ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL%>" <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL %>"
value="<%=irisVerificaPagamentiURL%>"></aui:input> value="<%= irisVerificaPagamentiURL %>" />
<aui:input cssClass="span12" type="text" <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL %>"
name="<%=ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL%>" value="<%= irisComunicazioniDebitorieURL %>" />
value="<%=irisComunicazioniDebitorieURL%>"></aui:input> <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL %>"
<aui:input cssClass="span12" type="text" name="<%=ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL%>" value="<%= irisGenerazioneIUVURL %>" />
value="<%=irisGenerazioneIUVURL%>"></aui:input> <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.IMPORTO_BOLLO %>"
<aui:input cssClass="span12" type="text" name="<%=ConfigurazioneConstants.IMPORTO_BOLLO%>" value="<%= importobollo %>" />
value="<%=importobollo%>"></aui:input> <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL %>"
<aui:input cssClass="span12" type="text" name="<%=ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL%>" value="<%= protocollazioneServiceURL %>" />
value="<%=protocollazioneServiceURL%>"></aui:input> <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL %>"
<aui:input cssClass="span12" type="text" value="<%= protocollazioneExportURL %>" />
name="<%=ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL%>" <aui:input cssClass="span12" type="text" name="<%= ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL %>"
value="<%=protocollazioneExportURL%>"></aui:input> value="<%= protocollazioneImportURL %>" />
<aui:input cssClass="span12" type="text"
name="<%=ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL%>"
value="<%=protocollazioneImportURL%>"></aui:input>
<div class="separator"></div>
<aui:select name='<%=ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO%>'>
<aui:option value="" label="" />
<%
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);
%>
<aui:option value='<%=day%>' selected="<%=day == dayOfWeekSorteggio%>" label='<%=dayString%>' />
<%
}
%>
</aui:select>
<aui:select name='<%=ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO%>'>
<aui:option value="" label="" />
<%
for (int i = 0; i < 24; i++) {
%>
<aui:option value='<%=i%>' selected="<%=i == hourOfDaySorteggio%>" label='<%=i%>' />
<%
}
%>
</aui:select>
<aui:select name='<%=ConfigurazioneConstants.DAY_OF_WEEK_PUBBLICAZIONE%>'>
<aui:option value="" label="" />
<%
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);
%>
<aui:option value='<%=day%>' selected="<%=day == dayOfWeekPubblicazione%>" label='<%=dayString%>' />
<%
}
%>
</aui:select>
<aui:button type="submit"></aui:button>
</aui:form> </aui:form>
</div> </div>
</div> </div>
</liferay-ui:panel> </liferay-ui:panel>
<% <%
List<DLFolder> rootfolders = DLFolderServiceUtil.getFolders(portletGroupId, List<DLFolder> rootfolders = DLFolderServiceUtil.getFolders(portletGroupId,
DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
long templateFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, long templateFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, ConfigurazioneConstants.TEMPLATE_FOLDER_ID);
ConfigurazioneConstants.TEMPLATE_FOLDER_ID);
%> %>
<liferay-portlet:actionURL name="saveConfigTemplate" var="saveConfigTemplateURL"> <liferay-portlet:actionURL name="saveConfigTemplate" var="saveConfigTemplateURL">
<portlet:param name="redirect" value="<%=redirect%>" /> <portlet:param name="redirect" value="<%= redirect %>" />
<portlet:param name="tabs1" value="<%=tabs1%>" /> <portlet:param name="tabs1" value="<%= tabs1 %>" />
</liferay-portlet:actionURL> </liferay-portlet:actionURL>
<liferay-ui:panel id='fileTemplate' title="panel-template-conf-geniocivile" collapsible='true' <liferay-ui:panel id='fileTemplate' title="panel-template-conf-geniocivile" collapsible='true' extended="false">
extended="false">
<div class="container-fluid"> <div class="container-fluid">
<div class="row row-configTemplate"> <div class="row row-configTemplate">
<aui:form action="<%=saveConfigTemplateURL%>" name="fmConfigurazioneTemplate"> <aui:form action="<%= saveConfigTemplateURL %>" name="fmConfigurazioneTemplate">
<aui:select name='<%= "configurazione--" + ConfigurazioneConstants.TEMPLATE_FOLDER_ID + "--" %>'>
<aui:select name='<%="configurazione--" + ConfigurazioneConstants.TEMPLATE_FOLDER_ID + "--"%>'>
<% <%
for (DLFolder dlFolder : rootfolders) { for (DLFolder dlFolder : rootfolders) {
%> %>
<aui:option value="<%=dlFolder.getFolderId()%>" <aui:option value="<%=dlFolder.getFolderId()%>"
selected="<%=dlFolder.getFolderId() == templateFolderId%>"><%=dlFolder.getName()%></aui:option> selected="<%= dlFolder.getFolderId() == templateFolderId %>"><%= dlFolder.getName() %></aui:option>
<% <%
} }
%> %>
</aui:select> </aui:select>
<c:if test="<%=templateFolderId != 0L%>"> <c:if test="<%= templateFolderId != 0L %>">
<% <%
DLFolder dlFolder = DLFolderLocalServiceUtil.getFolder(templateFolderId); DLFolder dlFolder = DLFolderLocalServiceUtil.getFolder(templateFolderId);
List<FileEntry> fileList = DLAppServiceUtil.getFileEntries(dlFolder.getRepositoryId(), templateFolderId); List<FileEntry> fileList = DLAppServiceUtil.getFileEntries(dlFolder.getRepositoryId(), templateFolderId);
Collection<String> keyColl = AvvisoUtil.getUniqueTipoDocumentoFileTemplateProps(); Collection<String> keyColl = AvvisoUtil.getUniqueTipoDocumentoFileTemplateProps();
for (String key : keyColl) { for (String key : keyColl) {
%> %>
<aui:select name='<%="configurazione--" + key + "--"%>' label="<%=key%>" <aui:select name='<%= "configurazione--" + key + "--" %>' label="<%= key %>"
helpMessage='<%="(" + key + ")"%>'> helpMessage='<%= "(" + key + ")" %>'>
<aui:option label="" value="" /> <aui:option label="" value="" />
<% <%
for (FileEntry fileEntry : fileList) { for (FileEntry fileEntry : fileList) {
long currentFileId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key); long currentFileId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key);
%> %>
<aui:option value="<%=fileEntry.getFileEntryId()%>" <aui:option value="<%= fileEntry.getFileEntryId() %>"
selected="<%=fileEntry.getFileEntryId() == currentFileId%>"><%=fileEntry.getTitle()%> selected="<%= fileEntry.getFileEntryId() == currentFileId %>"><%= fileEntry.getTitle() %>
</aui:option> </aui:option>
<% <%
} }
%> %>
</aui:select> </aui:select>
<% <%
} }
%> %>
</c:if> </c:if>
<aui:button type="submit"></aui:button> <aui:button type="submit"></aui:button>
@ -265,66 +141,65 @@
</div> </div>
</div> </div>
</liferay-ui:panel> </liferay-ui:panel>
<liferay-ui:panel id='fileFolder' title="panel-folder-conf-geniocivile" collapsible='true' extended="false"> <liferay-ui:panel id='fileFolder' title="panel-folder-conf-geniocivile" collapsible='true' extended="false">
<div class="container-fluid"> <div class="container-fluid">
<div class="row row-configTemplate"> <div class="row row-configTemplate">
<aui:form action="<%=saveConfigTemplateURL%>" name="fmConfigurazioneTemplate"> <aui:form action="<%= saveConfigTemplateURL %>" name="fmConfigurazioneTemplate">
<% <%
Collection<String> keyColl = AvvisoUtil.getAllTipoDocumentoFolderProps().values(); Collection<String> keyColl = AvvisoUtil.getAllTipoDocumentoFolderProps().values();
for (String key : keyColl) { for (String key : keyColl) {
%> %>
<aui:select name='<%="configurazione--" + key + "--"%>'> <aui:select name='<%= "configurazione--" + key + "--" %>'>
<aui:option label="" value="" /> <aui:option label="" value="" />
<% <%
for (DLFolder fd : rootfolders) { for (DLFolder fd : rootfolders) {
long currentFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong( long currentFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, key);
companyId, key); String parentFolderName = StringPool.BLANK;
String parentFolderName = StringPool.BLANK; DLFolder parentFolder = fd.getParentFolder();
DLFolder parentFolder = fd.getParentFolder(); if (parentFolder != null)
if (parentFolder != null) parentFolderName = parentFolder.getName();
parentFolderName = parentFolder.getName();
%> %>
<aui:option value="<%=fd.getFolderId()%>" selected="<%=fd.getFolderId() == currentFolderId%>"><%=parentFolderName.equals(StringPool.BLANK) ? fd.getName() <aui:option value="<%= fd.getFolderId() %>" selected="<%= fd.getFolderId() == currentFolderId %>">
: parentFolderName + StringPool.MINUS + fd.getName()%> <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName()
: parentFolderName + StringPool.MINUS + fd.getName() %>
</aui:option> </aui:option>
<% <%
} }
%> %>
</aui:select> </aui:select>
<% <%
} }
%> %>
<aui:button type="submit"></aui:button> <aui:button type="submit"></aui:button>
</aui:form> </aui:form>
</div> </div>
</div> </div>
</liferay-ui:panel> </liferay-ui:panel>
<liferay-ui:panel id='fileFolderAttachment' title="panel-folder-attachment-conf-geniocivile" <liferay-ui:panel id='fileFolderAttachment' title="panel-folder-attachment-conf-geniocivile" collapsible='true'
collapsible='true' extended="false"> extended="false">
<div class="container-fluid"> <div class="container-fluid">
<div class="row row-configTemplate"> <div class="row row-configTemplate">
<aui:form action="<%=saveConfigTemplateURL%>" name="fmConfigurazioneTemplate"> <aui:form action="<%= saveConfigTemplateURL %>" name="fmConfigurazioneTemplate">
<% <%
String key = ConfigurazioneConstants.ATTACHMENT_FOLDER_ID; String key = ConfigurazioneConstants.ATTACHMENT_FOLDER_ID;
%> %>
<aui:select name='<%="configurazione--" + key + "--"%>'> <aui:select name='<%= "configurazione--" + key + "--" %>'>
<aui:option label="" value="" /> <aui:option label="" value="" />
<% <%
for (DLFolder fd : rootfolders) { for (DLFolder fd : rootfolders) {
long currentFolderId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong( long currentFolderId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, key);
companyId, key); String parentFolderName = StringPool.BLANK;
String parentFolderName = StringPool.BLANK; DLFolder parentFolder = fd.getParentFolder();
DLFolder parentFolder = fd.getParentFolder(); if (parentFolder != null) {
if (parentFolder != null) parentFolderName = parentFolder.getName();
parentFolderName = parentFolder.getName(); }
%> %>
<aui:option value="<%=fd.getFolderId()%>" selected="<%=fd.getFolderId() == currentFolderId%>"><%=parentFolderName.equals(StringPool.BLANK) ? fd.getName() <aui:option value="<%= fd.getFolderId() %>" selected="<%= fd.getFolderId() == currentFolderId %>">
: parentFolderName + StringPool.MINUS + fd.getName()%> <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName()
: parentFolderName + StringPool.MINUS + fd.getName()%>
</aui:option> </aui:option>
<% <%
} }
%> %>
</aui:select> </aui:select>
<aui:button type="submit" value="save" /> <aui:button type="submit" value="save" />

248
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 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.dao.orm.QueryUtil"%>
<%@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.language.LanguageUtil"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
<%@page import="com.liferay.portal.kernel.util.StringPool"%> <%@page import="com.liferay.portal.kernel.util.StringPool"%>
<%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%> <%@page import="com.liferay.portal.kernel.util.Validator"%>
<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
<%@page import="it.tref.liferay.portos.bo.service.impl.DettPraticaLocalServiceImpl"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowInstance"%>
<%@page import="it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil"%>
<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@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="com.liferay.portal.model.User"%>
<%@page import="java.util.concurrent.TimeUnit"%> <%@page import="com.liferay.portal.model.WorkflowInstanceLink"%>
<%@page import="java.util.Date"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> <%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Provincia"%>
<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.Comune"%> <%@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.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.service.IntPraticaLocalServiceUtil"%>
<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> <%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%> <%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%>
<%@page import="java.util.List"%> <%@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 //Informazioni relative alla pratica
IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId()); IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId());
DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
%> %>
<c:if test="<%= Validator.isNotNull(intPratica) %>"> <c:if test="<%= Validator.isNotNull(intPratica) %>">
<% <%
ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId());
Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId());
Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId());
Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
if(controlloPratica.getStatus() == 0 || controlloPratica.getStatus() == 4 || controlloPratica.getStatus() == 6){
}
//Informazioni relative al workflow //Informazioni relative al workflow
WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(
controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey()); controlloPratica.getCompanyId(), controlloPratica.getGroupId(), ControlloPratica.class.getName(),
controlloPratica.getPrimaryKey());
List<WorkflowTask> listaTask = null; List<WorkflowTask> listaTask = null;
WorkflowInstance workflowInstance = null; WorkflowInstance workflowInstance = null;
if (workflowInstanceLink != null) { if (workflowInstanceLink != null) {
long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId(); long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();
workflowInstance = workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId);
WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId);
listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, 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; WorkflowTask task = null;
if (listaTask != null && !listaTask.isEmpty()) {
if(listaTask != null && !listaTask.isEmpty()){ task = listaTask.get(0);
task = listaTask.get(0);
} }
%> %>
<liferay-ui:search-container-column-text name="taskName"> <liferay-ui:search-container-column-text name="taskName">
<% <%
String taskName = StringPool.BLANK; String taskName = StringPool.BLANK;
if(task!=null){ if (task != null) {
User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId());
taskName = LanguageUtil.get(pageContext,task.getName()); taskName = LanguageUtil.get(pageContext,task.getName());
if(userTask!=null){ if (userTask != null) {
taskName += " ("+userTask.getFullName()+")"; taskName += " (" + userTask.getFullName() + StringPool.CLOSE_PARENTHESIS;
}
}else if (workflowInstance != null){
taskName = LanguageUtil.get(pageContext, workflowInstance.getState());
} }
} else if (workflowInstance != null) {
if(lastDettPratica != null){ taskName = LanguageUtil.get(pageContext, workflowInstance.getState());
}
if (lastDettPratica.getTipoIntegrazione() != null) { if (lastDettPratica != null) {
//BUG BO ID=14: NOME TASK SEZIONE ATTIVITA' if (lastDettPratica.getTipoIntegrazione() != null) {
if(lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)){ //BUG BO ID=14: NOME TASK SEZIONE ATTIVITA'
taskName = taskName + " - Integrazione #" + (lastDettPratica.getIntegrazione()); if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) {
} else if(lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)){ taskName += " - Integrazione #" + lastDettPratica.getIntegrazione();
taskName = taskName + " - Variante #" + (lastDettPratica.getVarianteNumero()); } else if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) {
} taskName += " - Variante #" + lastDettPratica.getVarianteNumero();
} }
} }
}
out.print(taskName); out.print(taskName);
%> %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Esito"> <liferay-ui:search-container-column-text name="Esito">
<% <%
String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId()); String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId());
out.print(tipoEsito); out.print(LanguageUtil.get(pageContext, tipoEsito));
%> %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<%-- ADT - BUG-12 Aggiunta colonna Data Esito --%>
<%-- ADT - BUG-12 Aggiunta colonna Data Esito --%>
<%-- Bug 33264 --%>
<c:if test='<%= "Tab_TaskCompletati".equals(currentTab) %>'> <c:if test='<%= "Tab_TaskCompletati".equals(currentTab) %>'>
<liferay-ui:search-container-column-text name="Data Esito" value='<%= <liferay-ui:search-container-column-text name="Data Esito" value='<%= controlloPratica.getStatusDate() != null ?
controlloPratica.getStatusDate()!=null ? dateFormatDate.format(controlloPratica.getStatusDate()): "" %>' > dateFormatDate.format(controlloPratica.getStatusDate()): StringPool.BLANK %>' >
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
</c:if> </c:if>
<%-- <liferay-ui:search-container-column-text name="Sorteggiata">
<%
/*boolean sorteggiata = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId())!=null;
String clazz = StringPool.BLANK;
if(sorteggiata){
out.print("<span><i class=\"relative fa fa-check-square txt-green\"></i></span>");
}*/
%>
</liferay-ui:search-container-column-text> --%>
<liferay-ui:search-container-column-text name="Pratica"> <liferay-ui:search-container-column-text name="Pratica">
<% <%
if (lastDettPratica != null) {
long lastDettPraticaId = lastDettPratica.getDettPraticaId();
if(lastDettPratica != null){ if (lastDettPraticaId != controlloPratica.getDettPraticaId()) {
long lastDettPraticaId = lastDettPratica.getDettPraticaId(); String messageLabel = LanguageUtil.get(pageContext,
if(lastDettPraticaId != controlloPratica.getDettPraticaId()){ "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio");
String messageLabel = LanguageUtil.get(pageContext, "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio"); if (controlloPratica.getStatus() == WorkflowConstants.STATUS_APPROVED
if(controlloPratica.getStatus() == WorkflowConstants.STATUS_APPROVED || controlloPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE || controlloPratica.getStatus() == WorkflowConstants.STATUS_DENIED){ || controlloPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE
messageLabel = LanguageUtil.get(pageContext, "sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio-closed"); || controlloPratica.getStatus() == WorkflowConstants.STATUS_DENIED) {
} messageLabel = LanguageUtil.get(pageContext,
"sono-presenti-aggiornamenti-fuori-dal-controllo-obbligatorio-closed");
%>
<span class="txt-bold avviso-aggiornamenti">
<i class="fa fa-exclamation-triangle txt-orange"></i>
<%=messageLabel %>
</span>
<%
} }
%>
<span class="txt-bold avviso-aggiornamenti">
<i class="fa fa-exclamation-triangle txt-orange"></i> <%= messageLabel %>
</span>
<%
} }
}
%> %>
<%= intPratica.getTitle(locale, true) %> <%= intPratica.getTitle(locale, true) %>
<%= Validator.isNull(intPratica.getTipoProcedura()) ? <%= Validator.isNull(intPratica.getTipoProcedura()) ? StringPool.BLANK
"" : : "<br><small>" + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura())
"<br><small>" + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) + "</small>" %> + "</small>" %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="istruttore"> <liferay-ui:search-container-column-text name="istruttore">
<c:if test="<%=intPratica.getStatusByUserId()!=0l %>"> <c:if test="<%= intPratica.getStatusByUserId() != 0L %>">
<% <%
User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId());
if (tecnico != null) { if (tecnico != null) {
out.print(tecnico.getFullName()); out.print(tecnico.getFullName());
} else { } else {
out.print(" [" + intPratica.getStatusByUserId() + "]"); out.print(" [" + intPratica.getStatusByUserId() + StringPool.CLOSE_BRACKET);
} }
%> %>
</c:if> </c:if>
<c:if test="<%=intPratica.getStatusByUserId()==0l %>"> <c:if test="<%= intPratica.getStatusByUserId() == 0L %>">
- -
</c:if> </c:if>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="unita-operativa"> <liferay-ui:search-container-column-text name="unita-operativa">
<%= intPratica.getUnitaOperativa() > 0 ? String.valueOf(intPratica.getUnitaOperativa()) : StringPool.BLANK %> <%= intPratica.getUnitaOperativa() > 0 ? String.valueOf(intPratica.getUnitaOperativa()) : StringPool.BLANK %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="provenienza"> <liferay-ui:search-container-column-text name="provenienza">
<% <%
WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(),controlloPratica.getGroupId(), null, controlloPratica); WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(),
controlloPratica.getGroupId(), null, controlloPratica);
%> %>
<c:if test="<%=workflowTask!=null%>"> <c:if test="<%= workflowTask != null %>">
<% <%
User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId()); User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId());
if(approvatore!=null){ if (approvatore!=null) {
out.print(approvatore.getFullName()); out.print(approvatore.getFullName());
}else{ } else {
if(workflowTask.getAssigneeUserId()==-1){ if (workflowTask.getAssigneeUserId() == -1) {
out.print( " [Portos 1]"); out.print( " [Portos 1]");
} else { } else {
out.print( " ["+workflowTask.getAssigneeUserId()+"]"); out.print( " [" + workflowTask.getAssigneeUserId() + StringPool.CLOSE_BRACKET);
}
} }
out.print(" ("+workflowTask.getName()+")"); }
out.print(" (" + workflowTask.getName() + StringPool.CLOSE_PARENTHESIS);
%> %>
</c:if> </c:if>
<c:if test="<%=workflowTask==null%>"> <c:if test="<%= workflowTask == null %>">
- -
</c:if> </c:if>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="data-inizio-procedimento"
<liferay-ui:search-container-column-text name="data-inizio-procedimento" value="<%= dateFormatDate.format(controlloPratica.getCreateDate()) %>" /> value="<%= dateFormatDate.format(controlloPratica.getCreateDate()) %>" />
<liferay-ui:search-container-column-text name="provincia" > <liferay-ui:search-container-column-text name="provincia" >
<%=provincia.getProvincia()+" - "+comune.getDenominazione() %> <%= provincia.getProvincia() + " - " + comune.getDenominazione() %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="GG*" cssClass="text-center"> <liferay-ui:search-container-column-text name="GG*" cssClass="text-center">
<% <%
long days = ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); long days = ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId());
%> %>
<%=days %> <%= days %>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-jsp path="/html/gestioneattivita/action_button.jsp" align="right"
<liferay-ui:search-container-column-jsp path="/html/gestioneattivita/action_button.jsp" align="right" cssClass="text-center"/> cssClass="text-center"/>
</c:if> </c:if>

4
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<String, Serializable> p : parameters.entrySet()) {
html = html.replaceAll("(<textarea\\s.*?\\sname=\"" + prefix + p.getKey() + suffix + "\"[^>]*>[^<]*)</textarea>", html = html.replaceAll("(<textarea\\s.*?\\sname=\"" + prefix + p.getKey() + suffix + "\"[^>]*>[^<]*)</textarea>",
"$1" + HtmlUtil.escape(p.getValue().toString()) + "</textarea>"); "$1" + HtmlUtil.escape(p.getValue().toString()) + "</textarea>");
} }
html = html.replaceAll("(?s)<div class=\"control-group form-inline input-radio-wrapper\">.*?<input.*?value=\"Value[0-9]\".*?</div>", ""); // Rimozione valori non utilizzati
html = html.replaceAll("(?s)<input[^>]*?value=\"Value[0-9]\"[^>]*>.*?</label>", "</label>");
html = html.replaceAll("(?s)<label[^>]*>[ \t\r\n]*</label>", "");
%> %>
<%= html %> <%= html %>

1
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.KaleoAction;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoCondition;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoDefinition;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoInstance;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoInstanceToken;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoLog;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoNode;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoNotification;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoNotificationRecipient;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTaskAssignmentInstance;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTaskAssignment;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTaskInstanceToken;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTask;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTimerInstanceToken;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTimer;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence;
import java.io.Serializable; import java.io.Serializable;

1
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.KaleoTransition;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence;
import java.io.Serializable; import java.io.Serializable;

134
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.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.kernel.workflow.WorkflowException; 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.WorkflowLog;
import com.liferay.portal.kernel.workflow.WorkflowLogManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowLogManagerUtil;
import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.kernel.workflow.WorkflowTask;
@ -101,6 +99,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
add(StatoPraticaConstants.NON_CONFORME); add(StatoPraticaConstants.NON_CONFORME);
add(StatoPraticaConstants.NO_PARERE); add(StatoPraticaConstants.NO_PARERE);
add(StatoPraticaConstants.PREAVVISO_CONTRARIO); add(StatoPraticaConstants.PREAVVISO_CONTRARIO);
add(StatoPraticaConstants.VIARCH);
} }
}; };
@ -109,36 +108,26 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
String cmd = ParamUtil.getString(actionRequest, Constants.CMD); String cmd = ParamUtil.getString(actionRequest, Constants.CMD);
if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) { if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) {
try { try {
if (cmd.equals(Constants.SAVE)) { if (cmd.equals(Constants.SAVE)) {
completeTask(actionRequest); completeTask(actionRequest);
} else if (cmd.equals(Constants.RESET)) { } else if (cmd.equals(Constants.RESET)) {
relaseTask(actionRequest); relaseTask(actionRequest);
} }
String redirect = ParamUtil.getString(actionRequest, "redirect"); String redirect = ParamUtil.getString(actionRequest, "redirect");
String closeRedirect = ParamUtil.getString(actionRequest, "closeRedirect"); String closeRedirect = ParamUtil.getString(actionRequest, "closeRedirect");
if (Validator.isNotNull(closeRedirect)) { if (Validator.isNotNull(closeRedirect)) {
redirect = HttpUtil.setParameter(redirect, "closeRedirect", closeRedirect); redirect = HttpUtil.setParameter(redirect, "closeRedirect", closeRedirect);
SessionMessages.add(actionRequest, PortalUtil.getPortletId(actionRequest) SessionMessages.add(actionRequest, PortalUtil.getPortletId(actionRequest)
+ SessionMessages.KEY_SUFFIX_CLOSE_REDIRECT, closeRedirect); + SessionMessages.KEY_SUFFIX_CLOSE_REDIRECT, closeRedirect);
} }
sendRedirect(actionRequest, actionResponse, redirect); sendRedirect(actionRequest, actionResponse, redirect);
} catch (Exception e) { } catch (Exception e) {
if (e instanceof WorkflowTaskDueDateException) { if (e instanceof WorkflowTaskDueDateException) {
SessionErrors.add(actionRequest, e.getClass()); SessionErrors.add(actionRequest, e.getClass());
} else if (e instanceof PrincipalException || e instanceof WorkflowException) { } else if (e instanceof PrincipalException || e instanceof WorkflowException) {
SessionErrors.add(actionRequest, e.getClass()); SessionErrors.add(actionRequest, e.getClass());
setForward(actionRequest, "portlet.workflow_tasks.error"); setForward(actionRequest, "portlet.workflow_tasks.error");
} else { } else {
throw e; throw e;
@ -147,8 +136,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
} else if (cmd.equals("removeUO")) { } else if (cmd.equals("removeUO")) {
removeUO(actionRequest); removeUO(actionRequest);
} else { } else {
originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig, originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig, actionRequest,
actionRequest, actionResponse); actionResponse);
} }
} }
@ -161,50 +150,47 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId"); long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId");
String comment = ParamUtil.getString(actionRequest, "comment"); String comment = ParamUtil.getString(actionRequest, "comment");
WorkflowTaskManagerUtil.assignWorkflowTaskToUser(themeDisplay.getCompanyId(), WorkflowTaskManagerUtil.assignWorkflowTaskToUser(themeDisplay.getCompanyId(), themeDisplay.getUserId(),
themeDisplay.getUserId(), workflowTaskId, assigneeUserId, comment, null, null); workflowTaskId, assigneeUserId, comment, null, null);
} }
protected void completeTask(ActionRequest actionRequest) throws Exception { protected void completeTask(ActionRequest actionRequest) throws Exception {
ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId"); long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
String transitionName = ParamUtil.getString(actionRequest, "transitionName"); String transitionName = ParamUtil.getString(actionRequest, "transitionName");
String comment = ParamUtil.getString(actionRequest, "comment"); String comment = ParamUtil.getString(actionRequest, "comment");
boolean aggiorna = true; boolean aggiorna = true;
// ADT: bug mancata problema assegnazione WF // ADT: bug mancata problema assegnazione WF
checkPresenzaIstruttore(transitionName, workflowTaskId); checkPresenzaIstruttore(transitionName, workflowTaskId);
// ADT: BUG ANOMALIA REGISTRA ESITO // ADT: BUG ANOMALIA REGISTRA ESITO
_log.info("transitionName = " + transitionName);
if (transitionName.equalsIgnoreCase("registra-esito")) { if (transitionName.equalsIgnoreCase("registra-esito")) {
HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil
.getHttpServletRequest(actionRequest)); .getHttpServletRequest(actionRequest));
String esito = httpServletRequest.getParameter("kaleo--esito--") != null ? httpServletRequest String esito = httpServletRequest.getParameter("kaleo--esito--") != null ? httpServletRequest.getParameter(
.getParameter("kaleo--esito--").trim() : ""; "kaleo--esito--").trim() : "";
String testoDocumento = httpServletRequest.getParameter("kaleo--testo_del_documento--") != null ? httpServletRequest String testoDocumento = httpServletRequest.getParameter("kaleo--testo_del_documento--") != null ? httpServletRequest
.getParameter("kaleo--testo_del_documento--") : ""; .getParameter("kaleo--testo_del_documento--") : "";
if (esito.equals(StatoPraticaConstants.VIARCH)) {
aggiorna = false;
}
if (!valoriAmmessi.contains(esito) if (!valoriAmmessi.contains(esito)
|| ((esito.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE) || esito || ((esito.equalsIgnoreCase(StatoPraticaConstants.INTEGRAZIONE) || esito
.equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO)) && testoDocumento .equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO)) && testoDocumento.isEmpty())) {
.isEmpty())) {
_log.error("controllo validazione completamento task registra-esito = " + workflowTaskId _log.error("controllo validazione completamento task registra-esito = " + workflowTaskId
+ " non riuscito - esito non valorizzato o esito " + " non riuscito - esito non valorizzato o esito " + StatoPraticaConstants.INTEGRAZIONE
+ StatoPraticaConstants.INTEGRAZIONE + StringPool.SLASH + StringPool.SLASH + StatoPraticaConstants.PREAVVISO_CONTRARIO
+ StatoPraticaConstants.PREAVVISO_CONTRARIO + " con testo del documento vuoto"); + " con testo del documento vuoto");
throw new PortalException( throw new PortalException("controllo validazione completamento task registra-esito non riuscito");
"controllo validazione completamento task registra-esito non riuscito");
} }
} else if (transitionName.equalsIgnoreCase("Riassegna") || transitionName.equalsIgnoreCase("assegna")) { } else if (transitionName.equalsIgnoreCase("Riassegna") || transitionName.equalsIgnoreCase("assegna")) {
HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil HttpServletRequest httpServletRequest = PortalUtil.getOriginalServletRequest(PortalUtil
.getHttpServletRequest(actionRequest)); .getHttpServletRequest(actionRequest));
String istruttore = httpServletRequest.getParameter("kaleo--istruttore--"); String istruttore = httpServletRequest.getParameter("kaleo--istruttore--");
if (Validator.isNull(istruttore)) { if (Validator.isNull(istruttore)) {
_log.error("controllo validazione completamento task = " + transitionName + " -" _log.error("controllo validazione completamento task = " + transitionName + " -" + workflowTaskId
+ workflowTaskId + " non riuscito - istruttore non presente nel workflow"); + " non riuscito - istruttore non presente nel workflow");
throw new PortalException("controllo validazione completamento task riassegna non riuscito"); throw new PortalException("controllo validazione completamento task riassegna non riuscito");
} }
if (istruttore.startsWith("--UO--")) { if (istruttore.startsWith("--UO--")) {
@ -215,21 +201,19 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId(); long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId();
int uo = Integer.parseInt(istruttore.substring(6)); int uo = Integer.parseInt(istruttore.substring(6));
WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, themeDisplay.getUserId(), WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, themeDisplay.getUserId(), workflowTaskId,
workflowTaskId, roleId, "Trasferito all'UO " + uo roleId, "Trasferito all'UO " + uo + " per assegnazione all'istruttore.\n" + comment, null,
+ " per assegnazione all'istruttore.\n" + comment, null,
WorkflowUtil.getWorkflowContext(controllo)); WorkflowUtil.getWorkflowContext(controllo));
pratica.setUnitaOperativa(uo); pratica.setUnitaOperativa(uo);
IntPraticaLocalServiceUtil.updateIntPratica(pratica); IntPraticaLocalServiceUtil.updateIntPratica(pratica);
} }
} }
if (aggiorna) { if (aggiorna) {
Map<String, Serializable> workflowContext = new HashMap<String, Serializable>(); Map<String, Serializable> workflowContext = new HashMap<String, Serializable>();
workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName); workflowContext.put(WorkflowConstants.CONTEXT_TRANSITION_NAME, transitionName);
WorkflowUtil.updateWorkflowContextWithTaskFormParameters(actionRequest, workflowContext); WorkflowUtil.updateWorkflowContextWithTaskFormParameters(actionRequest, workflowContext);
WorkflowTaskManagerUtil.completeWorkflowTask(themeDisplay.getCompanyId(), WorkflowTaskManagerUtil.completeWorkflowTask(themeDisplay.getCompanyId(), themeDisplay.getUserId(),
themeDisplay.getUserId(), workflowTaskId, transitionName, comment, workflowContext); workflowTaskId, transitionName, comment, workflowContext);
} }
} }
@ -245,11 +229,11 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
Map<String, Serializable> workflowContext = WorkflowUtil.getWorkflowContext(controllo); Map<String, Serializable> workflowContext = WorkflowUtil.getWorkflowContext(controllo);
long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId(); long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId();
WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, workflowTaskId, userId, WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, workflowTaskId, userId, StringPool.BLANK,
StringPool.BLANK, null, workflowContext); null, workflowContext);
WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, userId, workflowTaskId, roleId, WorkflowTaskManagerUtil
"Rimosso dalla unità operativa " + pratica.getUnitaOperativa() + ".\n" + comment, null, .assignWorkflowTaskToRole(companyId, userId, workflowTaskId, roleId, "Rimosso dalla unità operativa "
workflowContext); + pratica.getUnitaOperativa() + ".\n" + comment, null, workflowContext);
pratica.setUnitaOperativa(0); pratica.setUnitaOperativa(0);
IntPraticaLocalServiceUtil.updateIntPratica(pratica); IntPraticaLocalServiceUtil.updateIntPratica(pratica);
} }
@ -263,8 +247,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId"); long assigneeUserId = ParamUtil.getLong(actionRequest, "assigneeUserId");
String comment = ParamUtil.getString(actionRequest, "comment"); String comment = ParamUtil.getString(actionRequest, "comment");
WorkflowTaskManagerUtil.assignWorkflowTaskToRole(themeDisplay.getCompanyId(), assigneeUserId, WorkflowTaskManagerUtil.assignWorkflowTaskToRole(themeDisplay.getCompanyId(), assigneeUserId, workflowTaskId,
workflowTaskId, 0L, comment, null, null); 0L, comment, null, null);
} }
protected boolean isCheckMethodOnProcessAction() { protected boolean isCheckMethodOnProcessAction() {
@ -294,8 +278,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
Date dueDate = PortalUtil.getDate(dueDateMonth, dueDateDay, dueDateYear, dueDateHour, dueDateMinute, Date dueDate = PortalUtil.getDate(dueDateMonth, dueDateDay, dueDateYear, dueDateHour, dueDateMinute,
WorkflowTaskDueDateException.class); WorkflowTaskDueDateException.class);
WorkflowTaskManagerUtil.updateDueDate(themeDisplay.getCompanyId(), themeDisplay.getUserId(), WorkflowTaskManagerUtil.updateDueDate(themeDisplay.getCompanyId(), themeDisplay.getUserId(), workflowTaskId,
workflowTaskId, comment, dueDate); comment, dueDate);
} }
private static final boolean _CHECK_METHOD_ON_PROCESS_ACTION = false; 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, protected void sendRedirect(PortletConfig portletConfig, ActionRequest actionRequest,
ActionResponse actionResponse, String redirect, String closeRedirect) throws IOException, ActionResponse actionResponse, String redirect, String closeRedirect) throws IOException, SystemException {
SystemException {
if (isDisplaySuccessMessage(actionRequest)) { if (isDisplaySuccessMessage(actionRequest)) {
addSuccessMessage(actionRequest, actionResponse); addSuccessMessage(actionRequest, actionResponse);
@ -396,8 +379,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
protected void addSuccessMessage(ActionRequest actionRequest, ActionResponse actionResponse) { protected void addSuccessMessage(ActionRequest actionRequest, ActionResponse actionResponse) {
PortletConfig portletConfig = (PortletConfig) actionRequest PortletConfig portletConfig = (PortletConfig) actionRequest.getAttribute(JavaConstants.JAVAX_PORTLET_CONFIG);
.getAttribute(JavaConstants.JAVAX_PORTLET_CONFIG);
boolean addProcessActionSuccessMessage = GetterUtil.getBoolean( boolean addProcessActionSuccessMessage = GetterUtil.getBoolean(
portletConfig.getInitParameter("add-process-action-success-action"), true); portletConfig.getInitParameter("add-process-action-success-action"), true);
@ -436,12 +418,10 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId"); long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId");
WorkflowTask workflowTask = null; WorkflowTask workflowTask = null;
if (workflowTaskId > 0) { if (workflowTaskId > 0) {
workflowTask = WorkflowTaskManagerUtil.getWorkflowTask(themeDisplay.getCompanyId(), workflowTask = WorkflowTaskManagerUtil.getWorkflowTask(themeDisplay.getCompanyId(), workflowTaskId);
workflowTaskId);
} }
String valoreTransizioneEsito = getTransitionValue(workflowTask.getWorkflowInstanceId(), String valoreTransizioneEsito = getTransitionValue(workflowTask.getWorkflowInstanceId(), "registra-esito");
"registra-esito");
String valoreTransizioneAssegna = getTransitionValue(workflowTask.getWorkflowInstanceId(), "assegna"); String valoreTransizioneAssegna = getTransitionValue(workflowTask.getWorkflowInstanceId(), "assegna");
renderRequest.setAttribute("registra-esito-value", valoreTransizioneEsito); renderRequest.setAttribute("registra-esito-value", valoreTransizioneEsito);
@ -451,10 +431,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
ControlloPratica controllo = getControlloPratica(workflowTask.getWorkflowInstanceId()); ControlloPratica controllo = getControlloPratica(workflowTask.getWorkflowInstanceId());
// ADT BUG BO ID=33 // ADT BUG BO ID=33
renderRequest.setAttribute( renderRequest.setAttribute("historyWorkflowEsitiLogs",
"historyWorkflowEsitiLogs", getHistoryWorkfloLogs(themeDisplay, workflowTask.getWorkflowInstanceId(), renderRequest, controllo));
getHistoryWorkfloLogs(themeDisplay, workflowTask.getWorkflowInstanceId(), renderRequest,
controllo));
Group group = GroupLocalServiceUtil.getGroup(controllo.getGroupId()); Group group = GroupLocalServiceUtil.getGroup(controllo.getGroupId());
User user = themeDisplay.getUser(); User user = themeDisplay.getUser();
@ -466,8 +444,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
org.getGroupId(), "portos_assegnatore") org.getGroupId(), "portos_assegnatore")
&& (unitaOperativeUtente.contains(unitaOperativa) || unitaOperativeUtente.contains(0)); && (unitaOperativeUtente.contains(unitaOperativa) || unitaOperativeUtente.contains(0));
KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(workflowTask KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(workflowTask.getWorkflowInstanceId());
.getWorkflowInstanceId());
KaleoInstanceToken rootToken = KaleoInstanceTokenLocalServiceUtil.getKaleoInstanceToken(instance KaleoInstanceToken rootToken = KaleoInstanceTokenLocalServiceUtil.getKaleoInstanceToken(instance
.getRootKaleoInstanceTokenId()); .getRootKaleoInstanceTokenId());
@ -485,8 +462,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
SystemException { SystemException {
ClassLoader classLoaderKaleoLog = (ClassLoader) PortletBeanLocatorUtil.locate( ClassLoader classLoaderKaleoLog = (ClassLoader) PortletBeanLocatorUtil.locate(
it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader");
"portletClassLoader");
DynamicQuery dqKaleoLog = DynamicQueryFactoryUtil.forClass(FormLog.class, classLoaderKaleoLog); DynamicQuery dqKaleoLog = DynamicQueryFactoryUtil.forClass(FormLog.class, classLoaderKaleoLog);
dqKaleoLog.add(RestrictionsFactoryUtil.eq("workflowInstanceId", taskInstanceId)); dqKaleoLog.add(RestrictionsFactoryUtil.eq("workflowInstanceId", taskInstanceId));
@ -498,8 +474,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
JSONObject json = JSONFactoryUtil.createJSONObject(formLog.getFormParameters()); JSONObject json = JSONFactoryUtil.createJSONObject(formLog.getFormParameters());
KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId); KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId);
ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(kaleoInstance
.getControlloPratica(kaleoInstance.getClassPK()); .getClassPK());
if (json.has("esito")) { if (json.has("esito")) {
String tipoEsito = StringPool.BLANK; String tipoEsito = StringPool.BLANK;
@ -524,8 +500,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
PortletBeanLocatorUtil.locate(ClpSerializer.getServletContextName(), "portletClassLoader"); PortletBeanLocatorUtil.locate(ClpSerializer.getServletContextName(), "portletClassLoader");
KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId); KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil.getKaleoInstance(taskInstanceId);
ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(kaleoInstance
.getControlloPratica(kaleoInstance.getClassPK()); .getClassPK());
return controlloPratica; return controlloPratica;
} }
@ -541,8 +517,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
logTypes.add(WorkflowLog.TASK_UPDATE); logTypes.add(WorkflowLog.TASK_UPDATE);
logTypes.add(WorkflowLog.TRANSITION); logTypes.add(WorkflowLog.TRANSITION);
List<WorkflowLog> workflowLogs = WorkflowLogManagerUtil.getWorkflowLogsByWorkflowInstance( List<WorkflowLog> workflowLogs = WorkflowLogManagerUtil.getWorkflowLogsByWorkflowInstance(
themeDisplay.getCompanyId(), workflowInstanceId, logTypes, QueryUtil.ALL_POS, themeDisplay.getCompanyId(), workflowInstanceId, logTypes, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
QueryUtil.ALL_POS, WorkflowComparatorFactoryUtil.getLogCreateDateComparator(true)); WorkflowComparatorFactoryUtil.getLogCreateDateComparator(true));
for (WorkflowLog workflowLog : workflowLogs) { for (WorkflowLog workflowLog : workflowLogs) {
try { try {
WorkflowTask wfTask = null; WorkflowTask wfTask = null;
@ -558,12 +534,9 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
if (json.has("esito")) { if (json.has("esito")) {
String tipoEsito = StringPool.BLANK; String tipoEsito = StringPool.BLANK;
if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) { if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) {
tipoEsito = StatoPraticaConstants.getEsitoDeposito(json tipoEsito = StatoPraticaConstants.getEsitoDeposito(json.getString("esito"));
.getString("esito")); } else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) {
} else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica tipoEsito = StatoPraticaConstants.getEsitoAutorizzazione(json.getString("esito"));
.getIntPraticaId())) {
tipoEsito = StatoPraticaConstants.getEsitoAutorizzazione(json
.getString("esito"));
} }
esitiMapByWorkflowLogID.put(workflowLog.getWorkflowLogId(), tipoEsito); esitiMapByWorkflowLogID.put(workflowLog.getWorkflowLogId(), tipoEsito);
} }
@ -592,8 +565,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
try { try {
KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil KaleoTaskInstanceToken kaleoTaskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
.getKaleoTaskInstanceToken(workflowTaskId); .getKaleoTaskInstanceToken(workflowTaskId);
ControlloPratica controlloPratica = getControlloPratica(kaleoTaskInstanceToken ControlloPratica controlloPratica = getControlloPratica(kaleoTaskInstanceToken.getKaleoInstanceId());
.getKaleoInstanceId());
Map<String, Serializable> wfParameters = it.tref.liferay.portos.bo.util.WorkflowUtil Map<String, Serializable> wfParameters = it.tref.liferay.portos.bo.util.WorkflowUtil
.getFormParameters(controlloPratica); .getFormParameters(controlloPratica);
String istruttore = (String) wfParameters.get("istruttore"); String istruttore = (String) wfParameters.get("istruttore");
@ -602,8 +574,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
if (istruttore == null) { if (istruttore == null) {
_log.info("checkPresenzaIstruttore - rilevata incongrueza WF - istruttore non presente per controlloPratica = " _log.info("checkPresenzaIstruttore - rilevata incongrueza WF - istruttore non presente per controlloPratica = "
+ controlloPratica.getControlloPraticaId()); + controlloPratica.getControlloPraticaId());
long istruttoreId = IntPraticaLocalServiceUtil.getIntPratica( long istruttoreId = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId())
controlloPratica.getIntPraticaId()).getStatusByUserId(); .getStatusByUserId();
if (istruttoreId > 0) { if (istruttoreId > 0) {
String jsonFormParameters = null; String jsonFormParameters = null;
Map<String, Serializable> parametri = new HashMap<String, Serializable>(); Map<String, Serializable> parametri = new HashMap<String, Serializable>();
@ -625,8 +597,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
} }
} catch (Exception e) { } catch (Exception e) {
_log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" _log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" + e.getMessage()
+ e.getMessage() + " , " + e.getCause() + "]"); + " , " + e.getCause() + "]");
} }
} }
} }

4
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

@ -13,8 +13,8 @@
## ##
build.namespace=Kaleo build.namespace=Kaleo
build.number=27 build.number=28
build.date=1613390393243 build.date=1616063088077
build.auto.upgrade=true build.auto.upgrade=true
## ##

Caricamento…
Annulla
Salva