diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
index 7c7f2b9..fbd032c 100644
--- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
+++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
@@ -17,3 +17,4 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache
diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache
new file mode 100644
index 0000000..9b27ce9
Binary files /dev/null and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ
diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index 222793c..97f3f5e 100644
Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
index 0769e2f..3057971 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
@@ -4,8 +4,10 @@
<% } %>
-
-
-
-<%--
--%>
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
index 9c8519e..5f31ad8 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
@@ -14,7 +14,7 @@ namespace PROJ_ETS.WebUserControls
{
// sistemare
lblUser.Text = "Current user";// string.Format("{0} ({1})", utils.obj.currUserCognomeNome, utils.obj.currUserId);
- //lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
+ lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
}
///
/// richiesta update
@@ -30,48 +30,9 @@ namespace PROJ_ETS.WebUserControls
///
private void doFullDataUpdate()
{
- //// salvo i dati attuali...
- //string cod_cdc = SteamWare.memLayer.ML.StringSessionObj("valRicercaCdC");
- //string lingua = user_std.UtSn.lingua;
- //string USER_NAME = SteamWare.memLayer.ML.StringSessionObj("USER_NAME");
- //string DOMINIO = SteamWare.memLayer.ML.StringSessionObj("DOMINIO");
- //bool isForceUser = user_std.UtSn.isForcedUser;
- //// salvo i valori delle tab in session...
- //Dictionary
sessionParam = SteamWare.memLayer.ML.valSess2SurvUpd;
-
// svuoto session e cache per rileggere i dati da Db
Session.RemoveAll();
Response.Redirect(Request.Url.ToString());
-
- //Uri MyUrl = Request.Url;
- //string delimStr = "/";
- //char[] delimiter = delimStr.ToCharArray();
- //string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
- //int n = finalUrl.Length;
- //_paginaCorrente = finalUrl[n - 1].ToString();
-
- //SteamWare.memLayer.ML.flushRegisteredCache();
-
- //// rimemorizzo
- //SteamWare.memLayer.ML.setSessionVal("valRicercaCdC", cod_cdc);
- //user_std.UtSn.startUpUtente(DOMINIO, USER_NAME);
- //user_std.UtSn.lingua = lingua;
- //user_std.UtSn.isForcedUser = isForceUser;
- //DataWrap.DW.resetVocabolario();
-
- //// risalvo in session i valori...
- //foreach (KeyValuePair kvp in sessionParam)
- //{
- // SteamWare.memLayer.ML.setSessionVal(kvp.Key, kvp.Value, true);
- //}
-
- //// cambio visibilità del menù laterale...
- //if (eh_reqUpdateMenu != null)
- //{
- // eh_reqUpdateMenu(this, new EventArgs());
- //}
-
- //Response.Redirect(_paginaCorrente);
}
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
index 1ce6e5c..f8cfa29 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
@@ -30,6 +30,15 @@ namespace PROJ_ETS.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblUser;
+ ///
+ /// lblDataOra control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblDataOra;
+
///
/// ibHome control.
///
@@ -40,12 +49,12 @@ namespace PROJ_ETS.WebUserControls {
protected global::System.Web.UI.WebControls.Image ibHome;
///
- /// A2 control.
+ /// btnUpdate control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.HtmlControls.HtmlAnchor A2;
+ protected global::System.Web.UI.WebControls.LinkButton btnUpdate;
}
}
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 222793c..97f3f5e 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index da2861c..9e49c06 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
index bc73f73..5ce07a3 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
index da2861c..9e49c06 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ