Merge branch 'release/Add3rdMachineMan02'

.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
  ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
  EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\NKC\Release'
  DEPLOY_FOLDER: 'c:\Projects\Deploy\NKC\Builds'
- VERS_MAIN: '2.0'
+ VERS_MAIN: '2.5'
  NEW_REL: ''
  NEXUS_PATH: 'NKC'
  PROJ_NAME: 'NKC_WF'
@@ -110,8 +110,8 @@ Net:IIS01:deploy:
  stage: deploy
  tags:
     - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
+ only:
+    - develop
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet'
@@ -124,8 +124,8 @@ Net:IIS02:deploy:
  stage: deploy
  tags:
     - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
+ only:
+    - master
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet'
@@ -161,9 +161,9 @@ Net:install:
  stage: installer
  tags:
    - win
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "master"'
-#      when: manual
+ only:
+   - develop
+   - master
  variables:
    APP_NAME: NKC
    PROJ_NAME: NKC_WF

NKC_WF/Reports/queueConf.json

@@ -29,6 +29,21 @@
       "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
     }
   },
+  {
+    "name": "queueUnloadBinNE03",
+    "template": "Bin.rdlc",
+    "printerName": "Microsoft Print to PDF",
+    "deviceInfoParam": {
+      "OutputFormat": "EMF",
+      "PageHeight": "11in",
+      "PageWidth": "8.5in",
+      "MarginLeft": "0.5in",
+      "MarginRight": "0.5in",
+      "MarginTop": "0.5in",
+      "MarginBottom": "0.5in",
+      "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+    }
+  },
   {
     "name": "queueUnloadCartNE01",
     "template": "Cart.rdlc",
@@ -59,6 +74,21 @@
       "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
     }
   },
+  {
+    "name": "queueUnloadCartNE03",
+    "template": "Cart.rdlc",
+    "printerName": "Microsoft Print to PDF",
+    "deviceInfoParam": {
+      "OutputFormat": "EMF",
+      "PageHeight": "11in",
+      "PageWidth": "8.5in",
+      "MarginLeft": "0.5in",
+      "MarginRight": "0.5in",
+      "MarginTop": "0.5in",
+      "MarginBottom": "0.5in",
+      "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+    }
+  },
   {
     "name": "queueBunk",
     "template": "BunkGroup.rdlc",
@@ -134,6 +164,21 @@
       "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>4.09in</PageWidth><PageHeight>2in</PageHeight><MarginTop>0in</MarginTop><MarginLeft>0in</MarginLeft><MarginRight>0in</MarginRight><MarginBottom>0in</MarginBottom></DeviceInfo>"
     }
   },
+  {
+    "name": "queuePartNE03",
+    "template": "Part.rdlc",
+    "printerName": "Microsoft Print to PDF",
+    "deviceInfoParam": {
+      "OutputFormat": "EMF",
+      "PageHeight": "2in",
+      "PageWidth": "4.09in",
+      "MarginLeft": "0in",
+      "MarginRight": "0in",
+      "MarginTop": "0in",
+      "MarginBottom": "0in",
+      "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>4.09in</PageWidth><PageHeight>2in</PageHeight><MarginTop>0in</MarginTop><MarginLeft>0in</MarginLeft><MarginRight>0in</MarginRight><MarginBottom>0in</MarginBottom></DeviceInfo>"
+    }
+  },
   {
     "name": "queueOtherPart",
     "template": "OtherPart.rdlc",
@@ -238,5 +283,20 @@
       "MarginBottom": "0.5in",
       "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
     }
+  },
+  {
+    "name": "queueSpecialPartNE03",
+    "template": "SpecialParts.rdlc",
+    "printerName": "Microsoft Print to PDF",
+    "deviceInfoParam": {
+      "OutputFormat": "EMF",
+      "PageHeight": "11in",
+      "PageWidth": "8.5in",
+      "MarginLeft": "0.5in",
+      "MarginRight": "0.5in",
+      "MarginTop": "0.5in",
+      "MarginBottom": "0.5in",
+      "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+    }
   }
 ]

NKC_WF/WebUserControls/cmp_DailyStatsList.ascx

@@ -50,6 +50,7 @@
                         <asp:ListItem Text="--- ALL ---" Value="*" />
                         <asp:ListItem Text="NE01" Value="NE01" />
                         <asp:ListItem Text="NE02" Value="NE02" />
+                        <asp:ListItem Text="NE03" Value="NE03" />
                     </asp:DropDownList>
                 </div>
             </div>

NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx

@@ -38,8 +38,10 @@
 
         var dataNE01 = dataTS.filter(record => record.label == "NE01");
         var dataNE02 = dataTS.filter(record => record.label == "NE02");
+        var dataNE03 = dataTS.filter(record => record.label == "NE03");
         //console.log('dataNE01 data', dataNE01);
         //console.log('dataNE02 data', dataNE02);
+        //console.log('dataNE03 data', dataNE03);
 
         var myOptions = {
             responsive: true,
@@ -84,6 +86,13 @@
                         lineTension: 0,
                         //steppedLine: false,
                         data: dataNE02
+                    },
+                    {
+                        label: 'NE03: <%=hfLegend.Value %>',
+                        borderColor: 'rgb(7, 203, 126)',
+                        lineTension: 0,
+                        //steppedLine: false,
+                        data: dataNE03
                     }
                 ]
             },

NKC_WF/WebUserControls/cmp_MachSelSmart.ascx.cs

@@ -58,6 +58,10 @@ namespace NKC_WF.WebUserControls
             {
                 cssClass = "primary";
             }
+            else if (MachineSel == "NE03")
+            {
+                cssClass = "success";
+            }
             hfMachine.Value = MachineSel;
             hfMachClass.Value = cssClass;
             lbtReset.Attributes.Remove("class");

NKC_WF/WebUserControls/cmp_MachSem.ascx

@@ -18,6 +18,7 @@
         <asp:ListItem Text="-- PLEASE SELECT ---" Value="" />
         <asp:ListItem Text="NE01" Value="NE01" />
         <asp:ListItem Text="NE02" Value="NE02" />
+        <asp:ListItem Text="NE03" Value="NE03" />
     </asp:DropDownList>
 </div>
 

VersGen/ChangeLog.html

@@ -8,6 +8,12 @@
             <b>Last Changes:</b>
             <ul>{{LAST-CHANGES}}</ul>
         </li>
+        <li>
+            <b>v.2.5.* &rarr;</b>
+            <ul>
+                <li>Multi machine setup (NE01/NE02/NE03)</li>
+            </ul>
+        </li>
         <li>
             <b>v.2.0.* &rarr;</b>
             <ul>