diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index dc63a435..9d9f6cdf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -57,7 +57,7 @@ public class AvvisoUtil { }; @SuppressWarnings("serial") - private final static Map allTipoDocumentoFolderTemplateProps = new LinkedHashMap(17) { + private final static Map allTipoDocumentoFolderTemplateProps = new LinkedHashMap(18) { { put(StatoPraticaConstants.VIDIMATA, "conf.geniocivile.avviso.folder.id.vidimata"); put(StatoPraticaConstants.CONFORME, "conf.geniocivile.avviso.folder.id.conforme"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java index 068990d5..e05ad290 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java @@ -19,7 +19,7 @@ public class PraticaUtil { public static String getFolderName(long dettPraticaId) { - return StringUtils.leftPad(String.valueOf(dettPraticaId), 10, '0') + StringPool.UNDERLINE + dettPraticaId; + return StringUtils.leftPad(String.valueOf(dettPraticaId), 10, '0') + '_' + dettPraticaId; } public static String getFolderNameDocumentazione() { @@ -28,7 +28,7 @@ public class PraticaUtil { } @SuppressWarnings("serial") - private static final Map statusChangeMap = new LinkedHashMap(4) { + private static final Map STATUS_CHANGE_MAP = new LinkedHashMap(4) { { put(StatoPraticaConstants.CONFORME, new String[] { StatoPraticaConstants.NON_CONFORME }); put(StatoPraticaConstants.NON_CONFORME, new String[] { StatoPraticaConstants.CONFORME }); @@ -41,10 +41,10 @@ public class PraticaUtil { public static Map getStatusChangeMap(long dettPraticaId) throws PortalException, SystemException { - return statusChangeMap; + return STATUS_CHANGE_MAP; } - private static final List dettPraticaHiddenFields = Arrays.asList("uuid", "uuid_", "dettPraticaId", + private static final List DETT_PRATICA_HIDDEN_FIELDS = Arrays.asList("uuid", "uuid_", "dettPraticaId", "companyId", "userId", "userName", "createDate", "modifiedDate", "groupId", "intPraticaId", "dataEffettuazione", "integrazione", "validata", "dtProtocollo", "protocollo", "completa", "gestita", "version", "versionata", "status", "statusByUserId", "statusByUserName", "statusDate", "statusTask", @@ -65,7 +65,7 @@ public class PraticaUtil { public static List getDettPraticaHiddenFields() { - return dettPraticaHiddenFields; + return DETT_PRATICA_HIDDEN_FIELDS; } public static String getStatoPraticaLabel(String statoPratica, IntPratica intPratica) throws PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties index 840f058b..bcad1604 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties @@ -348,4 +348,15 @@ Approvato = Approvato NonApprovato = Non approvato label-integrazione-05 = Richiesta Integrazione -label-integrazione-13 = Variante \ No newline at end of file +label-integrazione-13 = Variante + +tipo-avviso = Tipo di avviso +invia-avviso-avvio-procedimento-non-trovato = Avvio procedimento non trovato +invia-avviso-collaudo-non-trovato = Collaudo non trovato +invia-avviso-dettpratica-non-trovato = Dettaglio Pratica non trovato, contattare l'assistenza +invia-avviso-finelavori-non-trovato = Fine lavori non trovato +invia-avviso-progetto-inesistente = Numero di progetto non trovato +invia-avviso-progetto-obbligatorio = È obbligatorio specificare il numero del progetto +invia-avviso-tipo-obbligatorio = È obbligatorio specificare il tipo di avviso +invia-avviso-tipo-pratica-non-deposito = La pratica indicata non è un deposito +invia-avviso-variante-non-trovato = Variante non trovata \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index e3efa1fb..fddf072a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -449,7 +449,7 @@ public class SismicaUtil { for (ControlloPratica controllo : controlli) { controlloPraticaId = controllo.getControlloPraticaId(); } - String tipoDocumento = null; + String templateDocumento = null; String className = null; long classPk = 0L; switch (tipoAvviso) { @@ -467,7 +467,8 @@ public class SismicaUtil { SessionErrors.add(actionRequest, "invia-avviso-collaudo-non-trovato"); return; } - tipoDocumento = StatoPraticaConstants.VIDIMATA; + templateDocumento = StatoPraticaConstants.VIDIMATA; + tipoAvviso = templateDocumento; className = Collaudo.class.getName(); classPk = collaudo.getPrimaryKey(); controlloPraticaId = 0L; @@ -486,7 +487,8 @@ public class SismicaUtil { SessionErrors.add(actionRequest, "invia-avviso-finelavori-non-trovato"); return; } - tipoDocumento = StatoPraticaConstants.VIDIMATA; + templateDocumento = StatoPraticaConstants.VIDIMATA; + tipoAvviso = templateDocumento; className = FineLavori.class.getName(); classPk = fineLavoro.getPrimaryKey(); controlloPraticaId = 0L; @@ -504,7 +506,8 @@ public class SismicaUtil { SessionErrors.add(actionRequest, "invia-avviso-variante-non-trovato"); return; } - tipoDocumento = StatoPraticaConstants.VIDIMATA; + templateDocumento = StatoPraticaConstants.VIDIMATA; + tipoAvviso = templateDocumento; className = DettPratica.class.getName(); classPk = variante.getPrimaryKey(); controlloPraticaId = 0L; @@ -521,12 +524,17 @@ public class SismicaUtil { SessionErrors.add(actionRequest, "invia-avviso-avvio-procedimento-non-trovato"); return; } - tipoDocumento = StatoPraticaConstants.SOTTOPOSTA_A_PARERE; + templateDocumento = StatoPraticaConstants.SOTTOPOSTA_A_PARERE; + tipoAvviso = templateDocumento; className = DettPratica.class.getName(); classPk = praticaSp.getPrimaryKey(); controlloPraticaId = 0L; break; - case "avviso_vidimazione": + case "avviso_conformita": + if (!intPratica.getTipoPratica().equals(Constants.TIPO_PRATICA_DEPOSITO)) { + SessionErrors.add(actionRequest, "invia-avviso-tipo-pratica-non-deposito"); + return; + } List pratichePresentate = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId); DettPratica praticaPresentata = null; for (DettPratica el : pratichePresentate) { @@ -535,10 +543,11 @@ public class SismicaUtil { } } if (Validator.isNull(praticaPresentata)) { - SessionErrors.add(actionRequest, "invia-avviso-vidimazione-non-trovato"); + SessionErrors.add(actionRequest, "invia-avviso-conformita-non-trovato"); return; } - tipoDocumento = StatoPraticaConstants.VIDIMATA; + templateDocumento = "DPB2"; + tipoAvviso = StatoPraticaConstants.CONFORME; className = DettPratica.class.getName(); classPk = praticaPresentata.getPrimaryKey(); controlloPraticaId = 0L; @@ -547,12 +556,12 @@ public class SismicaUtil { SessionErrors.add(actionRequest, "operazione-non-supportata"); return; } - String templateName = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(tipoAvviso); + String templateName = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(templateDocumento); long template = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, templateName); esitoLog(esito, "template = " + templateName); try { AvvisoLocalServiceUtil.addAvviso(intPraticaId, StringPool.BLANK, new Date(), - AvvisoUtil.TIPO_AVVISO_DIRETTO, tipoDocumento, template, classPk, className, controlloPraticaId, + AvvisoUtil.TIPO_AVVISO_DIRETTO, tipoAvviso, template, classPk, className, controlloPraticaId, getServiceContextbyIntPratica(intPratica)); } catch (PortalException e) { SessionErrors.add(actionRequest, "errore-generico"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp index a0a446b9..577baa19 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp @@ -14,52 +14,41 @@ <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> <%@include file="/html/fascicolo/init.jsp"%> - <% - SearchContainer searchContainer = (SearchContainer) request - .getAttribute("liferay-ui:search:searchContainer"); - String redirect = ParamUtil.getString(request, "backUrl"); - IntPratica intPratica = null; - - boolean showExpanded = true; - if (searchContainer != null) { - redirect = searchContainer.getIteratorURL().toString(); - - ResultRow row = (ResultRow) request - .getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); - - intPratica = (IntPratica) row.getObject(); - - showExpanded = false; - } else { - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - } - - String randomId = StringUtil.randomId(); - String buttonIdCambiaStato = "buttonIdCambiaStato_"+randomId; - String buttonIdToggleSospensione = "buttonIdToggleSospensione_"+randomId; - String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_"+randomId; - String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_"+randomId; - String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_"+randomId; - - DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); - Map changeMap = null; - if (lastDettPratica == null) { - changeMap = new HashMap(); - } else { - changeMap = PraticaUtil.getStatusChangeMap(lastDettPratica.getDettPraticaId()); - } - List statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica())); - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); +String redirect = ParamUtil.getString(request, "backUrl"); +IntPratica intPratica = null; +boolean showExpanded = true; +if (searchContainer != null) { + redirect = searchContainer.getIteratorURL().toString(); + ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); + intPratica = (IntPratica) row.getObject(); + showExpanded = false; +} else { + long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); + intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +} +String randomId = StringUtil.randomId(); +String buttonIdCambiaStato = "buttonIdCambiaStato_" + randomId; +String buttonIdToggleSospensione = "buttonIdToggleSospensione_" + randomId; +String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_" + randomId; +String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_" + randomId; +String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId; +DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); +Map changeMap = null; +if (lastDettPratica == null) { + changeMap = new HashMap(); +} else { + changeMap = PraticaUtil.getStatusChangeMap(lastDettPratica.getDettPraticaId()); +} +List statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica())); +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - - - + + @@ -70,53 +59,52 @@ - <%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %> - - <%} %> - - + + - - + + + + + - - - - - - + + + + - - - <%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %> + + - <%} %> - - - - - - + + + + - - - - - + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp index 1e49a2f8..ab5b2ca5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp @@ -33,115 +33,96 @@ <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> <%@ include file="/html/gestioneattivita/init.jsp" %> <% - - SearchContainer searchContainer = (SearchContainer) request - .getAttribute("liferay-ui:search:searchContainer"); - String redirect = ParamUtil.getString(request, "backUrl"); - ControlloPratica controlloPratica = null; - - redirect = searchContainer.getIteratorURL().toString(); - - ResultRow row = (ResultRow) request - .getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); - - controlloPratica = (ControlloPratica) row.getObject(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId()); - Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL); - long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(),true); - - WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( - controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey()); - - List listaTask = null; - if (workflowInstanceLink == null) { - listaTask = new ArrayList(); - } else { - listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, - workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - } - - String randomId = StringUtil.randomId(); - - long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()).getDettPraticaId(); - - String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_"+randomId; - String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_"+randomId; - String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_"+randomId; - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); +String redirect = ParamUtil.getString(request, "backUrl"); +ControlloPratica controlloPratica = null; +redirect = searchContainer.getIteratorURL().toString(); +ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); +controlloPratica = (ControlloPratica) row.getObject(); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId()); +Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL); +long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(),true); +WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( + controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey()); +List listaTask = null; +if (workflowInstanceLink == null) { + listaTask = new ArrayList(); +} else { + listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, + workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); +} +String randomId = StringUtil.randomId(); +long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()).getDettPraticaId(); +String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + randomId; +String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId; +String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + randomId; +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> -
- +
<% - listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, - workflowInstanceLink.getWorkflowInstanceId(), true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), + null, workflowInstanceLink.getWorkflowInstanceId(), true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, + null); %> <% - PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS,controlPanelPlid, PortletRequest.RENDER_PHASE); - workflowTaskURL.setParameter("struts_action", - "/my_workflow_tasks/edit_workflow_task"); - workflowTaskURL.setParameter("workflowTaskId",String.valueOf(listaTask.get(0).getWorkflowTaskId())); - workflowTaskURL.setPortletMode(PortletMode.VIEW); - workflowTaskURL.setWindowState(LiferayWindowState.POP_UP); + PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS, + controlPanelPlid, PortletRequest.RENDER_PHASE); + workflowTaskURL.setParameter("struts_action", "/my_workflow_tasks/edit_workflow_task"); + workflowTaskURL.setParameter("workflowTaskId", String.valueOf(listaTask.get(0).getWorkflowTaskId())); + workflowTaskURL.setParameter("tab", tabs1); + workflowTaskURL.setPortletMode(PortletMode.VIEW); + workflowTaskURL.setWindowState(LiferayWindowState.POP_UP); %> - -
- +
+
"> + && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.ASSEGNA_AL_RUOLO) + && Validator.isNotNull(listaTask.get(0).getAssigneeUserId()) + && (listaTask.get(0).getAssigneeUserId() != -1) + && (listaTask.get(0).getName().equals(\"Assegnazione\") + || listaTask.get(0).getName().equals(\"Approvazione\")) %>"> - - - - + + + +
- - + - +
-
- @@ -151,7 +132,6 @@ -
@@ -165,47 +145,41 @@ - - -
+ +
- - - + - -
- +
- - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/init.jsp index ecff9832..334cbc75 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/init.jsp @@ -3,32 +3,23 @@ <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Role"%> <%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%> -<%@ include file="/html/init.jsp" %> - +<%@include file="/html/init.jsp"%> <%@page import="it.tref.liferay.portos.bo.search.ControlloPraticaAdvancedSearch"%> <%@page import="javax.portlet.PortletURL"%> - <% String tabNames = "Tab_MieiTask,Tab_TaskMieiRuoli,Tab_AtriTask,Tab_TaskCompletati"; - String tabs1 = ParamUtil.getString(request, "tabs1", StringUtil.split(tabNames)[0]); - Role ruoloDirigente = RoleLocalServiceUtil.getRole(company.getCompanyId(), "dirigente_generale"); - boolean isPortosPo = false; - List organizationList = user.getOrganizations(); -for(Organization org : organizationList){ - boolean appVerify = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),org.getGroupId(), "portos_po"); - if(appVerify){ - isPortosPo = true; - } +for (Organization org : organizationList) { + boolean appVerify = UserGroupRoleLocalServiceUtil + .hasUserGroupRole(user.getUserId(), org.getGroupId(), "portos_po"); + if (appVerify) { + isPortosPo = true; + } } - //Per esportazione - -String dataRichiestaInizio = ParamUtil.getString(renderRequest, "dataRichiestaInizio",""); -String dataRichiestaFine = ParamUtil.getString(renderRequest, "dataRichiestaFine",""); - +String dataRichiestaInizio = ParamUtil.getString(renderRequest, "dataRichiestaInizio", ""); +String dataRichiestaFine = ParamUtil.getString(renderRequest, "dataRichiestaFine", ""); %> - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp index 6d1604d0..2bbb1407 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sismica_administration/view.jsp @@ -13,13 +13,12 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa + message="Non è stato indicato nessun numero di progetto" /> + message="Non è stato trovato alcun collaudo completo e protocollato per il progetto selezionato" /> - + message="Non è stato trovato alcun fine lavori completo e protocollato per il progetto selezionato" />
@@ -28,7 +27,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
Form per reindicizzare un fascicolo
- +
@@ -39,7 +38,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
- +
@@ -57,7 +56,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa Ultimo Sorteggio lanciato il <%= dataSorteggio %>. Si è sicuri di volerlo lanciare?
- +
@@ -65,7 +64,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
Mostra configurazione server
- +
@@ -78,7 +77,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
Manutenzione database
- +
@@ -87,7 +86,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
Ripara documenti
- +
@@ -101,7 +100,7 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
Form per reimpostare i documenti alla firma
- +
@@ -111,30 +110,30 @@ String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(compa
<% - String tipoAvviso = ParamUtil.getString(renderRequest, "tipoAvviso", ""); - String numeroProgetto = ParamUtil.getString(renderRequest, "numeroProgetto", ""); + String tipoAvviso = ParamUtil.getString(renderRequest, "tipoAvviso", ""); + String numeroProgetto = ParamUtil.getString(renderRequest, "numeroProgetto", ""); %>
Invia avviso
- +
- - + + + selected="<%= tipoAvviso.equals(StatoPraticaConstants.COLLAUDO) %>" + value="<%= StatoPraticaConstants.COLLAUDO %>" /> + selected="<%= tipoAvviso.equals(StatoPraticaConstants.FINE_LAVORI) %>" + value="<%=StatoPraticaConstants.FINE_LAVORI%>" /> + selected='<%= tipoAvviso.equals("vidimazione_variante") %>' + value="vidimazione_variante" /> - + selected='<%= tipoAvviso.equals("avviso_avvio_proced") %>' + value="avviso_avvio_proced" /> +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp index 8d1750af..a5ecf336 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp @@ -36,19 +36,6 @@ if (searchContainer != null) { } String intPraticaIdString = String.valueOf(intPratica.getIntPraticaId()); String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPraticaIdString; -if (intPratica.getNumeroProgetto().equals("88320")) { - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPratica.getIntPraticaId(), - Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); - if (Validator.isNotNull(dettPratica)) { - System.out.println("########### return false;"); - } - System.out.println("########### 1 " + (intPratica.getStatus() != WorkflowConstants.STATUS_ANY)); - System.out.println("########### 2 " + (intPratica.getStatus() != WorkflowConstants.STATUS_INCOMPLETE)); - System.out.println("########### 3 " + intPratica.getStatoPratica()); - System.out.println("########### 4 " + ValidazionePraticaUtil.praticaCanAddIntegrazione(intPratica.getIntPraticaId())); - System.out.println("########### 5 " + AzioniPraticheUtil.isAllowedAction(intPratica.getIntPraticaId(), - AzioniPraticheUtil.ACTION_INTEGRAZIONE)); -} %> diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf index 202c23e9..854f7b40 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf @@ -37,10 +37,7 @@ <% - -//ADT: bug bo id=33 -Map historyWorkflowEsitiLogs = (Map)request.getAttribute("historyWorkflowEsitiLogs"); - +Map historyWorkflowEsitiLogs = (Map) request.getAttribute("historyWorkflowEsitiLogs"); for (WorkflowLog workflowLog : workflowLogs) { Role curRole = null; User curUser = null; @@ -60,143 +57,144 @@ for (WorkflowLog workflowLog : workflowLogs) { kaleoNodeName = jsonObject.getString("kaleoNodeName"); transitionName = jsonObject.getString("transitionName"); } catch (JSONException e) { - kaleoNodeName = workflowLog.getState(); + kaleoNodeName = workflowLog.getState(); + } + String comment = null; + String tabProvenienza = null; + try { + JSONObject jsonObject = JSONFactoryUtil.createJSONObject(workflowLog.getComment()); + comment = jsonObject.getString("comment"); + tabProvenienza = jsonObject.getString("tab"); + } catch (JSONException e) { + comment = workflowLog.getComment(); } - %> - - - - - - - <%= dateFormatDateTime.format(workflowLog.getCreateDate()) %> - - - - -
- - - - - - - <% - //ADT: bug bo id=33 - String esito = (String)request.getAttribute("registra-esito-value"); - if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ - esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); - } - %> - - - - <% - String assegna = (String)request.getAttribute("assegna-value"); - %> - - - - - - - - - - - -   - -
- - -
- -
- - -
- -
- - + + + <%= dateFormatDateTime.format(workflowLog.getCreateDate()) %> + + + + +
- -
- -
+ + - <% - if (curRole == null) { - String assignerName = PortalUtil.getUserName(workflowLog.getAuditUserId(), StringPool.BLANK); - %> -
- - - - -
- <% - } - else { - %> -
- -
- <% - } - %> + + <% + String esito = (String) request.getAttribute("registra-esito-value"); + if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ + esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); + } + %> + + + + <% + String assegna = (String)request.getAttribute("assegna-value"); + %> + + + + + - - - - - <% - if(Validator.isNotNull(kaleoNodeName)){ - out.print(kaleoNodeName); - if(Validator.isNotNull(transitionName)){ - if("registra-esito".equalsIgnoreCase(transitionName)){ - //out.print(" ( " + (String)request.getAttribute("registra-esito-value") + " ) "); - //ADT BUG BO ID=33 - String esito = (String)request.getAttribute("registra-esito-value"); - if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ - esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); + + + + +   + +
+ + +
+ +
+ + +
+ +
+ + + + +
+ + + () + +
+ + + <% + if (curRole == null) { + String assignerName = PortalUtil.getUserName(workflowLog.getAuditUserId(), StringPool.BLANK); + %> +
+ + + + +
+ <% + } else { + %> +
+ +
+ <% } - out.print(" ( " + esito + " ) "); - - } else if("assegna".equalsIgnoreCase(transitionName)){ - out.print(" ( " + (String)request.getAttribute("assegna-value") + " ) "); - } - + %> + + + + + + + <% + if (Validator.isNotNull(kaleoNodeName)) { + out.print(kaleoNodeName); + if (Validator.isNotNull(transitionName)) { + if ("registra-esito".equalsIgnoreCase(transitionName)) { + String esito = (String)request.getAttribute("registra-esito-value"); + if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ + esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); } + out.print(" ( " + esito + " ) "); + } else if ("assegna".equalsIgnoreCase(transitionName)) { + out.print(" ( " + (String)request.getAttribute("assegna-value") + " ) "); } - %> - - - -
-
-

<%= dateFormatDateTime.format(workflowLog.getCreateDate()) %>

-

- - <%= curUser.getFullName() %> - -

-
-
- <%= HtmlUtil.escape(workflowLog.getComment()) %> -
-
- - - + } + } + %> + + + +
+
+

<%= dateFormatDateTime.format(workflowLog.getCreateDate()) %>

+

+ + <%= curUser.getFullName() %> + +

+
+
+ <%= HtmlUtil.escape(comment) %> +
+
+ + + <% } %> @@ -234,29 +232,28 @@ for (WorkflowLog workflowLog : workflowLogs) { padding-bottom: 40px!important; } .post-it-note { - min-width: 13em; - background: rgb(255,215,7); - position: relative; - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ + min-width: 13em; + background: rgb(255,215,7); + position: relative; } .post-it-note:after { - content: ""; - position: absolute; - bottom: -2em; - left: 0; - right: 2em; - border-width: 1em; - border-style: solid; - border-color: rgb(255,215,7); + content: ""; + position: absolute; + bottom: -2em; + left: 0; + right: 2em; + border-width: 1em; + border-style: solid; + border-color: rgb(255,215,7); } .post-it-note:before { - content: ""; - position: absolute; - bottom: -2em; - right: 0; - border-width: 2em 2em 0 0; - border-style: solid; - border-color: #d3b100 transparent; + content: ""; + position: absolute; + bottom: -2em; + right: 0; + border-width: 2em 2em 0 0; + border-style: solid; + border-color: #d3b100 transparent; } .header-post-it { diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp index cc2a777d..33b59d7e 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/edit_workflow_task.jsp @@ -97,7 +97,7 @@ else { viewFullContentURLString = viewFullContentURL.toString(); } - +String tab = ParamUtil.getString(request, "tab", StringPool.BLANK); request.setAttribute(WebKeys.WORKFLOW_ASSET_PREVIEW, Boolean.TRUE); %> @@ -211,9 +211,7 @@ request.setAttribute(WebKeys.WORKFLOW_ASSET_PREVIEW, Boolean.TRUE);
-
-

Azioni

@@ -222,7 +220,6 @@ request.setAttribute(WebKeys.WORKFLOW_ASSET_PREVIEW, Boolean.TRUE); %> -
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp index 0bbab4d6..62c30d5d 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp @@ -47,6 +47,7 @@ else { } long[] pooledActorsIds = WorkflowTaskManagerUtil .getPooledActorsIds(company.getCompanyId(), workflowTask.getWorkflowTaskId()); +String tab = ParamUtil.getString(request, "tab", StringPool.BLANK); %>
@@ -113,15 +114,11 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil + - + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar new file mode 100644 index 00000000..71714a3c Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties index 1f5d2523..868e6b08 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties @@ -13,3 +13,8 @@ error-portos-kaleo-required = {0} campo obbligatorio x-assigned-the-task-to-x = L'attività è stata assegnata a {1} x-completed-the-task-x-y={0} ha completato l'attività {1} ({2}). x-sent-signal-x=Il sistema ha inviato un segnale {1}. + +Tab_MieiTask = Pratica prelevata da le mie attività +Tab_TaskMieiRuoli = Pratica prelevata da attività dei miei ruoli +Tab_AtriTask = Pratica prelevata da altre attività +Tab_TaskCompletati = Pratica prelevata da attività completate diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java index 866d53ed..96f207c7 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java @@ -41,6 +41,7 @@ import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.json.JSONSerializer; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.portlet.DynamicActionRequest; import com.liferay.portal.kernel.servlet.BrowserSnifferUtil; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.servlet.SessionMessages; @@ -97,7 +98,16 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { String cmd = ParamUtil.getString(actionRequest, Constants.CMD); - if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) { + if (cmd.equals(Constants.ASSIGN)) { + Map info = new HashMap<>(); + info.put("comment", ParamUtil.getString(actionRequest, "comment", StringPool.BLANK)); + info.put("tab", ParamUtil.getString(actionRequest, "tab", StringPool.BLANK)); + String json = JSONFactoryUtil.createJSONSerializer().serializeDeep(info); + DynamicActionRequest dynamicActionRequest = new DynamicActionRequest(actionRequest); + dynamicActionRequest.setParameter("comment", json); + originalStrutsPortletAction.processAction(originalStrutsPortletAction, portletConfig, dynamicActionRequest, + actionResponse); + } else if (cmd.equals(Constants.SAVE) || cmd.equals(Constants.RESET)) { try { if (cmd.equals(Constants.SAVE)) { completeTask(actionRequest); @@ -112,8 +122,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { + SessionMessages.KEY_SUFFIX_CLOSE_REDIRECT, closeRedirect); } sendRedirect(actionRequest, actionResponse, redirect); - } - catch (Exception e) { + } catch (Exception e) { if (e instanceof WorkflowTaskDueDateException) { SessionErrors.add(actionRequest, e.getClass()); } else if (e instanceof PrincipalException || e instanceof WorkflowException) { @@ -296,8 +305,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { if (layoutTypePortlet.hasPortletId(portletId)) { return true; } - } - catch (PortalException pe) { + } catch (PortalException pe) { if (_log.isDebugEnabled()) { _log.debug(pe, pe); } @@ -497,14 +505,12 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { } } } - } - catch (Exception e) { + } catch (Exception e) { // l'errore non va gestito e.printStackTrace(); } } - } - catch (Exception e) { + } catch (Exception e) { _log.error("Errore in getHistoryWorkflowLogs", e); } return esitiMapByWorkflowLogID; @@ -513,7 +519,6 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { /** * ADT: check congruenza WF - presenza dell'istruttore * - * * @param transitionName * @param workflowTaskId */ @@ -553,8 +558,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { + controlloPratica.getControlloPraticaId()); } } - } - catch (Exception e) { + } catch (Exception e) { _log.error("checkPresenzaIstruttore KO per workflowTaskId = " + workflowTaskId + " [" + e.getMessage() + " , " + e.getCause() + "]"); } diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 4296428d..db20086c 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=40 - build.date=1636729923800 + build.number=41 + build.date=1644918876973 build.auto.upgrade=true ##