diff --git a/C2P/App_Start/BundleConfig.cs b/C2P/App_Start/BundleConfig.cs index 02f4ca6..6f38d92 100644 --- a/C2P/App_Start/BundleConfig.cs +++ b/C2P/App_Start/BundleConfig.cs @@ -50,8 +50,8 @@ namespace C2P // aggiungo bundle dinamico x coffee --> jscript //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); - //// abilito boundle "forzato"! - //BundleTable.EnableOptimizations = true; + // abilito boundle "forzato"! + BundleTable.EnableOptimizations = true; } } } \ No newline at end of file diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 8672af6..0b502e4 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -1,5 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="ExistingProductOffer.aspx.cs" Inherits="C2P.ExistingProductOffer" %> +<%@ Register Src="~/WebUserControls/mod_autocomplete.ascx" TagPrefix="uc1" TagName="mod_autocomplete" %> + @@ -13,33 +15,41 @@ - - + + + + <%-- + --%> + + - - - - - - <%: traduci("RawMat") %> - - - - - - <%: traduci("ExistingProduct")%> - <%: traduci("NewProduct")%> - - - - - - - - - - + + + + + + + <%: traduci("RawMat") %> + + + + + + <%: traduci("ExistingProduct")%> + <%: traduci("NewProduct")%> + + + + + + + + + + + + diff --git a/C2P/ExistingProductOffer.aspx.cs b/C2P/ExistingProductOffer.aspx.cs index 1365267..4e92558 100644 --- a/C2P/ExistingProductOffer.aspx.cs +++ b/C2P/ExistingProductOffer.aspx.cs @@ -11,6 +11,7 @@ namespace C2P { protected void Page_Load(object sender, EventArgs e) { + repView.Visible = (acArticolo.valore != ""); } /// /// url x rimbalzo offerta @@ -28,13 +29,14 @@ namespace C2P } catch { } + string product = acArticolo.valore; if (isNew) { - answ = string.Format("~/NewProductOffer?RawMat={0}&CodItem={1}", _rawMat, ddlProduct.SelectedValue); + answ = string.Format("~/NewProductOffer?RawMat={0}&CodItem={1}", _rawMat, product); } else { - answ = string.Format("~/Quote?RawMat={0}&CodItem={1}", _rawMat, ddlProduct.SelectedValue); + answ = string.Format("~/Quote?RawMat={0}&CodItem={1}", _rawMat, product); } return answ; } diff --git a/C2P/ExistingProductOffer.aspx.designer.cs b/C2P/ExistingProductOffer.aspx.designer.cs index 039fe76..92a40b9 100644 --- a/C2P/ExistingProductOffer.aspx.designer.cs +++ b/C2P/ExistingProductOffer.aspx.designer.cs @@ -13,31 +13,31 @@ namespace C2P { public partial class ExistingProductOffer { /// - /// ddlProduct control. + /// upSelettore control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList ddlProduct; + protected global::System.Web.UI.UpdatePanel upSelettore; /// - /// odsProducts control. + /// acArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsProducts; + protected global::C2P.WebUserControls.mod_autocomplete acArticolo; /// - /// lstView control. + /// upItems control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ListView lstView; + protected global::System.Web.UI.UpdatePanel upItems; /// /// repView control. diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 36a4b95..362d13c 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 0796440..9decf03 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 20fbb1f..f69d9e3 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.61.162")] -[assembly: AssemblyFileVersion("0.6.61.162")] +[assembly: AssemblyVersion("0.6.62.162")] +[assembly: AssemblyFileVersion("0.6.62.162")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index dca15f5..a9b42c4 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.61.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.61.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.6.62.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.6.62.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+