diff --git a/C2P.v11.suo b/C2P.v11.suo index e642aaf..7a81237 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 573c541..4664748 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -125,6 +125,12 @@ + + Style.less + + + Style.less + diff --git a/C2P/Content/Style.css b/C2P/Content/Style.css new file mode 100644 index 0000000..978654a --- /dev/null +++ b/C2P/Content/Style.css @@ -0,0 +1,9 @@ +.warnRed { + color: red; +} +.warnOrange { + color: orange; +} +.allOk { + color: green; +} diff --git a/C2P/Content/Style.less b/C2P/Content/Style.less index 46800d1..027b16d 100644 --- a/C2P/Content/Style.less +++ b/C2P/Content/Style.less @@ -1,2 +1,12 @@ body { } + +.warnRed { + color: red; +} +.warnOrange { + color: orange; +} +.allOk { + color: green; +} diff --git a/C2P/Content/Style.min.css b/C2P/Content/Style.min.css new file mode 100644 index 0000000..364447f --- /dev/null +++ b/C2P/Content/Style.min.css @@ -0,0 +1 @@ +.warnRed{color:red}.warnOrange{color:#ffa500}.allOk{color:green} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_QuoteList.ascx b/C2P/WebUserControls/mod_QuoteList.ascx index 6fb8c57..62ab482 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx +++ b/C2P/WebUserControls/mod_QuoteList.ascx @@ -3,27 +3,133 @@ { %> <%} %> -
- +
+ + - + + <%-- + --%> + <%-- + + --%> + <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --%> + - + / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + <%-- @@ -36,61 +142,11 @@ --%> - <%--ConnectionString="name=Proxima_C2PEntities" DefaultContainerName="Proxima_C2PEntities" ContextTypeName="C2P_Data.C2P_mod"--%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + <%--ConnectionString="name=Proxima_C2PEntities" DefaultContainerName="Proxima_C2PEntities" ContextTypeName="C2P_Data.C2P_mod"--%>
- NEW +
diff --git a/C2P/WebUserControls/mod_QuoteList.ascx.cs b/C2P/WebUserControls/mod_QuoteList.ascx.cs index 2964843..2f2f1dc 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteList.ascx.cs @@ -30,5 +30,40 @@ namespace C2P.WebUserControls int QuoteRev = Convert.ToInt16(grView.SelectedDataKey["QuoteRev"]); ricalcolaQuote(QuoteType, CodQuote, QuoteRev); } + /// + /// Calcola css dato valore prezzo offerto vs importi full cost e min price + /// + /// + /// + /// + /// + public string priceVsCost(object _FullCost, object _MinPrice, object _PriceOff) + { + string answ = ""; + double FullCost = 0; + double MinPrice = 0; + double PriceOff = 0; + try + { + FullCost = Convert.ToDouble(_FullCost); + MinPrice = Convert.ToDouble(_MinPrice); + PriceOff = Convert.ToDouble(_PriceOff); + } + catch + { } + if (PriceOff > MinPrice) + { + answ = "allOk"; + } + else if (PriceOff > FullCost) + { + answ = "warnOrange"; + } + else + { + answ = "warnRed"; + } + return answ; + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs b/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs index ab4a363..cbfc96e 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs @@ -47,5 +47,14 @@ namespace C2P.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblOut; + + /// + /// btnNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnNew; } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 3c21904..ee49df3 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P.pdb b/C2P/bin/C2P.pdb index f24d985..176c8e4 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index 3c21904..ee49df3 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8f0bf09..53edbb1 100644 Binary files a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ