diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs
index f71677d..c74e4ae 100644
--- a/MP-MAG/Controllers/PrintQueueController.cs
+++ b/MP-MAG/Controllers/PrintQueueController.cs
@@ -64,17 +64,22 @@ namespace MP_API.Controllers
///
/// Recupera report da CODA report
///
- ///
+ ///
///
- protected reportRichiesto reportByTemplate(string template)
+ protected reportRichiesto reportByTemplate(string queueName)
{
reportRichiesto report = reportRichiesto.ND;
- try
+ var qConf = MagDataLayer.man.queueConfRedis.Find(x => x.name == queueName);
+ if (qConf != null)
{
- report = (reportRichiesto)Enum.Parse(typeof(reportRichiesto), template.Replace(".rdlc", ""));
+ // decodifico
+ try
+ {
+ report = (reportRichiesto)Enum.Parse(typeof(reportRichiesto), qConf.template.Replace(".rdlc", ""));
+ }
+ catch
+ { }
}
- catch
- { }
return report;
}
diff --git a/MP-MAG/Reports/queueConf.json b/MP-MAG/Reports/queueConf.json
index 067ed8b..fde38ef 100644
--- a/MP-MAG/Reports/queueConf.json
+++ b/MP-MAG/Reports/queueConf.json
@@ -30,7 +30,7 @@
// }
//},
{
- "name": "codaFin_01",
+ "name": "codaFiniti_01",
"template": "CartellinoFinitiOdette.rdlc",
"printerName": "Microsoft Print to PDF",
"deviceInfoParam": {
@@ -60,7 +60,7 @@
// }
//},
{
- "name": "codaPList_01",
+ "name": "codaPedane_01",
"template": "CartellinoPedane.rdlc",
"printerName": "Microsoft Print to PDF",
"deviceInfoParam": {
@@ -73,5 +73,20 @@
"MarginBottom": "10mm",
"xmlParam": "EMF210mm148mm10mm10mm10mm10mm"
}
+ },
+ {
+ "name": "codaSemilav_01",
+ "template": "CartellinoSemilavorati.rdlc",
+ "printerName": "Microsoft Print to PDF",
+ "deviceInfoParam": {
+ "OutputFormat": "EMF",
+ "PageHeight": "148mm",
+ "PageWidth": "210mm",
+ "MarginLeft": "10mm",
+ "MarginRight": "10mm",
+ "MarginTop": "10mm",
+ "MarginBottom": "10mm",
+ "xmlParam": "EMF210mm148mm10mm10mm10mm10mm"
+ }
}
]
\ No newline at end of file
diff --git a/MagData/DS_Report.xsd b/MagData/DS_Report.xsd
index e5e2513..c48cb6e 100644
--- a/MagData/DS_Report.xsd
+++ b/MagData/DS_Report.xsd
@@ -322,7 +322,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO
-
+
@@ -347,7 +347,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO
-
+
@@ -955,7 +955,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO
-
+
diff --git a/MagData/DS_Report.xss b/MagData/DS_Report.xss
index 1059da1..3e8dcc5 100644
--- a/MagData/DS_Report.xss
+++ b/MagData/DS_Report.xss
@@ -6,9 +6,9 @@
-->
-
-
-
+
+
+
\ No newline at end of file