diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 949630d..1d9855d 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -1,6 +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" %> +<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %> @@ -54,11 +55,9 @@
- +
- <%--
-
--%> diff --git a/C2P/ExistingProductOffer.aspx.cs b/C2P/ExistingProductOffer.aspx.cs index bcdfda4..1460437 100644 --- a/C2P/ExistingProductOffer.aspx.cs +++ b/C2P/ExistingProductOffer.aspx.cs @@ -11,19 +11,39 @@ namespace C2P { protected void Page_Load(object sender, EventArgs e) { - repView.Visible = (acArticolo.valore != ""); + fixDetailVisibility(); acArticolo.eh_reset += acArticolo_eh_reset; acArticolo.eh_valSelezionato += acArticolo_eh_valSelezionato; } - + /// + /// selezionato articolo + /// + /// + /// void acArticolo_eh_valSelezionato(object sender, EventArgs e) { - repView.Visible = (acArticolo.valore != ""); + mod_imgPreview.CodItem = acArticolo.valore; + fixDetailVisibility(); } - + /// + /// determina visualizzazione dettagli articolo + /// + private void fixDetailVisibility() + { + repView.Visible = (acArticolo.valore != ""); + mod_imgPreview.Visible = (acArticolo.valore != ""); + } + /// + /// resettato articolo + /// + /// + /// void acArticolo_eh_reset(object sender, EventArgs e) { - repView.Visible = false; + //repView.Visible = false; + //mod_imgPreview.Visible = false; + mod_imgPreview.CodItem = ""; + fixDetailVisibility(); } /// /// url x rimbalzo offerta diff --git a/C2P/ExistingProductOffer.aspx.designer.cs b/C2P/ExistingProductOffer.aspx.designer.cs index 18b0425..e272928 100644 --- a/C2P/ExistingProductOffer.aspx.designer.cs +++ b/C2P/ExistingProductOffer.aspx.designer.cs @@ -58,12 +58,12 @@ namespace C2P { protected global::System.Web.UI.WebControls.ObjectDataSource ods; /// - /// Image1 control. + /// mod_imgPreview control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Image Image1; + protected global::C2P.WebUserControls.mod_imgPreview mod_imgPreview; } } diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index 58080de..b24a61f 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -3,7 +3,7 @@ <%@ Register Src="mod_selPeriodo.ascx" TagName="mod_selPeriodo" TagPrefix="uc2" %> <%@ Register Src="mod_slider.ascx" TagName="mod_slider" TagPrefix="uc3" %> <%@ Register Src="mod_range.ascx" TagName="mod_range" TagPrefix="uc4" %> -<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %> +<%@ Register Src="mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %> <%if (false) diff --git a/C2P/WebUserControls/mod_newProduct.ascx b/C2P/WebUserControls/mod_newProduct.ascx index a81faa5..f6695c2 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx +++ b/C2P/WebUserControls/mod_newProduct.ascx @@ -6,6 +6,8 @@ <%@ Register Src="~/WebUserControls/mod_S_PackPar.ascx" TagName="mod_S_PackPar" TagPrefix="uc4" %> <%@ Register Src="~/WebUserControls/mod_S_Quot.ascx" TagName="mod_S_Quot" TagPrefix="uc5" %> <%@ Register Src="~/WebUserControls/mod_S_Dies.ascx" TagName="mod_S_Dies" TagPrefix="uc6" %> +<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc7" TagName="mod_imgPreview" %> + <%if (false) { %> @@ -33,43 +35,51 @@
-
-
-
-
-  <%: traduci("HEADER") %> +
+ +
+
+
+
+  <%: traduci("HEADER") %> +
+
+  <%: traduci("EXTRUS-PARAM") %> +
+
+  <%: traduci("PACK-PARAM") %> +
+
+  <%: traduci("DIES-PARAM") %> +
+
+  <%: traduci("COSTS") %> +
-
-  <%: traduci("EXTRUS-PARAM") %> -
-
-  <%: traduci("PACK-PARAM") %> -
-
-  <%: traduci("DIES-PARAM") %> -
-
-  <%: traduci("COSTS") %> +
+ + + + +
-
- - - - - -
+
+
+
-
-
-
-  <%: traduci("QUOTATION") %> +
+
+
+
+  <%: traduci("QUOTATION") %> +
+
+
+
-
-
-
diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index 218e6e3..6cf13ff 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -239,9 +239,11 @@ namespace C2P.WebUserControls QuoteRev = Request.QueryString["QuoteRev"]; // carico stato offerta... int IdxQS = 0; + string CodItem = ""; try { IdxQS = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0].IdxQState; + CodItem = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0].CodItem; } catch { } @@ -250,6 +252,8 @@ namespace C2P.WebUserControls setBtnVisibility(); mod_S_Quot1.doUpdate(); mod_S_Costs1.doUpdate(); + // fix articolo x visualizzazione... + mod_imgPreview.CodItem = CodItem; } /// /// Calcola css dato valore prezzo offerto vs importi full cost e min price diff --git a/C2P/WebUserControls/mod_newProduct.ascx.designer.cs b/C2P/WebUserControls/mod_newProduct.ascx.designer.cs index c98c572..1d40f27 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.designer.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.designer.cs @@ -192,6 +192,15 @@ namespace C2P.WebUserControls { /// protected global::C2P.WebUserControls.mod_S_Dies mod_S_Dies1; + /// + /// mod_imgPreview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_imgPreview mod_imgPreview; + /// /// lbQuotation control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index d32983b..a94a8b0 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index e2dd77f..30502b6 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 580ce28..e753bd9 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index e2dd77f..2bb44dd 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index edbef9a..3f722a5 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 580ce28..491bc7d 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 20c343c..1eada3c 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.119.274")] -[assembly: AssemblyFileVersion("0.9.119.274")] +[assembly: AssemblyVersion("0.9.120.275")] +[assembly: AssemblyFileVersion("0.9.120.275")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 6ec8afd..330e3cc 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.119.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.9.119.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.9.120.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.9.120.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+