Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ulteriori fix grafici

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-08-29 19:30:41 +02:00
parent 44b67e4f1f
commit 062a19dcbb
13 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_OffersArchive.ascx
+10 -12
View File
@@ -92,19 +92,19 @@
</div>
<div class="col-sm-8">
<div class="row" style="min-height: 3.1em;">
<div class="col-sm-2 col-sm-offset-1" style="padding: 0px 4px;">
<div class="col-sm-3 col-sm-offset-1" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbOpen" CssClass="btn btn-success" OnClick="lbOpen_Click"><i class="fa fa-search"></i> <%:traduci("Open") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click" OnClientClick="if (!confermaDel()) return false;"><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbDuplicate" CssClass="btn btn-primary" OnClick="lbDuplicate_Click"><i class="fa fa-code-fork"></i> <%:traduci("Duplicate") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click" OnClientClick="if (!confermaDel()) return false;"><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;" hidden="true">
<asp:LinkButton runat="server" Width="100%" ID="lbSimulate" CssClass="btn btn-warning" OnClick="lbSimulate_Click"><i class="fa fa-flask"></i> <%:traduci("Simulate") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<div class="col-sm-2 col-sm-offset-1" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbPrint" CssClass="btn btn-info" OnClick="lbPrint_Click"><i class="fa fa-print"></i> <%:traduci("Print") %></asp:LinkButton>
</div>
</div>
@@ -153,22 +153,20 @@
<ItemStyle HorizontalAlign="Right"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="FullCost" SortExpression="FullCost" ItemStyle-HorizontalAlign="Right">
<%--<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadFC" Text="FC" ToolTip="Full Cost" />
</HeaderTemplate>--%>
<%--<asp:TemplateField HeaderText="FullCost" SortExpression="FullCost" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("FullCost", "{0:C3}") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right"></ItemStyle>
</asp:TemplateField>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="RockBott" SortExpression="MinPrice" ItemStyle-HorizontalAlign="Right">
<%--<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadMP" Text="MP" ToolTip="Minimum Price" />
</HeaderTemplate>--%>
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("MinPrice", "{0:C3}") %>' />
<asp:Label ID="Label3" runat="server" Text='<%# Eval("MinPrice", "{0:C3}") %>' Visible='<%# (Eval("QuoteType").ToString() == "Q") %>' />
<asp:Label ID="Label9" runat="server" Text='<%# Eval("MinPrice_sim", "{0:C3}") %>' Visible='<%# (Eval("QuoteType").ToString() != "Q") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right"></ItemStyle>
@@ -178,7 +176,7 @@
<asp:Label runat="server" ID="lblHeadPO" Text="PO" ToolTip="Price Offeres" />
</HeaderTemplate>--%>
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Eval("PriceOff", "{0:C3}") %>' CssClass='<%# priceVsCost(Eval("FullCost"),Eval("MinPrice"),Eval("PriceOff")) %>' />
<asp:Label ID="Label4" runat="server" Text='<%# Eval("PriceOff", "{0:C3}") %>' CssClass='<%# priceVsCost(Eval("QuoteType"),Eval("FullCost"),Eval("MinPrice"),Eval("MinPrice_sim"),Eval("PriceOff")) %>' />
</ItemTemplate>
<EditItemTemplate>
<asp:TextBox ID="txtPriceOff" runat="server" Text='<%# Bind("PriceOff") %>' Width="5em" />
C2P/WebUserControls/mod_OffersArchive.ascx.cs
+14 -2
View File
@@ -220,20 +220,31 @@ namespace C2P.WebUserControls
/// <summary>
/// Calcola css dato valore prezzo offerto vs importi full cost e min price
/// </summary>
/// <param name="QuoteType"></param>
/// <param name="FullCost"></param>
/// <param name="MinPrice"></param>
/// <param name="MinPrice_sim"></param>
/// <param name="PriceOff"></param>
/// <returns></returns>
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);
}
}
/// <summary>
/// Codice Quote
/// </summary>
C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs
Generated
+9 -9
View File
@@ -111,15 +111,6 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbOpen;
/// <summary>
/// lbDelete control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbDelete;
/// <summary>
/// lbDuplicate control.
/// </summary>
@@ -129,6 +120,15 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbDuplicate;
/// <summary>
/// lbDelete control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbDelete;
/// <summary>
/// lbSimulate control.
/// </summary>
C2P/WebUserControls/mod_Q_Quot.ascx
+2 -1
View File
@@ -25,8 +25,9 @@
</div>
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em;">
<div class="col-xs-6 text-left">
<uc1:mod_displayHor ID="mod_displayHor8" runat="server" etichetta='<%# traduci("PriceOff") %>' valore='<%# Eval("PriceOff", "{0:C3}") %>' valueCss='<%# colorByVal(Eval("PriceOff"), Eval("MinPrice")) %>' />
<uc1:mod_displayHor ID="mod_displayHor8" runat="server" etichetta='<%# traduci("PriceOff") %>' valore='<%# Eval("PriceOff", "{0:C3}") %>' valueCss='<%# priceVsCost(Eval("QuoteType"),Eval("FullCost"),Eval("MinPrice"),Eval("MinPrice_sim"),Eval("PriceOff")) %>' />
</div>
<%--valueCss='<%# colorByVal(Eval("PriceOff"), Eval("MinPrice")) %>'--%>
<div class="col-xs-6 text-right">
<uc1:mod_displayHor ID="mod_displayHor11" runat="server" etichetta='<%# traduci("P_PriceOff") %>' valore='<%# Eval("P_PriceOff", "{0:C3}") %>' />
</div>
C2P/WebUserControls/mod_Q_Quot.ascx.cs
+46
View File
@@ -60,6 +60,52 @@ namespace C2P.WebUserControls
return answ;
}
/// <summary>
/// Calcola css dato valore prezzo offerto vs importi full cost e min price
/// </summary>
/// <param name="QuoteType"></param>
/// <param name="FullCost"></param>
/// <param name="MinPrice"></param>
/// <param name="MinPrice_sim"></param>
/// <param name="PriceOff"></param>
/// <returns></returns>
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;
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -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")]
VersGen/C2P.tt
+2 -2
View File
@@ -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")]
<#+