From 5f2a38ac0ffe9e58bb7b5517c173d5d8de981c51 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Mon, 14 Jun 2021 17:29:13 +0200 Subject: [PATCH] Versionamento JS e CSS --- .../docroot/WEB-INF/liferay-portlet.xml | 120 ++++++------------ .../WEB-INF/src/content/Portal.properties | 2 - .../navigator/page_dettagli_principali.jsp | 2 +- .../portos-bo-portlet/docroot/js/main.js | 113 +---------------- .../docroot/WEB-INF/liferay-portlet.xml | 20 +-- .../domanda/page_dettagli_principali.jsp | 11 -- 6 files changed, 46 insertions(+), 222 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml index e1335b66..71c7d22c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -70,160 +70,112 @@ it.tref.liferay.portos.bo.asset.ControlloPraticaAssetRendererFactory it.tref.liferay.portos.bo.workflow.ControlloPraticaWorkflowHandler - /css/main.css - - /js/main.js - + /css/main.css?v=1 + /js/main.js?v=2 fascicolo-portlet 2 /icon.png - - configuration - + configuration 1.5 - /css/main.css - - /js/main.js - - - tabelle-di-sistema-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + tabelle-di-sistema-portlet 4 /icon.png 0 - /css/main.css - - /js/main.js - - - gestione-firme-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + gestione-firme-portlet true 5 /icon.png - /css/main.css - - /js/main.js - - - doc-aggiuntiva-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + doc-aggiuntiva-portlet 6 /icon.png 0 - /css/main.css - - /js/main.js - - - gestione-attivita - + /css/main.css?v=1 + /js/main.js?v=2 + gestione-attivita 7 /icon.png - /css/main.css - - /js/main.js - - - allegati-manuali-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + allegati-manuali-portlet 8 /icon.png 0 - /css/main.css - - /js/main.js - - - gestione-attivita-istruttore-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + gestione-attivita-istruttore-portlet 9 /icon.png - - carichi-di-lavoro-portlet - + carichi-di-lavoro-portlet true true 10 /icon.png - - tempistiche-portlet - + tempistiche-portlet true 11 /icon.png - - generate-protocollo-csv-portlet - + generate-protocollo-csv-portlet true 12 /icon.png - - configuration - + configuration 1.6 - - pending-pagamenti-portlet - + pending-pagamenti-portlet portos-administration /icon.png - - configuration - + configuration 1.6 - /css/main.css - - /js/main.js - - - portos-administration-portlet - + /css/main.css?v=1 + /js/main.js?v=2 + portos-administration-portlet ricerca-posizione /icon.png - /css/main.css - /js/main.js + /css/main.css?v=1 + /js/main.js?v=2 ricerca-posizione-portlet 22 /icon.png - /css/main.css - - /js/main.js - + /css/main.css?v=1 + /js/main.js?v=2 22-portlet 13 /icon.png - /css/main.css - - /js/main.js - + /css/main.css?v=1 + /js/main.js?v=2 13-portlet 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 4bf3e497..03993193 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 @@ -1279,8 +1279,6 @@ tipo_procedura_P8 = 7) Accertamento di compatibilità paesaggistica (D.Lgs. 42/2 tipo_procedura_P9 = 8) Accertamento di compatibilità paesaggistica per Sanatorie Edilizie (L. 47/1985 e L.R. 37/1985 – L. 724/1994 – L. 326/2003 e L.R. 15/2004) tipo_procedura_P10 = 9) Certificazione di sussistenza vincoli -sanatoria-edilizia = Sanatoria edilizia - mappe-bbcc = Mappe BBCC mappe-openstreetmap = OpenStreetmap #tipo_procedura_Q11 = 1) Autorizzazione per interventi su Beni Culturali mobili diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp index 04e1393a..01462cfa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp @@ -229,7 +229,7 @@ String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
- +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js index 1efedd7d..c07f0a7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/js/main.js @@ -1,113 +1,9 @@ -/* -var versionamento = { - changes : [], - init : function(idPratica, lastVersion, currentVersion) { - var scope = this; - this.loadJsonVersion(idPratica, lastVersion, true); - if (currentVersion > 0) { - this.loadJsonVersion(idPratica, currentVersion, false); - setTimeout(function() { - scope.getChanges(idPratica, currentVersion); - }, 300) - } else { - $('#_1_WAR_portosboportlet_version_number .version_body').html( - "

Nessuna Versione precedente all'attuale

") - } - }, - sliderChange : function(idPratica, currentVersion) { - var scope = this; - this.loadJsonVersion(idPratica, currentVersion, false); - setTimeout(function() { - scope.getChanges(idPratica, currentVersion); - }, 300) - }, - loadJsonVersion : function(idPratica, versionNumber, last) { - var scope = this; - Liferay.Service('/portos-bo-portlet.dettpratica/get-json-version', { - intPraticaId : idPratica, - version : versionNumber - }, function(obj) { - var item = last ? "_1_WAR_portosboportlet_version_last" : "_1_WAR_portosboportlet_version_number"; - scope.updateHTML(JSON.parse(obj), item, last ? false : versionNumber); - }); - }, - getChanges : function(idPratica, versionNumber) { - var scope = this; - Liferay.Service('/portos-bo-portlet.dettpratica/call-for-changes', - { - intPraticaId : idPratica, - version : versionNumber - }, - function(obj) { - var arr = JSON.parse(obj); - $("#_1_WAR_portosboportlet_version_number .version_item").removeClass("background-red") - $("#_1_WAR_portosboportlet_version_last .version_item").removeClass("background-green") - for (index in arr) { - var key = arr[index]; - var left = $("#_1_WAR_portosboportlet_version_number .item_" + key), right = $("#_1_WAR_portosboportlet_version_last .item_" - + key); - left.addClass("background-red") - right.addClass("background-green") - var heights = [ left, right ].map(function(item) { - return $(item).outerHeight(); - }); - left.css('height', Math.max.apply(null, heights)); - right.css('height', Math.max.apply(null, heights)); - } - } - ); - }, - updateHTML : function(obj, containerId, versionNumber) { - var scope = this; - var version_container = $('#' + containerId); - if (versionNumber) { - version_container.find(".number").html(versionNumber); - } - for (item in obj) { - var item_value = obj[item].replace(/</g, "<").replace(/>/g, ">").replace(/"/g, "\""); - version_container.find('.item_' + item + " .item_value").html("" + item_value + "") - } - } -} - -var sliderVersion = { - init : function(val, idPratica) { - var initialValue = val; - var min = 1; - var maxValue = (val - 1) > 0 ? val - 1 : 0; - versionamento.init(idPratica, val, maxValue); - $("#label-slider").text(maxValue); - if (maxValue <= 1) { - $("#label-slider").css("margin-left", '0'); - } - $(function() { - $("#slider").slider({ - value : val, - min : 1, - max : maxValue, - step : 1, - slide : function(event, ui) { - $("#label-slider").text(ui.value); - if (maxValue == 0) { - $("#label-slider").css("margin-left", '0'); - } else { - $("#label-slider").css("margin-left", (ui.value - min) / (maxValue - min) * 100 + '%'); - } - $("#label-slider").css("left", "-15px"); - versionamento.sliderChange(idPratica, ui.value); - } - }); - }); - }, -} -*/ - -if($('.cont_maps').length){ - $('.cont_maps ul li').click(function(){ +if ($('.cont_maps').length) { + $('.cont_maps ul li').click(function () { var map = mapItMap.getInstance(); - setTimeout(function(){ + setTimeout(function () { map.updateSize(); - if(map.layers.length > 0) + if (map.layers.length > 0) map.layers[0].redraw(); }, 100); }); @@ -115,4 +11,3 @@ if($('.cont_maps').length){ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-portlet.xml index f952966d..b928b1fe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -10,18 +10,14 @@ com.liferay.portal.kernel.portlet.DefaultConfigurationAction /css/main.css - - /js/main.js - + /js/main.js?v=2 1-portlet 2 /icon.png /css/main.css - - /js/main.js - + /js/main.js?v=2 ricerca-pratiche-portlet @@ -31,9 +27,7 @@ /icon.png 0 /css/main.css - - /js/main.js - + /js/main.js?v=2 soggetti-pratica-portlet @@ -45,9 +39,7 @@ true 0 /css/main.css - - /js/main.js - + /js/main.js?v=2 alegati-pratica-portlet @@ -59,9 +51,7 @@ true 0 /css/main.css - - /js/main.js - + /js/main.js?v=2 parere-geologo-portlet 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 c4d05be8..906bb04e 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 @@ -177,17 +177,6 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
-