From e405d4e79cdaae62fa65f9133a946196f69f7c1b Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 22 Feb 2021 09:18:27 +0100 Subject: [PATCH] integrazione --- .../org.eclipse.core.resources.prefs | 1 + jasper/Richiesta Integrazione.jrxml | 379 +++++++++++++++++ jasper/accettata_integrazione.jrxml | 392 ++++++++++++++++++ .../docroot/WEB-INF/src/service.properties | 4 +- .../fascicolo/navigator/page_riepilogo.jsp | 16 +- .../docroot/html/fascicolo/view.jsp | 11 +- .../docroot/WEB-INF/src/service.properties | 4 +- 7 files changed, 790 insertions(+), 17 deletions(-) create mode 100644 jasper/Richiesta Integrazione.jrxml create mode 100644 jasper/accettata_integrazione.jrxml diff --git a/jasper/.settings/org.eclipse.core.resources.prefs b/jasper/.settings/org.eclipse.core.resources.prefs index ff97bec4..03fa7b60 100644 --- a/jasper/.settings/org.eclipse.core.resources.prefs +++ b/jasper/.settings/org.eclipse.core.resources.prefs @@ -10,6 +10,7 @@ encoding/Modello_integrazione.jrxml=UTF-8 encoding/Modello_non_competenza.jrxml=UTF-8 encoding/Modello_preavviso.jrxml=UTF-8 encoding/Modello_vidimazione.jrxml=UTF-8 +encoding/accettata_integrazione.jrxml=UTF-8 encoding/annullamento.jrxml=UTF-8 encoding/cambio_istruttore.jrxml=UTF-8 encoding/visualizza_fascicolo.jrxml=UTF-8 diff --git a/jasper/Richiesta Integrazione.jrxml b/jasper/Richiesta Integrazione.jrxml new file mode 100644 index 00000000..5d1a6c3b --- /dev/null +++ b/jasper/Richiesta Integrazione.jrxml @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jasper/accettata_integrazione.jrxml b/jasper/accettata_integrazione.jrxml new file mode 100644 index 00000000..26d83ca5 --- /dev/null +++ b/jasper/accettata_integrazione.jrxml @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 60c4534f..85e3d5d2 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=2877 - build.date=1613381936427 + build.number=2878 + build.date=1613390462371 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp index cbbfd6bb..d42bfbc8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp @@ -103,25 +103,25 @@
<% User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId()); - List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(dettPratica.getIntPraticaId(), dettPratica.getCodiceFiscaleDelegatoCommittente()); + /*List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(dettPratica.getIntPraticaId(), dettPratica.getCodiceFiscaleDelegatoCommittente()); Soggetto titolare = null; if(!titolari.isEmpty()){ - titolare = titolari.get(0); - } + titolare = titolari.get(0); + }*/ %> - +
Nome: - <%= titolare.getNome() %> + <%= titolareUser.getFirstName() %>
Cognome: - <%= titolare.getCognome() %> + <%= titolareUser.getLastName() %>
Codice Fiscale: - <%= titolare.getCodiceFiscale().toUpperCase() %> -
+ <%= titolareUser.getScreenName() %> +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp index 970d26a3..d76a0a62 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp @@ -238,16 +238,17 @@ String keywords = StringPool.BLANK; <% Soggetto titolare = null; + User titolareUser = null; if(lastDettPratica != null) { - User titolareUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); - List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(lastDettPratica.getIntPraticaId(), lastDettPratica.getCodiceFiscaleDelegatoCommittente()); + titolareUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); + /*List titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(lastDettPratica.getIntPraticaId(), lastDettPratica.getCodiceFiscaleDelegatoCommittente()); if(titolari != null && !titolari.isEmpty()){ titolare = titolari.get(0); - } + }*/ } %> - - <%= titolare.getTitle() %>
<%= titolare.getCodiceFiscale() %> + + <%= titolareUser.getFirstName() %>
<%= titolareUser.getLastName() %> 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 8b5f2af0..2a843095 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=26 - build.date=1613381463048 + build.number=27 + build.date=1613390393243 build.auto.upgrade=true ##