Refresh QRCode gen

NKC_WF/NKC_WF.csproj

@@ -1369,7 +1369,7 @@
     <Content Include="SHARE_SQL\.PlaceHolder.file">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="temp\119752.pdf" />
+    <Content Include="temp\none.pdf" />
     <None Include="Web.Debug-LELE.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

NKC_WF/WebUserControls/cmp_secScreen.ascx

@@ -4,15 +4,13 @@
 
 <div class="card text-center border-primary" style="width: 100%;">
     <asp:HiddenField runat="server" ID="hfNum" />
-    <asp:HiddenField runat="server" ID="hfShowMode" />
     <asp:HiddenField ID="hfBatchId" runat="server" Value="0" />
     <asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
     <div class="card-header bg-primary text-light">
         <div class="row">
             <div class="col-3">
                 <%--<asp:LinkButton runat="server" ID="lbtScambia" CssClass="btn btn-info btn-block" OnClick="lbtScambia_Click" OnClientClick="loadPdf()">Scambia</asp:LinkButton>--%>
-                <asp:HyperLink runat="server" ID="hlShowCurrSheet" Target="_blank" CssClass="btn btn-warning btn-block">SHOW SHEET</asp:HyperLink>
-                <asp:HyperLink runat="server" ID="hlPdfOpener" Target="_blank" CssClass="btn btn-success btn-block">OPEN PDF</asp:HyperLink>
+                <asp:HyperLink runat="server" ID="hlShowCurrSheet" Target="_blank" CssClass="btn btn-warning btn-block"><i class="fa fa-object-group fa-2x" aria-hidden="true"></i><br /><%: traduci("ShowCurrSheet") %></asp:HyperLink>
             </div>
             <div class="col-6">
                 <h3 class="text-uppercase"><%: traduci("SecScreen") %> -
@@ -20,17 +18,18 @@
                 <asp:Label runat="server" ID="lblPdf"></asp:Label>
             </div>
             <div class="col-3">
-                <asp:Image runat="server" Height="128" ID="imgQrSmall" />
+                <asp:HyperLink runat="server" ID="hlPdfOpener" Target="_blank" CssClass="btn btn-success btn-block"><i class="fa fa-file-pdf-o fa-2x" aria-hidden="true"></i>
+<br /><%: traduci("ShowPDF") %></asp:HyperLink>
             </div>
         </div>
     </div>
     <div class="card-body py-1">
         <div class="row">
             <div runat="server" id="divImg" class="col-12">
-                <asp:Image runat="server" Height="512" ID="imgQrMain" />
+                <asp:Image runat="server"  ID="imgQrMain" CssClass="img-fluid" />
             </div>
-            <div class="col-12">
-                <%--<script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
+            <%--<div class="col-12">
+                <script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
                 <script>
 
                     function loadPdf() {
@@ -77,9 +76,9 @@
                             console.error(reason);
                         });
                     };
-                </script>--%>
+                </script>
                 <canvas runat="server" id="canvasPdf"></canvas>
-            </div>
+            </div>--%>
         </div>
     </div>
 </div>

NKC_WF/WebUserControls/cmp_secScreen.ascx.cs

@@ -18,11 +18,10 @@ namespace NKC_WF.WebUserControls
         {
             if (!Page.IsPostBack)
             {
-                showMode = true;
                 // recupero numero
                 currNum = ComLib.getSecScreenCode();
                 doUpdate();
-                pdfPath = "../temp/119752.pdf";
+                pdfPath = "../temp/none.pdf";
                 SheetId = 999999999;
             }
         }
@@ -54,19 +53,6 @@ namespace NKC_WF.WebUserControls
                 hlShowCurrSheet.NavigateUrl = $"~/site/SvgFull?sheetId={value}";
             }
         }
-        public bool showMode
-        {
-            get
-            {
-                bool answ = false;
-                bool.TryParse(hfShowMode.Value, out answ);
-                return answ;
-            }
-            set
-            {
-                hfShowMode.Value = value.ToString();
-            }
-        }
         public string pdfPath
         {
             get
@@ -76,7 +62,6 @@ namespace NKC_WF.WebUserControls
             set
             {
                 // FIXME TODO necessario copiare in locale il pdf?
-
                 lblPdf.Text = value.Trim();
                 hlPdfOpener.NavigateUrl = value.Trim();
             }
@@ -104,32 +89,17 @@ namespace NKC_WF.WebUserControls
         /// Aggiorna componente principale e child components
         /// </summary>
         public void doUpdate()
-        {
-            // genero nuovo QR
-            string qrUrl = getImageUrl();
-            divImg.Visible = showMode;
-            canvasPdf.Visible = !showMode; 
-            imgQrSmall.Visible = !showMode;
-            // fix img!
-            if (showMode)
-            {
-                imgQrMain.ImageUrl = qrUrl;
-            }
-            else
-            {
-                imgQrSmall.ImageUrl = qrUrl;
-            }
-        }
-
-        protected void lbtScambia_Click(object sender, EventArgs e)
         {
             // valutato ma non usato pdf.js:
             // https://mozilla.github.io/pdf.js/examples/index.html#interactive-examples
-            pdfPath = ComLib.getSecScreenRequest(codSSC);
-            showMode = !showMode;
-            doUpdate();
+            string newPath = ComLib.getSecScreenRequest(codSSC);
+            pdfPath = string.IsNullOrEmpty(newPath) ? "../temp/none.pdf" : newPath;
+            // genero nuovo QR
+            string qrUrl = getImageUrl();
+            imgQrMain.ImageUrl = qrUrl;
         }
 
+
        
     }
 }

NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs

@@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfNum;
 
-        /// <summary>
-        /// Controllo hfShowMode.
-        /// </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 hfShowMode;
-
         /// <summary>
         /// Controllo hfBatchId.
         /// </summary>
@@ -59,15 +50,6 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlShowCurrSheet;
 
-        /// <summary>
-        /// Controllo hlPdfOpener.
-        /// </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.HyperLink hlPdfOpener;
-
         /// <summary>
         /// Controllo lblNum.
         /// </summary>
@@ -87,13 +69,13 @@ namespace NKC_WF.WebUserControls
         protected global::System.Web.UI.WebControls.Label lblPdf;
 
         /// <summary>
-        /// Controllo imgQrSmall.
+        /// Controllo hlPdfOpener.
         /// </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.Image imgQrSmall;
+        protected global::System.Web.UI.WebControls.HyperLink hlPdfOpener;
 
         /// <summary>
         /// Controllo divImg.
@@ -112,14 +94,5 @@ namespace NKC_WF.WebUserControls
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Image imgQrMain;
-
-        /// <summary>
-        /// Controllo canvasPdf.
-        /// </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.HtmlControls.HtmlGenericControl canvasPdf;
     }
 }

NKC_WF/site/SecondScreen.aspx.cs

@@ -15,7 +15,6 @@ namespace NKC_WF
 
         protected void timerSecScreen_Tick(object sender, EventArgs e)
         {
-            cmp_secScreen.showMode = !cmp_secScreen.showMode;
             cmp_secScreen.doUpdate();
         }
     }