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 6b98e63d..e708c95a 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 @@ -186,7 +186,8 @@ label-albo-geometri = Geometri label-albo-periti_edili = Periti Edili label-albo-geologi = Geologi label-albo-altro = Altro -label-albo-albo-elenco = Elenco L.110/2014 - D.M. 244/2019 +label-albo-albo-elenco = Elenco D.M. MIBAC 244/2019 +label-albo-elenco = Elenco D.M. MIBAC 244/2019 dati-soggetti-fisici = Dati Soggetti Fisici dati-soggetti-giuridici = Dati Soggetti Giuridici diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/ControlloPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/ControlloPraticaAdvancedSearch.java index 92f107d9..64312f3f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/ControlloPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/ControlloPraticaAdvancedSearch.java @@ -686,10 +686,14 @@ public class ControlloPraticaAdvancedSearch { sort.setType(Sort.INT_TYPE); } else if (orderField.equals(PortosIndexField.PROTOCOLLO)) { sort.setType(Sort.INT_TYPE); - } else if (orderField.equals("dataCreazione")) { + } else if (orderField.equals("dtPratica") || + orderField.equals("dataCreazione") || + orderField.equals("createDate") + ) { sort.setType(Sort.LONG_TYPE); } } + if (Validator.isNotNull(orderType) && !orderType.equals("-1")) { if (orderType.equals("asc")) { sort.setReverse(false); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java index 202429f8..f0f4e021 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java @@ -422,10 +422,14 @@ public class IntPraticaAdvancedSearch { sort.setType(Sort.INT_TYPE); } else if (orderField.equals(PortosIndexField.PROTOCOLLO)) { sort.setType(Sort.INT_TYPE); - } else if (orderField.equals("dataCreazione")) { + } else if (orderField.equals("dtPratica") || + orderField.equals("dataCreazione") || + orderField.equals("createDate") + ) { sort.setType(Sort.LONG_TYPE); } } + if (Validator.isNotNull(orderType) && !orderType.equals("-1")) { if (orderType.equals("asc")) { sort.setReverse(false); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp index d62e8b11..4e91d5f8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp @@ -99,7 +99,7 @@ Numero Progetto Protocollo - Data Creazione + Data Creazione
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 44486c35..1cb289fc 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 @@ -1222,7 +1222,7 @@ Liferay.provide(window, 'aggiornaForm', function () { $(".regione_albo").hide(); disableInput('.regione_albo'); } - if (value == geologo || value == altro_soggetto || value == archeologo) { + if (value == geologo || value == altro_soggetto || value == archeologo || value == restauratore || value == storico_arte) { $('.tabella_albo').show(); enableInput('.tabella_albo'); $(".provincia_albo").hide();