diff --git a/jasper/.project b/jasper/.project index cf7b0875..1959985f 100644 --- a/jasper/.project +++ b/jasper/.project @@ -8,11 +8,4 @@ - - - Modello_A.jrxml - 1 - C:/Users/m.gosetto/Desktop/Modello_A.jrxml - - diff --git a/jasper/Modello_A.jrxml b/jasper/Modello_A.jrxml new file mode 100644 index 00000000..b75b1a29 --- /dev/null +++ b/jasper/Modello_A.jrxml @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jasper/Modello_A1.jrxml b/jasper/Modello_A1.jrxml index 29698446..f4374da3 100644 --- a/jasper/Modello_A1.jrxml +++ b/jasper/Modello_A1.jrxml @@ -5,9 +5,15 @@ + + + + + + @@ -23,6 +29,7 @@ + @@ -33,30 +40,34 @@ - + - + - - + - + - + + + + @@ -86,13 +97,6 @@ e dell'identità siciliana]]> - - - - - - - @@ -129,6 +133,18 @@ e dell'identità siciliana]]> + + + + + + + + + + + + @@ -283,9 +299,9 @@ e dell'identità siciliana]]> - @@ -354,7 +370,7 @@ Viene di seguito riportato l’elenco dei documenti allegati all’istanza:]]> - diff --git a/jasper/ld.png b/jasper/ld.png new file mode 100644 index 00000000..4209018f Binary files /dev/null and b/jasper/ld.png differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 1155f26e..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java index ee742d3e..f470422c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraDocumento.java @@ -175,7 +175,12 @@ public class SchedulerGeneraDocumento implements MessageListener { String resourcePath = getClass().getName().replaceAll("\\w+\\.", "../") .replace(getClass().getSimpleName(), ReportConstants.PATH_LOGO_REGIONE); + + String resourcePathDip = getClass().getName().replaceAll("\\w+\\.", "../") + .replace(getClass().getSimpleName(), ReportConstants.PATH_LOGO_DIPARTIMENTO); + parameters.put(ReportConstants.LOGO_REGIONE, getClass().getResource(resourcePath).getPath()); + parameters.put(ReportConstants.LOGO_DIPARTIMENTO, getClass().getResource(resourcePathDip).getPath()); // avviso = gestioneProtocollazione(avviso, dettPratica); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_DIPARTIMENTO.png b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_DIPARTIMENTO.png new file mode 100644 index 00000000..4209018f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_DIPARTIMENTO.png differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_REGIONE.png b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_REGIONE.png deleted file mode 100644 index 8383024f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/report/LOGO_REGIONE.png and /dev/null differ 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 a6045c1b..32172159 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=2435 - build.date=1596032131778 + build.number=2436 + build.date=1596116006117 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/constants/ReportConstants.java b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/constants/ReportConstants.java index 7d149ff7..9f5b20e5 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/constants/ReportConstants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/constants/ReportConstants.java @@ -43,5 +43,7 @@ public class ReportConstants { * Genio Civile */ public final static String LOGO_REGIONE = "LOGO_REGIONE"; + public final static String LOGO_DIPARTIMENTO = "LOGO_DIPARTIMENTO"; public final static String PATH_LOGO_REGIONE = "resource/report/LOGO_REGIONE.png"; + public final static String PATH_LOGO_DIPARTIMENTO = "resource/report/LOGO_DIPARTIMENTO.png"; }