diff --git a/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml b/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml
new file mode 100644
index 00000000..60b2aa3a
--- /dev/null
+++ b/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml
@@ -0,0 +1,393 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jasper/reports-2023/FL2_avviso_fine_lavori.jrxml b/jasper/reports-2023/FL2_avviso_fine_lavori.jrxml
new file mode 100644
index 00000000..2859b466
--- /dev/null
+++ b/jasper/reports-2023/FL2_avviso_fine_lavori.jrxml
@@ -0,0 +1,393 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jasper/reports-2023/FL3-4_vidimazione-attestazione.jrxml b/jasper/reports-2023/FL3-4_vidimazione-attestazione.jrxml
new file mode 100644
index 00000000..6e42ad7f
--- /dev/null
+++ b/jasper/reports-2023/FL3-4_vidimazione-attestazione.jrxml
@@ -0,0 +1,500 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar
new file mode 100644
index 00000000..1e39d223
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
index 69e60114..dc76f556 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar
index 12e6b2c0..626f71c9 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java
index a5d647b6..39c3812e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java
@@ -127,6 +127,8 @@ public class ReportTaskManagerServiceImpl extends ReportTaskManagerServiceBaseIm
baos);
rawReports.add(baos.toByteArray());
}
+ } catch (Exception e){
+ _log.error(e,e);
} finally {
StreamUtil.cleanUp(templateInputStream);
}
@@ -156,7 +158,7 @@ public class ReportTaskManagerServiceImpl extends ReportTaskManagerServiceBaseIm
fileEntryIds = ArrayUtil.append(fileEntryIds, fileEntry.getFileEntryId());
}
} catch (Exception e) {
- e.printStackTrace();
+ _log.error(e,e);
}
return fileEntryIds;
}
diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java
index f20249b6..1556fabc 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/src/it/tref/liferay/portos/report/shared/util/ReportUtil.java
@@ -17,11 +17,15 @@ import java.util.concurrent.TimeUnit;
import com.liferay.portal.kernel.json.JSONArray;
import com.liferay.portal.kernel.json.JSONFactoryUtil;
import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.messaging.Message;
import com.liferay.portal.kernel.messaging.MessageBusUtil;
public class ReportUtil {
+ private static final Log _log = LogFactoryUtil.getLog(ReportUtil.class);
+
/*
* Considerazioni per report generati con modalità asincrona. Il risultato finale sarà inviato tramite
* message bus su una destinazione passata in input. La chiave di legame tra l'ack iniziale e il messaggio di esito
@@ -36,6 +40,7 @@ public class ReportUtil {
public static ReportResultDto generateReport(long companyId, long userId, ReportDto reportDto, Object dataSource)
throws ReportGenerationException {
+
try {
Message message = new Message();
setMessage(message, companyId, userId, ReportProcessMode.SYNC, Collections.singletonList(reportDto),
@@ -43,6 +48,9 @@ public class ReportUtil {
String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, message, 1);
return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class);
} catch (Exception e) {
+ if(_log.isDebugEnabled()){
+ _log.debug(e,e);
+ }
throw new ReportGenerationException(e);
}
}
@@ -56,6 +64,9 @@ public class ReportUtil {
String json = (String) MessageBusUtil.sendSynchronousMessage(ReportDestinationNames.SYNC, message, 1);
return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class);
} catch (Exception e) {
+ if(_log.isDebugEnabled()){
+ _log.debug(e,e);
+ }
throw new ReportGenerationException(e);
}
}
@@ -71,6 +82,9 @@ public class ReportUtil {
TimeUnit.SECONDS.toMillis(60));
return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class);
} catch (Exception e) {
+ if(_log.isDebugEnabled()){
+ _log.debug(e,e);
+ }
throw new ReportGenerationException(e);
}
}
@@ -86,6 +100,9 @@ public class ReportUtil {
TimeUnit.SECONDS.toMillis(60));
return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class);
} catch (Exception e) {
+ if(_log.isDebugEnabled()){
+ _log.debug(e,e);
+ }
throw new ReportGenerationException(e);
}
}
@@ -101,6 +118,9 @@ public class ReportUtil {
message, 1);
return JSONFactoryUtil.looseDeserialize(json, ReportResultDto.class);
} catch (Exception e) {
+ if(_log.isDebugEnabled()){
+ _log.debug(e,e);
+ }
throw new ReportGenerationException(e);
}
}