From 8ab4a366bc86e61b89ecbc5876da50ff2775eb63 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 20 May 2014 17:49:59 +0200 Subject: [PATCH] update versione 0.7.69 update della simulazione (inserita anche modifica x parte COSTI) --- C2P/WebUserControls/mod_S_Quot.ascx | 140 +++++++++++++++++- C2P/WebUserControls/mod_S_Quot.ascx.cs | 40 ++++- .../mod_S_Quot.ascx.designer.cs | 31 +++- C2P/WebUserControls/mod_newProduct.ascx.cs | 4 +- C2P/bin/C2P.dll | Bin 357376 -> 357888 bytes C2P/bin/C2P_Data.dll | Bin 498176 -> 498176 bytes C2P/bin/SteamWare.dll | Bin 501248 -> 501248 bytes C2P_Report/bin/C2P_Data.dll | Bin 498176 -> 498176 bytes C2P_Report/bin/C2P_Report.dll | Bin 6656 -> 6656 bytes C2P_Report/bin/SteamWare.dll | Bin 501248 -> 501248 bytes 10 files changed, 206 insertions(+), 9 deletions(-) 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 db30e0ed8214f8bb4cc05e76e435a1d452ca4561..afee37ff16fc6ee850562a0286b3f6b49207ca6a 100644 GIT binary patch delta 6014 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 WU)!$1NxnCVjG5ziefzBOH~a&gSKPe- diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index ea8ba5ac8ee28a13a6eea38325f6b5dfe6ae1ce8..5aad60f33a9f11723837e457e429f6aa0fa35579 100644 GIT binary patch delta 75 zcmZqJBG<4*ZbAoBdSzo*YZqf{7gK8&b88n%YZq&47u(h@_H`Ko!WFu&3_N_jwpDgS ft6kb0vE3t+Jw^klW%{y->{^Us+b>RJ*XIBLX>S~j delta 75 zcmZqJBG<4*ZbAps>Ws#&)-J}@E~eHl=GHEj)-Kl8F1D>*?CUZFj7!;7mL0Hl?hA~~ f(N`1G-|msg9-{%&GJV-Zb}dGc?H4Dq>vI4AOKuw` diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index b824c82f985c09d8e622bb919a9febf8f4e5646f..60805f422ad83281d1199eede4dd7e32ede2ff95 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbAoBYGq?rYZqf{7gK8&b88n%YZq&47u(h@_NY{WeREc-aLv8!wfnGM ebfMqnP0PQevReRkO#e2QU5in9yW%|d`|JRUGai!w delta 74 zcmZoTBiC?7ZbAps%8bUY)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#3JX@eUN7wLGxxP* eu#f-0^5tJr*)4!Nrhl8uuEnUhU2z`!eRcqgx*l}^ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index ea8ba5ac8ee28a13a6eea38325f6b5dfe6ae1ce8..5aad60f33a9f11723837e457e429f6aa0fa35579 100644 GIT binary patch delta 75 zcmZqJBG<4*ZbAoBdSzo*YZqf{7gK8&b88n%YZq&47u(h@_H`Ko!WFu&3_N_jwpDgS ft6kb0vE3t+Jw^klW%{y->{^Us+b>RJ*XIBLX>S~j delta 75 zcmZqJBG<4*ZbAps>Ws#&)-J}@E~eHl=GHEj)-Kl8F1D>*?CUZFj7!;7mL0Hl?hA~~ f(N`1G-|msg9-{%&GJV-Zb}dGc?H4Dq>vI4AOKuw` diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index d09d3ce29fe5e868dbe37457d1832c00feb3f294..b88a16fe473a6643e30146a0556c3185bcfb07e0 100644 GIT binary patch delta 49 zcmZoLX)u}4!IW9Ku}ermU`21lPx# diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index b824c82f985c09d8e622bb919a9febf8f4e5646f..60805f422ad83281d1199eede4dd7e32ede2ff95 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbAoBYGq?rYZqf{7gK8&b88n%YZq&47u(h@_NY{WeREc-aLv8!wfnGM ebfMqnP0PQevReRkO#e2QU5in9yW%|d`|JRUGai!w delta 74 zcmZoTBiC?7ZbAps%8bUY)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#3JX@eUN7wLGxxP* eu#f-0^5tJr*)4!Nrhl8uuEnUhU2z`!eRcqgx*l}^