diff --git a/.vs/GPW.sqlite b/.vs/GPW.sqlite index dd23db6..e45c9c3 100644 Binary files a/.vs/GPW.sqlite and b/.vs/GPW.sqlite differ diff --git a/GPW.sln b/GPW.sln index d99791a..68b22fc 100644 --- a/GPW.sln +++ b/GPW.sln @@ -43,8 +43,8 @@ Global {6427F4E4-105A-4918-BAB4-5F94234320E4}.Release|Any CPU.Build.0 = Release|Any CPU {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS|Any CPU.ActiveCfg = Release|Any CPU {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS|Any CPU.Build.0 = Release|Any CPU - {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS|Any CPU.ActiveCfg = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS|Any CPU.Build.0 = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -55,8 +55,8 @@ Global {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.Build.0 = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS|Any CPU.ActiveCfg = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS|Any CPU.Build.0 = Release|Any CPU - {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.Build.0 = Release|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS|Any CPU.ActiveCfg = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -67,8 +67,8 @@ Global {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Release|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS|Any CPU.ActiveCfg = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7e7e2ba..0b48f87 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs index b292004..d591708 100644 --- a/GPW_Data/DataProxy.cs +++ b/GPW_Data/DataProxy.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using SteamWare; +using SteamWare; +using System; namespace GPW_data { @@ -120,7 +117,6 @@ namespace GPW_data public bool sendUserAuthEmail(string destinatario, string UserAuthKey, int idxDipendente) { bool fatto = false; - string smtpCli = ""; string mittente = ""; string oggetto = ""; string userUrl = ""; @@ -131,16 +127,14 @@ namespace GPW_data try { // compongo la stringa - smtpCli = memLayer.ML.confReadString("_smtpCli"); mittente = memLayer.ML.confReadString("_fromEmail"); oggetto = "Link autorizzazione device per GPW"; baseUrl = memLayer.ML.confReadString("baseUrl"); baseWebUrl = memLayer.ML.confReadString("baseWebUrl"); - userUrl = string.Format("{2}jumper.aspx?UserAuthkey={0}&idxDipendente={1}", UserAuthKey, idxDipendente, baseUrl); - userWebUrl = string.Format("{2}jumper.aspx?UserAuthkey={0}&idxDipendente={1}", UserAuthKey, idxDipendente, baseWebUrl); + userUrl = string.Format("{2}jumper?UserAuthkey={0}&idxDipendente={1}", UserAuthKey, idxDipendente, baseUrl); + userWebUrl = string.Format("{2}jumper?UserAuthkey={0}&idxDipendente={1}", UserAuthKey, idxDipendente, baseWebUrl); corpo = string.Format("Hai ricevuto questa email su richiesta tua o dell'Admin per poter procedere a registrare un (nuovo) devices con GPW:{0}
Per proseguire clicca sul link seguente(rete interna):
{0}{0}{1}{0}{0}

oppure sul link seguente (internet):
{0}{0}{2}{0}{0}

Team GPW Steamware", Environment.NewLine, userUrl, userWebUrl); - gestEmail.ge.mandaEmail(mittente, destinatario, oggetto, corpo); - fatto = true; + fatto = gestEmail.geAuth.mandaEmail(mittente, destinatario, oggetto, corpo); } catch { } diff --git a/GPW_Smart/Content/Style.css b/GPW_Smart/Content/Style.css index 72c472e..aa79696 100644 --- a/GPW_Smart/Content/Style.css +++ b/GPW_Smart/Content/Style.css @@ -3,17 +3,6 @@ @import url('ExtraComp.css'); @import url('BtnReport.css'); @import url('JQClock.css'); -* { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -*:before, -*:after { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} .logo { background-image: url(../images/logo_sw.png); -khtml-opacity: .50; @@ -115,4 +104,7 @@ A:hover { width: 100%; background-attachment: scroll; background-repeat: no-repeat; +} +.textError { + color: red; } \ No newline at end of file diff --git a/GPW_Smart/Content/Style.less b/GPW_Smart/Content/Style.less index 1d652ca..1329af7 100644 --- a/GPW_Smart/Content/Style.less +++ b/GPW_Smart/Content/Style.less @@ -122,3 +122,7 @@ A:hover background-attachment: scroll; background-repeat: no-repeat; } + +.textError{ + color: red; +} diff --git a/GPW_Smart/Content/Style.min.css b/GPW_Smart/Content/Style.min.css index 880f8b1..d265e26 100644 --- a/GPW_Smart/Content/Style.min.css +++ b/GPW_Smart/Content/Style.min.css @@ -1 +1 @@ -@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyMainCenter{vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}.bodyMain{vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainEmpty{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainWhite{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainWhite a:hover{color:#fff;}.bodyMainNoLogo{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainLogoPiccolo{background-image:url(../images/sfondoMedio.png);background-position:97% 210px;vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat;} \ No newline at end of file +@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyMainCenter{vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}.bodyMain{vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainEmpty{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainWhite{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainWhite a:hover{color:#fff;}.bodyMainNoLogo{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainLogoPiccolo{background-image:url(../images/sfondoMedio.png);background-position:97% 210px;vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat;}.textError{color:#f00;} \ No newline at end of file diff --git a/GPW_Smart/WebMasterPages/jQueryMobileNoCookie.Master b/GPW_Smart/WebMasterPages/jQueryMobileNoCookie.Master index 8acd147..eed6236 100644 --- a/GPW_Smart/WebMasterPages/jQueryMobileNoCookie.Master +++ b/GPW_Smart/WebMasterPages/jQueryMobileNoCookie.Master @@ -9,7 +9,7 @@ - + @@ -23,31 +23,39 @@ <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jSteamware") %> + <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/jquerymobile") %> - + + + + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + +
-
-

Registrazione Device -

+ +
+

Registrazione Device +

-
+ +
+ + + <%: Scripts.Render("~/bundles/droid") %> + diff --git a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx index 391a799..0088058 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx +++ b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx @@ -1,26 +1,21 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_enrollByEmail.ascx.cs" Inherits="GPW.WebUserControls.mod_enrollByEmail" %> -

- Reset AuthKey via email

- +

Reset AuthKey via email

+
- +
- +
- +
-

- Spiegazione

- Questa funzione permette di inserire un email e se questa è tra quelle registrate - per i dipendenti sarà generata una nuova AuthKey personale e verrà inviato all'email - stessa il link con tale key di autoenroll. +

Spiegazione

+ Questa funzione permette di inserire un email e se questa è tra quelle registrate per i dipendenti sarà generata una nuova AuthKey personale e verrà inviato all'email stessa il link con tale key di autoenroll.
diff --git a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.cs b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.cs index 6537847..55a6069 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using GPW_data; using SteamWare; -using GPW_data; +using System; namespace GPW.WebUserControls { @@ -13,7 +8,6 @@ namespace GPW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } /// /// salvo nuovo device... @@ -26,6 +20,7 @@ namespace GPW.WebUserControls int idxDipendente = 0; string UserAuthKey = ""; string destinatario = ""; + bool fatto = false; DS_Applicazione.DipendentiRow dipendente = null; try { @@ -39,13 +34,23 @@ namespace GPW.WebUserControls if (destinatario != "" && idxDipendente > 0) { // invio email... - DataProxy.DP.sendUserAuthEmail(destinatario, UserAuthKey, idxDipendente); - logger.lg.scriviLog(string.Format("Inviata mail x auth smart device: destinatario: {0}, authKey: {1}, idxDip: {2}", destinatario, UserAuthKey, idxDipendente), tipoLog.INFO); + fatto = DataProxy.DP.sendUserAuthEmail(destinatario, UserAuthKey, idxDipendente); + if (fatto) + { + logger.lg.scriviLog(string.Format("Inviata mail x auth smart device: destinatario: {0}, authKey: {1}, idxDip: {2}", destinatario, UserAuthKey, idxDipendente), tipoLog.INFO); + lblWarning.Text = "Email inviata!"; + lblWarning.Visible = true; + } + else + { + lblWarning.Text = "ERRORE in invio email auth!"; + lblWarning.Visible = true; + } } else { lblWarning.Text = "Email non valida/dipendente non trovato!"; - lblWarning.Visible = false; + lblWarning.Visible = true; } } diff --git a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.designer.cs b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.designer.cs index 6c17639..07c10b8 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/mod_enrollByEmail.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 GPW.WebUserControls { @@ -13,38 +13,38 @@ namespace GPW.WebUserControls { public partial class mod_enrollByEmail { /// - /// txtUserEmail control. + /// Controllo txtUserEmail. /// /// - /// 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.TextBox txtUserEmail; /// - /// lblWarning control. + /// Controllo lblWarning. /// /// - /// 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 lblWarning; /// - /// btnConferma control. + /// Controllo btnConferma. /// /// - /// 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.Button btnConferma; /// - /// btnAnnulla control. + /// Controllo btnAnnulla. /// /// - /// 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.Button btnAnnulla; } diff --git a/GPW_Smart/WebUserControls/mod_regNewDevice.ascx b/GPW_Smart/WebUserControls/mod_regNewDevice.ascx index 7e1eebd..2138193 100644 --- a/GPW_Smart/WebUserControls/mod_regNewDevice.ascx +++ b/GPW_Smart/WebUserControls/mod_regNewDevice.ascx @@ -6,12 +6,12 @@ <%@ Register src="mod_enrollByEmail.ascx" tagname="mod_enrollByEmail" tagprefix="uc3" %>
-
+
-
+