diff --git a/C2P/WebUserControls/mod_Q_Header.ascx b/C2P/WebUserControls/mod_Q_Header.ascx index 76607a8..e1aa001 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx +++ b/C2P/WebUserControls/mod_Q_Header.ascx @@ -105,7 +105,7 @@ - + diff --git a/C2P/WebUserControls/mod_Q_Header.ascx.cs b/C2P/WebUserControls/mod_Q_Header.ascx.cs index be75c57..1a8a6b1 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Header.ascx.cs @@ -13,6 +13,7 @@ namespace C2P.WebUserControls { } + public event EventHandler eh_update; /// /// fa toggle tra modo edit e read/item /// @@ -28,5 +29,13 @@ namespace C2P.WebUserControls } } + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx b/C2P/WebUserControls/mod_Q_Quot.ascx index 5404cf1..c3d5372 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx +++ b/C2P/WebUserControls/mod_Q_Quot.ascx @@ -111,7 +111,7 @@ - + diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx.cs b/C2P/WebUserControls/mod_Q_Quot.ascx.cs index 250b579..9478fc5 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Quot.ascx.cs @@ -13,7 +13,7 @@ namespace C2P.WebUserControls { } - + public event EventHandler eh_update; /// /// fa toggle tra modo edit e read/item /// @@ -29,5 +29,13 @@ namespace C2P.WebUserControls } } + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index d5801e7..e11bc88 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -46,7 +46,7 @@
-  <%: traduci("CheckStd") %> +  <%: traduci("CheckStd") %>
@@ -68,918 +68,8 @@
- -
- - <%-- - Vers: - -
- QuoteType: - -
- CodQuote: - -
- QuoteRev: - -
- CodClient: - -
- ClientName: - -
- CodItem: - -
- CodItemGroup: - -
- RawMat: - -
- UnitWeight: - -
- BatchQty: - -
- CodInco: - -
- KeyAM: - -
- Note: - -
- PriceOff: - -
- CodClientAssoc: - -
- ClientNameAssoc: - -
- ItemDescr: - -
- CodifProfilo: - -
- ClasseMerc: - -
- TipoDies: - -
- CodDiesGroup: - -
- DiamDies: - -
- HoleNumDies: - -
- DiesPrice: - -
- DiesExpLife: - -
- DiesEOLife: - -
- NumDiesInList: - -
- NumDiesExaust: - -
- CodPlant: - -
- KeyAMIL: - -
- KgTeo: - -
- NumSMED: - -
- QuotaMan: - -
- PRMWeight: - -
- PWeight: - -
- PTare: - -
- LivPackage: - -
- LivPackageDett: - -
- RawMatCost: - -
- RawMatExtraCost: - -
- RawMatFullCost: - -
- CodPackag: - -
- PkgDesc: - -
- FSR: - -
- ProvvCost: - -
- EECost: - -
- GasCost: - -
- DiesCost: - -
- PackCost: - -
- TranspCost: - -
- SellCost01: - -
- RefCost01: - -
- SellCost04: - -
- RefCost04: - -
- WSR01: - -
- MSR01: - -
- NetProd01: - -
- FC4UG01: - -
- VC4UG01: - -
- OH4UG01: - -
- SC4UG01: - -
- DSR: - -
- NetProd04: - -
- FC4UG04: - -
- VC4UG04: - -
- FVC: - -
- Charge: - -
- P_FVC: - -
- CPS: - -
- P_CPS: - -
- P_FC4UG04: - -
- FullCost: - -
- P_FullCost: - -
- MinPrice: - -
- P_MinPrice: - -
- P_PriceOff: - -
- NetMar: - -
- FCShield: - -
- PckSur: - -
- -   -
--%> - <%-- - Vers: - -
- QuoteType: - -
- CodQuote: - -
- QuoteRev: - -
- CodClient: - -
- ClientName: - -
- CodItem: - -
- CodItemGroup: - -
- RawMat: - -
- UnitWeight: - -
- BatchQty: - -
- CodInco: - -
- KeyAM: - -
- Note: - -
- PriceOff: - -
- CodClientAssoc: - -
- ClientNameAssoc: - -
- ItemDescr: - -
- CodifProfilo: - -
- ClasseMerc: - -
- TipoDies: - -
- CodDiesGroup: - -
- DiamDies: - -
- HoleNumDies: - -
- DiesPrice: - -
- DiesExpLife: - -
- DiesEOLife: - -
- NumDiesInList: - -
- NumDiesExaust: - -
- CodPlant: - -
- KeyAMIL: - -
- KgTeo: - -
- NumSMED: - -
- QuotaMan: - -
- PRMWeight: - -
- PWeight: - -
- PTare: - -
- LivPackage: - -
- LivPackageDett: - -
- RawMatCost: - -
- RawMatExtraCost: - -
- RawMatFullCost: - -
- CodPackag: - -
- PkgDesc: - -
- FSR: - -
- ProvvCost: - -
- EECost: - -
- GasCost: - -
- DiesCost: - -
- PackCost: - -
- TranspCost: - -
- SellCost01: - -
- RefCost01: - -
- SellCost04: - -
- RefCost04: - -
- WSR01: - -
- MSR01: - -
- NetProd01: - -
- FC4UG01: - -
- VC4UG01: - -
- OH4UG01: - -
- SC4UG01: - -
- DSR: - -
- NetProd04: - -
- FC4UG04: - -
- VC4UG04: - -
- FVC: - -
- Charge: - -
- P_FVC: - -
- CPS: - -
- P_CPS: - -
- P_FC4UG04: - -
- FullCost: - -
- P_FullCost: - -
- MinPrice: - -
- P_MinPrice: - -
- P_PriceOff: - -
- NetMar: - -
- FCShield: - -
- PckSur: - -
- -   -
--%> - -
-
-
-
-
- -

Codice offerta

-
-
- - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
-
-
-
-
-
-
- -

Cliente

-
-
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Articolo

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - - -
-
-
-
-
-
-
-
- -

Matrice

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Impianto

-
-
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
-
- -

Imballi

-
-
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
-
-
- -

Imballo

-
-
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Costi 1

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Costi 2

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
-
-
- -

Costi fase 1

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Costi fase 4?

-
-
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
- -

Intestazione A

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
-
-
- -

Intestazione B

-
-
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
- : - -
-
-
-
-
-
-
- -

Cliente Test

-
-
-
- : - -
- : - -
- : - -
-
-
-
- <%--
-
-
-
- -

Intestazione

-
-
- contenuto -
-
-
-
-
-
- -

Intestazione

-
-
- contenuto -
-
-
-
--%> -
- -
-
- - - - - - - - -
+
+
+  <%: traduci("CreateOffer") %> +
+
diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index 02b519c..ae3260e 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -79,6 +79,18 @@ namespace C2P.WebUserControls prevReq = ""; setModVisibility("Header"); } + mod_Q_Header1.eh_update += mod_Q_Header1_eh_update; + mod_Q_Quot1.eh_update += mod_Q_Quot1_eh_update; + } + + void mod_Q_Quot1_eh_update(object sender, EventArgs e) + { + setModVisibility(""); + } + + void mod_Q_Header1_eh_update(object sender, EventArgs e) + { + setModVisibility(""); } /// /// wrapper traduzione @@ -177,6 +189,38 @@ namespace C2P.WebUserControls break; } prevReq = req; + // controllo SE sia visibile il pulsante crea offerta (netMargin > 0... DA VERIFICARE) + bool okCreate = false; + DS_Quotes.QuoteFull_QRow riga; + try + { + riga = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0]; + if (riga.NetMar > 0 && riga.PriceOff > 0) + { + okCreate = true; + } + } + catch + { } + lbCreateOffer.Visible = okCreate; + } + /// + /// Verifica se si possibile creare offerta standard (o si debba passare a SIMULAZIONE) + /// + /// + /// + protected void lbChkStandard_Click(object sender, EventArgs e) + { + + } + /// + /// Crea un offerta (SE + /// + /// + /// + protected void lnkCreateOffer_Click(object sender, EventArgs e) + { + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs index 01b2c58..6e39d32 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs @@ -130,13 +130,13 @@ namespace C2P.WebUserControls { protected global::C2P.WebUserControls.mod_Q_PackPar mod_Q_PackPar1; /// - /// LinkButton1 control. + /// lbChkStandard control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton1; + protected global::System.Web.UI.WebControls.LinkButton lbChkStandard; /// /// lbQuotation control. @@ -157,21 +157,12 @@ namespace C2P.WebUserControls { protected global::C2P.WebUserControls.mod_Q_Quot mod_Q_Quot1; /// - /// FormView1 control. + /// lbCreateOffer control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.FormView FormView1; - - /// - /// odsQuotes control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsQuotes; + protected global::System.Web.UI.WebControls.LinkButton lbCreateOffer; } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 9a18fde..e116e4a 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 82f0c1b..7c5eea6 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/C2P_Data.pdb b/C2P/bin/C2P_Data.pdb index be19078..d900c7b 100644 Binary files a/C2P/bin/C2P_Data.pdb and b/C2P/bin/C2P_Data.pdb differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index a30e2ab..7a5758f 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/DtProxy.cs b/C2P_Data/DtProxy.cs index 4f9d83a..25f8f99 100644 --- a/C2P_Data/DtProxy.cs +++ b/C2P_Data/DtProxy.cs @@ -24,6 +24,7 @@ namespace C2P_Data protected virtual void avvioTableAdapters() { taQL = new DS_QuotesTableAdapters.QuoteListTableAdapter(); + taQFQ = new DS_QuotesTableAdapters.QuoteFull_QTableAdapter(); taQRM = new DS_QuotesTableAdapters.QuoteRMTableAdapter(); taVSCli = new DS_UtilityTableAdapters.v_selClientTableAdapter(); taVSItm = new DS_UtilityTableAdapters.v_selItemsTableAdapter(); @@ -37,6 +38,7 @@ namespace C2P_Data string connStr = memLayer.ML.confReadString("C2PConnectionString"); // connections del db vocabolario taQL.Connection.ConnectionString = connStr; + taQFQ.Connection.ConnectionString = connStr; taQRM.Connection.ConnectionString = connStr; taVSCli.Connection.ConnectionString = connStr; taVSItm.Connection.ConnectionString = connStr; @@ -48,6 +50,7 @@ namespace C2P_Data #region area public public DS_QuotesTableAdapters.QuoteListTableAdapter taQL; + public DS_QuotesTableAdapters.QuoteFull_QTableAdapter taQFQ; public DS_QuotesTableAdapters.QuoteRMTableAdapter taQRM; public DS_UtilityTableAdapters.v_selClientTableAdapter taVSCli; public DS_UtilityTableAdapters.v_selItemsTableAdapter taVSItm;