-
+
<%: traduci("AnagSchedeColl") %>
-
+
<%: traduci("ElencoSchede") %>
<%: traduci("Collaudi") %>
- <%--
- <%: traduci("Report") %>
+
+ <%: traduci("Logout") %>
-
+ <%--
<%: traduci("StdCostList") %>
--%>
diff --git a/CMS_SC/Home.aspx.cs b/CMS_SC/Home.aspx.cs
index fd4f48e..fa3ac2b 100644
--- a/CMS_SC/Home.aspx.cs
+++ b/CMS_SC/Home.aspx.cs
@@ -16,6 +16,7 @@ namespace CMS_SC
{
hlAnagSchedeColl.DataBind();
hlElencoSchede.DataBind();
+ hlLogout.DataBind();
}
}
///
@@ -60,15 +61,24 @@ namespace CMS_SC
///
/// verifica visibilità in base al menù...
///
+ ///
///
- public string checkShow()
+ public string checkShow(object _doShow)
{
- string answ = "hidden ";
+ bool doShow = false;
+ try
+ {
+ doShow = Convert.ToBoolean(_doShow);
+ }
+ catch
+ { }
// verifico: se è userIsSuperAdmin vede tutto
if (userIsSuperAdmin || userIsCapoOfficina || userIsCapoGruppo || userIsAnagAdmin)
{
- answ = "";
+ doShow = !doShow;
}
+ string answ = "";
+ if (doShow) answ = "hidden ";
return answ;
}
}
diff --git a/CMS_SC/Home.aspx.designer.cs b/CMS_SC/Home.aspx.designer.cs
index 3a7d568..fcc2274 100644
--- a/CMS_SC/Home.aspx.designer.cs
+++ b/CMS_SC/Home.aspx.designer.cs
@@ -38,5 +38,14 @@ namespace CMS_SC {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.HyperLink hlCollaudi;
+
+ ///
+ /// hlLogout control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink hlLogout;
}
}
diff --git a/CMS_SC/Logout.aspx b/CMS_SC/Logout.aspx
new file mode 100644
index 0000000..78f3862
--- /dev/null
+++ b/CMS_SC/Logout.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Logout.aspx.cs" Inherits="CMS_SC.Logout" %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CMS_SC/Logout.aspx.cs b/CMS_SC/Logout.aspx.cs
new file mode 100644
index 0000000..7bb7f80
--- /dev/null
+++ b/CMS_SC/Logout.aspx.cs
@@ -0,0 +1,25 @@
+using CMS_SC_Data;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace CMS_SC
+{
+ public partial class Logout : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ // cancello cookie!
+ memLayer.ML.emptyCookieVal(devicesAuthProxy.AuthCookieName);
+ // resetto sessione
+ devicesAuthProxy.stObj.clearAllUserData();
+ OpAuth.stopAuth();
+ // reload default!
+ Response.Redirect("Default");
+ }
+ }
+}
\ No newline at end of file
diff --git a/CMS_SC/Logout.aspx.designer.cs b/CMS_SC/Logout.aspx.designer.cs
new file mode 100644
index 0000000..16a30a6
--- /dev/null
+++ b/CMS_SC/Logout.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// 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 CMS_SC
+{
+
+
+ public partial class Logout
+ {
+
+ ///
+ /// form1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/CMS_SC/WebUserControls/mod_enrollUserBase.ascx.cs b/CMS_SC/WebUserControls/mod_enrollUserBase.ascx.cs
index 85e3bbd..9b34747 100644
--- a/CMS_SC/WebUserControls/mod_enrollUserBase.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_enrollUserBase.ascx.cs
@@ -27,7 +27,7 @@ namespace CMS_SC.WebUserControls
{
// salvo i dati MINIMI per auth utente (in sessione) SENZA cookie...
setupUserBase();
- Response.Redirect("Collaudi");
+ Response.Redirect("Default");
}
else
{
diff --git a/CMS_SC/WebUserControls/mod_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx
index b7698c3..f3fb0ef 100644
--- a/CMS_SC/WebUserControls/mod_testata.ascx
+++ b/CMS_SC/WebUserControls/mod_testata.ascx
@@ -26,7 +26,7 @@
-
-
+
Home
diff --git a/CMS_SC/WebUserControls/mod_testata.ascx.cs b/CMS_SC/WebUserControls/mod_testata.ascx.cs
index 8f77117..158b835 100644
--- a/CMS_SC/WebUserControls/mod_testata.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_testata.ascx.cs
@@ -214,7 +214,7 @@ namespace CMS_SC.WebUserControls
{ }
}
}
- // salvo in sessione utente
+ // salvo in sessione utente l'email...
memLayer.ML.setSessionVal("email", email);
// avvio utente...
devicesAuthProxy.stObj.startUpUtente(email);
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 1b2058f..bf56cea 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll
index 55111e3..11802d6 100644
Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index 20b9af1..2a856d8 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs
index 4447ca0..7c5b68b 100644
--- a/VersGen/CMS_SC.cs
+++ b/VersGen/CMS_SC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.9.109.356")]
-[assembly: AssemblyFileVersion("1.9.109.356")]
+[assembly: AssemblyVersion("2.0.123.356")]
+[assembly: AssemblyFileVersion("2.0.123.356")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt
index fc9e224..c1b538b 100644
--- a/VersGen/CMS_SC.tt
+++ b/VersGen/CMS_SC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.9.109.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.9.109.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.0.123.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.0.123.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll
index e48541a..2bb85be 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ