diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java index d945b8ed..5514aa02 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java @@ -30,10 +30,9 @@ public class MappeUtil { public static String getUrlFe(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly) throws UnsupportedEncodingException, PortalException, SystemException { - + ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); - String baseUrl = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_FE); return getUrlComune(request, baseUrl, dettPratica, comune, readOnly); @@ -41,68 +40,55 @@ public class MappeUtil { public static String getUrlBo(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly) throws UnsupportedEncodingException, PortalException, SystemException { - + ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); - String baseUrl = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO); return getUrlComune(request, baseUrl, dettPratica, comune, readOnly); } - private static String getUrlComune(HttpServletRequest request, - String baseUrl, DettPratica dettPratica, Comune comune, - boolean readOnly) throws UnsupportedEncodingException, - PortalException, SystemException { + private static String getUrlComune(HttpServletRequest request, String baseUrl, DettPratica dettPratica, + Comune comune, boolean readOnly) throws UnsupportedEncodingException, PortalException, SystemException { + long date = new Date().getTime() / 1000; ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = td.getCompanyId(); - - long intPraticaId = dettPratica.getIntPraticaId(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - String sharedSecret = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_SHARED_SECRET); - long date = new Date().getTime() / 1000; - String auth = DigestUtils.sha256Hex(date + sharedSecret + request.getServerName()); - - String url = baseUrl; - - if(Validator.isNotNull(comune)) - url = url.replace("{{COD_BELFIORE}}", urlEncode(comune.getCodiceBelfiore())); - else - url = url.replace("{{COD_BELFIORE}}", ""); - - if(Validator.isNotNull(dettPratica)) - url = url.replace("{{ESTREMI_CAT}}", urlEncode(dettPratica.getEstremiCatastali())); - else - url = url.replace("{{ESTREMI_CAT}}", ""); - - String localizzazione = dettPratica.getLocalizzazioneGeografica(); - String lat = ""; - String lng = ""; - if(Validator.isNotNull(localizzazione)){ - String[] coordinate = StringUtils.split(localizzazione, "|"); - if(coordinate.length > 1){ - lat = coordinate[0]; - lng = coordinate[1]; + String intPraticaId = StringPool.BLANK; + String estremiCatastali = StringPool.BLANK; + String lat = StringPool.BLANK; + String lng = StringPool.BLANK; + String numeroProgetto = StringPool.BLANK; + if (Validator.isNotNull(dettPratica)) { + estremiCatastali = urlEncode(dettPratica.getEstremiCatastali()); + String localizzazione = dettPratica.getLocalizzazioneGeografica(); + if (Validator.isNotNull(localizzazione)) { + String[] coordinate = StringUtils.split(localizzazione, StringPool.PIPE); + if (coordinate.length > 1) { + lat = coordinate[0]; + lng = coordinate[1]; + } } + intPraticaId = String.valueOf(dettPratica.getIntPraticaId()); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + numeroProgetto = intPratica.getNumeroProgetto(); } - url = url.replace("{{LAT}}", lat); - url = url.replace("{{LNG}}", lng); - - url = url.replace("{{IDPRATICA}}", String.valueOf(intPraticaId)); - url = url.replace("{{NPRATICA}}", String.valueOf(intPratica.getNumeroProgetto())); - url = url.replace("{{READONLY}}", (readOnly ? "true" : "false")); - + String auth = DigestUtils.sha256Hex(date + sharedSecret + request.getServerName()); + String url = baseUrl; + url = url + .replace("{{COD_BELFIORE}}", + Validator.isNull(comune) ? StringPool.BLANK : urlEncode(comune.getCodiceBelfiore())) + .replace("{{ESTREMI_CAT}}", estremiCatastali).replace("{{LAT}}", lat).replace("{{LNG}}", lng) + .replace("{{IDPRATICA}}", intPraticaId).replace("{{NPRATICA}}", numeroProgetto) + .replace("{{READONLY}}", String.valueOf(readOnly)); String query = StringPool.BLANK; String[] parti = StringUtils.split(url, StringPool.QUESTION); if (parti.length > 1) { query = parti[1]; } - if (query == null) { - query = StringPool.BLANK; - } else if (!query.equals(StringPool.BLANK)) { + if (!query.equals(StringPool.BLANK)) { query += StringPool.AMPERSAND; } query += "date=" + date + "&auth=" + auth; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index 73a46094..3e5128f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index 8f8bd310..d73613ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 0b546e1a..02dcaba3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b0b64b21..4a23bffd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index 0b7f9ee2..f5b8166f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66507dd0..32809343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 48cf51eb..a4fa6f91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index 402cecd0..8c56fb32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index bef23f56..36e82c84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 689264dd..3adff95b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index f4a4b84a..13bd7b4f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 41c1b2be..15f0504f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index ad50d7ea..f80406ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 35a1b793..b2d8fab5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 12fb36d2..863e32df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..e4133c60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 35a48fdf..90251acb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index da5af496..26f13dda 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 90d5b692..de92727b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index 6e60848d..030778b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; 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 148f9f19..f3a5da70 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=3159 - build.date=1625231374376 + build.number=3220 + build.date=1625646212446 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp index 88e4cab4..8746e27e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/input_date_time.jsp @@ -138,7 +138,7 @@ boolean nullable = (dt == null); AUI().ready(function(A) { var formValidator = Liferay.Form.get('<%=formName%>').formValidator; - + console.log(formValidator); var required = <%= String.valueOf(required) %>; var showTime = <%= String.valueOf(showTime) %>; var nullable = <%= String.valueOf(nullable) %>; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp index 2971a610..9ae8cd3b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp @@ -4,20 +4,15 @@ <%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%> <%@page import="java.util.Date"%> <%@page import="java.util.Map"%> -<%@ include file="/html/paesaggistica_administration/init.jsp"%> - +<%@include file="/html/paesaggistica_administration/init.jsp"%> <% - SimpleDateFormat simpleDateTimeFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - long companyId = company.getCompanyId(); String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_FE); String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO); String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_SHARED_SECRET); %> -
- @@ -25,9 +20,8 @@ String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
-
Impostazioni sistema mappe
- Valore di test: https://test2.mwg.it/geoportal.php
- +
Impostazioni sistema mappe
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp index 640845eb..65290a5e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp @@ -202,7 +202,6 @@ var modalWin = Liferay.Util.Window.getById(modalName); modalWin.after('visibleChange', function(event) { - console.log('VISIBILE CHANGE'); Loading.start(); if(event.prevVal && verifyPopupReady){ window.location.href = "<%= refreshURL %>" @@ -210,7 +209,6 @@ Loading.end(); }); modalWin.after('hide', function(event) { - console.log('HIDE'); Loading.start(); if(verifyPopupReady){ window.location.href = "<%= refreshURL %>" @@ -218,7 +216,6 @@ Loading.end(); }); modalWin.after('destroy', function(event) { - console.log('DESTROY'); Loading.start(); if(verifyPopupReady){ window.location.href = "<%= refreshURL %>" diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp index a7b1556e..33d5871a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp @@ -985,6 +985,7 @@ Liferay.provide( isError = true; } }) + var dn = AUI().one('#dataNascita'); if (isError) { AUI().all("input:not(:disabled)").each(function(node) { Liferay.Form.get('fm').formValidator.validateField(node.get('name')); diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpclient.jar new file mode 100644 index 00000000..970c9891 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpcore.jar new file mode 100644 index 00000000..99715b6a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpmime.jar new file mode 100644 index 00000000..b631ceb4 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/httpmime.jar differ 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 77781ca6..a3d9960e 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 @@ -11,6 +11,7 @@ public class Parameters { public static final String CODE = "code"; public static final String CONTENT_BASE64 = "contentBase64"; public static final String DESCRIPTION = "description"; + public static final String DESCRIPTIONS = "descriptions"; public static final String FIELDS = "fields"; public static final String FIRST_NAME = "firstName"; public static final String LAST_NAME = "lastName"; diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/bean/Description.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/bean/Description.java new file mode 100644 index 00000000..7f140181 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/bean/Description.java @@ -0,0 +1,14 @@ +package it.mwg.sicilia.sue.api.v1.bean; + +public class Description { + + private final String description; + + public Description(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/Command.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/Command.java index dfc50fb2..953d4fd5 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/Command.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/Command.java @@ -41,6 +41,14 @@ import com.liferay.portal.kernel.util.MapUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Company; +import com.liferay.portal.model.Role; +import com.liferay.portal.model.RoleConstants; +import com.liferay.portal.model.User; +import com.liferay.portal.security.permission.PermissionChecker; +import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; +import com.liferay.portal.security.permission.PermissionThreadLocal; +import com.liferay.portal.service.RoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.util.PortalUtil; public abstract class Command { @@ -66,7 +74,7 @@ public abstract class Command { private static final List DEFAULT_METHODS = Arrays.asList(HttpMethods.GET, HttpMethods.POST); private static final JSONDeserializer> deserializer = JSONFactoryUtil - .createJSONDeserializer(); + .> createJSONDeserializer(); private static final List BLACKLIST = Arrays.asList("password", "token", "username"); public Command(String description, String... methods) { @@ -114,6 +122,7 @@ public abstract class Command { } if (request.getMethod().equals(HttpMethods.POST) && !input.isEmpty()) { try { + _log.info("Input = [" + input + "]"); parameters.putAll(deserializer.deserialize(input)); } catch (Exception e) { e.printStackTrace(); @@ -126,6 +135,17 @@ public abstract class Command { return parameters; } + protected void setAdministratorPermissions() { + try { + Role role = RoleLocalServiceUtil.getRole(companyId, RoleConstants.ADMINISTRATOR); + User user = UserLocalServiceUtil.getRoleUsers(role.getRoleId(), 0, 1).get(0); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); + PermissionThreadLocal.setPermissionChecker(permissionChecker); + } catch (Exception e) { + e.printStackTrace(); + } + } + protected String getCommandVerb() { return getCommandVerb(getClass().getSimpleName()); } 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 3d6f72cc..98e57ab5 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 @@ -11,11 +11,11 @@ import it.mwg.sicilia.sue.api.v1.command.impl.ListAttachments; import it.mwg.sicilia.sue.api.v1.command.impl.ListFields; import it.mwg.sicilia.sue.api.v1.command.impl.ListValues; import it.mwg.sicilia.sue.api.v1.command.impl.Login; -import it.mwg.sicilia.sue.api.v1.command.impl.ManualHtml; +import it.mwg.sicilia.sue.api.v1.command.impl.Manual; 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.UploadAttachment; -import it.mwg.sicilia.sue.api.v1.command.impl.VerifyApplication; +import it.mwg.sicilia.sue.api.v1.command.impl.ValidateApplication; import java.util.Collection; import java.util.LinkedHashMap; @@ -33,7 +33,7 @@ public class CommandList { private static final Set verbs = new TreeSet<>(); static { // Manuali - addCommand(new ManualHtml("Restituisce la documentazione dell'API generata automaticamente in versione HTML")); + addCommand(new Manual("Restituisce la documentazione dell'API generata automaticamente in versione HTML")); // Login addCommand(new Login("Esegue l'accesso con nome email e password e restituisce un token di accesso", HttpMethods.POST)); @@ -47,7 +47,7 @@ public class CommandList { "Crea una nuova istanza di endoprocedimento, crea l'utente se non esiste ancora sul portale")); addCommand(new GetApplications("Elenca le istanze in lavorazione da questo SUE")); addCommand(new DeleteApplication("Elimina un'istanza")); - addCommand(new VerifyApplication("Verifica la completezza dell'istanza")); + addCommand(new ValidateApplication("Verifica la completezza dell'istanza")); addCommand(new SetFields( "Imposta i valori dei dati dell'istanza, l'elenco dei campi valorizzabili è fornito dal comando " + Command.getCommandVerb(ListFields.class))); 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 808df6f8..441ca3c2 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 @@ -32,14 +32,16 @@ public class GetApplications extends Command { } }; - 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"); - p.addSubParameter(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Identificatore dell'istanza")); - p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice dell'istanza")); - p.addSubParameter(new Parameter(Parameters.VATIN, TYPES.STRING, "Codice fiscale del titolare digitale")); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.APPLICATIONS, TYPES.ARRAY, "Elenco di istanze presentate"); + p.addSubParameter(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Identificatore dell'istanza")); + p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice dell'istanza")); + p.addSubParameter(new Parameter(Parameters.VATIN, TYPES.STRING, "Codice fiscale del titolare digitale")); + add(p); + } }; public GetApplications(String description, String... methods) { 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/GetAttachments.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetAttachments.java index 8653c2e7..fd445671 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetAttachments.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetAttachments.java @@ -31,14 +31,16 @@ public class GetAttachments extends Command { } }; - private static final List OUTPUT_PARAMETERS = new ArrayList(); - static { - OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); - Parameter p = new Parameter(Parameters.ATTACHMENTS, TYPES.ARRAY, "Elenco di allegati dell'istanza"); - p.addSubParameter(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Identificatore dell'allegato")); - p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice dell'allegato")); - p.addSubParameter(new Parameter(Parameters.SHA256, TYPES.STRING, "Hash SHA256 dell'allegato")); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.ATTACHMENTS, TYPES.ARRAY, "Elenco di allegati dell'istanza"); + p.addSubParameter(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Identificatore dell'allegato")); + p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice dell'allegato")); + p.addSubParameter(new Parameter(Parameters.SHA256, TYPES.STRING, "Hash SHA256 dell'allegato")); + add(p); + } }; public GetAttachments(String description, String... methods) { 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/GetSourceCode.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetSourceCode.java index f93fbb51..a62ffe3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetSourceCode.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/GetSourceCode.java @@ -189,14 +189,16 @@ public class GetSourceCode extends Command { if (!command.getVerb().equals("login")) { sb.append(prefix).append(INDENT).append(StringPool.APOSTROPHE); if (command.isSecure()) { - sb.append(StringPool.STAR); + sb.append("** "); + } else { + sb.append(" "); } sb.append(command.getVerb().isEmpty() ? "nop" : command.getVerb()).append(": ") .append(command.getDescription().replace(StringPool.APOSTROPHE, "\\\\'")).append("',\n"); } } sb.append(prefix).append(INDENT).append("'',\n"); - sb.append(prefix).append(INDENT).append("'* = richiede nome utente e password',\n"); + sb.append(prefix).append(INDENT).append("'** = richiede autenticazione',\n"); sb.append(prefix).append("],\n"); for (String verb : CommandList.getVerbs()) { if (!verb.equals("login")) { @@ -221,7 +223,7 @@ public class GetSourceCode extends Command { boolean hasRequired = false; for (Parameter parameter : command.getInputParameters()) { if (parameter.isRequired()) { - sb.append(prefix).append(INDENT).append("'**").append(parameter.getName()).append(": ") + sb.append(prefix).append(INDENT).append("'** ").append(parameter.getName()).append(": ") .append(parameter.getDescription().replace(StringPool.APOSTROPHE, "\\\\'")) .append("',\n"); hasRequired = true; @@ -229,8 +231,7 @@ public class GetSourceCode extends Command { } for (Parameter parameter : command.getInputParameters()) { if (!parameter.isRequired()) { - sb.append(prefix).append(INDENT).append(StringPool.APOSTROPHE).append(parameter.getName()) - .append(": ") + sb.append(prefix).append(INDENT).append("' ").append(parameter.getName()).append(": ") .append(parameter.getDescription().replace(StringPool.APOSTROPHE, "\\\\'")) .append("',\n"); } @@ -312,15 +313,23 @@ public class GetSourceCode extends Command { } sb.append(");\n"); } else { - sb.append(prefix).append(INDENT).append("\\$data = [\n"); + sb.append(prefix).append(INDENT).append("\\$data = ["); + boolean hasRequired = false; for (Parameter parameter : parameters) { if (parameter.isRequired()) { + if (!hasRequired) { + sb.append(StringPool.NEW_LINE); + hasRequired = true; + } sb.append(prefix).append(INDENT).append(INDENT).append("Parameters::") .append(PARAMETER_NAMES.get(parameter.getName())).append(" => \\$") .append(parameter.getName()).append(",\n"); } } - sb.append(prefix).append(INDENT).append("];\n"); + if (hasRequired) { + sb.append(prefix).append(INDENT); + } + sb.append("];\n"); for (Parameter parameter : parameters) { if (!parameter.isRequired()) { sb.append(prefix).append(INDENT).append("if (null !== \\$").append(parameter.getName()) 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 e8fd652c..447979cf 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 @@ -21,13 +21,15 @@ import javax.servlet.http.HttpServletResponse; public class ListApplications extends Command { - 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 presentabili"); - p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice del tipo di istanza")); - p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione dell'istanza")); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.APPLICATIONS, TYPES.ARRAY, "Elenco di istanze presentabili"); + p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice del tipo di istanza")); + p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione dell'istanza")); + add(p); + } }; public ListApplications(String description, String... methods) { 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/ListAttachments.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListAttachments.java index 8ca83c40..465af8ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListAttachments.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListAttachments.java @@ -21,13 +21,15 @@ import javax.servlet.http.HttpServletResponse; public class ListAttachments extends Command { - private static final List OUTPUT_PARAMETERS = new ArrayList<>(); - static { - OUTPUT_PARAMETERS.addAll(BASE_OUTPUT_PARAMETERS); - Parameter p = new Parameter(Parameters.ATTACHMENTS, TYPES.ARRAY, "Elenco di documenti"); - p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice del documento")); - p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione del documento")); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.ATTACHMENTS, TYPES.ARRAY, "Elenco di documenti"); + p.addSubParameter(new Parameter(Parameters.CODE, TYPES.STRING, "Codice del documento")); + p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione del documento")); + add(p); + } }; public ListAttachments(String description, String... methods) { 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 25123341..b9ca7b91 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 @@ -28,17 +28,19 @@ import com.liferay.portal.kernel.util.StringPool; public class ListFields extends Command { - 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"); - p.addSubParameter(new Parameter(Parameters.NAME, TYPES.STRING, "Nome del parametro")); - p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione del parametro")); - p.addSubParameter(new Parameter(Parameters.TYPE, TYPES.STRING, "Tipo del parametro (" + TYPES.STRING + ", " - + TYPES.INT + ", ecc.)")); - p.addSubParameter(new Parameter(Parameters.NULLABLE, TYPES.BOOLEAN, - "Se true il campo può essere impostato al valore NULL")); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.FIELDS, TYPES.ARRAY, "Elenco di dati accettati"); + p.addSubParameter(new Parameter(Parameters.NAME, TYPES.STRING, "Nome del parametro")); + p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione del parametro")); + p.addSubParameter(new Parameter(Parameters.TYPE, TYPES.STRING, "Tipo del parametro (" + TYPES.STRING + ", " + + TYPES.INT + ", ecc.)")); + p.addSubParameter(new Parameter(Parameters.NULLABLE, TYPES.BOOLEAN, + "Se true il campo può essere impostato al valore NULL")); + add(p); + } }; public ListFields(String description, String... methods) { 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/ListValues.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListValues.java index fc7881bc..2b662106 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListValues.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ListValues.java @@ -29,14 +29,16 @@ public class ListValues extends Command { } }; - 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 valori ammissibili"); - p.addSubParameter(new Parameter(Parameters.VALUE, TYPES.STRING, "Valore per il campo")); - p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, "Descrizione del valore, se disponibile", - false)); - OUTPUT_PARAMETERS.add(p); + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.USES, TYPES.ARRAY, "Elenco di valori ammissibili"); + p.addSubParameter(new Parameter(Parameters.VALUE, TYPES.STRING, "Valore per il campo")); + p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, + "Descrizione del valore, se disponibile", false)); + add(p); + } }; public ListValues(String description, String... methods) { 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/Manual.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/Manual.java index 68dbe983..b3289c64 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/Manual.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/Manual.java @@ -2,9 +2,12 @@ package it.mwg.sicilia.sue.api.v1.command.impl; import it.mwg.sicilia.sue.api.v1.Parameters; import it.mwg.sicilia.sue.api.v1.command.Command; +import it.mwg.sicilia.sue.api.v1.command.CommandList; import it.mwg.sicilia.sue.api.v1.parameter.Parameter; import it.mwg.sicilia.sue.api.v1.parameter.Parameter.TYPES; +import it.mwg.sicilia.sue.api.v1.util.ApiUtil; +import java.io.File; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -21,6 +24,7 @@ import javax.servlet.http.HttpServletResponse; import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONSerializer; import com.liferay.portal.kernel.servlet.HttpMethods; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; import com.liferay.portal.kernel.util.Base64; import com.liferay.portal.kernel.util.StringPool; @@ -29,26 +33,111 @@ public class Manual extends Command { @SuppressWarnings("serial") private static final List OUTPUT_PARAMETERS = new ArrayList() { { - add(new Parameter(StringPool.BLANK, TYPES.TEXT_PLAIN, "Il testo del manuale (questa pagina)")); + add(new Parameter(StringPool.BLANK, TYPES.TEXT_HTML, "Il testo del manuale (questa pagina)")); } }; - private static final JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer(); - public Manual(String description, String... methods) { super(description, methods); } + private static final JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer(); + @Override public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { + + String cssFile = "/css/api/v1/api.css"; + String bootstrapFile = "/css/bootstrap.css"; + StringBuilder result = new StringBuilder(); + result.append("") + .append("") + .append("Manual") + .append(""); + result.append("
"); + result.append("

Sicilia SUE API v1

"); + result.append("
"); + for (Command command : CommandList.getList()) { + result.append("
"); + result.append("
"); + result.append("

/").append(command.getVerb()); + if (command.isSecure()) + result.append(" [T]"); + result.append("

"); + result.append("

").append(command.getDescription()) + .append(".

"); + for (String method : command.getMethods()) { + result.append("
"); + result.append("").append(method).append(""); + result.append("
"); + result.append("
");
+				result.append(getCurlExample(command, method, ApiUtil.getBaseUrl(request)));
+				result.append("
"); + } + List parameters = command.getInputParameters(); + result.append("
"); + result.append("

Parametri

"); + if (parameters.isEmpty()) { + result.append("

Nessuno

"); + } else { + result.append(""); + result.append(""); + result.append(""); + result.append(""); + result.append(printTableParameters(parameters, 0)); + result.append("
CampoOpzionaleTipoDescrizione
"); + } + result.append("
"); + parameters = command.getOutputParameters(); + result.append("

Risposta

"); + if (parameters.isEmpty()) { + result.append("

Nessuno

"); + } else { + result.append(""); + result.append(""); + result.append(""); + result.append(""); + result.append(printTableParameters(parameters, 0)); + result.append("
CampoOpzionaleTipoDescrizione
"); + } + result.append("
"); + } + result.append("

"); + result.append("Note
[T] = Richiede token di autenticazione: header di richiesta \""); + result.append(Parameters.X_AUTH_TOKEN).append("\" oppure per il metodo POST parametro JSON \"") + .append(Parameters.TOKEN); + result.append("\"

"); + setTextHtml(response); + ServletResponseUtil.write(response, result.toString()); } - protected String getCurlExample(Command command, String method, String baseUrl) { + private String printTableParameters(List parameters, int level) { + StringBuilder result = new StringBuilder(); + for (Parameter parameter : parameters) { + result.append(""); + for (int i = 0; i < level; i++) { + result.append(">"); + } + result.append(StringPool.SPACE).append(parameter.getName()).append("") + .append(parameter.isRequired() ? "No" : "Sì").append("") + .append(parameter.getType().toString()).append("").append(parameter.getDescription()) + .append(""); + if (parameter.getType().equals(TYPES.ARRAY)) { + result.append(printTableParameters(parameter.getSubParameters(), level + 1)); + } + } + return result.toString(); + } + + protected String getCurlExample(Command command, String method, String baseUrl) { return getCurlExample(command, method, baseUrl, StringPool.BLANK); } - protected String getCurlExample(Command command, String method, String baseUrl, String prefix) { + private String getCurlExample(Command command, String method, String baseUrl, String prefix) { StringBuilder sb = new StringBuilder(); sb.append(prefix).append("curl "); @@ -128,11 +217,6 @@ public class Manual extends Command { return ret; } - @Override - public boolean isSecure() { - return false; - } - @Override public List getInputParameters() { return EMPTY_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/ManualHtml.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ManualHtml.java deleted file mode 100644 index adf8f17a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ManualHtml.java +++ /dev/null @@ -1,153 +0,0 @@ -package it.mwg.sicilia.sue.api.v1.command.impl; - -import it.mwg.sicilia.sue.api.v1.Parameters; -import it.mwg.sicilia.sue.api.v1.command.Command; -import it.mwg.sicilia.sue.api.v1.command.CommandList; -import it.mwg.sicilia.sue.api.v1.parameter.Parameter; -import it.mwg.sicilia.sue.api.v1.parameter.Parameter.TYPES; -import it.mwg.sicilia.sue.api.v1.util.ApiUtil; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.liferay.portal.kernel.servlet.ServletResponseUtil; -import com.liferay.portal.kernel.util.StringPool; - -public class ManualHtml extends Manual { - - @SuppressWarnings("serial") - private static final List OUTPUT_PARAMETERS = new ArrayList() { - { - add(new Parameter(StringPool.BLANK, TYPES.TEXT_HTML, "Il testo del manuale (questa pagina)")); - } - }; - - public ManualHtml(String description, String... methods) { - super(description, methods); - } - - @Override - public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { - - String cssFile = "/css/api/v1/api.css"; - String bootstrapFile = "/css/bootstrap.css"; - StringBuilder result = new StringBuilder(); - result.append("") - .append("") - .append("Manual") - .append(""); - result.append("
"); - result.append("
"); - result.append("
"); - result.append("

Sicilia SUE API v1

"); - result.append("
"); - result.append("
"); - for (Command command : CommandList.getList()) { - result.append("
"); - result.append("
"); - result.append("

/").append(command.getVerb()); - if (command.isSecure()) - result.append(" [T]"); - result.append("

"); - result.append("

").append(command.getDescription()) - .append(".

"); - for (String method : command.getMethods()) { - result.append("
"); - result.append("").append(method).append(""); - result.append("
"); - result.append("
");
-				result.append(getCurlExample(command, method, ApiUtil.getBaseUrl(request)));
-				result.append("
"); - } - List parameters = command.getInputParameters(); - result.append("
"); - result.append("

Parametri

"); - if (parameters.isEmpty()) { - result.append("

Nessuno

"); - } else { - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(printTableParameters(parameters, 0)); - result.append(""); - result.append("
CampoOpzionaleTipoDescrizione
"); - } - result.append("
"); - parameters = command.getOutputParameters(); - result.append("
"); - result.append("

Risposta

"); - if (parameters.isEmpty()) { - result.append("

Nessuno

"); - } else { - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - result.append(printTableParameters(parameters, 0)); - result.append(""); - result.append("
CampoOpzionaleTipoDescrizione
"); - } - result.append("
"); - result.append("
"); - result.append("
"); - } - result.append("
"); - result.append("
"); - result.append("

"); - result.append("Note
[T] = Richiede token di autenticazione: header di richiesta \""); - result.append(Parameters.X_AUTH_TOKEN).append("\" oppure per il metodo POST parametro JSON \"") - .append(Parameters.TOKEN); - result.append("\"

"); - result.append("
"); - result.append("
"); - result.append("
"); - result.append(""); - setTextHtml(response); - ServletResponseUtil.write(response, result.toString()); - } - - private String printTableParameters(List parameters, int level) { - - StringBuilder result = new StringBuilder(); - for (Parameter parameter : parameters) { - result.append(""); - for (int i = 0; i < level; i++) { - result.append(">"); - } - result.append(StringPool.SPACE).append(parameter.getName()).append("") - .append(parameter.isRequired() ? "No" : "Sì").append("") - .append(parameter.getType().toString()).append("").append(parameter.getDescription()) - .append(""); - if (parameter.getType().equals(TYPES.ARRAY)) { - result.append(printTableParameters(parameter.getSubParameters(), level + 1)); - } - } - return result.toString(); - } - - @Override - public List getOutputParameters() { - return 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/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 index 3a8208d7..7de5e866 100644 --- 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 @@ -29,15 +29,17 @@ 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.INT, "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 come restituito dal comando " - + getCommandVerb(ListFields.class))); - p.addSubParameter(new Parameter(Parameters.VALUE, TYPES.VARYING, "Valore da impostare per il campo")); - INPUT_PARAMETERS.add(p); - } + @SuppressWarnings("serial") + private static final List INPUT_PARAMETERS = new ArrayList() { + { + add(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "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 come restituito dal comando " + getCommandVerb(ListFields.class))); + p.addSubParameter(new Parameter(Parameters.VALUE, TYPES.VARYING, "Valore da impostare per il campo")); + add(p); + } + }; @SuppressWarnings("serial") private static final List OUTPUT_PARAMETERS = new ArrayList() { 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/ValidateApplication.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/ValidateApplication.java new file mode 100644 index 00000000..36b1a4bd --- /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/ValidateApplication.java @@ -0,0 +1,97 @@ +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.bean.Description; +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.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.SezioniUtil; +import it.tref.liferay.portos.bo.util.ValidazionePraticaUtil; + +import java.io.Serializable; +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.util.Validator; + +public class ValidateApplication extends Command { + + @SuppressWarnings("serial") + private static final List INPUT_PARAMETERS = new ArrayList() { + { + add(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Id dell'istanza")); + } + }; + + @SuppressWarnings("serial") + private static final List OUTPUT_PARAMETERS = new ArrayList() { + { + addAll(BASE_OUTPUT_PARAMETERS); + Parameter p = new Parameter(Parameters.DESCRIPTIONS, TYPES.ARRAY, "Elenco di informazioni mancanti"); + p.addSubParameter(new Parameter(Parameters.DESCRIPTION, TYPES.STRING, + "Descrizione dell'informazione mancante")); + add(p); + add(new Parameter(Parameters.ADDITIONAL_INFO, TYPES.STRING, + "Eventuali informazioni aggiuntive sull'operazione o sugli errori incontrati", false)); + } + }; + + public ValidateApplication(String description, String... methods) { + super(description, methods); + } + + @Override + public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { + + if (verifyAccessToken(request, response)) { + IntPratica intPratica = getSecureIntPratica(response); + if (Validator.isNotNull(intPratica)) { + List additionalInfo = new ArrayList<>(); + try { + DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPratica + .getIntPraticaId()); + List notCompleted = new ArrayList<>(); + setAdministratorPermissions(); + for (String section : new String[] { SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI, + SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI, SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO, + SezioniUtil.SEZIONE_GEOLOGICA, SezioniUtil.SEZIONE_ALLEGATI }) { + for (String nc : ValidazionePraticaUtil.notCompletedSection(section, + dettPratica.getDettPraticaId())) { + nc = LanguageUtil.get(Locale.ITALIAN, nc); + notCompleted.add(new Description(nc)); + } + } + Map result = new HashMap<>(); + result.put(Parameters.DESCRIPTIONS, (Serializable) notCompleted); + Response.write(response, Status.OK, result, additionalInfo); + } catch (Exception e) { + additionalInfo.add("Errore durante l'esecuzione: " + e.getMessage()); + Response.write(response, Status.SERVER_ERROR, additionalInfo); + } + } + } + } + + @Override + public List getInputParameters() { + return INPUT_PARAMETERS; + } + + @Override + public List getOutputParameters() { + return 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/VerifyApplication.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/VerifyApplication.java deleted file mode 100644 index 8e1bbd7a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/command/impl/VerifyApplication.java +++ /dev/null @@ -1,62 +0,0 @@ -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.IntPratica; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.liferay.portal.kernel.util.Validator; - -public class VerifyApplication extends Command { - - @SuppressWarnings("serial") - private static final List INPUT_PARAMETERS = new ArrayList() { - { - add(new Parameter(Parameters.APPLICATION_ID, TYPES.INT, "Id dell'istanza")); - } - }; - - @SuppressWarnings("serial") - private static final List OUTPUT_PARAMETERS = new ArrayList() { - { - addAll(BASE_OUTPUT_PARAMETERS); - add(new Parameter(Parameters.ADDITIONAL_INFO, TYPES.STRING, - "Eventuali informazioni aggiuntive sull'operazione o sugli errori incontrati", false)); - } - }; - - public VerifyApplication(String description, String... methods) { - super(description, methods); - } - - @Override - public void run(HttpServletRequest request, HttpServletResponse response) throws Exception { - - if (verifyAccessToken(request, response)) { - IntPratica intPratica = getSecureIntPratica(response); - if (Validator.isNotNull(intPratica)) { - Response.write(response, Status.OK); - } - } - } - - @Override - public List getInputParameters() { - return INPUT_PARAMETERS; - } - - @Override - public List getOutputParameters() { - return OUTPUT_PARAMETERS; - } - -} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/README.txt b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/README.txt index 4d92044c..5f2228d4 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/README.txt +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/README.txt @@ -1,6 +1,6 @@ Prima di operare aggiornare il file SueApi/v1/config/api.json con i corretti parametri di accesso, oppure utilizzare il comando: - php client.php username password + php client.php set_login username password Compatibile con php 7.1+ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/functions.php b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/functions.php index f63d4e5f..29732f15 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/functions.php +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/functions.php @@ -23,14 +23,18 @@ function parseCommandLine() $argv = array_values($argv); } -function help(Client $api, string $command = '') +function help(Client $api, string $application, string $command = '') { - echo "set_login: Salva le credenziali per l'accesso\n"; - echo "set_default: Imposta il metodo predefinito per le richieste (GET o POST)\n"; - echo $api->getHelp($command); - echo "\nDigitare help per maggiori informazioni sul comando.\n"; - echo "L'opzione --debug visualizza a schermo le comunicazioni con il server.\n"; - echo " Es.: php client.php nop --debug\n"; + if ('' === $command) { + echo " set_login: Salva le credenziali per l'accesso\n"; + echo " set_default: Imposta il metodo predefinito per le richieste (GET o POST)\n"; + echo $api->getHelp($application); + echo "\nDigitare help per maggiori informazioni sul comando.\n"; + echo "L'opzione --debug visualizza a schermo le comunicazioni con il server.\n"; + echo " Es.: php client.php nop --debug\n"; + } else { + echo $api->getHelp($application, $command); + } } function helpSetLogin(string $program) diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/v1/Client.php b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/v1/Client.php index 8f0f40f2..93a70426 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/v1/Client.php +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/SueApi/v1/Client.php @@ -73,7 +73,7 @@ class Client CURLOPT_HTTPHEADER => ['Content-Type:application/json; charset=UTF-8'], CURLOPT_POST => true, ]); - if (null !== $payload) { + if ((null !== $payload) && !empty($payload)) { $json = json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); curl_setopt($curl, CURLOPT_POSTFIELDS, $json); } @@ -81,7 +81,7 @@ class Client echo "DEBUG: POST $url" . (isset($json) ? " > $json" : '') . "\n"; } } else { - if (null != $payload) { + if ((null !== $payload) && !empty($payload)) { $url .= '?' . http_build_query($payload); } if (DEBUG) { diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/client.php b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/client.php index 88304c91..d07dbc43 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/client.php +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/resource/client/php/client.php @@ -33,10 +33,10 @@ switch ($argv[1] ?? '') { helpSetLogin($argv[0]); break; default: - help($api, $argv[2]); + help($api, $argv[0], $argv[2] ?? ''); break; } break; default: - help($api); + help($api, $argv[0]); } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml index c2505b76..7a1a407f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml @@ -1,20 +1,17 @@ - + - + - - + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 index 0ed1f36e..cabe985a 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 @@ -1 +1 @@ -69711437a490d849efa50a10f33cd0e9 +2ca84fda03feca53b6ee9dc91aeed605 diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 6b238df9..431fa900 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=51 - build.date=1624550499018 + build.number=52 + build.date=1625487127239 build.auto.upgrade=true ##