From b18efea3dc79e890de899b49f2bec0a3f56b3532 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 16 Jan 2023 20:07:43 +0100 Subject: [PATCH] Aggiunta gestione link nuova versione SMART --- GPW_Admin/WebUserControls/cmp_userCard.ascx | 2 + .../WebUserControls/cmp_userCard.ascx.cs | 27 +++++++- .../cmp_userCard.ascx.designer.cs | 18 +++++ GPW_Admin/dipendenti.aspx | 1 + GPW_Admin/dipendenti.aspx.cs | 66 +++++++++++-------- GPW_Admin/dipendenti.aspx.designer.cs | 9 +++ 6 files changed, 94 insertions(+), 29 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx b/GPW_Admin/WebUserControls/cmp_userCard.ascx index e439a9b..e687162 100644 --- a/GPW_Admin/WebUserControls/cmp_userCard.ascx +++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx @@ -2,6 +2,8 @@
+ +
diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs index 0b4fcd7..494334f 100644 --- a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs +++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs @@ -60,12 +60,33 @@ namespace GPW_Admin.WebUserControls } } + public bool linkCore + { + get + { + bool answ = false; + bool.TryParse(hfLinkCore.Value, out answ); + return answ; + } + set + { + hfLinkCore.Value = $"{value}"; + repUserCards.DataBind(); + } + } + public string jumperFormat + { + get => hfJumperFormat.Value; + set => hfJumperFormat.Value = value; + } + #endregion Public Properties #region Protected Methods protected void Page_Load(object sender, EventArgs e) { + jumperFormat = "jumper?idxDipendente={0}&UserAuthkey={1}"; } #endregion Protected Methods @@ -75,12 +96,16 @@ namespace GPW_Admin.WebUserControls public string getImgUrl(object idxDip, object UserAuthkey) { string urlName = showExt ? "smartBaseUrlExt" : "smartBaseUrlInt"; + // se vuole modalità core --> sostituisco + if(linkCore) + { + urlName += "Core"; + } string[] valori = new string[2]; valori[0] = $"{idxDip}"; valori[1] = HttpUtility.UrlEncode($"{UserAuthkey}"); string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/{memLayer.ML.CRS("UrlQuery")}"; - //string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/JSON_ENC?val="; string urlEncoded = memLayer.ML.CRS(urlName) + HttpUtility.UrlEncode("jumper?idxDipendente={0}&UserAuthkey={1}"); //string rawUrl = memLayer.ML.CRS(urlName) + "jumper?idxDipendente={0}&UserAuthkey={1}"; diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_userCard.ascx.designer.cs index 271ff02..4d4e684 100644 --- a/GPW_Admin/WebUserControls/cmp_userCard.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx.designer.cs @@ -23,6 +23,24 @@ namespace GPW_Admin.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfShowExt; + /// + /// hfLinkCore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfLinkCore; + + /// + /// hfJumperFormat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfJumperFormat; + /// /// repUserCards control. /// diff --git a/GPW_Admin/dipendenti.aspx b/GPW_Admin/dipendenti.aspx index e50ae33..f86c036 100644 --- a/GPW_Admin/dipendenti.aspx +++ b/GPW_Admin/dipendenti.aspx @@ -19,6 +19,7 @@
+  
diff --git a/GPW_Admin/dipendenti.aspx.cs b/GPW_Admin/dipendenti.aspx.cs index afb6621..31cace4 100644 --- a/GPW_Admin/dipendenti.aspx.cs +++ b/GPW_Admin/dipendenti.aspx.cs @@ -21,6 +21,35 @@ namespace GPW_Admin #endregion Protected Properties + #region Protected Methods + + protected void chkShowCards_CheckedChanged(object sender, EventArgs e) + { + fixDisplay(); + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + fixDisplay(); + } + mod_pageSize.eh_nuovaSize += Mod_pageSize_eh_nuovaSize; + cmp_toggleCards.ehToggle += Cmp_toggleCards_ehToggle; + cmp_toggleLinkExt.ehToggle += Cmp_toggleLinkExt_ehToggle; + cmp_toggleCoreSmart.ehToggle += Cmp_toggleCoreSmart_ehToggle; + mod_adminDipendenti1.eh_addNew += Mod_adminDipendenti1_eh_addNew; + mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_doReset; + mod_adminDipendenti1.eh_doRefresh += Mod_adminDipendenti1_eh_doRefresh; + cmp_userLicense.eh_doReset += Cmp_userLicense_eh_doReset; + cmp_userLicense.eh_addNew += Cmp_userLicense_eh_addNew; + cmp_ticketFreeActiv.eh_doRefresh += Cmp_ticketFreeActiv_eh_doRefresh; + cmp_ticketFreeActiv.eh_doReset += Cmp_ticketFreeActiv_eh_doReset; + cmp_ticketList.eh_doReset += Cmp_ticketList_eh_doReset; + } + + #endregion Protected Methods + #region Private Methods private void Cmp_ticketFreeActiv_eh_doRefresh(object sender, EventArgs e) @@ -51,6 +80,11 @@ namespace GPW_Admin fixDisplay(); } + private void Cmp_toggleCoreSmart_ehToggle(object sender, EventArgs e) + { + fixDisplay(); + } + private void Cmp_toggleLinkExt_ehToggle(object sender, EventArgs e) { fixDisplay(); @@ -75,8 +109,12 @@ namespace GPW_Admin cmp_userCard.Visible = cmp_toggleCards.toggleValue; mod_adminDipendenti1.doUpdate(); cmp_toggleLinkExt.Visible = cmp_toggleCards.toggleValue; + cmp_toggleCoreSmart.Visible = cmp_toggleCards.toggleValue; cmp_userCard.showAll = mod_adminDipendenti1.showAll; cmp_userCard.showExt = cmp_toggleLinkExt.toggleValue; + cmp_userCard.linkCore = cmp_toggleCoreSmart.toggleValue; + string jumpFormat = cmp_toggleCoreSmart.toggleValue ? "jumper?idxDipendente={0}&authKey={1}" : "jumper?idxDipendente={0}&UserAuthkey={1}"; + cmp_userCard.jumperFormat = jumpFormat; cmp_userLicense.Visible = IdxDipSel > 0; cmp_ticketFreeActiv.Visible = cmp_ticketFreeActiv.idxDipSel > 0; cmp_ticketList.Visible = mod_adminDipendenti1.showTickets; @@ -120,33 +158,5 @@ namespace GPW_Admin } #endregion Private Methods - - #region Protected Methods - - protected void chkShowCards_CheckedChanged(object sender, EventArgs e) - { - fixDisplay(); - } - - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - fixDisplay(); - } - mod_pageSize.eh_nuovaSize += Mod_pageSize_eh_nuovaSize; - cmp_toggleCards.ehToggle += Cmp_toggleCards_ehToggle; - cmp_toggleLinkExt.ehToggle += Cmp_toggleLinkExt_ehToggle; - mod_adminDipendenti1.eh_addNew += Mod_adminDipendenti1_eh_addNew; - mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_doReset; - mod_adminDipendenti1.eh_doRefresh += Mod_adminDipendenti1_eh_doRefresh; - cmp_userLicense.eh_doReset += Cmp_userLicense_eh_doReset; - cmp_userLicense.eh_addNew += Cmp_userLicense_eh_addNew; - cmp_ticketFreeActiv.eh_doRefresh += Cmp_ticketFreeActiv_eh_doRefresh; - cmp_ticketFreeActiv.eh_doReset += Cmp_ticketFreeActiv_eh_doReset; - cmp_ticketList.eh_doReset += Cmp_ticketList_eh_doReset; - } - - #endregion Protected Methods } } \ No newline at end of file diff --git a/GPW_Admin/dipendenti.aspx.designer.cs b/GPW_Admin/dipendenti.aspx.designer.cs index 6891eff..c2fad7f 100644 --- a/GPW_Admin/dipendenti.aspx.designer.cs +++ b/GPW_Admin/dipendenti.aspx.designer.cs @@ -32,6 +32,15 @@ namespace GPW_Admin /// protected global::GPW_Admin.WebUserControls.cmp_toggle cmp_toggleLinkExt; + /// + /// cmp_toggleCoreSmart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Admin.WebUserControls.cmp_toggle cmp_toggleCoreSmart; + /// /// cmp_userLicense control. ///