diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 23e41b4..7de30f5 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index f12a96a..06b5808 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -156,17 +156,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279,6 +314,13 @@ Menu.aspx + + MyDocs.aspx + ASPXCodeBehind + + + MyDocs.aspx + ricerca.aspx diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index d1e3424..c5d89ed 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -28,7 +28,7 @@ - + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs index 5651ee8..4d77892 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs @@ -38,25 +38,25 @@ namespace ETS_WS.WebUserControls { path = string.Format("{0}/{1}", utils.obj.confReadString("tempUplDir"), utils.obj.currUser_FS); utils.obj.setSessionVal("UserTempPath", path); - } + } fileMover.checkDir(path); } - catch(Exception exc) + catch (Exception exc) { lg.Info("errore check directory: {0}", exc); } - // opra il file... + // ora il file... try { - if(path!="") + if (path != "") { - path = string.Format("{0}/{1}",path, e.FileName); - fileUpload.SaveAs(MapPath(path)); - lg.Info("salvato file: {0}, {1} Kb", path, e.FileSize / 1024); - if (eh_fileCaricato != null) - { - eh_fileCaricato(this, new EventArgs()); - } + path = string.Format("{0}/{1}", path, e.FileName); + fileUpload.SaveAs(MapPath(path)); + lg.Info("salvato file: {0}, {1} Kb", path, e.FileSize / 1024); + if (eh_fileCaricato != null) + { + eh_fileCaricato(this, new EventArgs()); + } } } catch (Exception exc) diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_menu.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_menu.ascx index 131d3cf..c3f1bee 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_menu.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_menu.ascx @@ -13,12 +13,12 @@ ToolTip="ETS" />
-
+

+ ToolTip="Offerte" PostBackUrl="~/MyDocs.aspx" />

diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx index d5239b4..33c265e 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_myTempFile.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_myTempFile" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <% if (false) { %> @@ -8,8 +9,8 @@ <% } %> - + @@ -19,16 +20,74 @@ - + <%-- + + + + +
+ + + + +
+ + + --%> + + + + + + + + + + + + ico + + - + - + + + + + + + + + + + - + + + + + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx.cs index c1a8bd8..b977e11 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx.cs @@ -4,14 +4,54 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using ETS_Data; namespace ETS_WS.WebUserControls { public partial class mod_myTempFile : System.Web.UI.UserControl { + protected void Page_Load(object sender, EventArgs e) { } + /// + /// seleziona/deseleziona le righe indicate... + /// + /// + /// + protected void btnSelAll_Click(object sender, EventArgs e) + { + // seleziono tutti i valori visibili nel datagrid + CheckBox chkbox = ((CheckBox)sender); + bool isChecked = chkbox.Checked; + if (!isChecked) + { + chkbox.ToolTip = "Seleziona tutti"; + } + else + { + chkbox.ToolTip = "Deseleziona tutti"; + } + foreach (GridViewRow riga in grView.Rows) + { + ((CheckBox)riga.FindControl("chkSelect")).Checked = isChecked; + } + } + /// + /// modalità di editing metadati attiva/disattiva + /// + public bool editMode + { + get + { + return utils.obj.BoolSessionObj("editMyDocsMetadata"); + } + set + { + utils.obj.setSessionVal("editMyDocsMetadata", value); + grView.DataBind(); + } + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx index 4d1ac6b..2219de0 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx @@ -8,14 +8,19 @@ <% } %> -
-
- + +
+
+ +
+
+ +
+
+ + + + +
-
- -
-
- ETS-WebScip -
-
+ diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx.designer.cs index 5cd3fda..3223983 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_testata.ascx.designer.cs @@ -12,6 +12,15 @@ namespace ETS_WS.WebUserControls { public partial class mod_testata { + /// + /// hlHome control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlHome; + /// /// lblUser control. /// @@ -29,5 +38,23 @@ namespace ETS_WS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblDataOra; + + /// + /// ibHome control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image ibHome; + + /// + /// lblTitolo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTitolo; } } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index f5d1bd1..f0ea7cb 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 07c6e6b..90d3e41 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/images/bg-menu-main.png b/ETS-WS/ETS-WS/images/bg-menu-main.png index 5ff3c91..d6f96ba 100644 Binary files a/ETS-WS/ETS-WS/images/bg-menu-main.png and b/ETS-WS/ETS-WS/images/bg-menu-main.png differ diff --git a/ETS-WS/packages/repositories.config b/ETS-WS/packages/repositories.config index 33c9191..a1bf342 100644 --- a/ETS-WS/packages/repositories.config +++ b/ETS-WS/packages/repositories.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index 26f010f..248ea80 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -47,6 +47,9 @@ true + + ..\ETS-WS\packages\NLog.2.0.0.2000\lib\net40\NLog.dll + @@ -118,6 +121,13 @@ DS_WebScip.xsd + + Always + + + Designer + + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/ETS_Data/fileMover.cs b/ETS_Data/fileMover.cs index 1f8b055..d61c0f5 100644 --- a/ETS_Data/fileMover.cs +++ b/ETS_Data/fileMover.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.IO; +using NLog; namespace ETS_Data { @@ -18,6 +19,8 @@ namespace ETS_Data /// public static fileMover obj = new fileMover(); + protected Logger lg = LogManager.GetCurrentClassLogger(); + #endregion /// @@ -83,5 +86,26 @@ namespace ETS_Data } return _di; } + /// + /// elimina un file dato path e nomefile + /// + /// + /// + /// + public bool eliminaFile(string Path, string Original_Nome) + { + bool answ = false; + try + { + //elimino file! + FileInfo _fi = new FileInfo(System.Web.HttpContext.Current.Server.MapPath(Path + Original_Nome)); + _fi.Delete(); + lg.Info("Eliminazione file: {0}/{1}", Path, Original_Nome); + answ = true; + } + catch + { } + return answ; + } } }