From 70a73828e83c465a5b6e54dabb28f33ff1023dde Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 28 Feb 2020 13:02:15 +0100
Subject: [PATCH] Continuo fix x report e dati corretti

---
 MP-MAG/Controllers/PrintQueueController.cs | 17 +++++++++++------
 MP-MAG/Reports/queueConf.json              | 19 +++++++++++++++++--
 MagData/DS_Report.xsd                      |  6 +++---
 MagData/DS_Report.xss                      |  6 +++---
 4 files changed, 34 insertions(+), 14 deletions(-)

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
     /// <summary>
     /// Recupera report da CODA report
     /// </summary>
-    /// <param name="template"></param>
+    /// <param name="queueName"></param>
     /// <returns></returns>
-    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": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>210mm</PageWidth><PageHeight>148mm</PageHeight><MarginTop>10mm</MarginTop><MarginLeft>10mm</MarginLeft><MarginRight>10mm</MarginRight><MarginBottom>10mm</MarginBottom></DeviceInfo>"
     }
+  },
+  {
+    "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": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>210mm</PageWidth><PageHeight>148mm</PageHeight><MarginTop>10mm</MarginTop><MarginLeft>10mm</MarginLeft><MarginRight>10mm</MarginRight><MarginBottom>10mm</MarginBottom></DeviceInfo>"
+    }
   }
 ]
\ 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
   <xs:element name="DS_Report" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Report" msprop:Generator_UserDSName="DS_Report">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="PrintJobQueue" msprop:Generator_TableClassName="PrintJobQueueDataTable" msprop:Generator_TableVarName="tablePrintJobQueue" msprop:Generator_RowChangedName="PrintJobQueueRowChanged" msprop:Generator_TablePropName="PrintJobQueue" msprop:Generator_RowDeletingName="PrintJobQueueRowDeleting" msprop:Generator_RowChangingName="PrintJobQueueRowChanging" msprop:Generator_RowEvHandlerName="PrintJobQueueRowChangeEventHandler" msprop:Generator_RowDeletedName="PrintJobQueueRowDeleted" msprop:Generator_RowClassName="PrintJobQueueRow" msprop:Generator_UserTableName="PrintJobQueue" msprop:Generator_RowEvArgName="PrintJobQueueRowChangeEvent">
+        <xs:element name="PrintJobQueue" msprop:Generator_TableClassName="PrintJobQueueDataTable" msprop:Generator_TableVarName="tablePrintJobQueue" msprop:Generator_TablePropName="PrintJobQueue" msprop:Generator_RowDeletingName="PrintJobQueueRowDeleting" msprop:Generator_RowChangingName="PrintJobQueueRowChanging" msprop:Generator_RowEvHandlerName="PrintJobQueueRowChangeEventHandler" msprop:Generator_RowDeletedName="PrintJobQueueRowDeleted" msprop:Generator_UserTableName="PrintJobQueue" msprop:Generator_RowChangedName="PrintJobQueueRowChanged" msprop:Generator_RowEvArgName="PrintJobQueueRowChangeEvent" msprop:Generator_RowClassName="PrintJobQueueRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxPrintJob" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxPrintJob" msprop:Generator_ColumnPropNameInRow="IdxPrintJob" msprop:Generator_ColumnPropNameInTable="IdxPrintJobColumn" msprop:Generator_UserColumnName="IdxPrintJob" type="xs:int" />
@@ -347,7 +347,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_prt_CartellinoFinitiOdette" msprop:Generator_TableClassName="stp_prt_CartellinoFinitiOdetteDataTable" msprop:Generator_TableVarName="tablestp_prt_CartellinoFinitiOdette" msprop:Generator_RowChangedName="stp_prt_CartellinoFinitiOdetteRowChanged" msprop:Generator_TablePropName="stp_prt_CartellinoFinitiOdette" msprop:Generator_RowDeletingName="stp_prt_CartellinoFinitiOdetteRowDeleting" msprop:Generator_RowChangingName="stp_prt_CartellinoFinitiOdetteRowChanging" msprop:Generator_RowEvHandlerName="stp_prt_CartellinoFinitiOdetteRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_prt_CartellinoFinitiOdetteRowDeleted" msprop:Generator_RowClassName="stp_prt_CartellinoFinitiOdetteRow" msprop:Generator_UserTableName="stp_prt_CartellinoFinitiOdette" msprop:Generator_RowEvArgName="stp_prt_CartellinoFinitiOdetteRowChangeEvent">
+        <xs:element name="stp_prt_CartellinoFinitiOdette" msprop:Generator_TableClassName="stp_prt_CartellinoFinitiOdetteDataTable" msprop:Generator_TableVarName="tablestp_prt_CartellinoFinitiOdette" msprop:Generator_TablePropName="stp_prt_CartellinoFinitiOdette" msprop:Generator_RowDeletingName="stp_prt_CartellinoFinitiOdetteRowDeleting" msprop:Generator_RowChangingName="stp_prt_CartellinoFinitiOdetteRowChanging" msprop:Generator_RowEvHandlerName="stp_prt_CartellinoFinitiOdetteRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_prt_CartellinoFinitiOdetteRowDeleted" msprop:Generator_UserTableName="stp_prt_CartellinoFinitiOdette" msprop:Generator_RowChangedName="stp_prt_CartellinoFinitiOdetteRowChanged" msprop:Generator_RowEvArgName="stp_prt_CartellinoFinitiOdetteRowChangeEvent" msprop:Generator_RowClassName="stp_prt_CartellinoFinitiOdetteRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CampoUDC" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCampoUDC" msprop:Generator_ColumnPropNameInRow="CampoUDC" msprop:Generator_ColumnPropNameInTable="CampoUDCColumn" msprop:Generator_UserColumnName="CampoUDC" minOccurs="0">
@@ -955,7 +955,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_prt_CartellinoPedane" msprop:Generator_TableClassName="stp_prt_CartellinoPedaneDataTable" msprop:Generator_TableVarName="tablestp_prt_CartellinoPedane" msprop:Generator_TablePropName="stp_prt_CartellinoPedane" msprop:Generator_RowDeletingName="stp_prt_CartellinoPedaneRowDeleting" msprop:Generator_RowChangingName="stp_prt_CartellinoPedaneRowChanging" msprop:Generator_RowEvHandlerName="stp_prt_CartellinoPedaneRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_prt_CartellinoPedaneRowDeleted" msprop:Generator_UserTableName="stp_prt_CartellinoPedane" msprop:Generator_RowChangedName="stp_prt_CartellinoPedaneRowChanged" msprop:Generator_RowEvArgName="stp_prt_CartellinoPedaneRowChangeEvent" msprop:Generator_RowClassName="stp_prt_CartellinoPedaneRow">
+        <xs:element name="stp_prt_CartellinoPedane" msprop:Generator_TableClassName="stp_prt_CartellinoPedaneDataTable" msprop:Generator_TableVarName="tablestp_prt_CartellinoPedane" msprop:Generator_RowChangedName="stp_prt_CartellinoPedaneRowChanged" msprop:Generator_TablePropName="stp_prt_CartellinoPedane" msprop:Generator_RowDeletingName="stp_prt_CartellinoPedaneRowDeleting" msprop:Generator_RowChangingName="stp_prt_CartellinoPedaneRowChanging" msprop:Generator_RowEvHandlerName="stp_prt_CartellinoPedaneRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_prt_CartellinoPedaneRowDeleted" msprop:Generator_RowClassName="stp_prt_CartellinoPedaneRow" msprop:Generator_UserTableName="stp_prt_CartellinoPedane" msprop:Generator_RowEvArgName="stp_prt_CartellinoPedaneRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodPedana" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCodPedana" msprop:Generator_ColumnPropNameInRow="CodPedana" msprop:Generator_ColumnPropNameInTable="CodPedanaColumn" msprop:Generator_UserColumnName="CodPedana" minOccurs="0">
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 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:PrintJobQueue" ZOrder="1" X="451" Y="146" Height="381" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:stp_prt_CartellinoFinitiOdette" ZOrder="3" X="43" Y="146" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:stp_prt_CartellinoPedane" ZOrder="2" X="54" Y="483" Height="229" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:PrintJobQueue" ZOrder="2" X="451" Y="146" Height="381" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:stp_prt_CartellinoFinitiOdette" ZOrder="3" X="43" Y="146" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignTable:stp_prt_CartellinoPedane" ZOrder="1" X="798" Y="148" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file