diff --git a/WebSCR/App_Start/RouteConfig.cs b/WebSCR/App_Start/RouteConfig.cs index d9f3af5..0d2cab7 100644 --- a/WebSCR/App_Start/RouteConfig.cs +++ b/WebSCR/App_Start/RouteConfig.cs @@ -6,13 +6,13 @@ using Microsoft.AspNet.FriendlyUrls; namespace WebSCR { - public static class RouteConfig + public static class RouteConfig + { + public static void RegisterRoutes(RouteCollection routes) { - public static void RegisterRoutes(RouteCollection routes) - { - var settings = new FriendlyUrlSettings(); - settings.AutoRedirectMode = RedirectMode.Permanent; - routes.EnableFriendlyUrls(settings); - } + var settings = new FriendlyUrlSettings(); + settings.AutoRedirectMode = RedirectMode.Permanent; + routes.EnableFriendlyUrls(settings); } + } } diff --git a/WebSCR/Pianificazione.aspx.cs b/WebSCR/Pianificazione.aspx.cs index 67f3982..ec2063d 100644 --- a/WebSCR/Pianificazione.aspx.cs +++ b/WebSCR/Pianificazione.aspx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -8,10 +9,17 @@ using System.Web.UI.WebControls; namespace WebSCR { - public partial class Pianificazione : System.Web.UI.Page + public partial class Pianificazione : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - } + // controllo se x caseo ha ACTION=RESET --> elimina matricola... + if (memLayer.ML.QSS("ACTION") == "RESET") + { + // rimuovo matrOp + memLayer.ML.emptySessionVal("matrOp"); + memLayer.ML.emptySessionVal("errorMess"); + } } + } } \ No newline at end of file diff --git a/WebSCR/Pianificazione.aspx.designer.cs b/WebSCR/Pianificazione.aspx.designer.cs index 3c62add..11a1255 100644 --- a/WebSCR/Pianificazione.aspx.designer.cs +++ b/WebSCR/Pianificazione.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace WebSCR { @@ -13,11 +13,11 @@ namespace WebSCR { public partial class Pianificazione { /// - /// mod_pianificazione1 control. + /// Controllo mod_pianificazione1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::WebSCR.WebUserControls.mod_pianificazione mod_pianificazione1; } diff --git a/WebSCR/WebSCR.csproj.user b/WebSCR/WebSCR.csproj.user index 9ccf1f8..87b7927 100644 --- a/WebSCR/WebSCR.csproj.user +++ b/WebSCR/WebSCR.csproj.user @@ -1,7 +1,7 @@  - OVH-Rigamonti + IIS02 ShowAllFiles true @@ -10,7 +10,7 @@ - Debug|Any CPU + Release|Any CPU diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx index 5aca6ff..a798b81 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx +++ b/WebSCR/WebUserControls/mod_footer.ascx @@ -1,8 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %> \ No newline at end of file + + diff --git a/WebSCR/WebUserControls/mod_footer.ascx.designer.cs b/WebSCR/WebUserControls/mod_footer.ascx.designer.cs index ac9930c..ab12352 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_footer.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace WebSCR.WebUserControls { @@ -13,20 +13,20 @@ namespace WebSCR.WebUserControls { public partial class mod_footer { /// - /// divFooterMenu control. + /// Controllo divFooterMenu. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFooterMenu; /// - /// ulStd control. + /// Controllo ulStd. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulStd; } diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index a47c355..25a7ca3 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -1,59 +1,59 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="WebSCR.WebUserControls.mod_header" %>
-
- WSC - <%: titolo %> +
+ WSC - <%: titolo %> +
+
+
+ +
-
-
- - -
-
- - -
-
-
-     -
- - -
-
-
-   +
+ + +
+
+
+     +
+ +
+
+
+   +
- +
-
- <%: CognomeNome %> -
-
- <%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %> -
- <%--
+
+ <%: CognomeNome %> +
+
+ <%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %> +
+ <%--
<%: DataSel %> | <%: ClienteSel %> | <%: SquadraSel %>
--%>
diff --git a/WebSCR/WebUserControls/mod_header.ascx.designer.cs b/WebSCR/WebUserControls/mod_header.ascx.designer.cs index f93ec0e..68ca583 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace WebSCR.WebUserControls { @@ -13,74 +13,74 @@ namespace WebSCR.WebUserControls { public partial class mod_header { /// - /// Timer1 control. + /// Controllo Timer1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.Timer Timer1; /// - /// lblVers control. + /// Controllo lblVers. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblVers; /// - /// updtRicerca control. + /// Controllo updtRicerca. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.UpdateProgress updtRicerca; /// - /// divHeaderMenu control. + /// Controllo divHeaderMenu. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHeaderMenu; /// - /// ulStd control. + /// Controllo ulStd. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulStd; /// - /// hlLocalUploader control. + /// Controllo hlLocalUploader. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HyperLink hlLocalUploader; /// - /// ulSquadra control. + /// Controllo ulSquadra. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulSquadra; /// - /// ulMagazzino control. + /// Controllo ulMagazzino. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulMagazzino; } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index fe2f8f1..94af396 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index fd2212b..c4c31e2 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index db55420..b84a08d 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ