Merge branch 'develop'

NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx

@@ -3,16 +3,20 @@
 <div id="uplTavola">
   <link href="../api/getMUCss" rel="stylesheet" id="dynCss" />
 </div>
+<asp:HiddenField ID="hfBatchId" runat="server" Value="0" />
 <asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
 <asp:HiddenField ID="hfFilename" runat="server" Value="" />
 <asp:HiddenField ID="hfCurrRev" runat="server" Value="0" />
+<asp:HiddenField ID="hfCurrBunkRev" runat="server" Value="0" />
 <script type="text/javascript">
   lastVal = 0;
   my_function();
   setInterval("my_function();", 1000);
   function my_function() {
+    BunkId = document.getElementById('<%=hfBatchId.ClientID%>').value;
     SheetId = document.getElementById('<%=hfSheetId.ClientID%>').value;
     lastVal = document.getElementById('<%=hfCurrRev.ClientID%>').value;
+    lastValBunk = document.getElementById('<%=hfCurrBunkRev.ClientID%>').value;
     document.getElementById("dynCss").href = "../api/getMUCss/" + SheetId;
     $.ajax({
       url: "../api/getMUCssRev/" + SheetId
@@ -23,6 +27,17 @@
         document.getElementById('<%=hfCurrRev.ClientID%>').value = data;
       }
     });
+    // qui leggo la versione del BUNK (con cambio foglio...)
+    $.ajax({
+      url: "../api/getMUSheetRev/" + BunkId
+    }).then(function (data) {
+      // se è cambiato...
+      if (data != lastValBunk) {
+        // ricarico intera pagina!
+        location.reload();
+        document.getElementById('<%=hfCurrBunkRev.ClientID%>').value = data;
+      }
+    });
   }
 </script>
 <svg width="2000" height="1000" xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" class="img-fluid">

NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs

@@ -12,6 +12,23 @@ namespace NKC_WF.WebUserControls
 {
   public partial class cmp_MU_svgViewer : System.Web.UI.UserControl
   {
+    /// <summary>
+    /// BatchId corrente...
+    /// </summary>
+    public int BatchId
+    {
+      set
+      {
+        hfBatchId.Value = value.ToString();
+        doUpdate();
+      }
+      get
+      {
+        int answ = 0;
+        int.TryParse(hfBatchId.Value, out answ);
+        return answ;
+      }
+    }
     /// <summary>
     /// Foglio corrente...
     /// </summary>
@@ -77,6 +94,11 @@ namespace NKC_WF.WebUserControls
     }
     protected void Page_Load(object sender, EventArgs e)
     {
+      if(!Page.IsPostBack)
+      {
+        // scrivo valore revisione batch!
+        hfCurrBunkRev.Value = ComLib.getSheetRevByBunk(BatchId).ToString();
+      }
     }
   }
 }

NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs

@@ -14,6 +14,15 @@ namespace NKC_WF.WebUserControls
   public partial class cmp_MU_svgViewer
   {
 
+    /// <summary>
+    /// Controllo hfBatchId.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.HiddenField hfBatchId;
+
     /// <summary>
     /// Controllo hfSheetId.
     /// </summary>
@@ -41,6 +50,15 @@ namespace NKC_WF.WebUserControls
     /// </remarks>
     protected global::System.Web.UI.WebControls.HiddenField hfCurrRev;
 
+    /// <summary>
+    /// Controllo hfCurrBunkRev.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.HiddenField hfCurrBunkRev;
+
     /// <summary>
     /// Controllo svgTable.
     /// </summary>

NKC_WF/site/MachineUnload.aspx.cs

@@ -57,6 +57,7 @@ namespace NKC_WF
       cmp_MU_stats.BatchId = BatchId;
       cmp_MU_bins.BatchId = BatchId;
       cmp_MU_carts.BatchId = BatchId;
+      cmp_MU_svgViewer.BatchId = BatchId;
       cmp_MU_svgViewer.SheetId = SheetId;
     }
     /// <summary>