diff --git a/C2P.sln b/C2P.sln index c729d09..a48926c 100644 --- a/C2P.sln +++ b/C2P.sln @@ -17,63 +17,28 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - EQUA|Any CPU = EQUA|Any CPU - ETS|Any CPU = ETS|Any CPU - ETS-218|Any CPU = ETS-218|Any CPU Release|Any CPU = Release|Any CPU - SomaschiniUSA|Any CPU = SomaschiniUSA|Any CPU - Steamware|Any CPU = Steamware|Any CPU WinLab|Any CPU = WinLab|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.EQUA|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.EQUA|Any CPU.Build.0 = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.ETS|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.ETS|Any CPU.Build.0 = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.ETS-218|Any CPU.Build.0 = Release|Any CPU {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Release|Any CPU.ActiveCfg = Release|Any CPU {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Release|Any CPU.Build.0 = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Steamware|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.Steamware|Any CPU.Build.0 = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.WinLab|Any CPU.Build.0 = Release|Any CPU + {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}.WinLab|Any CPU.Build.0 = WinLab|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.EQUA|Any CPU.ActiveCfg = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.EQUA|Any CPU.Build.0 = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.ETS|Any CPU.ActiveCfg = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.ETS|Any CPU.Build.0 = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.ETS-218|Any CPU.Build.0 = Release|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Release|Any CPU.Build.0 = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Steamware|Any CPU.ActiveCfg = Release|Any CPU - {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.Steamware|Any CPU.Build.0 = Release|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.WinLab|Any CPU.ActiveCfg = Release|Any CPU {2F5A305C-ACBA-4B09-844A-2C7A0919C175}.WinLab|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = ETS-218|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = ETS-218|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Steamware|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Steamware|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = WinLab|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/C2P.v11.suo b/C2P.v11.suo index 3af5a2d..c3b0a53 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/Bootstrap.Master b/C2P/Bootstrap.Master index 0431014..a427536 100644 --- a/C2P/Bootstrap.Master +++ b/C2P/Bootstrap.Master @@ -135,10 +135,11 @@
diff --git a/C2P/Bootstrap.Master.cs b/C2P/Bootstrap.Master.cs index 8dc063f..4ae2c38 100644 --- a/C2P/Bootstrap.Master.cs +++ b/C2P/Bootstrap.Master.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace C2P { diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 9158da7..ab082c7 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -234,6 +234,7 @@ + @@ -281,6 +282,9 @@ + + Web.config + @@ -406,6 +410,15 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user index 1637e80..f95a5c4 100644 --- a/C2P/C2P.csproj.user +++ b/C2P/C2P.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - 218 + WinLab diff --git a/C2P/Properties/PublishProfiles/WinLab.pubxml b/C2P/Properties/PublishProfiles/WinLab.pubxml index b79fd3e..58f4db0 100644 --- a/C2P/Properties/PublishProfiles/WinLab.pubxml +++ b/C2P/Properties/PublishProfiles/WinLab.pubxml @@ -6,7 +6,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy - Release + WinLab Any CPU True diff --git a/C2P/Quote.aspx b/C2P/Quote.aspx index de77bc8..844b6cc 100644 --- a/C2P/Quote.aspx +++ b/C2P/Quote.aspx @@ -10,8 +10,9 @@ + +
Elenco Offerte | Nuovo Profilo (Esistente) | Simulazione
-
diff --git a/C2P/Quote.aspx.cs b/C2P/Quote.aspx.cs index d885339..0c8e107 100644 --- a/C2P/Quote.aspx.cs +++ b/C2P/Quote.aspx.cs @@ -17,12 +17,12 @@ namespace C2P void mod_newQuote1_eh_newQuote(object sender, EventArgs e) { - //mod_QuoteList1.doUpdate(); + mod_QuoteList1.doUpdate(); } void mod_newQuote1_eh_newSearchData(object sender, EventArgs e) { - //mod_QuoteList1.doUpdate(); + mod_QuoteList1.doUpdate(); } } } \ No newline at end of file diff --git a/C2P/Services/WS_data.asmx.cs b/C2P/Services/WS_data.asmx.cs index 512973d..ed33880 100644 --- a/C2P/Services/WS_data.asmx.cs +++ b/C2P/Services/WS_data.asmx.cs @@ -33,31 +33,31 @@ namespace C2P.Services return output.ToArray(); } - //[WebMethod] - //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] - //public string[] Clienti(string keywordStartsWith) - //{ - // // inizializzo risposta - // List suggerimenti = new List(); - // // elenco candidati - // DS_utilsProjEts.v_selClientiDataTable tabella = DataProxy_ProjEts.DP.taSelCli.getBySearchLike(keywordStartsWith); - // // contatore risultati - // //int i = 0; - // // aggiungo ogni riga... - // foreach (DS_utilsProjEts.v_selClientiRow riga in tabella) - // { - // //suggerimenti.Add(riga.label); - // suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value)); - // //// controllo se ho meno risultati di quanti richiesti x filtraggio - // //if (i == maxResults) - // //{ - // // suggerimenti.Add(string.Format("+{0}...", tabella.Rows.Count - maxResults)); - // // break; - // //} - // //i++; - // } - // return suggerimenti.ToArray(); - //} + [WebMethod] + [ScriptMethod(ResponseFormat = ResponseFormat.Json)] + public string[] Clients(string keywordStartsWith) + { + // inizializzo risposta + List suggerimenti = new List(); + // elenco candidati + DS_Utility.v_selClientDataTable tabella = DtProxy.man.taVSCli.searchLike(keywordStartsWith); + // contatore risultati + //int i = 0; + // aggiungo ogni riga... + foreach (DS_Utility.v_selClientRow riga in tabella) + { + //suggerimenti.Add(riga.label); + suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value)); + //// controllo se ho meno risultati di quanti richiesti x filtraggio + //if (i == maxResults) + //{ + // suggerimenti.Add(string.Format("+{0}...", tabella.Rows.Count - maxResults)); + // break; + //} + //i++; + } + return suggerimenti.ToArray(); + } //[WebMethod] //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] diff --git a/C2P/Web.config b/C2P/Web.config index 9f99a7e..40fce5e 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -5,28 +5,32 @@ --> - -
- - + + + + + + + + + + + + - - - - @@ -48,19 +52,7 @@ - - - - - - - - - - - - - + @@ -78,16 +70,6 @@ - - - - - - - - - - diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index 8a57336..70f6d86 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -4,7 +4,7 @@ <%} %>
- + diff --git a/C2P/WebUserControls/mod_QuoteList.ascx b/C2P/WebUserControls/mod_QuoteList.ascx index 3511d0b..cd0a85b 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx +++ b/C2P/WebUserControls/mod_QuoteList.ascx @@ -157,10 +157,15 @@ - + + + + + + diff --git a/C2P/WebUserControls/mod_QuoteList.ascx.cs b/C2P/WebUserControls/mod_QuoteList.ascx.cs index 9ad7843..702a254 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteList.ascx.cs @@ -90,7 +90,7 @@ namespace C2P.WebUserControls doUpdate(); } - private void doUpdate() + public void doUpdate() { memLayer.ML.setSessionVal("valoreRicerca", ricerca); grView.DataBind(); diff --git a/C2P/WebUserControls/mod_autocomplete.ascx.cs b/C2P/WebUserControls/mod_autocomplete.ascx.cs index cdb8e26..cc8f756 100644 --- a/C2P/WebUserControls/mod_autocomplete.ascx.cs +++ b/C2P/WebUserControls/mod_autocomplete.ascx.cs @@ -201,6 +201,16 @@ namespace C2P.WebUserControls } } /// + /// larghezza textbox in unità % + /// + public int textEmPerc + { + set + { + txtSelezione.Width = Unit.Parse(string.Format("{0}%", value)); + } + } + /// /// imposta il focus sulla textBox /// public void setFocus() diff --git a/C2P/WebUserControls/mod_newQuote.ascx b/C2P/WebUserControls/mod_newQuote.ascx index 409809c..0ac8b9d 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx +++ b/C2P/WebUserControls/mod_newQuote.ascx @@ -12,13 +12,10 @@
-
- +
+
- -
-
@@ -32,7 +29,7 @@
- Materiale + Lega
elenco diff --git a/C2P/WebUserControls/mod_newQuote.ascx.cs b/C2P/WebUserControls/mod_newQuote.ascx.cs index 754925c..74d60a4 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx.cs +++ b/C2P/WebUserControls/mod_newQuote.ascx.cs @@ -33,7 +33,8 @@ namespace C2P.WebUserControls /// private void traduciObj() { - lblCodCli.Text = traduci("lblCodCli"); + string cKey = acCliente.contextKey; + acCliente.labelRicerca = traduci("ac[C]liente"); } /// /// wrapper traduzione @@ -69,9 +70,9 @@ namespace C2P.WebUserControls private void salvaRicerca() { // aggiorno dati cliente mostrati - lblDescrCli.Text = string.Format("clietne codice: {0}", acCliente.valore); + lblDescrCli.Text = string.Format("codice: {0}", acCliente.valore); // salvo valore selezionato cliente - memLayer.ML.setSessionVal("CercaCodCli", acCliente.valore); + memLayer.ML.setSessionVal("codClient", acCliente.valore); // sollevo evento if (eh_newSearchData != null) { diff --git a/C2P/WebUserControls/mod_newQuote.ascx.designer.cs b/C2P/WebUserControls/mod_newQuote.ascx.designer.cs index a16aa74..34c7693 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx.designer.cs +++ b/C2P/WebUserControls/mod_newQuote.ascx.designer.cs @@ -21,15 +21,6 @@ namespace C2P.WebUserControls { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// - /// lblCodCli control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblCodCli; - /// /// acCliente control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index beaca0a..058edfb 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 0c34a5e..328c4fb 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 277d541..8278f86 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 b2c524e..1827679 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 2d47a8e..68a431f 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c7bc1b8..4ea540c 100644 Binary files a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/Bootstrap.Master b/C2P/obj/Release/AspnetCompileMerge/Source/Bootstrap.Master index c820940..a427536 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/Bootstrap.Master +++ b/C2P/obj/Release/AspnetCompileMerge/Source/Bootstrap.Master @@ -19,8 +19,9 @@ <%: Scripts.Render("~/bundles/modernizr") %> --%> - + + <%-- --%> @@ -134,10 +135,11 @@
diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/Bundle.config b/C2P/obj/Release/AspnetCompileMerge/Source/Bundle.config index dbf49e0..a29b326 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/Bundle.config +++ b/C2P/obj/Release/AspnetCompileMerge/Source/Bundle.config @@ -7,6 +7,9 @@ + + diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/Default.aspx b/C2P/obj/Release/AspnetCompileMerge/Source/Default.aspx index a83483b..18bd2fc 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/Default.aspx +++ b/C2P/obj/Release/AspnetCompileMerge/Source/Default.aspx @@ -20,7 +20,7 @@
-

Quote

+

Quote

@@ -32,7 +32,7 @@
-

Simulation

+

Simulation

@@ -44,7 +44,7 @@
-

Report

+

Report

@@ -56,7 +56,7 @@
-

Help

+

Help

diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/Quote.aspx b/C2P/obj/Release/AspnetCompileMerge/Source/Quote.aspx index 532c1a7..844b6cc 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/Quote.aspx +++ b/C2P/obj/Release/AspnetCompileMerge/Source/Quote.aspx @@ -1,28 +1,18 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> +<%@ Register Src="WebUserControls/mod_newQuote.ascx" TagName="mod_newQuote" TagPrefix="uc1" %> + +<%@ Register Src="WebUserControls/mod_QuoteList.ascx" TagName="mod_QuoteList" TagPrefix="uc2" %> + - -
-
-

NUOVA OFFERTA

-
-
- - i campi compilati x nuovo FANNO da filtro x elenco sotto -
- - se ho almeno 1 campo calcolato mostro elenco sotto -
- - da elenco ho "duplica" o "riporta" -
-
+ + + +
Elenco Offerte | Nuovo Profilo (Esistente) | Simulazione
-
- -

- Work In Progress -

diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/Web.config b/C2P/obj/Release/AspnetCompileMerge/Source/Web.config index 580cec2..e30d23b 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/Web.config +++ b/C2P/obj/Release/AspnetCompileMerge/Source/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteDet.ascx b/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteDet.ascx index 8a57336..70f6d86 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteDet.ascx @@ -4,7 +4,7 @@ <%} %>
- + diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteList.ascx b/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteList.ascx index 3511d0b..cd0a85b 100644 --- a/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteList.ascx +++ b/C2P/obj/Release/AspnetCompileMerge/Source/WebUserControls/mod_QuoteList.ascx @@ -157,10 +157,15 @@ - + + + + + + diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll b/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P.dll index 464b016..766132b 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/Source/bin/C2P_Data.dll b/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P_Data.dll index 277d541..8278f86 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P_Data.dll and b/C2P/obj/Release/AspnetCompileMerge/Source/bin/C2P_Data.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/Source/bin/SteamWare.dll b/C2P/obj/Release/AspnetCompileMerge/Source/bin/SteamWare.dll index 2d47a8e..68a431f 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/Source/bin/SteamWare.dll and b/C2P/obj/Release/AspnetCompileMerge/Source/bin/SteamWare.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bootstrap.Master b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bootstrap.Master index c820940..a427536 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bootstrap.Master +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bootstrap.Master @@ -19,8 +19,9 @@ <%: Scripts.Render("~/bundles/modernizr") %> --%> - + + <%-- --%> @@ -134,10 +135,11 @@
diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bundle.config b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bundle.config index dbf49e0..a29b326 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bundle.config +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Bundle.config @@ -7,6 +7,9 @@ + + diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Default.aspx b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Default.aspx index a83483b..18bd2fc 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Default.aspx +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Default.aspx @@ -20,7 +20,7 @@
-

Quote

+

Quote

@@ -32,7 +32,7 @@
-

Simulation

+

Simulation

@@ -44,7 +44,7 @@
-

Report

+

Report

@@ -56,7 +56,7 @@
-

Help

+

Help

diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Quote.aspx b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Quote.aspx index 532c1a7..844b6cc 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Quote.aspx +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Quote.aspx @@ -1,28 +1,18 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> +<%@ Register Src="WebUserControls/mod_newQuote.ascx" TagName="mod_newQuote" TagPrefix="uc1" %> + +<%@ Register Src="WebUserControls/mod_QuoteList.ascx" TagName="mod_QuoteList" TagPrefix="uc2" %> + - -
-
-

NUOVA OFFERTA

-
-
- - i campi compilati x nuovo FANNO da filtro x elenco sotto -
- - se ho almeno 1 campo calcolato mostro elenco sotto -
- - da elenco ho "duplica" o "riporta" -
-
+ + + +
Elenco Offerte | Nuovo Profilo (Esistente) | Simulazione
-
- -

- Work In Progress -

diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Web.config b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Web.config index 580cec2..e30d23b 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Web.config +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteDet.ascx b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteDet.ascx index 8a57336..70f6d86 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteDet.ascx @@ -4,7 +4,7 @@ <%} %>
- + diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteList.ascx b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteList.ascx index 3511d0b..cd0a85b 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteList.ascx +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_QuoteList.ascx @@ -157,10 +157,15 @@ - + + + + + + diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.compiled b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.compiled index 4d00220..95a077c 100644 --- a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.compiled +++ b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.compiled @@ -1,5 +1,5 @@  - + 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 845312b..81072df 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 464b016..766132b 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/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P_Data.dll b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P_Data.dll index 277d541..8278f86 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P_Data.dll and b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/C2P_Data.dll differ diff --git a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/SteamWare.dll b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/SteamWare.dll index 2d47a8e..68a431f 100644 Binary files a/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/SteamWare.dll and b/C2P/obj/Release/AspnetCompileMerge/TempBuildDir/bin/SteamWare.dll differ diff --git a/C2P/obj/Release/C2P.dll b/C2P/obj/Release/C2P.dll index beaca0a..766132b 100644 Binary files a/C2P/obj/Release/C2P.dll and b/C2P/obj/Release/C2P.dll differ diff --git a/C2P/obj/Release/CSAutoParameterize.parameters.xml b/C2P/obj/Release/CSAutoParameterize.parameters.xml index 0953612..0c6b621 100644 --- a/C2P/obj/Release/CSAutoParameterize.parameters.xml +++ b/C2P/obj/Release/CSAutoParameterize.parameters.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/C2P/obj/Release/CSAutoParameterize/original/Web.config b/C2P/obj/Release/CSAutoParameterize/original/Web.config index 580cec2..e30d23b 100644 --- a/C2P/obj/Release/CSAutoParameterize/original/Web.config +++ b/C2P/obj/Release/CSAutoParameterize/original/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/CSAutoParameterize/transformed/Web.config b/C2P/obj/Release/CSAutoParameterize/transformed/Web.config index dacf4d1..f2a6908 100644 --- a/C2P/obj/Release/CSAutoParameterize/transformed/Web.config +++ b/C2P/obj/Release/CSAutoParameterize/transformed/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/Package/PackageTmp/Bootstrap.Master b/C2P/obj/Release/Package/PackageTmp/Bootstrap.Master index c820940..a427536 100644 --- a/C2P/obj/Release/Package/PackageTmp/Bootstrap.Master +++ b/C2P/obj/Release/Package/PackageTmp/Bootstrap.Master @@ -19,8 +19,9 @@ <%: Scripts.Render("~/bundles/modernizr") %> --%> - + + <%-- --%> @@ -134,10 +135,11 @@
diff --git a/C2P/obj/Release/Package/PackageTmp/Bundle.config b/C2P/obj/Release/Package/PackageTmp/Bundle.config index dbf49e0..a29b326 100644 --- a/C2P/obj/Release/Package/PackageTmp/Bundle.config +++ b/C2P/obj/Release/Package/PackageTmp/Bundle.config @@ -7,6 +7,9 @@ + + diff --git a/C2P/obj/Release/Package/PackageTmp/Default.aspx b/C2P/obj/Release/Package/PackageTmp/Default.aspx index a83483b..18bd2fc 100644 --- a/C2P/obj/Release/Package/PackageTmp/Default.aspx +++ b/C2P/obj/Release/Package/PackageTmp/Default.aspx @@ -20,7 +20,7 @@
-

Quote

+

Quote

@@ -32,7 +32,7 @@
-

Simulation

+

Simulation

@@ -44,7 +44,7 @@
-

Report

+

Report

@@ -56,7 +56,7 @@
-

Help

+

Help

diff --git a/C2P/obj/Release/Package/PackageTmp/Quote.aspx b/C2P/obj/Release/Package/PackageTmp/Quote.aspx index 532c1a7..844b6cc 100644 --- a/C2P/obj/Release/Package/PackageTmp/Quote.aspx +++ b/C2P/obj/Release/Package/PackageTmp/Quote.aspx @@ -1,28 +1,18 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> +<%@ Register Src="WebUserControls/mod_newQuote.ascx" TagName="mod_newQuote" TagPrefix="uc1" %> + +<%@ Register Src="WebUserControls/mod_QuoteList.ascx" TagName="mod_QuoteList" TagPrefix="uc2" %> + - -
-
-

NUOVA OFFERTA

-
-
- - i campi compilati x nuovo FANNO da filtro x elenco sotto -
- - se ho almeno 1 campo calcolato mostro elenco sotto -
- - da elenco ho "duplica" o "riporta" -
-
+ + + +
Elenco Offerte | Nuovo Profilo (Esistente) | Simulazione
-
- -

- Work In Progress -

diff --git a/C2P/obj/Release/Package/PackageTmp/Web.config b/C2P/obj/Release/Package/PackageTmp/Web.config index dacf4d1..f2a6908 100644 --- a/C2P/obj/Release/Package/PackageTmp/Web.config +++ b/C2P/obj/Release/Package/PackageTmp/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteDet.ascx b/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteDet.ascx index 8a57336..70f6d86 100644 --- a/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteDet.ascx @@ -4,7 +4,7 @@ <%} %>
- + diff --git a/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteList.ascx b/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteList.ascx index 3511d0b..cd0a85b 100644 --- a/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteList.ascx +++ b/C2P/obj/Release/Package/PackageTmp/WebUserControls/mod_QuoteList.ascx @@ -157,10 +157,15 @@ - + + + + + + diff --git a/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.compiled b/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.compiled index 4d00220..95a077c 100644 --- a/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.compiled +++ b/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.compiled @@ -1,5 +1,5 @@  - + diff --git a/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.dll b/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.dll index 845312b..81072df 100644 Binary files a/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.dll and b/C2P/obj/Release/Package/PackageTmp/bin/App_global.asax.dll differ diff --git a/C2P/obj/Release/Package/PackageTmp/bin/C2P.dll b/C2P/obj/Release/Package/PackageTmp/bin/C2P.dll index 464b016..766132b 100644 Binary files a/C2P/obj/Release/Package/PackageTmp/bin/C2P.dll and b/C2P/obj/Release/Package/PackageTmp/bin/C2P.dll differ diff --git a/C2P/obj/Release/Package/PackageTmp/bin/C2P_Data.dll b/C2P/obj/Release/Package/PackageTmp/bin/C2P_Data.dll index 277d541..8278f86 100644 Binary files a/C2P/obj/Release/Package/PackageTmp/bin/C2P_Data.dll and b/C2P/obj/Release/Package/PackageTmp/bin/C2P_Data.dll differ diff --git a/C2P/obj/Release/Package/PackageTmp/bin/SteamWare.dll b/C2P/obj/Release/Package/PackageTmp/bin/SteamWare.dll index 2d47a8e..68a431f 100644 Binary files a/C2P/obj/Release/Package/PackageTmp/bin/SteamWare.dll and b/C2P/obj/Release/Package/PackageTmp/bin/SteamWare.dll differ diff --git a/C2P/obj/Release/TransformWebConfig/original/Web.config b/C2P/obj/Release/TransformWebConfig/original/Web.config index 9f99a7e..c9e62d0 100644 --- a/C2P/obj/Release/TransformWebConfig/original/Web.config +++ b/C2P/obj/Release/TransformWebConfig/original/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P/obj/Release/TransformWebConfig/transformed/Web.config b/C2P/obj/Release/TransformWebConfig/transformed/Web.config index 580cec2..2967155 100644 --- a/C2P/obj/Release/TransformWebConfig/transformed/Web.config +++ b/C2P/obj/Release/TransformWebConfig/transformed/Web.config @@ -5,28 +5,27 @@ --> - -
- - + + + + + + + - - - - @@ -48,19 +47,7 @@ - - - - - - - - - - - - - + @@ -78,16 +65,6 @@ - - - - - - - - - - diff --git a/C2P_Data/C2P_Data.csproj b/C2P_Data/C2P_Data.csproj index ba5f91a..a5557f1 100644 --- a/C2P_Data/C2P_Data.csproj +++ b/C2P_Data/C2P_Data.csproj @@ -54,6 +54,11 @@ True DS_Quotes.xsd + + True + True + DS_Utility.xsd + @@ -75,6 +80,17 @@ DS_Quotes.xsd + + DS_Utility.xsd + + + Designer + MSDataSetGenerator + DS_Utility.Designer.cs + + + DS_Utility.xsd + SettingsSingleFileGenerator diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index b267e65..b9a824b 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -11639,7 +11639,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll"; @@ -11656,13 +11656,21 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DoUpdate", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_QuoteFull_Q_update"; + this._commandCollection[2].CommandText = "dbo.stp_QL_fullDataSearch"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_QuoteFull_Q_update"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11724,11 +11732,40 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Quotes.QuoteFull_QDataTable getBySearch(string CodClient, string CodItem, string RawMat) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((CodClient == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodClient)); + } + if ((CodItem == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodItem)); + } + if ((RawMat == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(RawMat)); + } + DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int QuoteFull_Q_update(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable PriceOff) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((Original_QuoteType == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 592d8ad..9eaab66 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -757,6 +757,19 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + dbo.stp_QL_fullDataSearch + + + + + + + + + @@ -781,7 +794,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -847,7 +860,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -883,7 +896,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -908,7 +921,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -988,7 +1001,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1025,7 +1038,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1095,7 +1108,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1371,11 +1384,11 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/DS_Quotes.xss b/C2P_Data/DS_Quotes.xss index 68a7b2b..4d698f5 100644 --- a/C2P_Data/DS_Quotes.xss +++ b/C2P_Data/DS_Quotes.xss @@ -4,17 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - + + + + + + + - + 462 @@ -26,7 +27,7 @@ - + 462 @@ -38,7 +39,7 @@ - + 645 @@ -54,7 +55,7 @@ - + 562 @@ -66,7 +67,7 @@ - + 718 diff --git a/C2P_Data/DtProxy.cs b/C2P_Data/DtProxy.cs index 3b59f81..ddd416d 100644 --- a/C2P_Data/DtProxy.cs +++ b/C2P_Data/DtProxy.cs @@ -24,15 +24,17 @@ namespace C2P_Data protected virtual void avvioTableAdapters() { taQL = new DS_QuotesTableAdapters.QuoteListTableAdapter(); + taVSCli = new DS_UtilityTableAdapters.v_selClientTableAdapter(); } /// /// effettua setup dei connection strings da web.config della singola applicazione /// protected virtual void setupConnectionString() { - string connStr = memLayer.ML.confReadString("QuotesConnectionString"); + string connStr = memLayer.ML.confReadString("C2PConnectionString"); // connections del db vocabolario taQL.Connection.ConnectionString = connStr; + taVSCli.Connection.ConnectionString = connStr; } #endregion @@ -40,6 +42,7 @@ namespace C2P_Data #region area public public DS_QuotesTableAdapters.QuoteListTableAdapter taQL; + public DS_UtilityTableAdapters.v_selClientTableAdapter taVSCli; public static DtProxy man = new DtProxy(); diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 277d541..8278f86 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index 2d47a8e..68a431f 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/C2P_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3992c90..5b78714 100644 Binary files a/C2P_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll b/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll index 153ec77..7370e1b 100644 Binary files a/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll and b/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll differ diff --git a/C2P_Data/obj/Release/C2P_Data.csproj.FileListAbsolute.txt b/C2P_Data/obj/Release/C2P_Data.csproj.FileListAbsolute.txt index ca78948..470210e 100644 --- a/C2P_Data/obj/Release/C2P_Data.csproj.FileListAbsolute.txt +++ b/C2P_Data/obj/Release/C2P_Data.csproj.FileListAbsolute.txt @@ -11,3 +11,4 @@ C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\C2P_Data\bin\Release\ C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\C2P_Data\obj\Release\C2P_Data.csprojResolveAssemblyReference.cache C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\C2P_Data\obj\Release\C2P_Data.dll C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\C2P_Data\obj\Release\C2P_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\C2P_Data\bin\Release\NLog.config diff --git a/C2P_Data/obj/Release/C2P_Data.dll b/C2P_Data/obj/Release/C2P_Data.dll index 277d541..8278f86 100644 Binary files a/C2P_Data/obj/Release/C2P_Data.dll and b/C2P_Data/obj/Release/C2P_Data.dll differ diff --git a/C2P_Data/obj/Release/TempPE/DS_Quotes.Designer.cs.dll b/C2P_Data/obj/Release/TempPE/DS_Quotes.Designer.cs.dll index 5de1bc7..640aeb2 100644 Binary files a/C2P_Data/obj/Release/TempPE/DS_Quotes.Designer.cs.dll and b/C2P_Data/obj/Release/TempPE/DS_Quotes.Designer.cs.dll differ