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

1.9.130

Browse Source 
fix colori x newProduct e quote detail e elenco (cambioa verde/giallo/rosso con pari criteri), aggiunto componente in utils x calcolo css
This commit is contained in:
Samuele E. Locatelli
2014-09-10 11:49:30 +02:00
parent d3d6f9d823
commit cc34d00fc5
18 changed files with 20384 additions and 12538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_OffersArchive.ascx
+1 -1
View File
@@ -177,7 +177,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("QuoteType"),Eval("FullCost"),Eval("MinPrice"),Eval("MinPrice_sim"),Eval("PriceOff")) %>' />
<asp:Label ID="Label4" runat="server" Text='<%# Eval("PriceOff", "{0:C3}") %>' CssClass='<%# C2P_Data.utils.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
-46
View File
@@ -226,52 +226,6 @@ 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 _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>
/// stringa formattata del numero di record mostrati
/// </summary>
public string numRecords
C2P/WebUserControls/mod_Q_Quot.ascx
+1 -2
View File
@@ -25,9 +25,8 @@
</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='<%# priceVsCost(Eval("QuoteType"),Eval("FullCost"),Eval("MinPrice"),Eval("MinPrice_sim"),Eval("PriceOff")) %>' />
<uc1:mod_displayHor ID="mod_displayHor8" runat="server" etichetta='<%# traduci("PriceOff") %>' valore='<%# Eval("PriceOff", "{0:C3}") %>' valueCss='<%# C2P_Data.utils.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
-60
View File
@@ -46,66 +46,6 @@ namespace C2P.WebUserControls
}
}
/// <summary>
/// restituisce classe CSS da confronto di 2 valori numerici:
/// - rosso se val1 minore val2
/// - verde se val1 >= val2
/// </summary>
/// <param name="val1"></param>
/// <param name="val2"></param>
/// <returns></returns>
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;
}
/// <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/WebUserControls/mod_S_Quot.ascx
+1 -1
View File
@@ -25,7 +25,7 @@
</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='<%# C2P_Data.utils.priceVsCost(Eval("QuoteType"),Eval("FullCost"),Eval("MinPrice"),Eval("MinPrice_sim"),Eval("PriceOff")) %>' />
</div>
<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}") %>' />
C2P/WebUserControls/mod_S_Quot.ascx.cs
-14
View File
@@ -47,20 +47,6 @@ namespace C2P.WebUserControls
}
}
/// <summary>
/// restituisce classe CSS da confronto di 2 valori numerici:
/// - rosso se val1 minore val2
/// - verde se val1 >= val2
/// </summary>
/// <param name="val1"></param>
/// <param name="val2"></param>
/// <returns></returns>
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;
}
/// <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_Data/C2P_Data.csproj
+1
View File
@@ -75,6 +75,7 @@
<Compile Include="reportPrinter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="utils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.Config" />
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/utils.cs
+70
View File
@@ -0,0 +1,70 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace C2P_Data
{
/// <summary>
/// utility generali applicazione
/// </summary>
public class utils
{
protected utils()
{
// avvio componente, nulla da fare...
}
/// <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 static 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>
/// singleton gestione utility
/// </summary>
public static utils man = new utils();
}
}
C2P_Project/bin/Release/C2P_DB.dacpac
BIN
View File
Binary file not shown.
C2P_Project/bin/Release/C2P_DB_Create.sql
+20306 -12410
View File
File diff suppressed because it is too large Load Diff
C2P_Project/bin/Release/C2P_Project.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.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.129.283")]
[assembly: AssemblyFileVersion("1.9.129.283")]
[assembly: AssemblyVersion("1.9.130.283")]
[assembly: AssemblyFileVersion("1.9.130.283")]
[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("1.9.129.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.129.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.9.130.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.130.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+