From aab5621411904ea55463d9fa5cc16a835a5f84e8 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 29 May 2018 18:49:44 +0200
Subject: [PATCH] rimesso scanner barcode

---
 MP-TAB/App_Start/BundleConfig.cs          | 10 ++--------
 MP-TAB/Web.config                         |  4 ++--
 MP-TAB/WebMasterPages/Bootstrap.Master    |  1 +
 MP-TAB/WebUserControls/mod_QRScanner.ascx |  2 --
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/MP-TAB/App_Start/BundleConfig.cs b/MP-TAB/App_Start/BundleConfig.cs
index 822442a4..e7d03cf0 100644
--- a/MP-TAB/App_Start/BundleConfig.cs
+++ b/MP-TAB/App_Start/BundleConfig.cs
@@ -40,14 +40,8 @@ namespace MoonProTablet
       bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
                   "~/Scripts/bootstrap.bundle.js"));
 
-      //bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include(
-      //            "~/Scripts/jquery-ui-i18n.min.js"));
-
-      // aggiungo bundle dinamico x less --> css
-      //bundles.Add(new DynamicFolderBundle("less", "*.less"));
-
-      // aggiungo bundle dinamico x coffee --> jscript
-      //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee"));
+      //bundles.Add(new ScriptBundle("~/bundles/instascan").Include(
+      //            "~/Scripts/instascan.min.js"));
 
       // abilito boundle "forzato"!
       BundleTable.EnableOptimizations = true;
diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config
index de1a6161..ebb0b9ff 100644
--- a/MP-TAB/Web.config
+++ b/MP-TAB/Web.config
@@ -49,7 +49,7 @@
     <add key="downloadPath" value="c:\Steamware\installers\MP\TAB" />
     <add key="doShrinkFolder" value="true" />
     <add key="CodModulo" value="MoonPro" />
-    <add key="EmbedQRead" value="false" />
+    <add key="EmbedQRead" value="true" />
     <!--impostazione cambio tempo calcolato tra minuti-ore-gg-->
     <add key="maxMinuti" value="60" />
     <add key="maxOre" value="1440" />
@@ -80,7 +80,7 @@
     <add key="dominio" value="Donati" />
     <add key="user" value="Mobile" />
     <add key="cookieDayExpire" value="3650" />
-    <add key="safePages" value="Test#regNewDevice#UserList" />
+    <add key="safePages" value="Test#regNewDevice" />
     <!--conf commenti e ricalcoli-->
     <add key="idxTipoCommento" value="999" />
     <add key="commEnableEditDel" value="true" />
diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master
index 4fa5bc4e..028a1afe 100644
--- a/MP-TAB/WebMasterPages/Bootstrap.Master
+++ b/MP-TAB/WebMasterPages/Bootstrap.Master
@@ -21,6 +21,7 @@
     <%: Scripts.Render("~/bundles/jquery") %>
     <%: Scripts.Render("~/bundles/jqueryui") %>
     <%: Scripts.Render("~/bundles/BrowserWindowSize") %>
+    <script type="text/javascript" src="Scripts/instascan.min.js"></script>
   </asp:PlaceHolder>
   <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
   <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx b/MP-TAB/WebUserControls/mod_QRScanner.ascx
index c5b3012c..02998b59 100644
--- a/MP-TAB/WebUserControls/mod_QRScanner.ascx
+++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx
@@ -1,7 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_QRScanner.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_QRScanner" %>
 
-<script src="~/Scripts/instascan.min.js"></script>
-
 <div class="row mt-3">
   <div class="col-12">
     <h3 class="text-center">QR SCanner</h3>