Sfoglia il codice sorgente

Unità operative e gestione firme per unità operativa

master
Salvatore La Manna 4 anni fa
parent
commit
b6f2c61c27
  1. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
  2. 12
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java
  3. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java
  4. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java
  5. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java
  6. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java
  7. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java
  8. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java
  9. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java
  10. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java
  11. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java
  12. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java
  13. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java
  14. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java
  15. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java
  16. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java
  17. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java
  18. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java
  19. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java
  20. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java
  21. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java
  22. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java
  23. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java
  24. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java
  25. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java
  26. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java
  27. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java
  28. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java
  29. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java
  30. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  31. 25
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp
  32. 47
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp
  33. 9
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp
  34. 38
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp
  35. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java
  36. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java
  37. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java
  38. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java
  39. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java
  40. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java
  41. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java
  42. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java
  43. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java
  44. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java
  45. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java
  46. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java
  47. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java
  48. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java
  49. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java
  50. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java
  51. 93
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java
  52. 40
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java
  53. 4
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

3
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java

@ -225,9 +225,8 @@ public class ControlloPraticaAdvancedSearch {
if (_log.isDebugEnabled()) {
_log.info("User " + user.getScreenName() + " Request query : " + booleanQuery.toString());
_log.debug("User " + user.getScreenName() + " Request query : " + booleanQuery.toString());
}
_log.info("User " + user.getScreenName() + " Request query : " + booleanQuery.toString());
hits = SearchEngineUtil.search(searchContext, booleanQuery);

12
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java

@ -200,17 +200,17 @@ public class GestioneFirmePortlet extends MVCPortlet {
Format dateFormat = FastDateFormatFactoryUtil.getDate(locale);
StringBuilder sb = new StringBuilder();
long[] gruopIds = new long[0];
long[] groupIds = new long[0];
List<Organization> organizations = OrganizationLocalServiceUtil
.getUserOrganizations(user.getUserId());
for (Organization organization : organizations) {
if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(),
Constants.ROLE_NAME_FIRMA, true)) {
gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId());
groupIds = ArrayUtil.append(groupIds, organization.getGroupId());
}
}
List<Avviso> lista = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(companyId, gruopIds,
List<Avviso> lista = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(companyId, groupIds,
user.getScreenName(), QueryUtil.ALL_POS, QueryUtil.ALL_POS);
sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto")));
@ -347,17 +347,17 @@ public class GestioneFirmePortlet extends MVCPortlet {
sb.append(StringPool.NEW_LINE);
sb.append(StringPool.NEW_LINE);
long[] gruopIds = new long[0];
long[] groupIds = new long[0];
List<Organization> organizations = OrganizationLocalServiceUtil
.getUserOrganizations(user.getUserId());
for (Organization organization : organizations) {
if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(),
Constants.ROLE_NAME_FIRMA, true)) {
gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId());
groupIds = ArrayUtil.append(groupIds, organization.getGroupId());
}
}
List<Avviso> listaFirmeAssegnateAlRuolo = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirma(
companyId, gruopIds, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
companyId, groupIds, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
sb.append("FIRME ASSEGNATE AL RUOLO");
sb.append(StringPool.NEW_LINE);

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java

@ -374,7 +374,9 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
codiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(),
controlloPratica.getGroupId(), statoPratica);
}
// TODO Da riempire
// XXX Di cosa? Di caramelle?
String jsonParameters = StringPool.BLANK;
avvisoLocalService.createStandardAvvisoPratica(controlloPratica.getIntPraticaId(), statoPratica,
jsonParameters, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext,

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException;
import it.tref.liferay.portos.bo.model.AllegatoManuale;
import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl;
import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl;
import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException;
import it.tref.liferay.portos.bo.model.Asseverazione;
import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl;
import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl;
import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException;
import it.tref.liferay.portos.bo.model.Avviso;
import it.tref.liferay.portos.bo.model.impl.AvvisoImpl;
import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl;
import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException;
import it.tref.liferay.portos.bo.model.Collaudo;
import it.tref.liferay.portos.bo.model.impl.CollaudoImpl;
import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl;
import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException;
import it.tref.liferay.portos.bo.model.Comune;
import it.tref.liferay.portos.bo.model.impl.ComuneImpl;
import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ComunePersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException;
import it.tref.liferay.portos.bo.model.Comunicazione;
import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl;
import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException;
import it.tref.liferay.portos.bo.model.Configurazione;
import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl;
import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException;
import it.tref.liferay.portos.bo.model.ControlloPratica;
import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl;
import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException;
import it.tref.liferay.portos.bo.model.Delega;
import it.tref.liferay.portos.bo.model.impl.DelegaImpl;
import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException;
import it.tref.liferay.portos.bo.model.DettPratica;
import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl;
import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException;
import it.tref.liferay.portos.bo.model.DocAggiuntiva;
import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl;
import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException;
import it.tref.liferay.portos.bo.model.DocPratica;
import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl;
import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException;
import it.tref.liferay.portos.bo.model.FineLavori;
import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl;
import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl;
import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java

@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException;
import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl;
import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl;
import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchIUVException;
import it.tref.liferay.portos.bo.model.IUV;
import it.tref.liferay.portos.bo.model.impl.IUVImpl;
import it.tref.liferay.portos.bo.model.impl.IUVModelImpl;
import it.tref.liferay.portos.bo.service.persistence.IUVPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchInfoFascicoloException;
import it.tref.liferay.portos.bo.model.InfoFascicolo;
import it.tref.liferay.portos.bo.model.impl.InfoFascicoloImpl;
import it.tref.liferay.portos.bo.model.impl.InfoFascicoloModelImpl;
import it.tref.liferay.portos.bo.service.persistence.InfoFascicoloPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java

@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException;
import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl;
import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java

@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException;
import it.tref.liferay.portos.bo.model.Pagamento;
import it.tref.liferay.portos.bo.model.impl.PagamentoImpl;
import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl;
import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException;
import it.tref.liferay.portos.bo.model.ParereGeologo;
import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl;
import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java

@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException;
import it.tref.liferay.portos.bo.model.Provincia;
import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl;
import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException;
import it.tref.liferay.portos.bo.model.Soggetto;
import it.tref.liferay.portos.bo.model.impl.SoggettoImpl;
import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl;
import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException;
import it.tref.liferay.portos.bo.model.Sorteggio;
import it.tref.liferay.portos.bo.model.impl.SorteggioImpl;
import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl;
import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java

@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException;
import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl;
import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java

@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException;
import it.tref.liferay.portos.bo.model.Tempistica;
import it.tref.liferay.portos.bo.model.impl.TempisticaImpl;
import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl;
import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence;
import java.io.Serializable;

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java

@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException;
import it.tref.liferay.portos.bo.model.Territorio;
import it.tref.liferay.portos.bo.model.impl.TerritorioImpl;
import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl;
import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence;
import java.io.Serializable;

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GestioneFirmeUtil.java

@ -4,12 +4,12 @@ import it.tref.liferay.portos.bo.model.Avviso;
import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
import java.util.ArrayList;
import java.util.List;
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.util.StringPool;
import com.liferay.portal.kernel.util.UniqueList;
import com.liferay.portal.model.Role;
import com.liferay.portal.model.User;
import com.liferay.portal.model.UserGroupRole;
@ -20,7 +20,7 @@ import com.liferay.portal.service.UserLocalServiceUtil;
public class GestioneFirmeUtil {
@SuppressWarnings("serial")
private static List<String> tipoDocumentoFirmaBase = new UniqueList<String>() {
private static List<String> tipoDocumentoFirmaBase = new ArrayList<String>() {
{
add(StatoPraticaConstants.INVIO_AVVISO_MANUALE);
add(StatoPraticaConstants.INTEGRAZIONE);

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

@ -13,8 +13,8 @@
##
build.namespace=portos_bo
build.number=2848
build.date=1610534815140
build.number=2851
build.date=1610621345251
build.auto.upgrade=true
##

25
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp

@ -1,4 +1,5 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.UnitaOperativeUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.GestioneFirmeUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
@ -20,19 +21,17 @@
<%@include file="/html/gestionefirme/init.jsp"%>
<%
SearchContainer searchContainer = (SearchContainer) request
.getAttribute("liferay-ui:search:searchContainer");
String redirect = ParamUtil.getString(request, "backUrl");
Avviso avviso = null;
SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer");
String redirect = ParamUtil.getString(request, "backUrl");
Avviso avviso = null;
redirect = searchContainer.getIteratorURL().toString();
redirect = searchContainer.getIteratorURL().toString();
ResultRow row = (ResultRow) request
.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
avviso = (Avviso) row.getObject();
ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
avviso = (Avviso) row.getObject();
IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId());
List<Integer> unitaOperativeUtente = UnitaOperativeUtil.getUnitaOperative(user);
boolean inUnitaOperativa = unitaOperativeUtente.contains(intPratica.getUnitaOperativa()) || unitaOperativeUtente.contains(0);
%>
<portlet:actionURL name="assignaFirma" var="assignaFirmaURL">
@ -57,7 +56,7 @@
<liferay-ui:icon iconCssClass="fa fa-pencil" url="portos2://applicazione_firma.exe" linkCssClass="btn btn-action"/>
</span>
</c:if>
<c:if test="<%=!avviso.getUserCodiceFiscalePrimaFirma().equalsIgnoreCase(user.getScreenName()) && GestioneFirmeUtil.userCanSignAvviso(user.getUserId(), avviso.getGroupId(), avviso.getAvvisoId())%>">
<c:if test="<%=!avviso.getUserCodiceFiscalePrimaFirma().equalsIgnoreCase(user.getScreenName()) && GestioneFirmeUtil.userCanSignAvviso(user.getUserId(), avviso.getGroupId(), avviso.getAvvisoId()) && inUnitaOperativa %>">
<c:if test="<%= Validator.isNotNull(avviso.getTipoDocumento()) %>">
<span class="tooltip-info" title="Assegna a Me">
<liferay-ui:icon iconCssClass="fa fa-user-plus" url="<%=assignaFirmaURL %>" linkCssClass="btn btn-action"/>
@ -70,7 +69,7 @@
%>
<span class="tooltip-info" title="Apri Pratica">
<%
String link_visualizza = "javascript:window.open('"+urlDettaglioPratica+"','_blank')";
String link_visualizza = "javascript:window.open('" + urlDettaglioPratica + "','_blank')";
%>
<aui:button value="" id='<%=renderResponse.getNamespace()+"visualizza"%>' icon="fa fa-clipboard" type="button" onclick="<%=link_visualizza %>" cssClass="btn btn-action"/>
</span>

47
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp

@ -1,6 +1,4 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%>
<%@page import="com.liferay.portal.util.comparator.GroupIdComparator"%>
<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%>
@ -28,19 +26,17 @@
<%@include file="/html/gestionefirme/init.jsp" %>
<%
boolean fromPopUp = renderRequest.getWindowState().equals(LiferayWindowState.POP_UP);
boolean fromPopUp = renderRequest.getWindowState().equals(LiferayWindowState.POP_UP);
String mvcPath = ParamUtil.getString(request, "mvcPath");
long[] gruopIds = new long[0];
List<Organization> organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId());
for(Organization organization:organizations){
if(UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)){
gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId());
}
String mvcPath = ParamUtil.getString(request, "mvcPath");
long[] groupIds = new long[0];
List<Organization> organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId());
for (Organization organization:organizations) {
if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)) {
groupIds = ArrayUtil.append(groupIds, organization.getGroupId());
}
}
%>
@ -102,14 +98,8 @@
<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
<liferay-ui:search-container-column-text name="provincia" >
<%
long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId();
long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId();
String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName();
%>
<%=genio %>
<liferay-ui:search-container-column-text name="U.O." >
<%= intPratica.getUnitaOperativa() %>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="label.avviso.dataAvviso" value='<%=dateFormatDateTime.format(avviso.getDtAvviso()) %>' />
@ -181,8 +171,8 @@
iteratorURL="<%= secondaFirmaURL %>" emptyResultsMessage="no-entries-were-found">
<liferay-ui:search-container-results
results="<%= AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirma(company.getCompanyId(), gruopIds, searchContainer.getStart(), searchContainer.getEnd()) %>"
total="<%=AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirma(company.getCompanyId(), gruopIds) %>"
results="<%= AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirma(company.getCompanyId(), groupIds, searchContainer.getStart(), searchContainer.getEnd()) %>"
total="<%=AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirma(company.getCompanyId(), groupIds) %>"
/>
<liferay-ui:search-container-row
@ -218,13 +208,8 @@
<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
<liferay-ui:search-container-column-text name="provincia" >
<% long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId();
long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId();
String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName();
%>
<%=genio %>
<liferay-ui:search-container-column-text name="U.O." >
<%= intPratica.getUnitaOperativa() %>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="label.avviso.dataAvviso" value='<%=dateFormatDateTime.format(avviso.getDtAvviso()) %>' />
@ -232,8 +217,6 @@
String tipoDocumento = avviso.translateTipoDocumento();
%>
<liferay-ui:search-container-column-text name="label.avviso.tipoDocumento" value='<%=LanguageUtil.get(pageContext, tipoDocumento) %>' />
<%
String urlFileEntryBase = StringPool.BLANK;
try {

9
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp

@ -1,6 +1,5 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%>
<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%>
<%@page import="com.liferay.portal.model.Organization"%>
@ -31,13 +30,13 @@
boolean fromPopUp = renderRequest.getWindowState().equals(LiferayWindowState.POP_UP);
String mvcPath = ParamUtil.getString(request, "mvcPath");
long[] gruopIds = new long[0];
long[] groupIds = new long[0];
List<Organization> organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId());
for(Organization organization:organizations){
if(UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)){
gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId());
groupIds = ArrayUtil.append(groupIds, organization.getGroupId());
}
}
@ -64,8 +63,8 @@
delta="5" iteratorURL="<%= primaFirmaURL %>" emptyResultsMessage="no-entries-were-found">
<liferay-ui:search-container-results
results="<%= AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(company.getCompanyId(),gruopIds, user.getScreenName(), searchContainer.getStart(), searchContainer.getEnd()) %>"
total="<%=AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirmaByNotCF(company.getCompanyId(),gruopIds, user.getScreenName()) %>"
results="<%= AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(company.getCompanyId(),groupIds, user.getScreenName(), searchContainer.getStart(), searchContainer.getEnd()) %>"
total="<%=AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirmaByNotCF(company.getCompanyId(),groupIds, user.getScreenName()) %>"
/>
<liferay-ui:search-container-row

38
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp

@ -25,14 +25,8 @@ String randomId = StringPool.BLANK;
String closeRedirect = ParamUtil.getString(request, "closeRedirect");
//boolean canPortosAssegnatore = ParamUtil.getBoolean(request, "canPortosAssegnatore", false);
//boolean canPortosApprovatore = ParamUtil.getBoolean(request, "canPortosApprovatore", false);
//boolean canPortosIstruttore = ParamUtil.getBoolean(request, "canPortosIstruttore", false);
boolean canPortosAssegnatore = (Boolean)request.getAttribute("canPortosAssegnatore");
boolean canPortosApprovatore = (Boolean)request.getAttribute("canPortosApprovatore");
boolean canPortosIstruttore = (Boolean)request.getAttribute("canPortosIstruttore");
boolean canRemoveUO = (Boolean)request.getAttribute("canRemoveUO");
ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
@ -46,7 +40,6 @@ WorkflowTask workflowTask = null;
if (row != null) {
randomId = StringUtil.randomId();
workflowTask = (WorkflowTask)row.getParameter("workflowTask");
}
else {
@ -76,19 +69,6 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
message = transitionName;
}
%>
<%
//Non fa nulla ma forse tornera comodo
boolean canCose = true;
if(transitionName.equals("registra-esito") && !canPortosIstruttore){
canCose = false;
} else if(transitionName.equals("approva") && !canPortosApprovatore){
canCose = false;
}
%>
<portlet:actionURL var="editURL">
<portlet:param name="struts_action" value="/workflow_tasks/edit_workflow_task" />
<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.SAVE %>" />
@ -148,7 +128,7 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
</c:if>
<c:if test='<%= !workflowTask.isCompleted() && !_isAssignedToUser(workflowTask, user) && !workflowTask.getName().equalsIgnoreCase("esito") && canPortosAssegnatore%>'>
<c:if test='<%= !workflowTask.isCompleted() && !_isAssignedToUser(workflowTask, user) && !workflowTask.getName().equalsIgnoreCase("esito") && canPortosAssegnatore %>'>
<portlet:actionURL var="assignToMeURL">
<portlet:param name="struts_action" value="/workflow_tasks/edit_workflow_task" />
<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.ASSIGN %>" />
@ -190,7 +170,7 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
/>
</c:if>
<%-- <c:if test='<%= !workflowTask.isCompleted() && !_isAssignedToUser(workflowTask, user) && !workflowTask.getName().equalsIgnoreCase("esito") && canPortosAssegnatore%>'> --%>
<c:if test="false">
<portlet:actionURL var="changeUOURL">
<portlet:param name="struts_action" value="/workflow_tasks/edit_workflow_task" />
<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.ASSIGN %>" />
@ -208,12 +188,12 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
method="get"
url="<%= changeUOURL %>"
/>
<%-- </c:if> --%>
</c:if>
<%-- <c:if test='<%= !workflowTask.isCompleted() && !_isAssignedToUser(workflowTask, user) && !workflowTask.getName().equalsIgnoreCase("esito") && canPortosAssegnatore%>'> --%>
<portlet:actionURL var="removeAssignUOURL">
<c:if test='<%= canRemoveUO %>'>
<portlet:actionURL var="removeUOURL">
<portlet:param name="struts_action" value="/workflow_tasks/edit_workflow_task" />
<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.ASSIGN %>" />
<portlet:param name="<%= Constants.CMD %>" value="removeUO" />
<portlet:param name="redirect" value="<%= currentURL %>" />
<portlet:param name="closeRedirect" value="<%= closeRedirect %>" />
<portlet:param name="workflowTaskId" value="<%= String.valueOf(workflowTask.getWorkflowTaskId()) %>" />
@ -226,9 +206,9 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
id='<%= randomId + "taskRemoveAssignUOLink" %>'
message="remove-uo"
method="get"
url="<%= removeAssignUOURL %>"
url="<%= removeUOURL %>"
/>
<%-- </c:if> --%>
</c:if>
<%-- <c:if test="<%= !workflowTask.isCompleted() %>">
<portlet:actionURL var="updateDueDateURL">

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.impl.KaleoActionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence;
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.impl.KaleoConditionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence;
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.impl.KaleoDefinitionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence;
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.impl.KaleoInstanceImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence;
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.impl.KaleoInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence;
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.impl.KaleoLogImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence;
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.impl.KaleoNodeImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence;
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.impl.KaleoNotificationImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence;
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.impl.KaleoNotificationRecipientImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence;
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.impl.KaleoTaskAssignmentInstanceImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence;
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.impl.KaleoTaskAssignmentImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence;
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.impl.KaleoTaskInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence;
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.impl.KaleoTaskImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence;
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.impl.KaleoTimerInstanceTokenImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence;
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.impl.KaleoTimerImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence;
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.impl.KaleoTransitionImpl;
import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl;
import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence;
import java.io.Serializable;

93
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java

@ -5,6 +5,7 @@ import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
import it.tref.liferay.portos.bo.shared.util.UnitaOperativeUtil;
import it.tref.liferay.portos.bo.util.AzioniPraticheUtil;
import it.tref.liferay.portos.kaleo.model.FormLog;
import it.tref.liferay.portos.kaleo.service.ClpSerializer;
@ -70,7 +71,6 @@ import com.liferay.portal.model.LayoutTypePortlet;
import com.liferay.portal.model.Organization;
import com.liferay.portal.model.Portlet;
import com.liferay.portal.model.User;
import com.liferay.portal.model.WorkflowInstanceLink;
import com.liferay.portal.security.auth.PrincipalException;
import com.liferay.portal.service.GroupLocalServiceUtil;
import com.liferay.portal.service.OrganizationLocalServiceUtil;
@ -80,12 +80,13 @@ import com.liferay.portal.service.ServiceContext;
import com.liferay.portal.service.ServiceContextFactory;
import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
import com.liferay.portal.service.UserLocalServiceUtil;
import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil;
import com.liferay.portal.theme.ThemeDisplay;
import com.liferay.portal.util.PortalUtil;
import com.liferay.portal.workflow.kaleo.model.KaleoInstance;
import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken;
import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken;
import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil;
import com.liferay.portal.workflow.kaleo.service.KaleoInstanceTokenLocalServiceUtil;
import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServiceUtil;
public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
@ -143,6 +144,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
throw e;
}
}
} else if (cmd.equals("removeUO")) {
removeUO(actionRequest);
} else {
originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig,
actionRequest, actionResponse);
@ -206,30 +209,18 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
}
if (istruttore.startsWith("--UO--")) {
aggiorna = false;
KaleoTaskInstanceToken taskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
.getKaleoTaskInstanceToken(workflowTaskId);
if (taskInstanceToken.getClassName().equals(ControlloPratica.class.getName())) {
ControlloPratica controllo = ControlloPraticaLocalServiceUtil
.getControlloPratica(taskInstanceToken.getClassPK());
IntPratica pratica = IntPraticaLocalServiceUtil
.getIntPratica(controllo.getIntPraticaId());
long companyId = controllo.getCompanyId();
long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId();
int uo = Integer.parseInt(istruttore.substring(6));
WorkflowInstanceLink link = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(
companyId, controllo.getGroupId(), ControlloPratica.class.getName(),
controllo.getPrimaryKey());
WorkflowInstance instance = WorkflowInstanceManagerUtil.getWorkflowInstance(companyId,
link.getWorkflowInstanceId());
pratica.setUnitaOperativa(uo);
IntPraticaLocalServiceUtil.updateIntPratica(pratica);
WorkflowTaskManagerUtil
.assignWorkflowTaskToRole(companyId, taskInstanceToken.getUserId(),
workflowTaskId, roleId, "Trasferito all'UO " + uo
+ " per assegnazione all'istruttore", null,
instance.getWorkflowContext());
}
ControlloPratica controllo = WorkflowUtil.getControlloPratica(workflowTaskId);
IntPratica pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId());
long companyId = controllo.getCompanyId();
long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId();
int uo = Integer.parseInt(istruttore.substring(6));
WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, themeDisplay.getUserId(),
workflowTaskId, roleId, "Trasferito all'UO " + uo
+ " per assegnazione all'istruttore.\n" + comment, null,
WorkflowUtil.getWorkflowContext(controllo));
pratica.setUnitaOperativa(uo);
IntPraticaLocalServiceUtil.updateIntPratica(pratica);
}
}
@ -242,6 +233,27 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
}
}
protected void removeUO(ActionRequest actionRequest) throws PortalException, SystemException {
ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
String comment = ParamUtil.getString(actionRequest, "comment");
ControlloPratica controllo = WorkflowUtil.getControlloPratica(workflowTaskId);
IntPratica pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId());
long companyId = themeDisplay.getCompanyId();
long userId = themeDisplay.getUserId();
Map<String, Serializable> workflowContext = WorkflowUtil.getWorkflowContext(controllo);
long roleId = RoleLocalServiceUtil.getRole(companyId, "portos_assegnatore").getRoleId();
WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, workflowTaskId, userId,
StringPool.BLANK, null, workflowContext);
WorkflowTaskManagerUtil.assignWorkflowTaskToRole(companyId, userId, workflowTaskId, roleId,
"Rimosso dalla unità operativa " + pratica.getUnitaOperativa() + ".\n" + comment, null,
workflowContext);
pratica.setUnitaOperativa(0);
IntPraticaLocalServiceUtil.updateIntPratica(pratica);
}
protected void relaseTask(ActionRequest actionRequest) throws Exception {
ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
@ -422,9 +434,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
ThemeDisplay themeDisplay = (ThemeDisplay) renderRequest.getAttribute(WebKeys.THEME_DISPLAY);
long workflowTaskId = ParamUtil.getLong(renderRequest, "workflowTaskId");
WorkflowTask workflowTask = null;
if (workflowTaskId > 0) {
workflowTask = WorkflowTaskManagerUtil.getWorkflowTask(themeDisplay.getCompanyId(),
workflowTaskId);
@ -438,31 +448,34 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
renderRequest.setAttribute("assegna-value", valoreTransizioneAssegna);
// Gestione permessi action button
ControlloPratica controlloPratica = getControlloPratica(workflowTask.getWorkflowInstanceId());
ControlloPratica controllo = getControlloPratica(workflowTask.getWorkflowInstanceId());
// ADT BUG BO ID=33
renderRequest.setAttribute(
"historyWorkflowEsitiLogs",
getHistoryWorkfloLogs(themeDisplay, workflowTask.getWorkflowInstanceId(), renderRequest,
controlloPratica));
long groupIdTerritorio = controlloPratica.getGroupId();
Group group = GroupLocalServiceUtil.getGroup(groupIdTerritorio);
controllo));
Group group = GroupLocalServiceUtil.getGroup(controllo.getGroupId());
User user = themeDisplay.getUser();
Organization org = OrganizationLocalServiceUtil.getOrganization(group.getClassPK());
int unitaOperativa = WorkflowUtil.getIntPratica(workflowTaskId).getUnitaOperativa();
List<Integer> unitaOperativeUtente = UnitaOperativeUtil.getUnitaOperative(user);
boolean canPortosAssegnatore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
org.getGroupId(), "portos_assegnatore");
boolean canPortosApprovatore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
org.getGroupId(), "portos_approvatore");
org.getGroupId(), "portos_assegnatore")
&& (unitaOperativeUtente.contains(unitaOperativa) || unitaOperativeUtente.contains(0));
KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(workflowTask
.getWorkflowInstanceId());
KaleoInstanceToken rootToken = KaleoInstanceTokenLocalServiceUtil.getKaleoInstanceToken(instance
.getRootKaleoInstanceTokenId());
boolean canPortosIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
org.getGroupId(), "portos_istruttore");
boolean canRemoveUO = canPortosAssegnatore && (0 != unitaOperativa)
&& rootToken.getCurrentKaleoNodeName().equalsIgnoreCase("Assegnazione");
renderRequest.setAttribute("canPortosAssegnatore", canPortosAssegnatore);
renderRequest.setAttribute("canPortosApprovatore", canPortosApprovatore);
renderRequest.setAttribute("canPortosIstruttore", canPortosIstruttore);
renderRequest.setAttribute("canRemoveUO", canRemoveUO);
return originalStrutsPortletAction.render(originalStrutsPortletAction, portletConfig, renderRequest,
renderResponse);

40
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java

@ -1,5 +1,9 @@
package it.tref.liferay.portos.kaleo.util;
import it.tref.liferay.portos.bo.model.ControlloPratica;
import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.kaleo.model.FormLog;
import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil;
import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants;
@ -29,6 +33,8 @@ import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowHandler;
import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil;
import com.liferay.portal.kernel.workflow.WorkflowInstance;
import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil;
import com.liferay.portal.model.WorkflowInstanceLink;
import com.liferay.portal.service.ServiceContext;
import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil;
@ -44,6 +50,40 @@ import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServ
public class WorkflowUtil {
private static Log _log = LogFactoryUtil.getLog(WorkflowUtil.class);
public static ControlloPratica getControlloPratica(long workflowTaskId) {
ControlloPratica controllo = null;
try {
KaleoTaskInstanceToken taskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
.getKaleoTaskInstanceToken(workflowTaskId);
if (taskInstanceToken.getClassName().equals(ControlloPratica.class.getName())) {
controllo = ControlloPraticaLocalServiceUtil.getControlloPratica(taskInstanceToken
.getClassPK());
}
} catch (PortalException | SystemException e) {
}
return controllo;
}
public static IntPratica getIntPratica(long workflowTaskId) {
IntPratica pratica = null;
ControlloPratica controllo = getControlloPratica(workflowTaskId);
try {
pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId());
} catch (PortalException | SystemException e) {
}
return pratica;
}
public static Map<String, Serializable> getWorkflowContext(ControlloPratica controllo)
throws PortalException, SystemException {
WorkflowInstanceLink link = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(
controllo.getCompanyId(), controllo.getGroupId(), ControlloPratica.class.getName(),
controllo.getPrimaryKey());
WorkflowInstance instance = WorkflowInstanceManagerUtil.getWorkflowInstance(controllo.getCompanyId(),
link.getWorkflowInstanceId());
return instance.getWorkflowContext();
}
public static Map<String, Serializable> executeOnOpenForm(long companyId, long workflowTaskId,
long assigneeUserId, String transitionName) throws PortalException, SystemException {

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

@ -13,8 +13,8 @@
##
build.namespace=Kaleo
build.number=19
build.date=1610533175798
build.number=20
build.date=1610543654321
build.auto.upgrade=true
##

Caricamento…
Annulla
Salva