diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar index 1e307ff5..f442b300 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index d8c83f70..4f7c7fff 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar index a2ad83f9..1dc53cda 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar index d5dbced2..7b4f112d 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar index 0d429312..8d5da7b3 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ 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-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/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar index 1e307ff5..f442b300 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index b14cfcda..0e3f9d35 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index d8c83f70..4f7c7fff 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index a2ad83f9..1dc53cda 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index d5dbced2..7b4f112d 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 0d429312..8d5da7b3 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar 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 6d182ade..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/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java index 48da31dc..95741608 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java @@ -137,6 +137,7 @@ public class AsseverazioniUtil { put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, Arrays.asList(TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.DIRETTORE_LAVORI)); put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A29, Arrays.asList(TipoSoggettoUtil.DIRETTORE_LAVORI)); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA, Arrays.asList(TipoSoggettoUtil.COMMITTENTE)); // Domanda put(ASSEVERAZIONI_DOMANDA, Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.COLLAUDATORE)); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index a6461bbe..82a8a4d9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -37,6 +37,7 @@ import java.util.Set; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.mime.HttpMultipartMode; @@ -418,7 +419,7 @@ public class ValidazionePraticaUtil { public static List notCompletedSection(String section, long dettPraticaId) throws PortalException, SystemException { - + _log.info("Inizio controllo allegati"); switch (section) { case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI: return notCompletedDettagliPrincipali(dettPraticaId); @@ -938,7 +939,7 @@ public class ValidazionePraticaUtil { } private static List notCompletedSezioniAllegati(long dettPraticaId) throws PortalException, SystemException { - + _log.info("Inizio controllo allegati"); DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); long intPraticaId = dettPratica.getIntPraticaId(); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); @@ -946,9 +947,11 @@ public class ValidazionePraticaUtil { List tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica.getTipoProcedura()); Set firmeTotali = new HashSet<>(); for (String codiceDoc : tipologiaAllegati) { + _log.info("Tipologia di allegato obbligatorio ---> "+ codiceDoc); if (isDocPraticaRequired(dettPratica, codiceDoc)) { List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + _log.info("la lista di docs e' vuota ?" + docs.isEmpty()); if (docs.isEmpty()) { // Ci dev'essere almeno un allegato per ogni tipologia obbligatoria notCompleted.add("Nessun Allegato per " + codiceDoc + " - " @@ -956,7 +959,8 @@ public class ValidazionePraticaUtil { } for (DocPratica doc : docs) { // Se il documento proviene da una dett precedente non viene controllato perche si presuppone che - // sia stata già verificato + // sia stata già  verificato + _log.info("il documento in analisi e' di tipo: "+ codiceDoc ); if (!doc.getClassName().equalsIgnoreCase(DettPratica.class.getName()) || doc.getClassPk() != dettPraticaId) { continue; @@ -991,13 +995,15 @@ public class ValidazionePraticaUtil { notCompleted.add("A17 firme obbligatorie mancanti"); } } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA)) { + _log.info("siamo nel controllo validita a98"); if (!isA98Valid(dettPratica, intPraticaId, signatures)) { - notCompleted.add("Allegato Delega firme obbligatorie mancanti"); + notCompleted.add("Allegato Delega firma obbligatoria dell' committente mancante"); } } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A29)) { if (!signatures.contains(dettPratica.getUserName().toLowerCase())) { List firmeCommittenti = getSignaturePerSubject(intPraticaId, signatures, TipoSoggettoUtil.COMMITTENTE, doc.getClassPk()); + if (firmeCommittenti.isEmpty()) { notCompleted.add("A29 firma del titolare digitale o del committente richiesta"); } @@ -1007,6 +1013,7 @@ public class ValidazionePraticaUtil { notCompleted.add(codiceDoc + " non firmato"); } else if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, TipoSoggettoUtil.getAllSubjects(), doc)) { + _log.info("non siamo entrati nel controllo validita a98"); notCompleted.add(codiceDoc + " firme obbligatorie mancanti"); } } @@ -1175,19 +1182,43 @@ public class ValidazionePraticaUtil { // Allegato Delega richiesto se il titolare Digitale pratica non è fra i committenti public static boolean isA98Required(DettPratica dettPratica) throws SystemException, PortalException { + if (IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()).isPraticaOspedaliera()) { + _log.info("Is ospedaliera"); + + return true; + } + _log.info("Is not ospedaliera"); return !SoggettiUtil.isTitolareInCommittenti(dettPratica.getIntPraticaId()); } + public static boolean isA98Valid(DettPratica dettPratica, long intPraticaId, List signatures) throws SystemException, PortalException { - - if (SoggettiUtil.isTitolareInCommittenti(intPraticaId)) { - return true; - } else { - return !signatures.isEmpty(); - } + + if (IntPraticaLocalServiceUtil.getIntPratica(intPraticaId).isPraticaOspedaliera()) { + _log.info("la pratica e' ospedaliera" ); + List committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(dettPratica.getDettPraticaId(), + TipoSoggettoUtil.COMMITTENTE); + for (Soggetto committente : committenti) { + _log.info("Committente ---> "+ committente ); + + for (String signature : signatures) { + _log.info("Signature ---> "+ signature); + + if(StringUtils.equals(signature,committente.getCodiceFiscale())){ + _log.info("Everything went well"); + + return true; + } + } + } + } + _log.info("Everything imploded"); + return !signatures.isEmpty(); } + + public static boolean isAllRequiredValid(String codiceDoc, long intPraticaId, List signatures, List tipologiaSoggetti, DocPratica docPratica) throws SystemException, PortalException { 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 d81131a9..30867170 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=2985 - build.date=1722424256719 + build.number=3004 + build.date=1741363123588 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-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 89a8953c..0e3f9d35 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index d8c83f70..4f7c7fff 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index d5dbced2..7b4f112d 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 0d429312..8d5da7b3 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java index 452b483f..31bcb0de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java @@ -1,9 +1,28 @@ package it.tref.liferay.portos.fe.util; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.model.User; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.ServiceContextFactory; +import com.liferay.portal.service.UserLocalServiceUtil; + +import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.Soggetto; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.Constants; +import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; +import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; + +import java.util.List; + +import javax.portlet.RenderRequest; public class FascicoloFEUtil { + private static final Log _log = LogFactoryUtil.getLog(FascicoloFEUtil.class); public static boolean isDestinazioneEnabled(boolean destinazioneClasse, boolean disabledInput, boolean enabledByIntegrazione, boolean alertClassi, boolean isPraticaOspedaliera){ @@ -23,6 +42,31 @@ public class FascicoloFEUtil { } } - + public static boolean isA98PraticaOspidaliera(String codiceDoc, long intPraticaId, long userId){ + _log.info("isA98PraticaOspidaliera method"); + try { + + User user = UserLocalServiceUtil.getUser(userId); + IntPratica intpratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA.equals(codiceDoc) && + intpratica.isPraticaOspedaliera()){ + DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId); + if (dettPratica==null){ + dettPratica= DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + } + List committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(dettPratica.getDettPraticaId(), + TipoSoggettoUtil.COMMITTENTE); + for (Soggetto committente : committenti) { + if(committente.getCodiceFiscale().equals(user.getScreenName())){ + return true; //è il committente + } + } + return false; //non è il committente + } + } catch (Exception e) { + _log.error(e,e); + } + return true; //è un altro documento + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf index 19601e88..2a717370 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jspf @@ -12,96 +12,100 @@ boolean canSignGeoDocsAll = comingFromGeologica && hasDelegaFirma; <% - if (firme.firmaIsPresent(user.getScreenName())) { - if (firme.firmaIsAnnullabile(user.getScreenName())) { + if(FascicoloFEUtil.isA98PraticaOspidaliera(codiceDoc, intPraticaId, themeDisplay.getUserId())){ + if (firme.firmaIsPresent(user.getScreenName())) { + if (firme.firmaIsAnnullabile(user.getScreenName())) { %> - - - - - -
- -
+ + + + - - A.one('<%="#"+renderResponse.getNamespace()+"remove_"+docPraticaId %>').on( - 'click', - function(event) { - event.preventDefault(); - Loading.start(); - A.io.request( - '<%=rimuoviFirmaURL%>', - { - on: { - failure: function() { - alert('impossibile rimuovere la firma!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refreshAll%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); +
+ +
+ + + A.one('<%="#"+renderResponse.getNamespace()+"remove_"+docPraticaId %>').on( + 'click', + function(event) { + event.preventDefault(); + Loading.start(); + A.io.request( + '<%=rimuoviFirmaURL%>', + { + on: { + failure: function() { + alert('impossibile rimuovere la firma!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); + if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ + <%=refreshAll%> + }else{ + Liferay.fire('allegati-"+comingFrom+"-open'); + Liferay.Portlet.refresh("#p_p_id"); + } + }, + complete : function(){ + Loading.end(); } - }, - complete : function(){ - Loading.end(); + } - } - } - ); - } - ); - - - <% + ); + } + ); + + + <% + } } else { + %> - - - - -
- -
- - - A.one('<%="#"+renderResponse.getNamespace()+"add_"+docPraticaId %>').on( - 'click', - function(event) { - event.preventDefault(); - Loading.start(); - A.io.request( - '<%=aggiungiFirmaURL%>', - { - on: { - failure: function() { - alert('impossibile rimuovere la firma!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refreshAll%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); + + + + +
+ +
+ + + A.one('<%="#"+renderResponse.getNamespace()+"add_"+docPraticaId %>').on( + 'click', + function(event) { + event.preventDefault(); + Loading.start(); + A.io.request( + '<%=aggiungiFirmaURL%>', + { + on: { + failure: function() { + alert('impossibile rimuovere la firma!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); + if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ + <%=refreshAll%> + }else{ + Liferay.fire('allegati-"+comingFrom+"-open'); + Liferay.Portlet.refresh("#p_p_id"); + } + }, + complete : function(){ + Loading.end(); } - }, - complete : function(){ - Loading.end(); } } - } - ); - } - ); - - - <% + ); + } + ); + + + <% + } } %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 394fbd73..5ffa589b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -30,6 +30,7 @@ <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="java.util.ArrayList"%> +<%@page import="it.tref.liferay.portos.fe.util.FascicoloFEUtil"%> <%@ include file="/html/soggettipratica/init.jsp"%> <% String comingFrom = ParamUtil.getString(request, "comingFrom", GetterUtil.getString(PortalUtil @@ -102,6 +103,7 @@ if (Validator.isNotNull(request.getParameter("disabled"))) { } else if (comingFromCollaudo) { disabledInput = disabled; } + %> diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java index cfb9eb89..d5c1e134 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java @@ -104,11 +104,15 @@ public class DocumentiPraticaUtil { TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A17, TIPOLOGIA_ALLEGATO_DELEGA); private static final List DOC_OBBLIGATORI_DOMANDA_C = Arrays.asList(TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A29); + + private static final List DOC_OBBLIGATORI_DOMANDA_H = Arrays.asList(TIPOLOGIA_ALLEGATO_DELEGA); public static List getDocObbligatoriDomanda(String tipoProcedura) { if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_C)) { return DOC_OBBLIGATORI_DOMANDA_C; + } else if(tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_H)) { + return DOC_OBBLIGATORI_DOMANDA_H; } else { return DOC_OBBLIGATORI_DOMANDA; }