diff --git a/jasper/Modello_autorizzazione.jrxml b/jasper/Modello_autorizzazione.jrxml index 5edb49e1..d76de27d 100644 --- a/jasper/Modello_autorizzazione.jrxml +++ b/jasper/Modello_autorizzazione.jrxml @@ -77,7 +77,7 @@ e dell'identità siciliana]]> - + @@ -103,118 +103,113 @@ e dell'identità siciliana]]> - - - - - - - - - - - + - - - - - - - - - - - + - - + + + + - + - + - + - + - - + + - + + + + - + - + - + - + - - + + - + - - + + - - + + - - - - + + + + - + + + + + + + + + + + - + @@ -300,27 +295,30 @@ e dell'identità siciliana]]> esaminata la documentazione allegata all’istanza;]]> - + - + - + - + + + + - + @@ -350,6 +348,21 @@ esaminata la documentazione allegata all’istanza;]]> + + + + + + + + + + + + + + + @@ -358,7 +371,7 @@ esaminata la documentazione allegata all’istanza;]]> - + - + - - - - - - - @@ -103,163 +96,185 @@ e dell'identità siciliana]]> - - + + + + + + + + + + + - + - + - + - + - + - + - - + + - + + + + - + - + - - - - - - - - - - - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - - + + + + + + + + + + + + + - + - + + - - + + + + - + - - - - + + + + + - + - - + + - + + + @@ -267,38 +282,27 @@ e dell'identità siciliana]]> - + - - - - - - - - - - - + - + - + + + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index 1d32a3c5..a5eb2eee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -41,7 +41,6 @@ import java.util.Calendar; import java.util.List; import java.util.Locale; import java.util.Map; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.language.LanguageUtil; @@ -176,6 +175,14 @@ public class ReportAvvisoBeanBuilder { DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO)) { docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(intPraticaId, DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO, -1, -1); + } else if (avviso.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.AUTORIZZATA) + && (avviso.getControlloPraticaId() != 0)) { + docPraticas = new ArrayList<>(); + for (DocPratica doc : DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId)) { + if ((WorkflowConstants.STATUS_APPROVED == doc.getStatus()) && !doc.getRimosso()) { + docPraticas.add(doc); + } + } } else { docPraticas = DocPraticaLocalServiceUtil.findByClassPk(avviso.getClassPk()); } @@ -328,6 +335,7 @@ public class ReportAvvisoBeanBuilder { if (Validator.isNull(parameters.get("motivazioni"))) parameters.put("motivazioni", parameters.get("testo_del_documento")); } + return bean; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 071234e2..65e8a1e7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -495,10 +495,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getJsonListaIstruttori(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - _log.info("Inizio attività"); ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil .getControlloPratica(controlloPraticaId); - _log.info("Controllo pratica " + controlloPratica.getControlloPraticaId()); JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 865fc16a..8d027839 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2759 - build.date=1606818542516 + build.number=2761 + build.date=1606987208464 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-java.jar new file mode 100644 index 00000000..6b5d95f8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-java.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java index 967ba906..6931e006 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException; import it.tref.liferay.portos.mailmanager.model.EmailAttachment; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentModelImpl; +import it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java index 12f7c61e..6b806a45 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailException; import it.tref.liferay.portos.mailmanager.model.Email; import it.tref.liferay.portos.mailmanager.model.impl.EmailImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailModelImpl; +import it.tref.liferay.portos.mailmanager.service.persistence.EmailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java index c7944800..b4583674 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailTemplateException; import it.tref.liferay.portos.mailmanager.model.EmailTemplate; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateModelImpl; +import it.tref.liferay.portos.mailmanager.service.persistence.EmailTemplatePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index 648d7e60..d743bad0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=80 - build.date=1606482952219 + build.number=81 + build.date=1606914570374 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath index b3161233..14d11aa5 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath @@ -23,6 +23,5 @@ - diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp index 9cd28488..3fc0a917 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp @@ -1,3 +1,4 @@ +<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%> <%@page import="java.io.Serializable"%> <%@page import="java.nio.file.Files"%> <%@page import="java.nio.file.Path"%> @@ -22,148 +23,146 @@ <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%> <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMTemplate"%> -<%@ include file="/html/portlet/workflow_tasks/init.jsp" %> +<%@ include file="/html/portlet/workflow_tasks/init.jsp"%> <% String classPkForCarichiLavoro = (String) renderRequest.getAttribute("classPkForCarichiLavoro"); %> - +
- - + + - + Visualizza Carichi di Lavoro Istruttori
<% + long ddmTemplateId = (Long) renderRequest.getAttribute("ddmTemplateId"); + long ddmStructureId = (Long) renderRequest.getAttribute("ddmStructureId"); + Map parameters = (Map) renderRequest + .getAttribute("parameters"); + String prefix = (String) renderRequest.getAttribute("prefix"); + String suffix = (String) renderRequest.getAttribute("suffix"); + Map>> fieldNameOptions = (Map>>) renderRequest + .getAttribute("fieldNameOptions"); -long ddmTemplateId = (Long) renderRequest.getAttribute("ddmTemplateId"); -long ddmStructureId = (Long) renderRequest.getAttribute("ddmStructureId"); -Map parameters = (Map) renderRequest.getAttribute("parameters"); -String prefix = (String) renderRequest.getAttribute("prefix"); -String suffix = (String) renderRequest.getAttribute("suffix"); -Map>> fieldNameOptions - = (Map>>) renderRequest.getAttribute("fieldNameOptions"); - -String redirect = StringPool.BLANK; + String redirect = StringPool.BLANK; -DDLRecord record = null; + DDLRecord record = null; -long recordId = BeanParamUtil.getLong(record, request, "recordId"); + long recordId = BeanParamUtil.getLong(record, request, "recordId"); -DDLRecordVersion recordVersion = null; + DDLRecordVersion recordVersion = null; -if (record != null) { - recordVersion = record.getLatestRecordVersion(); -} + if (record != null) { + recordVersion = record.getLatestRecordVersion(); + } -DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getDDMStructure(ddmStructureId); + DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getDDMStructure(ddmStructureId); -Fields fields = null; + Fields fields = null; -if (recordVersion != null) { - fields = StorageEngineUtil.getFields(recordVersion.getDDMStorageId()); -} + if (recordVersion != null) { + fields = StorageEngineUtil.getFields(recordVersion.getDDMStorageId()); + } -Locale[] availableLocales = new Locale[0]; + Locale[] availableLocales = new Locale[0]; -if (fields != null) { - Set availableLocalesSet = fields.getAvailableLocales(); + if (fields != null) { + Set availableLocalesSet = fields.getAvailableLocales(); - availableLocales = availableLocalesSet.toArray(new Locale[availableLocalesSet.size()]); -} + availableLocales = availableLocalesSet.toArray(new Locale[availableLocalesSet.size()]); + } -String defaultLanguageId = StringPool.BLANK; + String defaultLanguageId = StringPool.BLANK; -if (Validator.isNull(defaultLanguageId)) { - defaultLanguageId = themeDisplay.getLanguageId(); + if (Validator.isNull(defaultLanguageId)) { + defaultLanguageId = themeDisplay.getLanguageId(); - if (fields != null) { - defaultLanguageId = LocaleUtil.toLanguageId(fields.getDefaultLocale()); + if (fields != null) { + defaultLanguageId = LocaleUtil.toLanguageId(fields.getDefaultLocale()); + } } -} -String languageId = defaultLanguageId; + String languageId = defaultLanguageId; -boolean translating = false; + boolean translating = false; -if (!defaultLanguageId.equals(languageId)) { - translating = true; -} + if (!defaultLanguageId.equals(languageId)) { + translating = true; + } -if (translating) { - redirect = currentURL; -} + if (translating) { + redirect = currentURL; + } -long classNameId = PortalUtil.getClassNameId(DDMStructure.class); + long classNameId = PortalUtil.getClassNameId(DDMStructure.class); -long classPK = ddmStructure.getStructureId(); + long classPK = ddmStructure.getStructureId(); -if (ddmTemplateId > 0) { - classNameId = PortalUtil.getClassNameId(DDMTemplate.class); + if (ddmTemplateId > 0) { + classNameId = PortalUtil.getClassNameId(DDMTemplate.class); - classPK = ddmTemplateId; -} + classPK = ddmTemplateId; + } %> - + <% - Log _log = LogFactoryUtil.getLog("kaleo_merda"); + String esito = parameters.containsKey("esito") ? parameters.get("esito").toString() + : StringPool.BLANK; + String istruttore = parameters.containsKey("istruttore") ? parameters.get("istruttore") + .toString() : StringPool.BLANK; String ns = renderResponse.getNamespace(); - for (Entry>> entry : fieldNameOptions.entrySet()) { - String name = entry.getKey(); - _log.info("name = "+ name); - for (Map option : entry.getValue()) { - for (Entry x : option.entrySet()) { - _log.info(" - " + x.getKey() + " = " + x.getValue()); - } - } - String regexSelect = "(?s)(.*?)()(.*)"; + + for (Entry>> entry : fieldNameOptions.entrySet()) { + String name = entry.getKey(); + String regexSelect = "(?s)(.*?)()(.*)"; if (html.matches(regexSelect)) { String match = html.replaceAll(regexSelect, "$2"); String select = match.replaceAll("(?s)([?>]*>).*", "$1\n"); for (Map option : entry.getValue()) { - select += "\n"; + String value = option.get("value").toString(); + select += "