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/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java index 3ec0c937..6540879c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java @@ -955,7 +955,7 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.SystemException; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.util.Map getDestinazioniuso(); + public java.util.Map getDestinazioniUso(); @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public java.util.List getDettPraticaFields(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java index 1837f1ac..f47084a3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java @@ -537,7 +537,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { _methodParameterTypes79 = new String[] { "long" }; - _methodName80 = "getDestinazioniuso"; + _methodName80 = "getDestinazioniUso"; _methodParameterTypes80 = new String[] { }; @@ -4606,7 +4606,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } @Override - public java.util.Map getDestinazioniuso() { + public java.util.Map getDestinazioniUso() { Object returnObj = null; try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java index 57e0e758..d1697b7e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java @@ -1287,8 +1287,8 @@ public class DettPraticaLocalServiceUtil { return getService().getFirstCompletedByIntPratica(intPraticaId); } - public static java.util.Map getDestinazioniuso() { - return getService().getDestinazioniuso(); + public static java.util.Map getDestinazioniUso() { + return getService().getDestinazioniUso(); } public static java.util.List getDettPraticaFields() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java index bb7f15d7..7e94dceb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java @@ -1357,8 +1357,8 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, } @Override - public java.util.Map getDestinazioniuso() { - return _dettPraticaLocalService.getDestinazioniuso(); + public java.util.Map getDestinazioniUso() { + return _dettPraticaLocalService.getDestinazioniUso(); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 677e26ae..5d0bf121 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -344,7 +344,7 @@ destinazione-A2D = Edifici ed opere individuate nei piani d'emergenza o in altre destinazione-A3 = Strutture Militari destinazione-A3A = Caserme delle Forze Armate, dei Carabinieri, della Pubblica Sicurezza, dei Vigili del Fuoco, della Guardia di Finanza, del Corpo Forestale dello Stato -destinazione-A4 = 4. Infrastrutture +destinazione-A4 = Infrastrutture destinazione-A4A = Centrali Elettriche di importanza primaria destinazione-A4B = Strutture primarie per le telecomunicazioni (radio, televisioni, telefonia fissa e portatile, ponti radio della rete nazionale) destinazione-A4C = Vie di comunicazione (strade, ferrovie) ed opere d'arte annesse, limitatamente a quelle strategiche individuate nei piani di emergenza o in altre disposizioni per la gestione dell'emergenza @@ -357,34 +357,34 @@ destinazione-A5A = altre infrastrutture destinazione-B = EDIFICI E OPERE INFRASTRUTTURALI RILEVANTI -destinazione-B1 = 1. Strutture per l'Istruzione sia pubbliche che private -destinazione-B1A = a) Scuole di ogni ordine e grado, comprese le strutture funzionali primarie annesse -destinazione-B1B = b) Palestre annesse agli edifici scolastici -destinazione-B1C = c) Sedi universitarie, accademie, conservatori e relative strutture gestionali e di coordinamento - -destinazione-B2 = 2. Strutture Civili -destinazione-B2A = a) Uffici amministrativi degli enti pubblici -destinazione-B2B = b) Uffici con notevole accesso al pubblico (uffici postali e bancari principali, centri civici, centri per convegni, mense) -destinazione-B2C = c) Edifici con elevato contenuto artistico e/o patrimoniale (musei, biblioteche) -destinazione-B2D = d) Edifici per il culto con superficie utile > 200 mq -destinazione-B2E = e) Sale per lo spettacolo, teatri, cinema, sale da ballo, con capienza utile > 100 persone -destinazione-B2F = f) Edifici adibiti ad attivitàsportive o ad esse funzionali e destinati al pubblico, con capienza utile > 100 persone (Stadi, tribune, palazzetti dello sport) -destinazione-B2G = g) Grandi magazzini di vendita, mercati coperti, centri commerciali con superficie di vendita > 2500 mq -destinazione-B2H = h) Edifici con destinazione residenziale con cubatura > 5.000 mc ed altezza > 25 m -destinazione-B2I = i) Edifici con destinazione alberghiera con capacità ricettiva > 50 persone -destinazione-B2J = j) Strutture sanitarie o socioassistenziali con ospiti non autosufficienti (ospizi, orfanotrofi) - -destinazione-B3 = 3. Strutture Industriali -destinazione-B3A = a) Edifici industriali ove sia prevista una presenza contemporanea media > 200 addetti -destinazione-B3B = b) Edifici industriali nei quali avvengono lavorazioni di materie insalubri o pericolose - -destinazione-B4 = 4. Infrastrutture -destinazione-B4A = a) Vie di comunicazione (strade, ferrovie, banchine portuali, piste aeroportuali , funivie) ed opere d'arte annesse, il collasso delle quali può determinare gravi conseguenze in termini di perdite di vite umane, ovvero interruzioni prolungate del traffico -destinazione-B4B = b) Opere di ritenuta (dighe) con volume di acqua invasato > 50000 mc o altezza dello sbarramento > 5 m -destinazione-B4C = c) Impianti primari di depurazione - -destinazione-B5 = 5. Altre strutture e infrastrutture individuate nei piani di emergenza o in altre disposizioni di protezione civile -destinazione-B5A = altre infrastrutture +destinazione-B1 = Strutture per l'Istruzione sia pubbliche che private +destinazione-B1A = Scuole di ogni ordine e grado, comprese le strutture funzionali primarie annesse +destinazione-B1B = Palestre annesse agli edifici scolastici +destinazione-B1C = Sedi universitarie, accademie, conservatori e relative strutture gestionali e di coordinamento + +destinazione-B2 = Strutture Civili +destinazione-B2A = Uffici amministrativi degli enti pubblici +destinazione-B2B = Uffici con notevole accesso al pubblico (uffici postali e bancari principali, centri civici, centri per convegni, mense) +destinazione-B2C = Edifici con elevato contenuto artistico e/o patrimoniale (musei, biblioteche) +destinazione-B2D = Edifici per il culto con superficie utile > 200 mq +destinazione-B2E = Sale per lo spettacolo, teatri, cinema, sale da ballo, con capienza utile > 100 persone +destinazione-B2F = Edifici adibiti ad attivitàsportive o ad esse funzionali e destinati al pubblico, con capienza utile > 100 persone (Stadi, tribune, palazzetti dello sport) +destinazione-B2G = Grandi magazzini di vendita, mercati coperti, centri commerciali con superficie di vendita > 2500 mq +destinazione-B2H = Edifici con destinazione residenziale con cubatura > 5.000 mc ed altezza > 25 m +destinazione-B2I = Edifici con destinazione alberghiera con capacità ricettiva > 50 persone +destinazione-B2J = Strutture sanitarie o socioassistenziali con ospiti non autosufficienti (ospizi, orfanotrofi) + +destinazione-B3 = Strutture Industriali +destinazione-B3A = Edifici industriali ove sia prevista una presenza contemporanea media > 200 addetti +destinazione-B3B = Edifici industriali nei quali avvengono lavorazioni di materie insalubri o pericolose + +destinazione-B4 = Infrastrutture +destinazione-B4A = Vie di comunicazione (strade, ferrovie, banchine portuali, piste aeroportuali , funivie) ed opere d'arte annesse, il collasso delle quali può determinare gravi conseguenze in termini di perdite di vite umane, ovvero interruzioni prolungate del traffico +destinazione-B4B = Opere di ritenuta (dighe) con volume di acqua invasato > 50000 mc o altezza dello sbarramento > 5 m +destinazione-B4C = Impianti primari di depurazione + +#destinazione-B5 = 5. Altre strutture e infrastrutture individuate nei piani di emergenza o in altre disposizioni di protezione civile +#destinazione-B5A = altre infrastrutture ## SISTEMI COSTRUTTIVI E NORME DI RIFERIMENTO ## dp-sc = Sistemi Costruttivi diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/DomandaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/DomandaUtil.java index 7a8c379d..5e3aaae6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/DomandaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/DomandaUtil.java @@ -18,7 +18,7 @@ public class DomandaUtil { private static final List DETT_PRATICA_FIELDS; private static final Map DETT_PRATICA_FIELDS_TYPES; - public static Map getDestinazioniuso() { + public static Map getDestinazioniUso() { return DESTINAZIONI_USO; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java index a0f3a8c6..017915f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java @@ -546,7 +546,7 @@ public class DettPraticaLocalServiceClpInvoker { _methodParameterTypes272 = new String[] { "long" }; - _methodName273 = "getDestinazioniuso"; + _methodName273 = "getDestinazioniUso"; _methodParameterTypes273 = new String[] { }; @@ -1532,7 +1532,7 @@ public class DettPraticaLocalServiceClpInvoker { if (_methodName273.equals(name) && Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) { - return DettPraticaLocalServiceUtil.getDestinazioniuso(); + return DettPraticaLocalServiceUtil.getDestinazioniUso(); } if (_methodName274.equals(name) && diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 163e78c5..745e07f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -1761,7 +1761,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl versions.add(deserializer.deserialize(serializer.serialize(lista.get(i)))); changes.add(new HashMap()); } - for (String field : dettPraticaFields) { + for (String field : DomandaUtil.getDettPraticaFields()) { Serializable v0 = null == versions.get(0).get(field) ? StringPool.BLANK : versions.get(0).get(field); boolean changed = false; for (int i = 1; i < size; i++) { @@ -1784,7 +1784,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public boolean isNumber(String field) { - switch (dettPraticaFieldsTypes.get(field)) { + switch (DomandaUtil.getDettPraticaFieldsTypes().get(field)) { case Types.BOOLEAN: case Types.TIMESTAMP: return false; @@ -1799,7 +1799,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl case Types.INTEGER: return true; default: - _log.info(dettPraticaFieldsTypes.get(field)); + _log.info(DomandaUtil.getDettPraticaFieldsTypes().get(field)); } return true; } @@ -1807,7 +1807,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public String format(String field, Serializable value) { - switch (dettPraticaFieldsTypes.get(field)) { + switch (DomandaUtil.getDettPraticaFieldsTypes().get(field)) { case Types.BOOLEAN: return (Boolean) value ? "Sì" : "No"; case Types.TIMESTAMP: @@ -1831,7 +1831,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl case Types.INTEGER: return NumberFormat.getInstance().format(value); default: - _log.info(dettPraticaFieldsTypes.get(field)); + _log.info(DomandaUtil.getDettPraticaFieldsTypes().get(field)); return "XXXXXXXXXXXXX"; } } @@ -1865,8 +1865,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } @Override - public Map getDestinazioniuso() { - return DomandaUtil.getDestinazioniuso(); + public Map getDestinazioniUso() { + return DomandaUtil.getDestinazioniUso(); } @Override 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 71fb88fa..4a85efcc 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=3203 - build.date=1624545918094 + build.number=3206 + build.date=1624547371477 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/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index bd02a1c4..6072c22d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -400,42 +400,42 @@ boolean enabledByIntegrazione = DelegheUtil.hasDelegaCompilazioneDomanda(user.ge

 

1. <%= LanguageUtil.get(pageContext, "destinazione-A1") %>

"/> + label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A1A") %>'/> "/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A1B") %>'/> "/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A1C") %>'/>

 

2. <%= LanguageUtil.get(pageContext, "destinazione-A2") %>

 

"/> + label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A2A") %>'/> "/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A2B") %>'/> "/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A2C") %>'/> "/> + label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-A2D") %>'/>

 

3. <%= LanguageUtil.get(pageContext, "destinazione-A3") %>

 

"/> + label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A3A") %>'/>

 

-

<%= LanguageUtil.get(pageContext, "destinazione-A4") %>

+

4. <%= LanguageUtil.get(pageContext, "destinazione-A4") %>

 

"/> + label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-A4A") %>'/> "/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-A4B") %>'/> "/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-A4C") %>'/> "/> + label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-A4D") %>'/> "/> + label='<%= "e) " + LanguageUtil.get(pageContext, "destinazione-A4E") %>'/> "/> + label='<%= "f) " + LanguageUtil.get(pageContext, "destinazione-A1F") %>'/>

 

5. <%= LanguageUtil.get(pageContext, "destinazione-A5") %>

 

@@ -447,59 +447,54 @@ boolean enabledByIntegrazione = DelegheUtil.hasDelegaCompilazioneDomanda(user.ge

B) <%= LanguageUtil.get(pageContext, "destinazione-B") %>

 

-

<%= LanguageUtil.get(pageContext, "destinazione-B1") %>

+

1. <%= LanguageUtil.get(pageContext, "destinazione-B1") %>

+ label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B1A") %>'/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B1B") %>'/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B1C") %>'/>

 

-

<%= LanguageUtil.get(pageContext, "destinazione-B2") %>

+

2. <%= LanguageUtil.get(pageContext, "destinazione-B2") %>

 

+ label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B2A") %>'/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B2B") %>'/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B2C") %>'/> + label='<%= "d) " + LanguageUtil.get(pageContext, "destinazione-B2D") %>'/> + label='<%= "e) " + LanguageUtil.get(pageContext, "destinazione-B2E") %>'/> + label='<%= "f) " + LanguageUtil.get(pageContext, "destinazione-B2F") %>'/> + label='<%= "g) " + LanguageUtil.get(pageContext, "destinazione-B2G") %>'/> + label='<%= "h) " + LanguageUtil.get(pageContext, "destinazione-B2H") %>'/> + label='<%= "i) " + LanguageUtil.get(pageContext, "destinazione-B2I") %>'/> + label='<%= "j) " + LanguageUtil.get(pageContext, "destinazione-B2J") %>'/>

 

-

<%= LanguageUtil.get(pageContext, "destinazione-B3") %>

+

3. <%= LanguageUtil.get(pageContext, "destinazione-B3") %>

 

+ label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B3A") %>'/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B3B") %>'/>

 

-

<%= LanguageUtil.get(pageContext, "destinazione-B4") %>

+

4. <%= LanguageUtil.get(pageContext, "destinazione-B4") %>

 

+ label='<%= "a) " + LanguageUtil.get(pageContext, "destinazione-B4A") %>'/> + label='<%= "b) " + LanguageUtil.get(pageContext, "destinazione-B4B") %>'/> + label='<%= "c) " + LanguageUtil.get(pageContext, "destinazione-B4C") %>'/>

 

- diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiUtil.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiUtil.java index 8eae6aae..97e6c270 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiUtil.java @@ -2,11 +2,14 @@ package it.mwg.sicilia.sue.api.v1; import it.mwg.sicilia.sue.service.ApiSettingLocalServiceUtil; +import java.io.Serializable; import java.security.KeyFactory; import java.security.PrivateKey; import java.security.PublicKey; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; +import java.util.Map; +import java.util.Map.Entry; import javax.crypto.Cipher; @@ -56,4 +59,21 @@ public class ApiUtil { String check = DigestUtils.sha256Hex(hash + secret); return hash + StringPool.PERIOD + check; } + + @SuppressWarnings("unchecked") + public static Map getMapStringSerializable(Object object) { + + if (object instanceof Map) { + Map map = (Map) object; + if (map.size() > 0) { + Entry first = map.entrySet().iterator().next(); + if ((first.getKey() instanceof String) && (first.getValue() instanceof Serializable)) { + return (Map) object; + } + } else { + return (Map) object; + } + } + return null; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Parameters.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Parameters.java index 20fb27dd..549a48b6 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Parameters.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Parameters.java @@ -21,6 +21,7 @@ public class Parameters { public static final String TYPE = "type"; public static final String USERNAME = "username"; public static final String USES = "uses"; + public static final String VALUE = "value"; public static final String VAT_ID = "vatId"; public static final String X_AUTH_TOKEN = "X-Auth-Token"; } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/CommandList.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/CommandList.java index 46fd33bd..d50792a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/CommandList.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/CommandList.java @@ -5,11 +5,13 @@ import it.mwg.sicilia.sue.api.v1.command.impl.DeleteApplication; import it.mwg.sicilia.sue.api.v1.command.impl.GetApplications; import it.mwg.sicilia.sue.api.v1.command.impl.ListApplications; import it.mwg.sicilia.sue.api.v1.command.impl.ListDocuments; +import it.mwg.sicilia.sue.api.v1.command.impl.ListFields; import it.mwg.sicilia.sue.api.v1.command.impl.ListUses; import it.mwg.sicilia.sue.api.v1.command.impl.Login; import it.mwg.sicilia.sue.api.v1.command.impl.Manual; import it.mwg.sicilia.sue.api.v1.command.impl.ManualHtml; import it.mwg.sicilia.sue.api.v1.command.impl.Nop; +import it.mwg.sicilia.sue.api.v1.command.impl.SetFields; import it.mwg.sicilia.sue.api.v1.command.impl.SetUse; import java.util.Collection; @@ -33,13 +35,15 @@ public class CommandList { addCommand(new ListApplications("Elenco delle istanze presentabili sul portale", HttpMethods.GET, HttpMethods.POST)); addCommand(new ListDocuments("Elenco dei documenti riconosciuti dal portale", HttpMethods.GET, HttpMethods.POST)); - // addCommand(new ListFields("Elenco dei dati dell'istanza accettati dal portale", HttpMethods.GET, - // HttpMethods.POST)); + addCommand(new ListFields("Elenco dei dati dell'istanza accettati dal portale", HttpMethods.GET, + HttpMethods.POST)); addCommand(new ListUses("Elenco delle destinazioni d'uso riconosciute dal portale", HttpMethods.GET, HttpMethods.POST)); // Istanze addCommand(new AddApplication( "Crea una nuova istanza di endoprocedimento, crea l'utente se non esiste ancora sul portale")); + addCommand(new SetFields("Imposta i valori dei dati dell'istanza, l'elenco è fornito dal comando /" + + Command.getCommandName(ListFields.class))); addCommand(new SetUse("Imposta la destinazione d'uso dell'immobile relativo all'istanza")); addCommand(new GetApplications("Elenca le istanze in lavorazione da questo SUE", HttpMethods.GET, HttpMethods.POST)); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/DeleteApplication.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/DeleteApplication.java index 7c2f71bd..1cc7746f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/DeleteApplication.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/DeleteApplication.java @@ -66,7 +66,7 @@ public class DeleteApplication extends Command { try { Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); if (territorio.getComuneId() != sportello.getComuneId() || !intPratica.isInLavorazioneSue()) { - additionalInfo.add("Istanza " + applicationId + " non cancellabile"); + additionalInfo.add("Istanza " + applicationId + " non modificabile"); ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); return; } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetApplications.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetApplications.java index 95ec2fb4..343131c6 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetApplications.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetApplications.java @@ -26,7 +26,7 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil; public class GetApplications extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList(); + private static final List OUTPUT_PARAMETERS = new ArrayList<>(); static { OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); Parameter p = new Parameter(Parameters.APPLICATIONS, TYPES.ARRAY, "Elenco di istanze presentate"); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListApplications.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListApplications.java index 52d922c3..0a15d1ea 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListApplications.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListApplications.java @@ -23,7 +23,7 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil; public class ListApplications extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList(); + private static final List OUTPUT_PARAMETERS = new ArrayList<>(); static { OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); Parameter p = new Parameter(Parameters.DOCUMENTS, TYPES.ARRAY, "Elenco di istanze presentabili"); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListDocuments.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListDocuments.java index 68046b0a..7feaf84f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListDocuments.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListDocuments.java @@ -23,7 +23,7 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil; public class ListDocuments extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList(); + private static final List OUTPUT_PARAMETERS = new ArrayList<>(); static { OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); Parameter p = new Parameter(Parameters.DOCUMENTS, TYPES.ARRAY, "Elenco di documenti"); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListFields.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListFields.java index 033af98c..422bd537 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListFields.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListFields.java @@ -14,19 +14,17 @@ import java.sql.Types; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.servlet.ServletResponseUtil; import com.liferay.portal.kernel.util.StringPool; public class ListFields extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList(); + private static final List OUTPUT_PARAMETERS = new ArrayList<>(); static { OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); Parameter p = new Parameter(Parameters.FIELDS, TYPES.ARRAY, "Elenco di dati accettati"); @@ -44,17 +42,21 @@ public class ListFields extends Command { @Override public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { - List fields = new ArrayList<>(); + List list = new ArrayList<>(); Map fieldTypes = DettPraticaLocalServiceUtil.getDettPraticaFieldsTypes(); - Map> dpFields = DettPraticaLocalServiceUtil.getFields(); - for (String section : dpFields.keySet()) { - List sFields = dpFields.get(section); - for (String field : sFields) { - String description = StringPool.OPEN_BRACKET - + section - + "] " - + LanguageUtil.get(Locale.ITALIAN, field.replaceAll("([A-Z])", "-$1").toLowerCase()).replace( - "
", StringPool.SPACE); + List fields = DettPraticaLocalServiceUtil.getDettPraticaFields(); + for (String field : fields) { + String description = StringPool.BLANK; + boolean insert = true; + switch (field) { + case "destinazione": + description = "Codice della destinazione d'uso, l'elenco è fornito dal comando /" + + getCommandName(ListUses.class); + break; + default: + insert = false; + } + if (insert) { TYPES type = TYPES.UNKNOWN; switch (fieldTypes.get(field)) { case Types.BIGINT: @@ -74,11 +76,11 @@ public class ListFields extends Command { type = TYPES.STRING; break; } - fields.add(new Field(field, description, type)); + list.add(new Field(field, description, type)); } } Map result = new HashMap<>(); - result.put(Parameters.FIELDS, (Serializable) fields); + result.put(Parameters.FIELDS, (Serializable) list); ServletResponseUtil.write(response, Response.get(Status.OK, result)); } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListUses.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListUses.java index efcdf954..28a386f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListUses.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListUses.java @@ -23,7 +23,7 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil; public class ListUses extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList(); + private static final List OUTPUT_PARAMETERS = new ArrayList<>(); static { OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); Parameter p = new Parameter(Parameters.USES, TYPES.ARRAY, "Elenco di destinazioni d'uso"); @@ -40,7 +40,7 @@ public class ListUses extends Command { public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { List uses = new ArrayList<>(); - for (Entry e : DettPraticaLocalServiceUtil.getDestinazioniuso().entrySet()) { + for (Entry e : DettPraticaLocalServiceUtil.getDestinazioniUso().entrySet()) { uses.add(new ListElement(e.getKey(), e.getValue())); } Map result = new HashMap<>(); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetFields.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetFields.java new file mode 100644 index 00000000..6496e03b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetFields.java @@ -0,0 +1,102 @@ +package it.mwg.sicilia.sue.api.v1.command.impl; + +import it.mwg.sicilia.sue.api.v1.ApiUtil; +import it.mwg.sicilia.sue.api.v1.Parameters; +import it.mwg.sicilia.sue.api.v1.Response; +import it.mwg.sicilia.sue.api.v1.Status; +import it.mwg.sicilia.sue.api.v1.command.Command; +import it.mwg.sicilia.sue.api.v1.parameter.Parameter; +import it.mwg.sicilia.sue.api.v1.parameter.Parameter.TYPES; +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.Territorio; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.util.MapUtil; + +public class SetFields extends Command { + + private static final List INPUT_PARAMETERS = new ArrayList<>(); + static { + INPUT_PARAMETERS.add(new Parameter(Parameters.APPLICATION_ID, TYPES.INTEGER, "Id dell'istanza")); + Parameter p = new Parameter(Parameters.FIELDS, TYPES.ARRAY, "Elenco di campi da impostare"); + p.addSubParameter(new Parameter(Parameters.NAME, TYPES.STRING, "Nome del campo")); + p.addSubParameter(new Parameter(Parameters.VALUE, TYPES.VARYING, "Valore da impostare per il campo")); + } + + public SetFields(String description, String... methods) { + super(description, methods); + } + + @Override + public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { + + if (verifyAccessToken(request, response)) { + List additionalInfo = new ArrayList(); + if (!parameters.containsKey(Parameters.APPLICATION_ID)) { + additionalInfo.add("Parametro " + Parameters.APPLICATION_ID + " mancante"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + if (!parameters.containsKey(Parameters.FIELDS)) { + additionalInfo.add("Parametro " + Parameters.FIELDS + " mancante"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + Map fields = ApiUtil.getMapStringSerializable(parameters.get(Parameters.FIELDS)); + if (null == fields) { + additionalInfo.add("Parametro " + Parameters.FIELDS + " non corretto"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + long applicationId = MapUtil.getLong(parameters, Parameters.APPLICATION_ID); + IntPratica intPratica = null; + try { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(applicationId); + } catch (PortalException | SystemException e) { + additionalInfo.add("Istanza " + applicationId + " non trovata"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + DettPratica dettPratica = null; + try { + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + if (territorio.getComuneId() != sportello.getComuneId() || !intPratica.isInLavorazioneSue()) { + additionalInfo.add("Istanza " + applicationId + " non modificabile"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(applicationId); + } catch (PortalException | SystemException e) { + additionalInfo.add("Errore del server durante il caricamento dell'istanza"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + ServletResponseUtil.write(response, Response.get(Status.OK)); + } + } + + @Override + public List getInputParameters() { + return INPUT_PARAMETERS; + } + + @Override + public List getOutputParameters() { + return BASE_OUTPUT_PARAMETERS; + } + +} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetUse.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetUse.java index 1f8ed51e..140579fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetUse.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/SetUse.java @@ -1,9 +1,17 @@ package it.mwg.sicilia.sue.api.v1.command.impl; import it.mwg.sicilia.sue.api.v1.Parameters; +import it.mwg.sicilia.sue.api.v1.Response; +import it.mwg.sicilia.sue.api.v1.Status; import it.mwg.sicilia.sue.api.v1.command.Command; import it.mwg.sicilia.sue.api.v1.parameter.Parameter; import it.mwg.sicilia.sue.api.v1.parameter.Parameter.TYPES; +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.Territorio; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import java.util.ArrayList; import java.util.List; @@ -11,6 +19,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.util.MapUtil; + public class SetUse extends Command { @SuppressWarnings("serial") @@ -20,7 +33,7 @@ public class SetUse extends Command { add(new Parameter(Parameters.CODE, TYPES.STRING, "Codice della destinazione d'uso come restituito da /" + getCommandName(ListUses.class))); add(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, - "Descrizione della destinazione d'uso, obbligatoria se " + Parameters.CODE + " = 3", false)); + "Descrizione della destinazione d'uso, obbligatoria* se " + Parameters.CODE + " = 3", false)); } }; @@ -32,7 +45,49 @@ public class SetUse extends Command { public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { if (verifyAccessToken(request, response)) { - + List additionalInfo = new ArrayList(); + if (!parameters.containsKey(Parameters.APPLICATION_ID)) { + additionalInfo.add("Parametro " + Parameters.APPLICATION_ID + " mancante"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + if (!parameters.containsKey(Parameters.CODE)) { + additionalInfo.add("Parametro " + Parameters.CODE + " mancante"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + long applicationId = MapUtil.getLong(parameters, Parameters.APPLICATION_ID); + String code = MapUtil.getString(parameters, Parameters.CODE); + if (!DettPraticaLocalServiceUtil.getDestinazioniUso().containsKey(code)) { + additionalInfo.add("Parametro " + Parameters.CODE + " = " + code + " non valido"); + ServletResponseUtil.write(response, Response.get(Status.MALFORMED_REQUEST, additionalInfo)); + return; + } + IntPratica intPratica = null; + try { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(applicationId); + } catch (PortalException | SystemException e) { + additionalInfo.add("Istanza " + applicationId + " non trovata"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + DettPratica dettPratica = null; + try { + Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + if (territorio.getComuneId() != sportello.getComuneId() || !intPratica.isInLavorazioneSue()) { + additionalInfo.add("Istanza " + applicationId + " non modificabile"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(applicationId); + } catch (PortalException | SystemException e) { + additionalInfo.add("Errore del server durante il caricamento dell'istanza"); + ServletResponseUtil.write(response, Response.get(Status.INVALID_INPUT, additionalInfo)); + return; + } + dettPratica.setDestinazione(code); + DettPraticaLocalServiceUtil.updateDettPratica(dettPratica); + ServletResponseUtil.write(response, Response.get(Status.OK)); } } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/parameter/Parameter.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/parameter/Parameter.java index e478649e..f115f8e4 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/parameter/Parameter.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/parameter/Parameter.java @@ -56,6 +56,6 @@ public class Parameter { } public static enum TYPES { - ARRAY, BOOLEAN, FLOAT, INTEGER, STRING, TIMESTAMP, TEXT_HTML, TEXT_PLAIN, UNKNOWN + ARRAY, BOOLEAN, FLOAT, INTEGER, STRING, TIMESTAMP, TEXT_HTML, TEXT_PLAIN, UNKNOWN, VARYING } }