diff --git a/C2P.v11.suo b/C2P.v11.suo index e747e9a..e642aaf 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index f69feaa..573c541 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -218,6 +218,7 @@ Always + Designer @@ -254,7 +255,6 @@ - @@ -361,13 +361,6 @@ Site.Mobile.Master - - test.aspx - ASPXCodeBehind - - - test.aspx - ViewSwitcher.ascx ASPXCodeBehind @@ -375,6 +368,13 @@ ViewSwitcher.ascx + + mod_QuoteList.ascx + ASPXCodeBehind + + + mod_QuoteList.ascx + diff --git a/C2P/QuoteList.aspx b/C2P/QuoteList.aspx index cb93b91..c8d70a4 100644 --- a/C2P/QuoteList.aspx +++ b/C2P/QuoteList.aspx @@ -1,7 +1,9 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="QuoteList.aspx.cs" Inherits="C2P.QuoteList" %> +<%@ Register src="WebUserControls/mod_QuoteList.ascx" tagname="mod_QuoteList" tagprefix="uc1" %> + diff --git a/C2P/QuoteList.aspx.designer.cs b/C2P/QuoteList.aspx.designer.cs index 0d70ff3..62bc9f0 100644 --- a/C2P/QuoteList.aspx.designer.cs +++ b/C2P/QuoteList.aspx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace C2P -{ - - - public partial class QuoteList - { +namespace C2P { + + + public partial class QuoteList { + + /// + /// mod_QuoteList1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_QuoteList mod_QuoteList1; } } diff --git a/C2P/WebUserControls/mod_QuoteList.ascx b/C2P/WebUserControls/mod_QuoteList.ascx new file mode 100644 index 0000000..6fb8c57 --- /dev/null +++ b/C2P/WebUserControls/mod_QuoteList.ascx @@ -0,0 +1,96 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_QuoteList.ascx.cs" Inherits="C2P.WebUserControls.mod_QuoteList" %> +<%if (false) + { %> + +<%} %> +
+ + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + --%> + <%--ConnectionString="name=Proxima_C2PEntities" DefaultContainerName="Proxima_C2PEntities" ContextTypeName="C2P_Data.C2P_mod"--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ NEW +
diff --git a/C2P/test.aspx.cs b/C2P/WebUserControls/mod_QuoteList.ascx.cs similarity index 89% rename from C2P/test.aspx.cs rename to C2P/WebUserControls/mod_QuoteList.ascx.cs index fac4bde..2964843 100644 --- a/C2P/test.aspx.cs +++ b/C2P/WebUserControls/mod_QuoteList.ascx.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using C2P_Data; -namespace C2P +namespace C2P.WebUserControls { - public partial class test : System.Web.UI.Page + public partial class mod_QuoteList : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) { - //ricalcolaQuote("Q", 1312130001, 0); - } + } private void ricalcolaQuote(string quoteType, long CodQuote, int Rev) { DateTime tick = DateTime.Now; diff --git a/C2P/test.aspx.designer.cs b/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs similarity index 77% rename from C2P/test.aspx.designer.cs rename to C2P/WebUserControls/mod_QuoteList.ascx.designer.cs index 9b71d58..ab4a363 100644 --- a/C2P/test.aspx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteList.ascx.designer.cs @@ -7,37 +7,19 @@ // //------------------------------------------------------------------------------ -namespace C2P { +namespace C2P.WebUserControls { - public partial class test { + public partial class mod_QuoteList { /// - /// form1 control. + /// BundleReference1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// lblOut control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblOut; - - /// - /// lblTest control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblTest; + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// /// grView control. @@ -56,5 +38,14 @@ namespace C2P { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsQuotes; + + /// + /// lblOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblOut; } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index a90c8ee..3c21904 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 2e8c233..f24d985 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index a90c8ee..3c21904 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6754a5d..8f0bf09 100644 Binary files a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/C2P/test.aspx b/C2P/test.aspx deleted file mode 100644 index 8de4eaa..0000000 --- a/C2P/test.aspx +++ /dev/null @@ -1,106 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="test.aspx.cs" Inherits="C2P.test" %> - - - - - - - - -
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - <%-- - - - - - - - - - - --%> - <%--ConnectionString="name=Proxima_C2PEntities" DefaultContainerName="Proxima_C2PEntities" ContextTypeName="C2P_Data.C2P_mod"--%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -