diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 2aba682..a18fb99 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -329,7 +329,12 @@ + + + + + @@ -695,6 +700,27 @@ mod_SyncVoc.ascx + + mod_S_Costs.ascx + ASPXCodeBehind + + + mod_S_Costs.ascx + + + mod_S_Dies.ascx + ASPXCodeBehind + + + mod_S_Dies.ascx + + + mod_S_ExtrPar.ascx + ASPXCodeBehind + + + mod_S_ExtrPar.ascx + mod_S_Header.ascx ASPXCodeBehind @@ -702,6 +728,20 @@ mod_S_Header.ascx + + mod_S_PackPar.ascx + ASPXCodeBehind + + + mod_S_PackPar.ascx + + + mod_S_Quot.ascx + ASPXCodeBehind + + + mod_S_Quot.ascx + mod_testata.ascx ASPXCodeBehind diff --git a/C2P/WebUserControls/mod_S_Costs.ascx b/C2P/WebUserControls/mod_S_Costs.ascx new file mode 100644 index 0000000..b553aab --- /dev/null +++ b/C2P/WebUserControls/mod_S_Costs.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Costs.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Costs" %> diff --git a/C2P/WebUserControls/mod_S_Costs.ascx.cs b/C2P/WebUserControls/mod_S_Costs.ascx.cs new file mode 100644 index 0000000..9edaea5 --- /dev/null +++ b/C2P/WebUserControls/mod_S_Costs.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_S_Costs : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Costs.ascx.designer.cs b/C2P/WebUserControls/mod_S_Costs.ascx.designer.cs new file mode 100644 index 0000000..cc1bdbe --- /dev/null +++ b/C2P/WebUserControls/mod_S_Costs.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_S_Costs + { + } +} diff --git a/C2P/WebUserControls/mod_S_Dies.ascx b/C2P/WebUserControls/mod_S_Dies.ascx new file mode 100644 index 0000000..cdf5cdb --- /dev/null +++ b/C2P/WebUserControls/mod_S_Dies.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Dies.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Dies" %> diff --git a/C2P/WebUserControls/mod_S_Dies.ascx.cs b/C2P/WebUserControls/mod_S_Dies.ascx.cs new file mode 100644 index 0000000..b01af56 --- /dev/null +++ b/C2P/WebUserControls/mod_S_Dies.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_S_Dies : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Dies.ascx.designer.cs b/C2P/WebUserControls/mod_S_Dies.ascx.designer.cs new file mode 100644 index 0000000..59f96a4 --- /dev/null +++ b/C2P/WebUserControls/mod_S_Dies.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_S_Dies + { + } +} diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx b/C2P/WebUserControls/mod_S_ExtrPar.ascx new file mode 100644 index 0000000..1ffd308 --- /dev/null +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_ExtrPar.ascx.cs" Inherits="C2P.WebUserControls.mod_S_ExtrPar" %> diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs new file mode 100644 index 0000000..3adcd3d --- /dev/null +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_S_ExtrPar : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx.designer.cs b/C2P/WebUserControls/mod_S_ExtrPar.ascx.designer.cs new file mode 100644 index 0000000..ab05287 --- /dev/null +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_S_ExtrPar + { + } +} diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx b/C2P/WebUserControls/mod_S_PackPar.ascx new file mode 100644 index 0000000..4f0f982 --- /dev/null +++ b/C2P/WebUserControls/mod_S_PackPar.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_PackPar.ascx.cs" Inherits="C2P.WebUserControls.mod_S_PackPar" %> diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx.cs b/C2P/WebUserControls/mod_S_PackPar.ascx.cs new file mode 100644 index 0000000..b768d37 --- /dev/null +++ b/C2P/WebUserControls/mod_S_PackPar.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_S_PackPar : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx.designer.cs b/C2P/WebUserControls/mod_S_PackPar.ascx.designer.cs new file mode 100644 index 0000000..4db478b --- /dev/null +++ b/C2P/WebUserControls/mod_S_PackPar.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_S_PackPar + { + } +} diff --git a/C2P/WebUserControls/mod_S_Quot.ascx b/C2P/WebUserControls/mod_S_Quot.ascx new file mode 100644 index 0000000..b97f4df --- /dev/null +++ b/C2P/WebUserControls/mod_S_Quot.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Quot.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Quot" %> diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.cs b/C2P/WebUserControls/mod_S_Quot.ascx.cs new file mode 100644 index 0000000..d09c600 --- /dev/null +++ b/C2P/WebUserControls/mod_S_Quot.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_S_Quot : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs b/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs new file mode 100644 index 0000000..994dadd --- /dev/null +++ b/C2P/WebUserControls/mod_S_Quot.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_S_Quot + { + } +} diff --git a/C2P/WebUserControls/mod_newProduct.ascx b/C2P/WebUserControls/mod_newProduct.ascx index 6ad8ddc..461136e 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx +++ b/C2P/WebUserControls/mod_newProduct.ascx @@ -1,10 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_newProduct.ascx.cs" Inherits="C2P.WebUserControls.mod_newProduct" %> -<%@ Register Src="~/WebUserControls/mod_Q_Costs.ascx" TagName="mod_Q_Costs" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_Q_ExtrPar.ascx" TagName="mod_Q_ExtrPar" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_S_Costs.ascx" TagName="mod_S_Costs" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_S_ExtrPar.ascx" TagName="mod_S_ExtrPar" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_S_Header.ascx" TagName="mod_S_Header" TagPrefix="uc3" %> -<%@ Register Src="~/WebUserControls/mod_Q_PackPar.ascx" TagName="mod_Q_PackPar" TagPrefix="uc4" %> -<%@ Register Src="~/WebUserControls/mod_Q_Quot.ascx" TagName="mod_Q_Quot" TagPrefix="uc5" %> +<%@ Register Src="~/WebUserControls/mod_S_PackPar.ascx" TagName="mod_S_PackPar" TagPrefix="uc4" %> +<%@ Register Src="~/WebUserControls/mod_S_Quot.ascx" TagName="mod_S_Quot" TagPrefix="uc5" %> <%if (false) { %> @@ -27,40 +27,74 @@ . -
+ +
+ + + +
-
+
-  <%: traduci("HEADER") %>
-  <%: traduci("EXTRUS-PARAM") %>
-  <%: traduci("PACK-PARAM") %>
-  <%: traduci("DIES-PARAM") %>
-  <%: traduci("COSTS") %>
- - +  <%: traduci("HEADER") %> +
+
+  <%: traduci("EXTRUS-PARAM") %> +
+
+  <%: traduci("PACK-PARAM") %> +
+
+  <%: traduci("DIES-PARAM") %> +
+
+  <%: traduci("COSTS") %> +
+
+
+ + - +
-
+
-  <%: traduci("QUOTATION") %>
- +  <%: traduci("QUOTATION") %> +
+
+
+
-  <%: traduci("nextIdxQState-01") %>
+  <%: traduci("nextIdxQState-01") %> +
+
+
-  <%: traduci("nextIdxQState-00") %>
-  <%: traduci("nextIdxQState-02") %>
+  <%: traduci("nextIdxQState-00") %> +
+
+  <%: traduci("nextIdxQState-02") %> +
+
+
-  <%: traduci("nextIdxQState-03") %>
+  <%: traduci("nextIdxQState-03") %> +
+ +
-  <%: traduci("createNewRev") %>
\ No newline at end of file +  <%: traduci("createNewRev") %> + + + + diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index 19c4053..48f2ae7 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -114,7 +114,9 @@ namespace C2P.WebUserControls setModVisibility("Header"); } mod_S_Header1.eh_update += mod_S_Header1_eh_update; - mod_Q_Quot1.eh_update += mod_Q_Quot1_eh_update; +#if false + mod_S_Quot1.eh_update += mod_S_Quot1_eh_update; +#endif } /// /// aggiorna info base dell'offerta @@ -142,7 +144,7 @@ namespace C2P.WebUserControls /// /// /// - void mod_Q_Quot1_eh_update(object sender, EventArgs e) + void mod_S_Quot1_eh_update(object sender, EventArgs e) { updateBaseData(); setModVisibility(""); @@ -214,10 +216,10 @@ namespace C2P.WebUserControls { // mostro solo controllo header in modalità INSERT mod_S_Header1.setInsertMode(); - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = false; + mod_S_Costs1.Visible = false; + mod_S_ExtrPar1.Visible = false; mod_S_Header1.Visible = true; - mod_Q_PackPar1.Visible = false; + mod_S_PackPar1.Visible = false; } else // altrimenti gestione ordinaria di editing @@ -225,38 +227,40 @@ namespace C2P.WebUserControls switch (req) { case "Costs": - mod_Q_Costs1.Visible = true; - mod_Q_ExtrPar1.Visible = false; + mod_S_Costs1.Visible = true; + mod_S_ExtrPar1.Visible = false; mod_S_Header1.Visible = false; - mod_Q_PackPar1.Visible = false; + mod_S_PackPar1.Visible = false; break; case "ExtrPar": - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = true; + mod_S_Costs1.Visible = false; + mod_S_ExtrPar1.Visible = true; mod_S_Header1.Visible = false; - mod_Q_PackPar1.Visible = false; + mod_S_PackPar1.Visible = false; break; case "Header": if (prevReq == req) mod_S_Header1.toggleMode(); - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = false; + mod_S_Costs1.Visible = false; + mod_S_ExtrPar1.Visible = false; mod_S_Header1.Visible = true; - mod_Q_PackPar1.Visible = false; + mod_S_PackPar1.Visible = false; break; case "PackPar": - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = false; + mod_S_Costs1.Visible = false; + mod_S_ExtrPar1.Visible = false; mod_S_Header1.Visible = false; - mod_Q_PackPar1.Visible = true; + mod_S_PackPar1.Visible = true; break; case "Quote": - if (prevReq == req) mod_Q_Quot1.toggleMode(); +#if false + if (prevReq == req) mod_S_Quot1.toggleMode(); +#endif break; default: - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = false; + mod_S_Costs1.Visible = false; + mod_S_ExtrPar1.Visible = false; mod_S_Header1.Visible = true; - mod_Q_PackPar1.Visible = false; + mod_S_PackPar1.Visible = false; break; } prevReq = req; @@ -279,12 +283,12 @@ namespace C2P.WebUserControls // fix altri button x edit.. if (!showEdit) { - lbHeader.CssClass = "btn btn-default disabled"; - lbExtrPar.CssClass = "btn btn-default disabled"; - lbPackPar.CssClass = "btn btn-default disabled"; - lbDiesPar.CssClass = "btn btn-default disabled"; - lbCosts.CssClass = "btn btn-default disabled"; - lbQuotation.CssClass = "btn btn-default disabled"; + lbHeader.CssClass = "btn btn-warning disabled"; + lbExtrPar.CssClass = "btn btn-warning disabled"; + lbPackPar.CssClass = "btn btn-warning disabled"; + lbDiesPar.CssClass = "btn btn-warning disabled"; + lbCosts.CssClass = "btn btn-warning disabled"; + lbQuotation.CssClass = "btn btn-warning disabled"; } } /// diff --git a/C2P/WebUserControls/mod_newProduct.ascx.designer.cs b/C2P/WebUserControls/mod_newProduct.ascx.designer.cs index da71b6f..d28d4d0 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.designer.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.designer.cs @@ -148,22 +148,22 @@ namespace C2P.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbCosts; /// - /// mod_Q_Costs1 control. + /// mod_S_Costs1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::C2P.WebUserControls.mod_Q_Costs mod_Q_Costs1; + protected global::C2P.WebUserControls.mod_S_Costs mod_S_Costs1; /// - /// mod_Q_ExtrPar1 control. + /// mod_S_ExtrPar1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::C2P.WebUserControls.mod_Q_ExtrPar mod_Q_ExtrPar1; + protected global::C2P.WebUserControls.mod_S_ExtrPar mod_S_ExtrPar1; /// /// mod_S_Header1 control. @@ -175,13 +175,13 @@ namespace C2P.WebUserControls { protected global::C2P.WebUserControls.mod_S_Header mod_S_Header1; /// - /// mod_Q_PackPar1 control. + /// mod_S_PackPar1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::C2P.WebUserControls.mod_Q_PackPar mod_Q_PackPar1; + protected global::C2P.WebUserControls.mod_S_PackPar mod_S_PackPar1; /// /// lbQuotation control. @@ -193,13 +193,13 @@ namespace C2P.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbQuotation; /// - /// mod_Q_Quot1 control. + /// mod_S_Quot1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::C2P.WebUserControls.mod_Q_Quot mod_Q_Quot1; + protected global::C2P.WebUserControls.mod_S_Quot mod_S_Quot1; /// /// divStato0 control. diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 38e2a13..d437e83 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 7790fe8..5c0b35a 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index d0f6256..fbc9e49 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 7790fe8..5c0b35a 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 4462b83..d1c0d37 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index d0f6256..fbc9e49 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index b885593..2ffdce2 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.63.162")] -[assembly: AssemblyFileVersion("0.6.63.162")] +[assembly: AssemblyVersion("0.6.64.164")] +[assembly: AssemblyFileVersion("0.6.64.164")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 39de1c7..9ea3e7e 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.63.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.63.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.6.64.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.6.64.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+