diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-display.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-display.xml index 9ec14628..3d76c594 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-display.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-display.xml @@ -14,6 +14,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml index 2039d4cb..5422c1ec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -203,6 +203,13 @@ /js/main.js?v=4 13-portlet + + 14 + /icon.png + /css/main.css?v=4 + /js/main.js?v=4 + 13-portlet + administrator Administrator diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml index e43cbf95..1778a424 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml @@ -565,4 +565,38 @@ user + + 14 + Pannello Controllo Fine Lavori/Collaudo + + it.tref.liferay.portos.bo.portlet.FineLavoriCollaudoPanel + + + view-template + /html/flcollaudopanel/view.jsp + + 0 + + text/html + view + + content.Language + + Pannello Controllo Fine Lavori/Collaudo + 14 + + + + administrator + + + guest + + + power-user + + + user + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FineLavoriCollaudoPanel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FineLavoriCollaudoPanel.java new file mode 100644 index 00000000..df74d5b0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FineLavoriCollaudoPanel.java @@ -0,0 +1,13 @@ +package it.tref.liferay.portos.bo.portlet; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.util.bridges.mvc.MVCPortlet; + +public class FineLavoriCollaudoPanel extends MVCPortlet { + + + + + private Log _log = LogFactoryUtil.getLog(FineLavoriCollaudoPanel.class); +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java index 50fd7765..662c8cc8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java @@ -287,12 +287,12 @@ public class SchedulerInvioDocumento implements MessageListener { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); tipoAllegato += LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (fineLavori.getParziale() ? "09" : "07")) - + " n° " + fineLavori.getNumero(); + + " n° " + fineLavori.getNumero(); } else if (avviso.getClassName().equals(Collaudo.class.getName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); tipoAllegato += LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (collaudo.getParziale() ? "10" : "08")) - + " n° " + collaudo.getNumero(); + + " n° " + collaudo.getNumero(); } } } else { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index caccb78f..d0aca856 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -133,7 +133,8 @@ public class SchedulerPratiche implements MessageListener { PrincipalThreadLocal.setName(user.getUserId()); PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - if (!fineLavori.isParziale() && fineLavori.isRichiestaAttestazione()) { +// if (!fineLavori.isParziale() && fineLavori.isRichiestaAttestazione()) { + if (fineLavori.isRichiestaAttestazione()) { creaAvvisoVidimazione(fineLavori.getCompanyId(), fineLavori.getGroupId(), fineLavori.getUserId(), fineLavori.getIntPraticaId(), fineLavori.getFineLavoriId(), FineLavori.class.getName()); @@ -273,7 +274,7 @@ public class SchedulerPratiche implements MessageListener { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); intPratica = assegnaNumeroProgetto(intPratica); String tipoIntegrazione = dettPratica.getTipoIntegrazione(); - // 1º Avviso di ricezione corretta o in errore della pratica + // 1º Avviso di ricezione corretta o in errore della pratica int count = AvvisoLocalServiceUtil.countAvvisoByClassPk_ClassName(dettPratica.getDettPraticaId(), DettPratica.class.getName()); // in caso di errore non genere un nuovo avviso diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/init.jsp new file mode 100644 index 00000000..87f4525a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/init.jsp @@ -0,0 +1,2 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@include file="/html/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/view.jsp new file mode 100644 index 00000000..649cf61d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/flcollaudopanel/view.jsp @@ -0,0 +1,2 @@ +<%@ include file="/html/flcollaudopanel/init.jsp" %> + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file