diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 3920eb2..2f47371 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -227,6 +227,7 @@ + @@ -516,6 +517,13 @@ Global.asax + + Home.aspx + ASPXCodeBehind + + + Home.aspx + JumboPage.master ASPXCodeBehind diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user index cd5a0b1..d496d3a 100644 --- a/C2P/C2P.csproj.user +++ b/C2P/C2P.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - costimateZip + IIS02 diff --git a/C2P/Default.aspx b/C2P/Default.aspx index 7de55a2..335d9e0 100644 --- a/C2P/Default.aspx +++ b/C2P/Default.aspx @@ -1,15 +1,5 @@ <%@ Page Title="Home Page" Language="C#" MasterPageFile="~/JumboPage.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="C2P._Default" %> -<%-- -
-
-
-

C2P = Cost 2 Price<%: Title %>

-
- Generazione preventivi, Simulazione, Report di campagna -
-
---%>
diff --git a/C2P/Default.aspx.cs b/C2P/Default.aspx.cs index 203f1f0..19051ac 100644 --- a/C2P/Default.aspx.cs +++ b/C2P/Default.aspx.cs @@ -14,7 +14,7 @@ namespace C2P { // resetto i dati utente all'accesso alla pagina default... devicesAuthProxy.stObj.clearAllUserData(); - Response.Redirect("UserAdmin"); + Response.Redirect("Home"); } } } \ No newline at end of file diff --git a/C2P/Home.aspx b/C2P/Home.aspx new file mode 100644 index 0000000..2669a8d --- /dev/null +++ b/C2P/Home.aspx @@ -0,0 +1,46 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JumboPage.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="C2P.Home" %> + + +
+
+
+ Costimate +
+

Cost to Price for Extrusion

+
+
+
+
+ + +
+
+
+
+
+

Quick Shortcut

+
+
+
+ + <%: traduci("ExistProdOff") %> + + + <%: traduci("NewProdOff") %> + + + <%: traduci("OffersArchive") %> + + + <%: traduci("MarginReport") %> + + + <%: traduci("StdCostList") %> + +
+
+
+
+
+
+ diff --git a/C2P/Home.aspx.cs b/C2P/Home.aspx.cs new file mode 100644 index 0000000..28fc424 --- /dev/null +++ b/C2P/Home.aspx.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace C2P +{ + public partial class Home : SteamWare.UserPage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/Home.aspx.designer.cs b/C2P/Home.aspx.designer.cs new file mode 100644 index 0000000..ee0af2d --- /dev/null +++ b/C2P/Home.aspx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// 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 { + + + public partial class Home { + + /// + /// HyperLink2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink2; + + /// + /// HyperLink3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink3; + + /// + /// HyperLink4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink4; + + /// + /// HyperLink5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink5; + + /// + /// HyperLink6 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink6; + } +} diff --git a/C2P/Properties/PublishProfiles/costimate.pubxml b/C2P/Properties/PublishProfiles/costimate.pubxml index e13830c..380455d 100644 --- a/C2P/Properties/PublishProfiles/costimate.pubxml +++ b/C2P/Properties/PublishProfiles/costimate.pubxml @@ -31,6 +31,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + diff --git a/C2P/Properties/PublishProfiles/costimateZip.pubxml b/C2P/Properties/PublishProfiles/costimateZip.pubxml index c10379f..77a1a84 100644 --- a/C2P/Properties/PublishProfiles/costimateZip.pubxml +++ b/C2P/Properties/PublishProfiles/costimateZip.pubxml @@ -26,6 +26,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + True diff --git a/C2P/Web.config b/C2P/Web.config index 91dda98..da5183e 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -26,7 +26,7 @@ - + diff --git a/C2P/WebUserControls/mod_testata.ascx.cs b/C2P/WebUserControls/mod_testata.ascx.cs index 0198e9f..5e01dc0 100644 --- a/C2P/WebUserControls/mod_testata.ascx.cs +++ b/C2P/WebUserControls/mod_testata.ascx.cs @@ -56,61 +56,47 @@ namespace C2P.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - if (true) + // altri controlli + if (!Page.IsPostBack) { - // altri controlli - if (!Page.IsPostBack) + Page.Title = Request.Url.ToString(); + // se ho cambiato pagina registro...) + if (devicesAuthProxy.pagPrecedente != titolo) { - Page.Title = Request.Url.ToString(); - // se ho cambiato pagina registro...) - if (devicesAuthProxy.pagPrecedente != titolo) - { - devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente; - } - // salvo apgina corrente - devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url); + devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente; } - // SOLO se la pagina NON E' "safe"... - if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0) + // salvo apgina corrente + devicesAuthProxy.pagCorrente = titolo; + // fix logo + imgLogo.Visible = logoVisible; + PagCorrente(); + memLayer.ML.emptySessionVal("searchVal"); + } + // SOLO se la pagina NON E' "safe"... + if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0) + { + bool userOk = checkUser(); + bool pageOk = checkPageIsAuth(); + // controllo se c'è utente in sessione.. + if ((userOk)) { - bool userOk = checkUser(); - bool pageOk = checkPageIsAuth(); - // controllo se c'è utente in sessione.. - if ((userOk)) + // ora controllo pagina... + if (!pageOk) { - // ora controllo pagina... - if (!pageOk) + if (devicesAuthProxy.stObj.isPageEnabled(devicesAuthProxy.pagPrecedente)) { - if (devicesAuthProxy.stObj.isPageEnabled(devicesAuthProxy.pagPrecedente)) - { - Response.Redirect(devicesAuthProxy.pagPrecedente); - } - else - { - Response.Redirect("Default"); - } + Response.Redirect(devicesAuthProxy.pagPrecedente); + } + else + { + Response.Redirect("Home"); } } - else - { - // rimando pagina x registrazione devices - Response.Redirect("UserAdmin"); - } } - } - else - { - // se l'utente NON c'è torno a login... - if (!user_std.UtSn.isAuth && currPage.IndexOf("login") < 0) + else { - Session["nextPage"] = currPage; - Response.Redirect("login"); - } - if (!Page.IsPostBack) - { - imgLogo.Visible = logoVisible; - PagCorrente(); - memLayer.ML.emptySessionVal("searchVal"); + // rimando pagina x registrazione devices + Response.Redirect("UserAdmin"); } } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 32164e7..1856393 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 eeec927..3527fc6 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 a139b45..4c7c8d8 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 4d4078f..3527fc6 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 56e94b6..4c7c8d8 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index eeec927..3527fc6 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 37629c7..d2f8380 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 a139b45..4c7c8d8 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 245532a..66bd24a 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.146.333")] -[assembly: AssemblyFileVersion("2.0.146.333")] +[assembly: AssemblyVersion("2.0.147.337")] +[assembly: AssemblyFileVersion("2.0.147.337")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index e6d47bf..946bd34 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.146.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.146.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.147.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.147.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+