diff --git a/MP-MAG/SMART/jumper.ascx b/MP-MAG/SMART/jumper.ascx deleted file mode 100644 index 440af664..00000000 --- a/MP-MAG/SMART/jumper.ascx +++ /dev/null @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="jumper.ascx.cs" Inherits="MP_MAG.SMART.jumper" %> diff --git a/MP-MAG/SMART/jumper.aspx b/MP-MAG/SMART/jumper.aspx new file mode 100644 index 00000000..4f5e454c --- /dev/null +++ b/MP-MAG/SMART/jumper.aspx @@ -0,0 +1,19 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="MP_MAG.SMART.jumper" %> + +<%@ Register Src="~/WebUserControls/cmp_jumper.ascx" TagPrefix="uc1" TagName="cmp_jumper" %> + + + + + + + + + +
+
+ +
+
+ + \ No newline at end of file diff --git a/MP-MAG/SMART/jumper.aspx.cs b/MP-MAG/SMART/jumper.aspx.cs new file mode 100644 index 00000000..a9ee3f36 --- /dev/null +++ b/MP-MAG/SMART/jumper.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.SMART +{ + public partial class jumper : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-MAG/SMART/jumper.aspx.designer.cs b/MP-MAG/SMART/jumper.aspx.designer.cs new file mode 100644 index 00000000..816b0de9 --- /dev/null +++ b/MP-MAG/SMART/jumper.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.SMART +{ + + + public partial class jumper + { + + /// + /// Controllo form1. + /// + /// + /// 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.HtmlForm form1; + + /// + /// Controllo cmp_jumper. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_jumper cmp_jumper; + } +} diff --git a/MP-MAG/WebUserControls/cmp_jumper.ascx b/MP-MAG/WebUserControls/cmp_jumper.ascx new file mode 100644 index 00000000..f6b4a874 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_jumper.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_jumper.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_jumper" %> diff --git a/MP-MAG/SMART/jumper.ascx.cs b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs similarity index 84% rename from MP-MAG/SMART/jumper.ascx.cs rename to MP-MAG/WebUserControls/cmp_jumper.ascx.cs index b1aab259..e1dd85ed 100644 --- a/MP-MAG/SMART/jumper.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs @@ -6,9 +6,9 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace MP_MAG.SMART +namespace MP_MAG.WebUserControls { - public partial class jumper : System.Web.UI.UserControl + public partial class cmp_jumper : System.Web.UI.UserControl { #region Protected Methods @@ -22,14 +22,13 @@ namespace MP_MAG.SMART MagData.prodPrintData newProdPrintData = new MagData.prodPrintData(MatrOpr, IdxODL, IdxMacchina, QtaUdc); // salvo in oggetto dedicato... MagData.MagDataLayer.man.currProdPrintData = newProdPrintData; - + string tgtPage = ""; // se l'operatore in sessione è DIVERSO da quello appena inviato --> effettuo NUOVO login if (MatrOpr == memLayer.ML.IntSessionObj("MatrOpr")) { // rimando a pagina di stampa.. secondo tipo finiti / semilavorati - // FARE!!! verifica SL/FI (NON E' ancora implementato davvero - string tgtPage = newProdPrintData.isProdFinito ? "prtFiniti" : "prtSemilav"; - Response.Redirect(tgtPage); + // FARE!!! verifica SL/FI (NON E' ancora implementato davvero) + tgtPage = newProdPrintData.isProdFinito ? "prtFiniti" : "prtSemilav"; } else { @@ -46,10 +45,11 @@ namespace MP_MAG.SMART // salvo in sessione memLayer.ML.setSessionVal("MatrOpr", MatrOpr); memLayer.ML.setSessionVal("UserAuthKey", UserAuthKey); + // redirect x login... + tgtPage = "tryLogin"; } - // redirect x login... - Response.Redirect("tryLogin"); } + Response.Redirect($"~/SMART/{tgtPage}"); } #endregion Protected Methods diff --git a/MP-MAG/SMART/jumper.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_jumper.ascx.designer.cs similarity index 85% rename from MP-MAG/SMART/jumper.ascx.designer.cs rename to MP-MAG/WebUserControls/cmp_jumper.ascx.designer.cs index 7ef40fc1..e6a52f7e 100644 --- a/MP-MAG/SMART/jumper.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_jumper.ascx.designer.cs @@ -8,9 +8,9 @@ //------------------------------------------------------------------------------ -namespace MP_MAG.SMART +namespace MP_MAG.WebUserControls { - public partial class jumper + public partial class cmp_jumper { } } diff --git a/MP-MAG/jumper.aspx b/MP-MAG/jumper.aspx new file mode 100644 index 00000000..931cd0a5 --- /dev/null +++ b/MP-MAG/jumper.aspx @@ -0,0 +1,19 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="MP_MAG.jumper" %> + +<%@ Register Src="~/WebUserControls/cmp_jumper.ascx" TagPrefix="uc1" TagName="cmp_jumper" %> + + + + + + + + + +
+
+ +
+
+ + \ No newline at end of file diff --git a/MP-MAG/jumper.aspx.cs b/MP-MAG/jumper.aspx.cs new file mode 100644 index 00000000..2687f880 --- /dev/null +++ b/MP-MAG/jumper.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG +{ + public partial class jumper : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-MAG/jumper.aspx.designer.cs b/MP-MAG/jumper.aspx.designer.cs new file mode 100644 index 00000000..f0abe700 --- /dev/null +++ b/MP-MAG/jumper.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG +{ + + + public partial class jumper + { + + /// + /// Controllo form1. + /// + /// + /// 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.HtmlForm form1; + + /// + /// Controllo cmp_jumper. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_jumper cmp_jumper; + } +}