From 14a72bc041c0cf072af4b9cfaa13a233003ade09 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 5 May 2014 18:23:00 +0200
Subject: [PATCH] iniziato modifica consumo anime (NON FINITA)

---
 GMW/WebUserControls/mod_consumoAnime.ascx     | 32 +++-------
 .../mod_consumoAnime.ascx.designer.cs         | 63 ++++++-------------
 GMW/anime.aspx.cs                             |  6 +-
 GMW/consumoAnime.aspx                         | 11 +++-
 VersGen/GMW.cs                                |  4 +-
 VersGen/GMW.tt                                |  4 +-
 6 files changed, 41 insertions(+), 79 deletions(-)

diff --git a/GMW/WebUserControls/mod_consumoAnime.ascx b/GMW/WebUserControls/mod_consumoAnime.ascx
index e5f1719a..ff1b150b 100644
--- a/GMW/WebUserControls/mod_consumoAnime.ascx
+++ b/GMW/WebUserControls/mod_consumoAnime.ascx
@@ -1,25 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_consumoAnime.ascx.cs" Inherits="GMW.WebUserControls.mod_consumoAnime" %>
-<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
+
 <% if (false)
    { %>
-<link href="../Style.css" rel="stylesheet" type="text/css" />
+<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
+<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
 <% } %>
 <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa" Height="100%">
     <div style="height: 100%;">
         <div style="float: none; text-align: center; margin: auto;">
-            <div class="fullPageHeader">
-                <div style="float: left;">
-                    <asp:Label runat="server" ID="lblPostazione" />
-                </div>
-                <div style="float: right;">
-                    <asp:Label runat="server" ID="lblPrinter" />
-                </div>
-                <div>
-                    <asp:Label runat="server" ID="lblCurrentPage" Text="Pag Corrente" Font-Size="16pt" ForeColor="White" />
-                    <br />
-                    <asp:HyperLink runat="server" ID="hlMenu" NavigateUrl="~/menu.aspx" Text="Main Menu" />
-                </div>
-            </div>
             <div>
                 <asp:Label runat="server" ID="lblUdcSel" Font-Size="36pt" Text="" />
             </div>
@@ -36,25 +24,25 @@
                     <asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
                     <br />
                     <asp:TextBox runat="server" ID="txtBarcode" Height="60px" Width="480px" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" />
-                    <asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtBarcode" ServicePath="~/WS/AutoCompletamento.asmx"
-                        ServiceMethod="elencoParticolari" MinimumPrefixLength="2" CompletionInterval="200" />
+                    <%--<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtBarcode" ServicePath="~/WS/AutoCompletamento.asmx"
+                        ServiceMethod="elencoParticolari" MinimumPrefixLength="2" CompletionInterval="200" />--%>
                 </div>
-                <div style="padding-top: 10; padding-bottom: 10;">
-                    <div style="padding-top: 10; padding-bottom: 10;">
+                <div style="padding: 10px 0px;">
+                    <div style="padding-top: 10px 0px;">
                         <asp:Label runat="server" ID="lblConsuma" Font-Size="24pt" />
                     </div>
                     &nbsp;
-                    <div style="padding-top: 10; padding-bottom: 10;">
+                    <div style="padding-top: 10px 0px;">
                         <asp:Button ID="btnConsuma" runat="server" Font-Size="20pt" Height="120px" OnClick="btnConsuma_Click" Width="300px" />
                     </div>
                     &nbsp;
-                    <div style="padding-top: 10; padding-bottom: 10;">
+                    <div style="padding-top: 10px 0px;">
                         <asp:Button ID="btnForzaCons_NoPosVLP" runat="server" Font-Size="20pt" Height="80px" OnClick="btnForzaCons_NoPosVLP_Click"
                             Width="400px" />
                         <asp:Button ID="btnForzaCons_inLDP" runat="server" Font-Size="20pt" Height="80px" OnClick="btnForzaCons_inLDP_Click" Width="400px" />
                     </div>
                 &nbsp;
-                <div style="padding-top: 10; padding-bottom: 10;">
+                <div style="padding-top: 10px 0px;">
                     <asp:Button ID="btnDisableConf" runat="server" Font-Size="20pt" Height="80px" Width="480px" OnClick="btnDisableConf_Click" />
                 </div>
             </div>
diff --git a/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs b/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
index 1b699a3f..34141ff2 100644
--- a/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
@@ -12,6 +12,24 @@ namespace GMW.WebUserControls {
     
     public partial class mod_consumoAnime {
         
+        /// <summary>
+        /// BundleReference1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+        
+        /// <summary>
+        /// BundleReference2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+        
         /// <summary>
         /// pnlAll control.
         /// </summary>
@@ -21,42 +39,6 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlAll;
         
-        /// <summary>
-        /// lblPostazione control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPostazione;
-        
-        /// <summary>
-        /// lblPrinter control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPrinter;
-        
-        /// <summary>
-        /// lblCurrentPage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblCurrentPage;
-        
-        /// <summary>
-        /// hlMenu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.HyperLink hlMenu;
-        
         /// <summary>
         /// lblUdcSel control.
         /// </summary>
@@ -102,15 +84,6 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtBarcode;
         
-        /// <summary>
-        /// aceParticolare control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
-        
         /// <summary>
         /// lblConsuma control.
         /// </summary>
diff --git a/GMW/anime.aspx.cs b/GMW/anime.aspx.cs
index 0ce69c0a..b3bbb059 100644
--- a/GMW/anime.aspx.cs
+++ b/GMW/anime.aspx.cs
@@ -29,10 +29,8 @@ namespace GMW
             // update vari...
             doUpdate();
             mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa);
-#if false
             mod_anime1.doUpdate();
-            mod_anime1.eh_reqUpdate += mod_PostRX_NT1_eh_reqUpdate; 
-#endif
+            mod_anime1.eh_reqUpdate += mod_PostRX_NT1_eh_reqUpdate;
             mod_selLineaNtDt1.eh_lineSelected += mod_selLineaNtDt1_eh_doRefresh;
             mod_selLineaNtDt1.eh_showHideStorico += mod_selLineaNtDt1_eh_showHideStorico;
         }
@@ -53,9 +51,7 @@ namespace GMW
         private void mod_selLineaNtDt1_eh_doRefresh(object sender, EventArgs e)
         {
             doUpdate();
-#if false
             mod_anime1.doUpdate(); 
-#endif
         }
         /// <summary>
         /// richiesta update del controllo SAO
diff --git a/GMW/consumoAnime.aspx b/GMW/consumoAnime.aspx
index 6179ad9b..5090ecb5 100644
--- a/GMW/consumoAnime.aspx
+++ b/GMW/consumoAnime.aspx
@@ -1,5 +1,10 @@
-<%@ Page Title="Cons Anime" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.Master" AutoEventWireup="true" CodeBehind="consumoAnime.aspx.cs" Inherits="GMW.consumoAnime" %>
-<%@ Register src="WebUserControls/mod_consumoAnime.ascx" tagname="mod_consumoAnime" tagprefix="uc1" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
+<%@ Page Title="Cons Anime" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="consumoAnime.aspx.cs" Inherits="GMW.consumoAnime" %>
+
+<%@ Register Src="WebUserControls/mod_consumoAnime.ascx" TagName="mod_consumoAnime" TagPrefix="uc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
     <uc1:mod_consumoAnime ID="mod_consumoAnime1" runat="server" />
 </asp:Content>
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index a57ba3e4..179dbfff 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.673.1585")]
-[assembly: AssemblyFileVersion("2.5.673.1585")]
+[assembly: AssemblyVersion("2.5.674.1585")]
+[assembly: AssemblyFileVersion("2.5.674.1585")]
 [assembly: AssemblyCopyright("Steamware © 2007-2014")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index f9221565..bbb712ee 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.673.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.673.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.674.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.674.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+