diff --git a/C2P/WebUserControls/mod_S_Quot.ascx b/C2P/WebUserControls/mod_S_Quot.ascx index 81e59e1..726b03b 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx +++ b/C2P/WebUserControls/mod_S_Quot.ascx @@ -1,5 +1,139 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Quot.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Quot" %> -<%@ Register Src="~/WebUserControls/mod_Q_Quot.ascx" TagName="mod_Q_Quot" TagPrefix="uc1" %> +<%if (false) + { %> + + +<%} %> +<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %> - - + + +
+   +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + +
+   +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+  <%: traduci("Update") %> +
+
+  <%: traduci("Cancel") %> +
+
+
+ + + + + + + + + + + + + + + + diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.cs b/C2P/WebUserControls/mod_S_Quot.ascx.cs index d09c600..eb892a3 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_S_Quot.ascx.cs @@ -7,11 +7,49 @@ using System.Web.UI.WebControls; namespace C2P.WebUserControls { - public partial class mod_S_Quot : System.Web.UI.UserControl + public partial class mod_S_Quot : SteamWare.UserControl { protected void Page_Load(object sender, EventArgs e) { } + public event EventHandler eh_update; + /// + /// fa toggle tra modo edit e read/item + /// + public void toggleMode() + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + frmView.ChangeMode(FormViewMode.Edit); + } + else + { + frmView.ChangeMode(FormViewMode.ReadOnly); + } + } + + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// restituisce classe CSS da confronto di 2 valori numerici: + /// - rosso se val1 minore val2 + /// - verde se val1 >= val2 + /// + /// + /// + /// + public string colorByVal(object val1, object val2) + { + string answ = "text-success"; + if (Math.Round(Convert.ToDecimal(val1), 3) < Math.Round(Convert.ToDecimal(val2), 3)) answ = "text-danger"; + return answ; + } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs b/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs index 59eef82..540554c 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs +++ b/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs @@ -13,12 +13,39 @@ namespace C2P.WebUserControls { public partial class mod_S_Quot { /// - /// mod_Q_Quot1 control. + /// BundleReference1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::C2P.WebUserControls.mod_Q_Quot mod_Q_Quot1; + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// frmView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmView; + + /// + /// odsQuotes control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsQuotes; } } diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index 9b14752..2bd9bef 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -267,9 +267,7 @@ namespace C2P.WebUserControls mod_S_Dies1.Visible = true; break; case "Quote": -#if false - if (prevReq == req) mod_S_Quot1.toggleMode(); -#endif + if (prevReq == req) mod_S_Quot1.toggleMode(); break; default: mod_S_Costs1.Visible = false; diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index db30e0e..afee37f 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 ea8ba5a..5aad60f 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 b824c82..60805f4 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 ea8ba5a..5aad60f 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 d09d3ce..b88a16f 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 b824c82..60805f4 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ