diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index bbc3372..1e00b11 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -92,19 +92,19 @@
-
+
<%:traduci("Open") %>
-
- <%:traduci("Delete") %> -
<%:traduci("Duplicate") %>
+ <%:traduci("Delete") %> +
+ -
+
<%:traduci("Print") %>
@@ -153,22 +153,20 @@ - - <%-- - - --%> + <%-- - + --%> <%-- --%> - + + @@ -178,7 +176,7 @@ --%> - + diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 5b007d4..35c069a 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -220,20 +220,31 @@ namespace C2P.WebUserControls /// /// Calcola css dato valore prezzo offerto vs importi full cost e min price /// + /// /// /// + /// /// /// - public string priceVsCost(object _FullCost, object _MinPrice, object _PriceOff) + public string priceVsCost(object _quoteType, object _FullCost, object _MinPrice, object _MinPrice_sim, object _PriceOff) { string answ = ""; + string QType = ""; double FullCost = 0; double MinPrice = 0; double PriceOff = 0; try { + QType = _quoteType.ToString(); FullCost = Convert.ToDouble(_FullCost); - MinPrice = Convert.ToDouble(_MinPrice); + if (QType == "S") + { + MinPrice = Convert.ToDouble(_MinPrice_sim); + } + else + { + MinPrice = Convert.ToDouble(_MinPrice); + } PriceOff = Convert.ToDouble(_PriceOff); } catch @@ -382,6 +393,7 @@ namespace C2P.WebUserControls memLayer.ML.setSessionVal("LastQuoteType", value); } } + /// /// Codice Quote /// diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs index 4ee5972..10efbb8 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs @@ -111,15 +111,6 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbOpen; - /// - /// lbDelete control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbDelete; - /// /// lbDuplicate control. /// @@ -129,6 +120,15 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbDuplicate; + /// + /// lbDelete control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbDelete; + /// /// lbSimulate control. /// diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx b/C2P/WebUserControls/mod_Q_Quot.ascx index 587e090..6500602 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx +++ b/C2P/WebUserControls/mod_Q_Quot.ascx @@ -25,8 +25,9 @@
- +
+ <%--valueCss='<%# colorByVal(Eval("PriceOff"), Eval("MinPrice")) %>'--%>
diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx.cs b/C2P/WebUserControls/mod_Q_Quot.ascx.cs index 9b2ec2a..73cce8a 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Quot.ascx.cs @@ -60,6 +60,52 @@ namespace C2P.WebUserControls return answ; } /// + /// Calcola css dato valore prezzo offerto vs importi full cost e min price + /// + /// + /// + /// + /// + /// + /// + public string priceVsCost(object _quoteType, object _FullCost, object _MinPrice, object _MinPrice_sim, object _PriceOff) + { + string answ = ""; + string QType = ""; + double FullCost = 0; + double MinPrice = 0; + double PriceOff = 0; + try + { + QType = _quoteType.ToString(); + FullCost = Convert.ToDouble(_FullCost); + if (QType == "S") + { + MinPrice = Convert.ToDouble(_MinPrice_sim); + } + else + { + MinPrice = Convert.ToDouble(_MinPrice); + } + PriceOff = Convert.ToDouble(_PriceOff); + } + catch + { } + if (PriceOff > MinPrice && (FullCost > 0 && MinPrice > 0)) + { + answ = "allOk"; + } + else if (PriceOff > FullCost && (FullCost > 0 && MinPrice > 0)) + { + answ = "warnOrange"; + } + else + { + answ = "warnRed"; + } + return answ; + } + /// /// controllo se inviare evento refresh al cambio di modo della formview /// /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index eb15210..421dce7 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 30502b6..6aa2890 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 e753bd9..2f09fd4 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 30502b6..6aa2890 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 c87c699..eacf577 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 e753bd9..2f09fd4 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 5ce8f08..4a906ff 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.117.271")] -[assembly: AssemblyFileVersion("0.9.117.271")] +[assembly: AssemblyVersion("0.9.118.271")] +[assembly: AssemblyFileVersion("0.9.118.271")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 0a1c304..6657400 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.117.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.9.117.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.9.118.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.9.118.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+