diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar deleted file mode 100644 index a4ad0aa8..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-io.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-io.jar deleted file mode 100644 index 00556b11..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-io.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar deleted file mode 100644 index a2c13d9a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar deleted file mode 100644 index 67a35fcb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar deleted file mode 100644 index 46733464..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar and /dev/null differ 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 71c7d22c..4e7754d9 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 @@ -129,12 +129,6 @@ true true - - 10 - /icon.png - tempistiche-portlet - true - 11 /icon.png 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 36cd5677..e976e342 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 @@ -270,40 +270,6 @@ user - - 10 - Tempistiche - - it.tref.liferay.portos.bo.portlet.TempistichePortlet - - - view-template - /html/tempistiche/view.jsp - - 0 - - text/html - view - - content.Language - - Tempistiche - 10 - - - - administrator - - - guest - - - power-user - - - user - - 11 Generate Protocollo Csv 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 f68357c5..2b769904 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=3347 - build.date=1631524835570 + build.number=3348 + build.date=1631526462579 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/tld/c.tld deleted file mode 100644 index 98efa6a6..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/tld/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.2 core library - JSTL core - 1.2 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - com.liferay.taglib.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - com.liferay.taglib.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - com.liferay.taglib.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - com.liferay.taglib.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/init.jsp deleted file mode 100644 index 1def1ea0..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/init.jsp +++ /dev/null @@ -1,7 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> - -<% -Format dateFormat = FastDateFormatFactoryUtil.getDate(locale); -Format dateTimeFormat = FastDateFormatFactoryUtil.getDateTime(locale); -%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/view.jsp deleted file mode 100644 index ce12242e..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/tempistiche/view.jsp +++ /dev/null @@ -1,383 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.service.impl.AvvisoLocalServiceImpl"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.util.TempisticaConstants"%> -<%@page import="com.liferay.portal.security.permission.ActionKeys"%> -<%@page import="com.liferay.portlet.PortletURLUtil"%> -<%@page import="javax.portlet.PortletURL"%> -<%@page import="java.util.List"%> -<%@page import="com.liferay.portal.kernel.exception.PortalException"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> -<%@page import="com.liferay.portal.model.User"%> -<%@page import="java.util.concurrent.TimeUnit"%> -<%@page import="com.liferay.portal.kernel.util.DateUtil"%> -<%@page import="java.util.Calendar"%> -<%@page import="org.apache.commons.lang.time.DateUtils"%> -<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> -<%@page import="com.liferay.portal.kernel.util.StringPool"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portal.kernel.util.Validator"%> -<%@page import="java.util.Date"%> -<%@page import="java.text.Format"%> -<%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%> - -<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> -<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.Comune"%> -<%@page import="it.tref.liferay.portos.bo.model.Territorio"%> -<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> - -<%@page import="javax.portlet.PortletURL"%> - -<%@include file="/html/tempistiche/init.jsp" %> - -<% - long companyId = company.getCompanyId(); - long groupId = 0l; - boolean fromPopUp = renderRequest.getWindowState().equals(LiferayWindowState.POP_UP); - - //ADT - BUG-14 - Scadenziario - //ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca - String tmpStatoPratica = request.getParameter("statoPratica"); - Integer statoPratica = Validator.isNotNull(tmpStatoPratica) && !"".equals(tmpStatoPratica.trim()) ? Integer.parseInt(tmpStatoPratica) : null; - - PortletURL portletURL = renderResponse.createRenderURL(); - portletURL.setParameter("statoPratica", request.getParameter("statoPratica")); - - //ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca - String tipoPratica = request.getParameter("tipoPratica"); - String istruttore = request.getParameter("istruttore"); - if(Validator.isNotNull(tipoPratica)) - portletURL.setParameter("tipoPratica", tipoPratica); - if(Validator.isNotNull(istruttore)) - portletURL.setParameter("istruttore", istruttore); -%> - - - -
-
-
-
- - - - -<%-- --%> - - -
-
-
- - Seleziona il tipo di pratica - - - - -
-
- -
-
- - Seleziona la scadenza - - - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% - Long intPraticaId = (Long) tempistica[0]; - Long start = (Long) tempistica[1]; - Long stop = (Long) tempistica[2]; - Long wait = (Long) tempistica[3]; - Long calcoloTempo = (Long) tempistica[4]; - Integer stato = (Integer) tempistica[5]; - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); - %> - - - - - - - <%= intPratica.getTitle(locale, true) %> - - - - <% - User istruttoreUser = null; - long statusByUserId = intPratica.getStatusByUserId(); - if (Validator.isNotNull(statusByUserId)) { - try { - istruttoreUser = UserLocalServiceUtil.getUser(statusByUserId); - } catch(PortalException e) { - } - } - %> - - <%= istruttoreUser.getFullName() + StringPool.SPACE - + StringPool.OPEN_PARENTHESIS + istruttoreUser.getScreenName() + StringPool.CLOSE_PARENTHESIS %> - - - - - <%= provincia.getProvincia()+" - "+comune.getDenominazione() %> - - - - - - - - <%=TempisticaLocalServiceUtil.getDtSottopostaAParere(intPraticaId) %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% - String urlDettaglioPratica = StringPool.BLANK; - if (fromPopUp) { - urlDettaglioPratica = FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()); - } - else { - urlDettaglioPratica = FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()); - } - %> - - - - - - - - - - - - - -
-
-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - <% - Long intPraticaId = (Long) tempistica[0]; - Long start = (Long) tempistica[1]; - Long calcoloTempo = (Long) tempistica[2]; - Integer stato = (Integer) tempistica[3]; - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); - Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia()); - %> - - - - - - - - <%= intPratica.getTitle(locale, true) %> - - - - <% - User istruttoreUser = null; - long statusByUserId = intPratica.getStatusByUserId(); - if (Validator.isNotNull(statusByUserId)) { - try { - istruttoreUser = UserLocalServiceUtil.getUser(statusByUserId); - } catch(PortalException e) { - } - } - %> - - <%= istruttoreUser.getFullName() + StringPool.SPACE - + StringPool.OPEN_PARENTHESIS + istruttoreUser.getScreenName() + StringPool.CLOSE_PARENTHESIS %> - - - - - <%= provincia.getProvincia()+" - "+comune.getDenominazione() %> - - - - <% - //out.print(dateFormat.format(intPratica.getDtPratica())); - //ADT: bug scadenzario- data invio = data invio integrazione - Avviso avv = AvvisoLocalServiceUtil.getLastAvvisoIntegrazione(intPratica.getIntPraticaId()); - if (avv!=null && avv.getDtInvio()!=null){ - out.print(dateFormat.format(avv.getDtInvio())); - }else{ - out.print(dateFormat.format(intPratica.getDtPratica())); - } - %> - - - - - - - - - - - - - - - - - - - <% - String urlDettaglioPratica = FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()); - %> - - - - - - - - - - - - - -
-
-
-
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/notification/portlet/NotificationPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/notification/portlet/NotificationPortlet.java index 81b4071f..0aaecabe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/notification/portlet/NotificationPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/notification/portlet/NotificationPortlet.java @@ -1,10 +1,6 @@ package it.tref.liferay.portos.notification.portlet; -import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ClpSerializer; -import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.Constants; import java.io.IOException; @@ -14,10 +10,6 @@ import javax.portlet.PortletException; import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; -import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil; -import com.liferay.portal.kernel.dao.orm.DynamicQuery; -import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; -import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -33,8 +25,6 @@ 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.workflow.kaleo.model.KaleoTaskInstanceToken; -import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServiceUtil; import com.liferay.util.bridges.mvc.MVCPortlet; /** @@ -45,39 +35,30 @@ public class NotificationPortlet extends MVCPortlet { private static final Log _log = LogFactoryUtil.getLog(NotificationPortlet.class); @Override - public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) - throws IOException, PortletException { + public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, + PortletException { String id = resourceRequest.getResourceID(); - try { - ServiceContext serviceContext = ServiceContextFactory.getInstance(resourceRequest); - long companyId = serviceContext.getCompanyId(); - // long groupId = serviceContext.getScopeGroupId(); long userId = serviceContext.getUserId(); - int count = 0; - if ("countTasksUser".equals(id)) { try { count = WorkflowTaskManagerUtil.getWorkflowTaskCountByUser(companyId, userId, false); - } catch (WorkflowException e) { - } + } catch (WorkflowException e) {} } else if ("countTasksUserRoles".equals(id)) { try { count = WorkflowTaskManagerUtil.getWorkflowTaskCountByUserRoles(companyId, userId, false); - } catch (WorkflowException e) { - } + } catch (WorkflowException e) {} } else if ("countTaksGestioneFirmeMie".equals(id)) { - count = AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirmaByCF(companyId, - UserLocalServiceUtil.getUser(userId).getScreenName()); + count = AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirmaByCF(companyId, UserLocalServiceUtil + .getUser(userId).getScreenName()); } else if ("countTaksGestioneFirme".equals(id)) { long[] groupIds = new long[0]; - - List organizations = OrganizationLocalServiceUtil - .getUserOrganizations(serviceContext.getUserId()); + List organizations = OrganizationLocalServiceUtil.getUserOrganizations(serviceContext + .getUserId()); for (Organization organization : organizations) { if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(serviceContext.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)) { @@ -89,87 +70,35 @@ public class NotificationPortlet extends MVCPortlet { } count = AvvisoLocalServiceUtil.countAvvisiDaFirmarePrimaFirma(companyId, groupIds); } else if ("countPraticheInScadenza".equals(id)) { - count = TempisticaLocalServiceUtil.countScadenzePraticheInScadenza(companyId, 0l); + count = 0; } else if ("countPraticheScadute".equals(id)) { - count = TempisticaLocalServiceUtil.countScadenzePraticheScadute(companyId, 0l); + count = 0; } else if ("countIntegrazioniScadute".equals(id)) { - count = TempisticaLocalServiceUtil.countScadenzeIntegrazioniScadute(companyId, 0l); + count = 0; } else if ("countPraticheAttive".equals(id)) { - count = TempisticaLocalServiceUtil.countPraticheAttive(companyId, 0l); + count = 0; } else if ("countPraticheAttiveAssegnazione".equals(id)) { - count = getCountPraticheAssegnazione(companyId, 0l, false); - } else if ("countPraticheAttiveOrdinarie".equals(id)) { count = getCountPraticheAssegnazione(companyId, 0l, true); } - JSONObject obj = JSONFactoryUtil.createJSONObject(); obj.put("count", count); - writeJSON(resourceRequest, resourceResponse, obj); - - } catch (PortalException e) { - _log.error("Error", e); - throw new PortletException(e); - } catch (SystemException e) { + } catch (PortalException | SystemException e) { _log.error("Error", e); throw new PortletException(e); } - } - private int getCountPraticheAssegnazione(long companyId, long groupId, boolean ordinarie) - throws SystemException { - - ClassLoader classLoaderBO = (ClassLoader) PortletBeanLocatorUtil.locate( - ClpSerializer.getServletContextName(), "portletClassLoader"); - - ClassLoader classLoader = (ClassLoader) PortletBeanLocatorUtil.locate( - com.liferay.portal.workflow.kaleo.service.ClpSerializer.getServletContextName(), - "portletClassLoader"); - - List pratiche = TempisticaLocalServiceUtil.countPraticheAttivePerDiscriminazione(companyId, 0l); + private int getCountPraticheAssegnazione(long companyId, long groupId, boolean ordinarie) throws SystemException { int countControlloDaAssegnare = 0; int countControlloOrdinarie = 0; - - for (Long intPraticaId : pratiche) { - - DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class, classLoaderBO); - query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - - List lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query); - if (lista != null && !lista.isEmpty()) { - - ControlloPratica controlloPratica = lista.get(0); - if (controlloPratica != null) { - - DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class, - classLoader); - queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", - controlloPratica.getControlloPraticaId())); - queryKaleo.add(RestrictionsFactoryUtil.eq("className", ControlloPratica.class.getName())); - queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione")); - queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false)); - - List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil - .dynamicQuery(queryKaleo); - if (listaKaleo != null && !listaKaleo.isEmpty()) { - countControlloDaAssegnare++; - } else { - countControlloOrdinarie++; - - } - } - } - } - if (ordinarie) { return countControlloOrdinarie; } else { return countControlloDaAssegnare; } } - }