diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index a5ab405..0f2fe16 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -67,8 +67,9 @@ True ..\ETS-WS\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll - - ..\ETS-WS\packages\NLog.2.0.0.2000\lib\net40\NLog.dll + + False + ..\PROJ-ETS\packages\NLog.2.0.1.2\lib\net40\NLog.dll diff --git a/ETS_Data/NLog.config b/ETS_Data/NLog.config index bbb24f5..a4d889d 100644 --- a/ETS_Data/NLog.config +++ b/ETS_Data/NLog.config @@ -2,24 +2,28 @@ - - - - - + + + + + - + - - - - + + - + \ No newline at end of file diff --git a/ETS_Data/NLog.xsd b/ETS_Data/NLog.xsd index b206007..b26df06 100644 --- a/ETS_Data/NLog.xsd +++ b/ETS_Data/NLog.xsd @@ -224,6 +224,84 @@ + + + + + + + + + + + + Name of the target. + + + + + Maximum number of log events that the buffer can keep. + + + + + Indicates whether buffer should grow as needed. + + + + + Number of log events to be buffered. + + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to add <!-- --> comments around all written texts. + + + + + Layout used to format log messages. + + + + + @@ -320,21 +398,22 @@ - - + + + - - - - + + + + - + @@ -342,31 +421,36 @@ Name of the target. - - - Indicates whether to append newline at the end of log message. - - Instance of that is used to format log messages. - - - Action that should be taken if the message is larger than maxMessageSize. - - Maximum message size in bytes. + + + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + Encoding to be used. + + + Indicates whether to keep connection open whenever possible. + + Size of the connection cache (number of connections which are kept alive). @@ -377,9 +461,14 @@ Network address. - + - Indicates whether to keep connection open whenever possible. + Maximum queue size. + + + + + NDC item separator. @@ -387,21 +476,11 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Indicates whether to include call site (class and method name) in the information sent over the network. - - AppInfo field. By default it's the friendly name of the current AppDomain. - - - NDC item separator. - - Indicates whether to include stack contents. @@ -412,6 +491,11 @@ Indicates whether to include NLog-specific extensions to log4j schema. + + + Indicates whether to include call site (class and method name) in the information sent over the network. + + Indicates whether to include dictionary contents. @@ -443,14 +527,143 @@ + + + + + + + + + + + + + + + + Name of the target. + + + + + Text to be rendered. + + + + + Header. + + + + + Footer. + + + + + Indicates whether to use default row highlighting rules. + + + + + Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Background color. + + + + + Condition that must be met in order to set the specified foreground and background color. + + + + + Foreground color. + + + + + + + + + + + + + + + Background color. + + + + + Foreground color. + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + - + @@ -463,16 +676,16 @@ Text to be rendered. - - - Footer. - - Header. + + + Footer. + + Indicates whether to send the log messages to the standard error instead of the standard output. @@ -634,6 +847,38 @@ + + + + + + + + + + + + Name of the target. + + + + + Footer. + + + + + Text to be rendered. + + + + + Header. + + + + + @@ -654,6 +899,56 @@ + + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + Name of the machine on which Event Log service is running. + + + + + Value to be used as the event Source. + + + + + Layout that renders event Category. + + + + + Layout that renders event ID. + + + + + Name of the Event Log to write to. This can be System, Application or any user-defined name. + + + + + @@ -686,12 +981,12 @@ - + + - @@ -745,11 +1040,6 @@ Maximum number of archive files that should be kept. - - - Name of the file to be used for an archive. - - Way file archives are numbered. @@ -760,6 +1050,16 @@ Indicates whether to automatically archive log files every time the specified time passes. + + + Name of the file to be used for an archive. + + + + + Name of the file to write to. + + Indicates whether to replace file contents on each write instead of appending log message at the end. @@ -770,11 +1070,6 @@ File attributes (Windows only). - - - Name of the file to write to. - - Indicates whether to delete old log file on startup. @@ -904,6 +1199,264 @@ + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + Name of the Form on which the control is located. + + + + + Indicates whether log text should be appended to the text of the control instead of overwriting it. + + + + + Name of control to which NLog will log write log text. + + + + + Whether new log entry are added to the start or the end of the control + + + + + + + + + + + + + + + + + + + + + Name of the target. + + + + + Username to change context to. + + + + + User account password. + + + + + Indicates whether to revert to the credentials of the process instead of impersonating another user. + + + + + Required impersonation level. + + + + + Windows domain name to change context to. + + + + + Logon Type. + + + + + Type of the logon provider. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name of the target. + + + + + Header. + + + + + Footer. + + + + + Text to be rendered. + + + + + Indicates whether to send message as HTML instead of plain text. + + + + + Indicates whether to add new lines between log entries. + + + + + Encoding to be used for sending e-mail. + + + + + Mail subject. + + + + + Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + + + + + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + + + + + Sender's email address (e.g. joe@domain.com). + + + + + CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + + + + + Mail message body (repeated for each log message send in one mail). + + + + + Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. + + + + + Indicates whether the default Settings from System.Net.MailSettings should be used. + + + + + Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + SMTP Authentication mode. + + + + + SMTP Server to be used for sending. + + + + + Port number that SMTP Server is listening on. + + + + + + + + + + + + @@ -999,6 +1552,62 @@ + + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to use the XML format when serializing message. + + + + + Encoding to be used when writing text to the queue. + + + + + Layout used to format log messages. + + + + + Indicates whether to use recoverable messages (with guaranteed delivery). + + + + + Indicates whether to create the queue if it doesn't exists. + + + + + Label to associate with each message. + + + + + Name of the queue to write to. + + + + + @@ -1012,6 +1621,7 @@ + @@ -1058,6 +1668,11 @@ Network address. + + + Maximum queue size. + + @@ -1066,21 +1681,22 @@ - - + + + - - - - + + + + - + @@ -1088,31 +1704,36 @@ Name of the target. - - - Indicates whether to append newline at the end of log message. - - Instance of that is used to format log messages. - - - Action that should be taken if the message is larger than maxMessageSize. - - Maximum message size in bytes. + + + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + Encoding to be used. + + + Indicates whether to keep connection open whenever possible. + + Size of the connection cache (number of connections which are kept alive). @@ -1123,9 +1744,14 @@ Network address. - + - Indicates whether to keep connection open whenever possible. + Maximum queue size. + + + + + NDC item separator. @@ -1133,21 +1759,11 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Indicates whether to include call site (class and method name) in the information sent over the network. - - AppInfo field. By default it's the friendly name of the current AppDomain. - - - NDC item separator. - - Indicates whether to include stack contents. @@ -1158,6 +1774,11 @@ Indicates whether to include NLog-specific extensions to log4j schema. + + + Indicates whether to include call site (class and method name) in the information sent over the network. + + Indicates whether to include dictionary contents. @@ -1212,6 +1833,88 @@ + + + + + + + + + + + + + + + Name of the target. + + + + + Performance counter instance name. + + + + + Counter help text. + + + + + Performance counter type. + + + + + Indicates whether performance counter should be automatically created. + + + + + Name of the performance counter category. + + + + + Name of the performance counter. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1309,6 +2012,165 @@ + + + + + + + + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + Initial height of the form with rich text box. + + + + + Indicates whether scroll bar will be moved automatically to show most recent log entries. + + + + + Maximum number of lines the rich text box will store (or 0 to disable this feature). + + + + + Indicates whether the created form will be initially minimized. + + + + + Indicates whether the created window will be a tool window. + + + + + Name of RichTextBox to which Nlog will write. + + + + + Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. + + + + + Initial width of the form with rich text box. + + + + + Indicates whether to use default coloring rules. + + + + + + + + + + + + + + + + + + + + + + + + + + + Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. + + + + + Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + + + + + + + + + + + Background color. + + + + + Condition that must be met in order to set the specified font color. + + + + + Font color. + + + + + Font style of matched text. + + + @@ -1337,6 +2199,26 @@ + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + @@ -1685,858 +2567,6 @@ - - - - - - - - - - - - - - - - Name of the target. - - - - - Indicates whether to use the XML format when serializing message. - - - - - Encoding to be used when writing text to the queue. - - - - - Layout used to format log messages. - - - - - Indicates whether to use recoverable messages (with guaranteed delivery). - - - - - Indicates whether to create the queue if it doesn't exists. - - - - - Label to associate with each message. - - - - - Name of the queue to write to. - - - - - - - - - - - - - - - - - Name of the target. - - - - - Maximum number of log events that the buffer can keep. - - - - - Indicates whether buffer should grow as needed. - - - - - Number of log events to be buffered. - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - - - - - - - - - - - - Name of the target. - - - - - Indicates whether to add <!-- --> comments around all written texts. - - - - - Layout used to format log messages. - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Text to be rendered. - - - - - Header. - - - - - Footer. - - - - - Indicates whether to use default row highlighting rules. - - - - - Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified foreground and background color. - - - - - Foreground color. - - - - - - - - - - - - - - - Background color. - - - - - Foreground color. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - - - Name of the target. - - - - - Footer. - - - - - Text to be rendered. - - - - - Header. - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Name of the machine on which Event Log service is running. - - - - - Value to be used as the event Source. - - - - - Layout that renders event Category. - - - - - Layout that renders event ID. - - - - - Name of the Event Log to write to. This can be System, Application or any user-defined name. - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Indicates whether log text should be appended to the text of the control instead of overwriting it. - - - - - Name of control to which NLog will log write log text. - - - - - Name of the Form on which the control is located. - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Username to change context to. - - - - - User account password. - - - - - Indicates whether to revert to the credentials of the process instead of impersonating another user. - - - - - Required impersonation level. - - - - - Windows domain name to change context to. - - - - - Logon Type. - - - - - Type of the logon provider. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Header. - - - - - Footer. - - - - - Text to be rendered. - - - - - Indicates whether to send message as HTML instead of plain text. - - - - - Indicates whether to add new lines between log entries. - - - - - Encoding to be used for sending e-mail. - - - - - Mail subject. - - - - - Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - Sender's email address (e.g. joe@domain.com). - - - - - Mail message body (repeated for each log message send in one mail). - - - - - Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). - - - - - Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. - - - - - Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). - - - - - SMTP Authentication mode. - - - - - SMTP Server to be used for sending. - - - - - Port number that SMTP Server is listening on. - - - - - - - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Performance counter instance name. - - - - - Counter help text. - - - - - Performance counter type. - - - - - Indicates whether performance counter should be automatically created. - - - - - Name of the performance counter category. - - - - - Name of the performance counter. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Initial height of the form with rich text box. - - - - - Indicates whether scroll bar will be moved automatically to show most recent log entries. - - - - - Maximum number of lines the rich text box will store (or 0 to disable this feature). - - - - - Indicates whether the created form will be initially minimized. - - - - - Indicates whether the created window will be a tool window. - - - - - Name of RichTextBox to which Nlog will write. - - - - - Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. - - - - - Initial width of the form with rich text box. - - - - - Indicates whether to use default coloring rules. - - - - - - - - - - - - - - - - - - - - - - - - - - - Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. - - - - - Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified font color. - - - - - Font color. - - - - - Font style of matched text. - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - diff --git a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6a76c59..f2c271f 100644 Binary files a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index ba63de6..0e8dc29 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/ETS_Data/packages.config b/ETS_Data/packages.config index d48ab31..feec055 100644 --- a/ETS_Data/packages.config +++ b/ETS_Data/packages.config @@ -2,6 +2,9 @@ + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/NLog.config b/PROJ-ETS/PROJ-ETS/NLog.config index d2e19fd..3bb347b 100644 --- a/PROJ-ETS/PROJ-ETS/NLog.config +++ b/PROJ-ETS/PROJ-ETS/NLog.config @@ -2,24 +2,28 @@ - - - - - + + + + + - + - - - - + + - + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 9a35579..29ce110 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -572,6 +572,7 @@ + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs index 76ed3c4..69a0aeb 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs @@ -30,11 +30,10 @@ namespace PROJ_ETS.WebUserControls { if (!Page.IsPostBack) { - SetUpByUserRight(); + //SetUpByUserRight(); } - // sistemare - lblUser.Text = "Current user";// string.Format("{0} ({1})", utils.obj.currUserCognomeNome, utils.obj.currUserId); - lblPostazione.Text = "ip..."; + lblUser.Text = string.Format("{0} ({1})", utils.obj.currUserCognomeNome, utils.obj.currUserId); + lblPostazione.Text = Request.UserHostName; } /// /// richiesta update diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index ba63de6..0e8dc29 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/NLog.config b/PROJ-ETS/PROJ-ETS/bin/NLog.config index d2e19fd..3bb347b 100644 --- a/PROJ-ETS/PROJ-ETS/bin/NLog.config +++ b/PROJ-ETS/PROJ-ETS/bin/NLog.config @@ -2,24 +2,28 @@ - - - - - + + + + + - + - - - - + + - + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 93f8578..b418ed9 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 65d5e8c..18d6881 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 93f8578..b418ed9 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 diff --git a/PROJ-ETS/packages/repositories.config b/PROJ-ETS/packages/repositories.config index d114046..ba54d12 100644 --- a/PROJ-ETS/packages/repositories.config +++ b/PROJ-ETS/packages/repositories.config @@ -1,5 +1,6 @@  + \ No newline at end of file