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

Merge branch 'develop' of keyhammer.ath.cx:C2P into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-02-25 15:34:23 +01:00
parent 26ea63c8f3 2c8c3a4888
commit d2107c29f9
7 changed files with 82 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Images/Help2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

C2P/Images/Quote2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

C2P/Images/Report2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

C2P/Images/Simulation2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

C2P/WebUserControls/mod_QuoteDet.ascx
+72 -72
View File
@@ -507,16 +507,16 @@
<h3>Codice offerta</h3>
</div>
<div class="widget-content">
Vers:
<asp:Label runat="server" ID="lblVers" Text='<%# traduci("lblVers") %>' />:
<asp:Label ID="VersLabel" runat="server" Text='<%# Bind("Vers") %>' />
<br />
QuoteType:
<asp:Label runat="server" ID="lblQuoteType" Text='<%# traduci("lblQuoteType") %>' />:
<asp:Label ID="QuoteTypeLabel" runat="server" Text='<%# Eval("QuoteType") %>' />
<br />
CodQuote:
<asp:Label runat="server" ID="lblCodQuote" Text='<%# traduci("lblCodQuote") %>' />:
<asp:Label ID="CodQuoteLabel" runat="server" Text='<%# Eval("CodQuote") %>' />
<br />
QuoteRev:
<asp:Label runat="server" ID="lblQuoteRev" Text='<%# traduci("lblQuoteRev") %>' />:
<asp:Label ID="QuoteRevLabel" runat="server" Text='<%# Eval("QuoteRev") %>' />
</div>
</div>
@@ -528,13 +528,13 @@
<h3>Cliente</h3>
</div>
<div class="widget-content">
CodClient:
<asp:Label runat="server" ID="lblCodClient" Text='<%# traduci("lblCodClient") %>' />:
<asp:Label ID="CodClientLabel" runat="server" Text='<%# Bind("CodClient") %>' />
<br />
ClientName:
<asp:Label runat="server" ID="lblClientName" Text='<%# traduci("lblClientName") %>' />:
<asp:Label ID="ClientNameLabel" runat="server" Text='<%# Bind("ClientName") %>' />
<br />
CodInco:
<asp:Label runat="server" ID="lblCodInco" Text='<%# traduci("lblCodInco") %>' />:
<asp:Label ID="CodIncoTextBox" runat="server" Text='<%# Bind("CodInco") %>' />
</div>
</div>
@@ -546,28 +546,28 @@
<h3>Articolo</h3>
</div>
<div class="widget-content">
CodItem:
<asp:Label runat="server" ID="lblCodItem" Text='<%# traduci("lblCodItem") %>' />:
<asp:Label ID="CodItemLabel" runat="server" Text='<%# Bind("CodItem") %>' />
<br />
CodItemGroup:
<asp:Label runat="server" ID="lblCodItemGroup" Text='<%# traduci("lblCodItemGroup") %>' />:
<asp:Label ID="CodItemGroupLabel" runat="server" Text='<%# Bind("CodItemGroup") %>' />
<br />
ItemDescr:
<asp:Label runat="server" ID="lblItemDescr" Text='<%# traduci("lblItemDescr") %>' />:
<asp:Label ID="ItemDescrLabel" runat="server" Text='<%# Bind("ItemDescr") %>' />
<br />
CodifProfilo:
<asp:Label runat="server" ID="lblCodifProfilo" Text='<%# traduci("lblCodifProfilo") %>' />:
<asp:Label ID="CodifProfiloLabel" runat="server" Text='<%# Bind("CodifProfilo") %>' />
<br />
ClasseMerc:
<asp:Label runat="server" ID="lblClasseMerc" Text='<%# traduci("lblClasseMerc") %>' />:
<asp:Label ID="ClasseMercLabel" runat="server" Text='<%# Bind("ClasseMerc") %>' />
<br />
RawMatCost:
<asp:Label runat="server" ID="lblRawMatCost" Text='<%# traduci("lblRawMatCost") %>' />:
<asp:Label ID="RawMatCostLabel" runat="server" Text='<%# Bind("RawMatCost") %>' />
<br />
RawMatExtraCost:
<asp:Label runat="server" ID="lblRawMatExtraCost" Text='<%# traduci("lblRawMatExtraCost") %>' />:
<asp:Label ID="RawMatExtraCostLabel" runat="server" Text='<%# Bind("RawMatExtraCost") %>' />
<br />
RawMatFullCost:
<asp:Label runat="server" ID="lblRawMatFullCost" Text='<%# traduci("lblRawMatFullCost") %>' />:
<asp:Label ID="RawMatFullCostLabel" runat="server" Text='<%# Bind("RawMatFullCost") %>' />
</div>
@@ -582,31 +582,31 @@
<h3>Matrice</h3>
</div>
<div class="widget-content">
TipoDies:
<asp:Label runat="server" ID="lblTipoDies" Text='<%# traduci("lblTipoDies") %>' />:
<asp:Label ID="TipoDiesLabel" runat="server" Text='<%# Bind("TipoDies") %>' />
<br />
CodDiesGroup:
<asp:Label runat="server" ID="lblCodDiesGroup" Text='<%# traduci("lblCodDiesGroup") %>' />:
<asp:Label ID="CodDiesGroupLabel" runat="server" Text='<%# Bind("CodDiesGroup") %>' />
<br />
DiamDies:
<asp:Label runat="server" ID="lblDiamDies" Text='<%# traduci("lblDiamDies") %>' />:
<asp:Label ID="DiamDiesLabel" runat="server" Text='<%# Bind("DiamDies") %>' />
<br />
HoleNumDies:
<asp:Label runat="server" ID="lblHoleNumDies" Text='<%# traduci("lblHoleNumDies") %>' />:
<asp:Label ID="HoleNumDiesLabel" runat="server" Text='<%# Bind("HoleNumDies") %>' />
<br />
DiesPrice:
<asp:Label runat="server" ID="lblDiesPrice" Text='<%# traduci("lblDiesPrice") %>' />:
<asp:Label ID="DiesPriceLabel" runat="server" Text='<%# Bind("DiesPrice") %>' />
<br />
DiesExpLife:
<asp:Label runat="server" ID="lblDiesExpLife" Text='<%# traduci("lblDiesExpLife") %>' />:
<asp:Label ID="DiesExpLifeLabel" runat="server" Text='<%# Bind("DiesExpLife") %>' />
<br />
DiesEOLife:
<asp:Label runat="server" ID="lblDiesEOLife" Text='<%# traduci("lblDiesEOLife") %>' />:
<asp:Label ID="DiesEOLifeLabel" runat="server" Text='<%# Bind("DiesEOLife") %>' />
<br />
NumDiesInList:
<asp:Label runat="server" ID="lblNumDiesInList" Text='<%# traduci("lblNumInList") %>' />:
<asp:Label ID="NumDiesInListLabel" runat="server" Text='<%# Bind("NumDiesInList") %>' />
<br />
NumDiesExaust:
<asp:Label runat="server" ID="lblNumDiesExaust" Text='<%# traduci("lblNumDiesExaust") %>' />:
<asp:Label ID="NumDiesExaustLabel" runat="server" Text='<%# Bind("NumDiesExaust") %>' />
</div>
</div>
@@ -618,16 +618,16 @@
<h3>Impianto</h3>
</div>
<div class="widget-content">
CodPlant:
<asp:Label runat="server" ID="lblCodPlant" Text='<%# traduci("lblCodPlant") %>' />:
<asp:Label ID="CodPlantLabel" runat="server" Text='<%# Bind("CodPlant") %>' />
<br />
KeyAMIL:
<asp:Label runat="server" ID="lblKeyAMIL" Text='<%# traduci("lblKeyAMIL") %>' />:
<asp:Label ID="KeyAMILLabel" runat="server" Text='<%# Bind("KeyAMIL") %>' />
<br />
KgTeo:
<asp:Label runat="server" ID="lblKgTeo" Text='<%# traduci("lblKgTeo") %>' />:
<asp:Label ID="KgTeoLabel" runat="server" Text='<%# Bind("KgTeo") %>' />
<br />
NumSMED:
<asp:Label runat="server" ID="lblNumSMED" Text='<%# traduci("lblNumSMED") %>' />:
<asp:Label ID="NumSMEDLabel" runat="server" Text='<%# Bind("NumSMED") %>' />
<br />
</div>
@@ -640,16 +640,16 @@
<h3>Imballi</h3>
</div>
<div class="widget-content">
QuotaMan:
<asp:Label runat="server" ID="lblQuotaMan" Text='<%# traduci("lblQuotaMan") %>' />:
<asp:Label ID="QuotaManLabel" runat="server" Text='<%# Bind("QuotaMan") %>' />
<br />
PRMWeight:
<asp:Label runat="server" ID="lblPRMWeight" Text='<%# traduci("lblPRMWeight") %>' />:
<asp:Label ID="PRMWeightLabel" runat="server" Text='<%# Bind("PRMWeight") %>' />
<br />
PWeight:
<asp:Label runat="server" ID="lblPWeight" Text='<%# traduci("lblPWeight") %>' />:
<asp:Label ID="PWeightLabel" runat="server" Text='<%# Bind("PWeight") %>' />
<br />
PTare:
<asp:Label runat="server" ID="lblPTare" Text='<%# traduci("lblPTare") %>' />:
<asp:Label ID="PTareLabel" runat="server" Text='<%# Bind("PTare") %>' />
</div>
</div>
@@ -663,16 +663,16 @@
<h3>Imballo</h3>
</div>
<div class="widget-content">
LivPackage:
<asp:Label runat="server" ID="lblLivPackage" Text='<%# traduci("lblLivPackage") %>' />:
<asp:Label ID="LivPackageLabel" runat="server" Text='<%# Bind("LivPackage") %>' />
<br />
LivPackageDett:
<asp:Label runat="server" ID="lblLivPackageDett" Text='<%# traduci("lblLivPackageDett") %>' />:
<asp:Label ID="LivPackageDettLabel" runat="server" Text='<%# Bind("LivPackageDett") %>' />
<br />
CodPackag:
<asp:Label runat="server" ID="lblCodPackag" Text='<%# traduci("lblCodPackag") %>' />:
<asp:Label ID="CodPackagLabel" runat="server" Text='<%# Bind("CodPackag") %>' />
<br />
PkgDesc:
<asp:Label runat="server" ID="lblPkgDesc" Text='<%# traduci("lblPkgDesc") %>' />:
<asp:Label ID="PkgDescLabel" runat="server" Text='<%# Bind("PkgDesc") %>' />
</div>
</div>
@@ -684,19 +684,19 @@
<h3>Costi 1</h3>
</div>
<div class="widget-content">
FSR:
<asp:Label runat="server" ID="lblFSR" Text='<%# traduci("lblFSR") %>' />:
<asp:Label ID="FSRLabel" runat="server" Text='<%# Bind("FSR") %>' />
<br />
ProvvCost:
<asp:Label runat="server" ID="lblProvvCost" Text='<%# traduci("lblProvvCost") %>' />:
<asp:Label ID="ProvvCostLabel" runat="server" Text='<%# Bind("ProvvCost") %>' />
<br />
EECost:
<asp:Label runat="server" ID="lblEECost" Text='<%# traduci("lblEECost") %>' />:
<asp:Label ID="EECostLabel" runat="server" Text='<%# Bind("EECost") %>' />
<br />
GasCost:
<asp:Label runat="server" ID="lblGasCost" Text='<%# traduci("lblGasCost") %>' />:
<asp:Label ID="GasCostLabel" runat="server" Text='<%# Bind("GasCost") %>' />
<br />
DiesCost:
<asp:Label runat="server" ID="lblDiesCost" Text='<%# traduci("lblDiesCost") %>' />:
<asp:Label ID="DiesCostLabel" runat="server" Text='<%# Bind("DiesCost") %>' />
</div>
</div>
@@ -708,22 +708,22 @@
<h3>Costi 2</h3>
</div>
<div class="widget-content">
PackCost:
<asp:Label runat="server" ID="lblPackCost" Text='<%# traduci("lblPackCost") %>' />:
<asp:Label ID="PackCostLabel" runat="server" Text='<%# Bind("PackCost") %>' />
<br />
TranspCost:
<asp:Label runat="server" ID="lblTranspCost" Text='<%# traduci("lblTranspCost") %>' />:
<asp:Label ID="TranspCostLabel" runat="server" Text='<%# Bind("TranspCost") %>' />
<br />
SellCost01:
<asp:Label runat="server" ID="lblSellCost01" Text='<%# traduci("lblSellCost01") %>' />:
<asp:Label ID="SellCost01Label" runat="server" Text='<%# Bind("SellCost01") %>' />
<br />
RefCost01:
<asp:Label runat="server" ID="lblRefCost01" Text='<%# traduci("lblRefCost01") %>' />:
<asp:Label ID="RefCost01Label" runat="server" Text='<%# Bind("RefCost01") %>' />
<br />
SellCost04:
<asp:Label runat="server" ID="lblSellCost04" Text='<%# traduci("lblSellCost04") %>' />:
<asp:Label ID="SellCost04Label" runat="server" Text='<%# Bind("SellCost04") %>' />
<br />
RefCost04:
<asp:Label runat="server" ID="lblRefCost04" Text='<%# traduci("lblRefCost04") %>' />:
<asp:Label ID="RefCost04Label" runat="server" Text='<%# Bind("RefCost04") %>' />
</div>
</div>
@@ -737,28 +737,28 @@
<h3>Costi fase 1</h3>
</div>
<div class="widget-content">
WSR01:
<asp:Label runat="server" ID="lblWSR01" Text='<%# traduci("lblWSR01") %>' />:
<asp:Label ID="WSR01Label" runat="server" Text='<%# Bind("WSR01") %>' />
<br />
MSR01:
<asp:Label runat="server" ID="lblMSR01" Text='<%# traduci("lblMSR01") %>' />:
<asp:Label ID="MSR01Label" runat="server" Text='<%# Bind("MSR01") %>' />
<br />
NetProd01:
<asp:Label runat="server" ID="lblNetProd01" Text='<%# traduci("lblNetProd01") %>' />:
<asp:Label ID="NetProd01Label" runat="server" Text='<%# Bind("NetProd01") %>' />
<br />
FC4UG01:
<asp:Label runat="server" ID="lblFC4UG01" Text='<%# traduci("lblFC4UG01") %>' />:
<asp:Label ID="FC4UG01Label" runat="server" Text='<%# Bind("FC4UG01") %>' />
<br />
VC4UG01:
<asp:Label runat="server" ID="lblVC4UG01" Text='<%# traduci("lblVC4UG01") %>' />:
<asp:Label ID="VC4UG01Label" runat="server" Text='<%# Bind("VC4UG01") %>' />
<br />
OH4UG01:
<asp:Label runat="server" ID="lblOH4UG01" Text='<%# traduci("lblOH4UG01") %>' />:
<asp:Label ID="OH4UG01Label" runat="server" Text='<%# Bind("OH4UG01") %>' />
<br />
SC4UG01:
<asp:Label runat="server" ID="lblSC4UG01" Text='<%# traduci("lblSC4UG01") %>' />:
<asp:Label ID="SC4UG01Label" runat="server" Text='<%# Bind("SC4UG01") %>' />
<br />
DSR:
<asp:Label runat="server" ID="lblDSR" Text='<%# traduci("lblDSR") %>' />:
<asp:Label ID="DSRLabel" runat="server" Text='<%# Bind("DSR") %>' />
</div>
</div>
@@ -770,16 +770,16 @@
<h3>Costi fase 4?</h3>
</div>
<div class="widget-content">
NetProd04:
<asp:Label runat="server" ID="lblNetProd04" Text='<%# traduci("lblNetProd04") %>' />:
<asp:Label ID="NetProd04Label" runat="server" Text='<%# Bind("NetProd04") %>' />
<br />
FC4UG04:
<asp:Label runat="server" ID="lblFC4UG04" Text='<%# traduci("lblFC4UG04") %>' />:
<asp:Label ID="FC4UG04Label" runat="server" Text='<%# Bind("FC4UG04") %>' />
<br />
VC4UG04:
<asp:Label runat="server" ID="lblVC4UG04" Text='<%# traduci("lblVC4UG04") %>' />:
<asp:Label ID="VC4UG04Label" runat="server" Text='<%# Bind("VC4UG04") %>' />
<br />
FVC:
<asp:Label runat="server" ID="lblFVC" Text='<%# traduci("lblFVC") %>' />:
<asp:Label ID="FVCLabel" runat="server" Text='<%# Bind("FVC") %>' />
</div>
</div>
@@ -791,19 +791,19 @@
<h3>Intestazione A</h3>
</div>
<div class="widget-content">
Charge:
<asp:Label runat="server" ID="lblCharge" Text='<%# traduci("lblCharge") %>' />:
<asp:Label ID="ChargeLabel" runat="server" Text='<%# Bind("Charge") %>' />
<br />
P_FVC:
<asp:Label runat="server" ID="lblP_FVC" Text='<%# traduci("lblP_FVC") %>' />:
<asp:Label ID="P_FVCLabel" runat="server" Text='<%# Bind("P_FVC") %>' />
<br />
CPS:
<asp:Label runat="server" ID="lblCPS" Text='<%# traduci("lblCPS") %>' />:
<asp:Label ID="CPSLabel" runat="server" Text='<%# Bind("CPS") %>' />
<br />
P_CPS:
<asp:Label runat="server" ID="lblP_CPS" Text='<%# traduci("lblP_CPS") %>' />:
<asp:Label ID="P_CPSLabel" runat="server" Text='<%# Bind("P_CPS") %>' />
<br />
P_FC4UG04:
<asp:Label runat="server" ID="lblP_FC4UG04" Text='<%# traduci("lblP_FC4UG04") %>' />:
<asp:Label ID="P_FC4UG04Label" runat="server" Text='<%# Bind("P_FC4UG04") %>' />
</div>
</div>
@@ -817,27 +817,27 @@
<h3>Intestazione B</h3>
</div>
<div class="widget-content">
FullCost:
<asp:Label runat="server" ID="lblFullCost" Text='<%# traduci("lblFullCost") %>' />:
<asp:Label ID="FullCostLabel" runat="server" Text='<%# Bind("FullCost") %>' />
<br />
P_FullCost:
<asp:Label runat="server" ID="lblP_FullCost" Text='<%# traduci("lblP_FullCost") %>' />:
<asp:Label ID="P_FullCostLabel" runat="server" Text='<%# Bind("P_FullCost") %>' />
<br />
MinPrice:
<asp:Label runat="server" ID="lblMinPrice" Text='<%# traduci("lblMinPrice") %>' />:
<asp:Label ID="MinPriceLabel" runat="server" Text='<%# Bind("MinPrice") %>' />
<br />
P_MinPrice:
<asp:Label runat="server" ID="lblP_MinPrice" Text='<%# traduci("lblP_MinPrice") %>' />:
<asp:Label ID="P_MinPriceLabel" runat="server" Text='<%# Bind("P_MinPrice") %>' />
P_PriceOff:
<asp:Label runat="server" ID="lblP_PriceOff" Text='<%# traduci("lblP_PriceOff") %>' />:
<asp:Label ID="P_PriceOffLabel" runat="server" Text='<%# Bind("P_PriceOff") %>' />
<br />
NetMar:
<asp:Label runat="server" ID="lblNetMar" Text='<%# traduci("lblNetMar") %>' />:
<asp:Label ID="NetMarLabel" runat="server" Text='<%# Bind("NetMar") %>' />
<br />
FCShield:
<asp:Label runat="server" ID="lblFCShield" Text='<%# traduci("lblFCShield") %>' />:
<asp:Label ID="FCShieldLabel" runat="server" Text='<%# Bind("FCShield") %>' />
<br />
PckSur:
<asp:Label runat="server" ID="lblPckSur" Text='<%# traduci("lblPckSur") %>' />:
<asp:Label ID="PckSurLabel" runat="server" Text='<%# Bind("PckSur") %>' />
</div>
</div>
C2P/WebUserControls/mod_QuoteDet.ascx.cs
+9 -1
View File
@@ -64,7 +64,15 @@ namespace C2P.WebUserControls
QuoteRev = Request.QueryString["QuoteRev"];
}
}
/// <summary>
/// wrapper traduzione
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(object lemma)
{
return user_std.UtSn.Traduci(lemma.ToString());
}
/// <summary>
/// Calcola css dato valore prezzo offerto vs importi full cost e min price
/// </summary>
C2P/WebUserControls/mod_newQuote.ascx
+1 -1
View File
@@ -120,7 +120,7 @@
<asp:Button runat="server" ID="btnNew" Text="Genera" CssClass="btn btn-primary" OnClick="btnNew_Click" />
</div>
<div class="col-sm-6 col-md-6">
<asp:Button runat="server" ID="btnReset" Text="Reset" CssClass="btn btn-danger" OnClick="btnReset_Click"/>
<asp:Button runat="server" ID="btnReset" Text="Reset" CssClass="btn btn-danger pull-right" OnClick="btnReset_Click"/>
</div>
</div>
</div>