From 61eefa2ade5f8b35a82ad90ec849b7020b8e7eef Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 25 Sep 2018 12:59:39 +0200
Subject: [PATCH] Inizio aggiunta btn barcode

---
 Jenkinsfile                                   |  2 +-
 MP-Admin/BCode.aspx                           |  3 ++
 MP-Admin/BCode.aspx.cs                        | 17 +++++++++++
 MP-Admin/BCode.aspx.designer.cs               | 17 +++++++++++
 MP-Admin/MP-Admin.csproj                      |  8 +++++
 MP-Admin/WebUserControls/mod_main_help.ascx   | 29 ++++++++++---------
 .../WebUserControls/mod_main_help.ascx.cs     |  5 ++++
 .../mod_main_help.ascx.designer.cs            |  9 ++++++
 MP-Admin/WebUserControls/mod_menuBottom.ascx  |  2 +-
 9 files changed, 77 insertions(+), 15 deletions(-)
 create mode 100644 MP-Admin/BCode.aspx
 create mode 100644 MP-Admin/BCode.aspx.cs
 create mode 100644 MP-Admin/BCode.aspx.designer.cs

diff --git a/Jenkinsfile b/Jenkinsfile
index 824c45f1..2f4a9a15 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=813']) {
+        withEnv(['NEXT_BUILD_NUMBER=814']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-Admin/BCode.aspx b/MP-Admin/BCode.aspx
new file mode 100644
index 00000000..3565f7b6
--- /dev/null
+++ b/MP-Admin/BCode.aspx
@@ -0,0 +1,3 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="BCode.aspx.cs" Inherits="MoonProAdmin.BCode" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
+</asp:Content>
diff --git a/MP-Admin/BCode.aspx.cs b/MP-Admin/BCode.aspx.cs
new file mode 100644
index 00000000..eb66def6
--- /dev/null
+++ b/MP-Admin/BCode.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MoonProAdmin
+{
+  public partial class BCode : System.Web.UI.Page
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+  }
+}
\ No newline at end of file
diff --git a/MP-Admin/BCode.aspx.designer.cs b/MP-Admin/BCode.aspx.designer.cs
new file mode 100644
index 00000000..6250a6f7
--- /dev/null
+++ b/MP-Admin/BCode.aspx.designer.cs
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MoonProAdmin
+{
+
+
+  public partial class BCode
+  {
+  }
+}
diff --git a/MP-Admin/MP-Admin.csproj b/MP-Admin/MP-Admin.csproj
index 961cc9c3..20135187 100644
--- a/MP-Admin/MP-Admin.csproj
+++ b/MP-Admin/MP-Admin.csproj
@@ -151,6 +151,7 @@
     <Content Include="approvazioneODL.aspx" />
     <Content Include="approvazioneProd.aspx" />
     <Content Include="App_Readme\Elmah.txt" />
+    <Content Include="BCode.aspx" />
     <Content Include="caricaUpdateOperatori.aspx" />
     <Content Include="Content\bootstrap-grid.css" />
     <Content Include="Content\bootstrap-grid.min.css" />
@@ -270,6 +271,13 @@
     <Compile Include="approvazioneProd.aspx.designer.cs">
       <DependentUpon>approvazioneProd.aspx</DependentUpon>
     </Compile>
+    <Compile Include="BCode.aspx.cs">
+      <DependentUpon>BCode.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BCode.aspx.designer.cs">
+      <DependentUpon>BCode.aspx</DependentUpon>
+    </Compile>
     <Compile Include="calendChiusura.aspx.cs">
       <DependentUpon>calendChiusura.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/MP-Admin/WebUserControls/mod_main_help.ascx b/MP-Admin/WebUserControls/mod_main_help.ascx
index 7dd456d7..18bc333b 100644
--- a/MP-Admin/WebUserControls/mod_main_help.ascx
+++ b/MP-Admin/WebUserControls/mod_main_help.ascx
@@ -1,19 +1,22 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" CodeBehind="mod_main_help.ascx.cs" %>
-<div id="Div1" class="quadro1">
-    <asp:Button runat="server" ID="btnAnagArticoli" CssClass="btnMain" OnClick="btnAnagArticoli_Click" />
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnAnagArticoli" CssClass="btnMain" OnClick="btnAnagArticoli_Click" />
 </div>
-<div id="Div2" class="quadro1">
-    <asp:Button runat="server" ID="btnGestPromesseOdl" CssClass="btnMain" OnClick="btnGestPromesseOdl_Click" />
-</div> 
-<div id="Div3" class="quadro1">
-    <asp:Button runat="server" ID="btnGestOdl" CssClass="btnMain" OnClick="btnGestOdl_Click" />
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnGestPromesseOdl" CssClass="btnMain" OnClick="btnGestPromesseOdl_Click" />
 </div>
-<div id="Div4" class="quadro1">
-    <asp:Button runat="server" ID="btnGestDatiMacchina" CssClass="btnMain" OnClick="btnGestDatiMacchina_Click" />
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnGestOdl" CssClass="btnMain" OnClick="btnGestOdl_Click" />
 </div>
-<div id="Div5" class="quadro1">
-    <asp:Button runat="server" ID="btnApprovaTC" CssClass="btnMain" OnClick="btnApprovaTC_Click" />
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnGestDatiMacchina" CssClass="btnMain" OnClick="btnGestDatiMacchina_Click" />
 </div>
-<div id="Div6" class="quadro1">
-    <asp:Button runat="server" ID="btnApprovaProd" CssClass="btnMain" OnClick="btnApprovaProd_Click" />
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnApprovaTC" CssClass="btnMain" OnClick="btnApprovaTC_Click" />
+</div>
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnApprovaProd" CssClass="btnMain" OnClick="btnApprovaProd_Click" />
+</div>
+<div class="quadro1">
+  <asp:Button runat="server" ID="btnBCode" CssClass="btnMain" OnClick="btnBCode_Click" />
 </div>
diff --git a/MP-Admin/WebUserControls/mod_main_help.ascx.cs b/MP-Admin/WebUserControls/mod_main_help.ascx.cs
index 4c709b52..21fe9e27 100644
--- a/MP-Admin/WebUserControls/mod_main_help.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_main_help.ascx.cs
@@ -13,6 +13,7 @@ public partial class mod_main_help : ApplicationUserControl
     btnGestDatiMacchina.Text = traduci("btnGestDatiMacchina");
     btnApprovaTC.Text = traduci("btnApprovaTC");
     btnApprovaProd.Text = traduci("btnApprovaProd");
+    btnBCode.Text = traduci("btnBCode");
   }
 
   protected void btnGestPromesseOdl_Click(object sender, EventArgs e)
@@ -43,4 +44,8 @@ public partial class mod_main_help : ApplicationUserControl
     Response.Redirect("~/approvazioneProd.aspx");
   }
 
+  protected void btnBCode_Click(object sender, EventArgs e)
+  {
+    Response.Redirect("~/BCode.aspx");
+  }
 }
diff --git a/MP-Admin/WebUserControls/mod_main_help.ascx.designer.cs b/MP-Admin/WebUserControls/mod_main_help.ascx.designer.cs
index 1995a593..1e778ae2 100644
--- a/MP-Admin/WebUserControls/mod_main_help.ascx.designer.cs
+++ b/MP-Admin/WebUserControls/mod_main_help.ascx.designer.cs
@@ -64,4 +64,13 @@ public partial class mod_main_help {
     /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
     /// </remarks>
     protected global::System.Web.UI.WebControls.Button btnApprovaProd;
+    
+    /// <summary>
+    /// Controllo btnBCode.
+    /// </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.Button btnBCode;
 }
diff --git a/MP-Admin/WebUserControls/mod_menuBottom.ascx b/MP-Admin/WebUserControls/mod_menuBottom.ascx
index 94b099ac..5a5d0c25 100644
--- a/MP-Admin/WebUserControls/mod_menuBottom.ascx
+++ b/MP-Admin/WebUserControls/mod_menuBottom.ascx
@@ -21,7 +21,7 @@
                 <div id="progress_back">
                 </div>
                 <div id="progress_top">
-                  <i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;
+                  <i class="fa fa-cog fa-spin fa"></i>&nbsp;<i class="fa fa-cog fa-spin fa"></i>&nbsp;<i class="fa fa-cog fa-spin fa"></i>&nbsp;
                 </div>
               </ProgressTemplate>
             </asp:UpdateProgress>