diff --git a/C2P.v11.suo b/C2P.v11.suo index e4d7356..ffcc296 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/Web.WinLab.config b/C2P/Web.WinLab.config index 1c367f6..d898eee 100644 --- a/C2P/Web.WinLab.config +++ b/C2P/Web.WinLab.config @@ -16,6 +16,7 @@ --> + diff --git a/C2P/WebUserControls/mod_newQuote.ascx b/C2P/WebUserControls/mod_newQuote.ascx index 9b30c7a..997277f 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx +++ b/C2P/WebUserControls/mod_newQuote.ascx @@ -25,20 +25,42 @@
-
- Costi Al +
+
+ + + + +
- importo -
-
- Costi extra +
+ + + + +
- importo +
+ + ImportoTot + +
- note: +
+
+ Lotto prod +
+
+ Incoterms +
+
+ note +
+
+

- i campi compilati x nuovo FANNO da filtro x elenco sotto
- se ho almeno 1 campo calcolato mostro elenco sotto
diff --git a/C2P/WebUserControls/mod_newQuote.ascx.cs b/C2P/WebUserControls/mod_newQuote.ascx.cs index ef2de5e..ea47597 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx.cs +++ b/C2P/WebUserControls/mod_newQuote.ascx.cs @@ -105,6 +105,45 @@ namespace C2P.WebUserControls eh_newSearchData(this, new EventArgs()); } } + /// + /// totale base lega + extra inserito... + /// + protected decimal totale + { + get + { + decimal answ = 0; + try + { + answ += Convert.ToDecimal(txtBaseAl.Text); + } + catch + { } + try + { + answ += Convert.ToDecimal(txtExtraLega.Text); + } + catch + { } + return answ; + } + } + + protected void txtExtraLega_TextChanged(object sender, EventArgs e) + { + updateTot(); + } + + private void updateTot() + { + + lblImportoTot.Text = totale.ToString(); + } + + protected void txtBaseAl_TextChanged(object sender, EventArgs e) + { + updateTot(); + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_newQuote.ascx.designer.cs b/C2P/WebUserControls/mod_newQuote.ascx.designer.cs index 3828345..34c165c 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx.designer.cs +++ b/C2P/WebUserControls/mod_newQuote.ascx.designer.cs @@ -47,5 +47,50 @@ namespace C2P.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::C2P.WebUserControls.mod_autocomplete acLega; + + /// + /// lblBaseAl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBaseAl; + + /// + /// txtBaseAl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtBaseAl; + + /// + /// lblExtraLega control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblExtraLega; + + /// + /// txtExtraLega control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtExtraLega; + + /// + /// lblImportoTot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblImportoTot; } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index a289f96..2977f03 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 dcfee9b..e3467a5 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/bin/SteamWare.pdb b/C2P/bin/SteamWare.pdb index 658e1bd..5d159d7 100644 Binary files a/C2P/bin/SteamWare.pdb and b/C2P/bin/SteamWare.pdb differ diff --git a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache index b4f40bb..dc4dcad 100644 Binary files a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache and b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index 73997c3..4d9f244 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll b/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll index 2016ead..2977f03 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll and b/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.dll b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.dll index d43150a..a86d420 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.dll and b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P.dll b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P.dll index 2016ead..2977f03 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P.dll and b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P.dll differ diff --git a/C2P_Data/Sql_update/C2P_Update002.sql b/C2P_Data/Sql_update/C2P_Update002.sql index 2ef0d83..a72c39c 100644 --- a/C2P_Data/Sql_update/C2P_Update002.sql +++ b/C2P_Data/Sql_update/C2P_Update002.sql @@ -62,6 +62,26 @@ FROM dbo.RawMatDet WHERE (RawMat <> '') GO +-- ============================================= +-- Author: S.E. Locatelli +-- Create date: 2014.02.18 +-- Description: Ricerca materiale Al +-- ============================================= +create PROCEDURE [dbo].stp_VSRM_SearchLike +( + @value NVARCHAR(50) +) + +AS +SET NOCOUNT ON; + +SELECT value + ,label +FROM v_selRawMat +WHERE (value LIKE '%' + @value + '%') + OR (label LIKE '%' + @value + '%') +go + PRINT N'Creating [dbo].[stp_esplodiVocab]...'; diff --git a/C2P_Data/bin/Debug/C2P_Data.dll b/C2P_Data/bin/Debug/C2P_Data.dll index 7ecb0de..282ad1a 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.dll and b/C2P_Data/bin/Debug/C2P_Data.dll differ diff --git a/C2P_Data/bin/Debug/C2P_Data.pdb b/C2P_Data/bin/Debug/C2P_Data.pdb index 212b9fa..b2585eb 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.pdb and b/C2P_Data/bin/Debug/C2P_Data.pdb differ diff --git a/C2P_Data/bin/Debug/SteamWare.dll b/C2P_Data/bin/Debug/SteamWare.dll index 4553889..63f9d73 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.dll and b/C2P_Data/bin/Debug/SteamWare.dll differ diff --git a/C2P_Data/bin/Debug/SteamWare.pdb b/C2P_Data/bin/Debug/SteamWare.pdb index 658e1bd..5d159d7 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.pdb and b/C2P_Data/bin/Debug/SteamWare.pdb differ