diff --git a/GPW_Smart/Properties/PublishProfiles/ETS.pubxml b/GPW_Smart/Properties/PublishProfiles/ETS.pubxml index 90176e4..7aa13b3 100644 --- a/GPW_Smart/Properties/PublishProfiles/ETS.pubxml +++ b/GPW_Smart/Properties/PublishProfiles/ETS.pubxml @@ -1,7 +1,7 @@  @@ -15,11 +15,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + diff --git a/GPW_Smart/Properties/PublishProfiles/IIS01.pubxml b/GPW_Smart/Properties/PublishProfiles/IIS01.pubxml index e28bfd0..178f21e 100644 --- a/GPW_Smart/Properties/PublishProfiles/IIS01.pubxml +++ b/GPW_Smart/Properties/PublishProfiles/IIS01.pubxml @@ -1,7 +1,7 @@  @@ -25,11 +25,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + diff --git a/GPW_Smart/Properties/PublishProfiles/IIS02.pubxml b/GPW_Smart/Properties/PublishProfiles/IIS02.pubxml index b91ad92..49990a5 100644 --- a/GPW_Smart/Properties/PublishProfiles/IIS02.pubxml +++ b/GPW_Smart/Properties/PublishProfiles/IIS02.pubxml @@ -1,7 +1,7 @@  @@ -19,11 +19,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + diff --git a/GPW_Smart/Properties/PublishProfiles/IISDEV.pubxml b/GPW_Smart/Properties/PublishProfiles/IISDEV.pubxml index 377e892..052f4d6 100644 --- a/GPW_Smart/Properties/PublishProfiles/IISDEV.pubxml +++ b/GPW_Smart/Properties/PublishProfiles/IISDEV.pubxml @@ -1,7 +1,7 @@  @@ -19,11 +19,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + diff --git a/GPW_Smart/Web.SPS.config b/GPW_Smart/Web.SPS.config index 92fccfa..193f4b6 100644 --- a/GPW_Smart/Web.SPS.config +++ b/GPW_Smart/Web.SPS.config @@ -4,55 +4,55 @@ - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - + diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config index f063947..9a10f13 100644 --- a/GPW_Smart/Web.config +++ b/GPW_Smart/Web.config @@ -4,140 +4,140 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> - - -
-
-
-
- - - - - - - - - - - + + +
+
+
+
+ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -338,101 +338,101 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/cmp_info.ascx b/GPW_Smart/WebUserControls/cmp_info.ascx index eb4ea77..d80c604 100644 --- a/GPW_Smart/WebUserControls/cmp_info.ascx +++ b/GPW_Smart/WebUserControls/cmp_info.ascx @@ -56,44 +56,38 @@
- Sede Operativa
+ Sede Legale ed Operativa
via Nazionale, 93
24068 Seriate - BG
- - info@steamware.net
- - 035.218124
- - 035.290178
- - 035.460560 + ITALIA
+
+ VAT:03985390164
- Sede Legale
- via Briolo Fuori, 27
- 24015 San Giovanni Bianco - Bergamo - ITALY
- VAT: - 03274190168
+ Contatti
+ + info@egalware.com
steamware@pec.it
- SDI: - M5UXCR1
+ + +39 035.460560
+ + +39 035.290178
+ + +39 035.218124
- www.steamware.net -
- Key: - + www.egalware.com +
diff --git a/GPW_Smart/WebUserControls/cmp_info.ascx.cs b/GPW_Smart/WebUserControls/cmp_info.ascx.cs index b38b246..d9a29bb 100644 --- a/GPW_Smart/WebUserControls/cmp_info.ascx.cs +++ b/GPW_Smart/WebUserControls/cmp_info.ascx.cs @@ -6,83 +6,91 @@ using System.Web.UI; namespace GPW_Smart.WebUserControls { - public partial class cmp_info : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) + public partial class cmp_info : System.Web.UI.UserControl { - if (!Page.IsPostBack) - { - lblInstallation.Text = licenzeGPW.installazione; - lblApplication.Text = licenzeGPW.applicazione; - lblNumLic.Text = string.Format("{1} ({0} disp)", licenzeGPW.licenzeAttive, licenzeGPW.licenzeDb); - lblNumLic.ToolTip = "licenze valide (licenze su db)"; - lblExpiryDate.Text = licenzeGPW.scadenzaLicenza.ToShortDateString(); - lblAuthKey.Text = licenzeGPW.authKey; - } - } + #region Public Properties - public string cssCheckClass - { - get - { - string answ = ""; - if (licenzeGPW.scadenzaLicenza >= DateTime.Now) + public string cognomeNome { - answ = "border-success"; + get + { + return memLayer.ML.StringSessionObj("cognomeNome"); + } } - else + + public string copyRight { - answ = "border-danger"; + get + { + return string.Format("{0}", ConfigurationManager.AppSettings.Get("copyRight")); + } } - return answ; - } - } - public string hashEmail - { - get - { - return memLayer.ML.StringSessionObj("hashEmail"); - } - } - public string email - { - get - { - return memLayer.ML.StringSessionObj("email"); - } - } - public string cognomeNome - { - get - { - return memLayer.ML.StringSessionObj("cognomeNome"); - } - } - public string IP - { - get - { - return Request.UserHostName; - } - } + public string cssCheckClass + { + get + { + string answ = ""; + if (licenzeGPW.scadenzaLicenza >= DateTime.Now) + { + answ = "border-success"; + } + else + { + answ = "border-danger"; + } + return answ; + } + } - public string versione - { - get - { - return string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - } + public string email + { + get + { + return memLayer.ML.StringSessionObj("email"); + } + } + + public string hashEmail + { + get + { + return memLayer.ML.StringSessionObj("hashEmail"); + } + } + + public string IP + { + get + { + return Request.UserHostName; + } + } + + public string versione + { + get + { + return string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + lblInstallation.Text = licenzeGPW.installazione; + lblApplication.Text = licenzeGPW.applicazione; + lblNumLic.Text = string.Format("{1} ({0} disp)", licenzeGPW.licenzeAttive, licenzeGPW.licenzeDb); + lblNumLic.ToolTip = "licenze valide (licenze su db)"; + lblExpiryDate.Text = licenzeGPW.scadenzaLicenza.ToShortDateString(); + } + } + + #endregion Protected Methods } - public string copyRight - { - get - { - return string.Format("{0}", ConfigurationManager.AppSettings.Get("copyRight")); - } - } - - - - } } \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/cmp_info.ascx.designer.cs b/GPW_Smart/WebUserControls/cmp_info.ascx.designer.cs index aa4cde6..00e33c7 100644 --- a/GPW_Smart/WebUserControls/cmp_info.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/cmp_info.ascx.designer.cs @@ -1,60 +1,53 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace GPW_Smart.WebUserControls { - - - public partial class cmp_info { - +namespace GPW_Smart.WebUserControls +{ + + + public partial class cmp_info + { + /// - /// Controllo lblInstallation. + /// lblInstallation control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblInstallation; - + /// - /// Controllo lblApplication. + /// lblApplication control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblApplication; - + /// - /// Controllo lblNumLic. + /// lblNumLic control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumLic; - + /// - /// Controllo lblExpiryDate. + /// lblExpiryDate control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblExpiryDate; - - /// - /// Controllo lblAuthKey. - /// - /// - /// 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 lblAuthKey; } } diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx b/GPW_Smart/WebUserControls/mod_commAttivita.ascx index 414f6ea..2f16773 100644 --- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx +++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx @@ -13,6 +13,9 @@ ToolTip="Ore caricate a commessa / ore lavorate da timbrature" /> +
+ Attenzione: licenza non valida, impossibile aggiunta record progetti +
diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs index 432bf22..ae5bf55 100644 --- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs @@ -9,6 +9,15 @@ namespace GPW.WebUserControls { public partial class mod_commAttivita : System.Web.UI.UserControl { + #region Private Properties + + private bool checkLicOk + { + get => licenzeGPW.checkLicenze && licenzeGPW.checkPayload; + } + + #endregion Private Properties + #region Protected Properties /// @@ -31,15 +40,34 @@ namespace GPW.WebUserControls /// protected string rhProjByIF { get; set; } - protected bool userEnabled - { - get => (DataProxy.currDipIsActive && DataProxy.currDipHasPayloadActive); - } + protected bool userEnabled { get; set; } = false; #endregion Protected Properties #region Public Properties + /// + /// idxDipendente in sessione + /// + public static int idxDipendenteCurr + { + get + { + int idx = 0; + try + { + idx = memLayer.ML.IntSessionObj("IdxDipendente"); + } + catch + { } + return idx; + } + set + { + memLayer.ML.setSessionVal("idxDipendente", value); + } + } + /// /// data riferimento (selezionata) da session /// @@ -167,7 +195,7 @@ namespace GPW.WebUserControls { int maxErrMinus = memLayer.ML.confReadInt("maxErrMinus"); int maxErrPlus = memLayer.ML.confReadInt("maxErrPlus"); - DS_Applicazione.v_logCommUtRow rigaLog = DataProxy.DP.taLCU.getByIdxDipDate(memLayer.ML.IntSessionObj("idxDipendente"), dataRif, dataRif.AddDays(1), maxErrMinus, maxErrPlus)[0]; + DS_Applicazione.v_logCommUtRow rigaLog = DataProxy.DP.taLCU.getByIdxDipDate(idxDipendenteCurr, dataRif, dataRif.AddDays(1), maxErrMinus, maxErrPlus)[0]; lblTotOreRA.Text = string.Format("{0:0.##} / {1:0.##} h", rigaLog.h_com, rigaLog.h_lav); } catch @@ -177,7 +205,9 @@ namespace GPW.WebUserControls memLayer.ML.setSessionVal("dataFromRA", dataRif.Date); memLayer.ML.setSessionVal("dataToRA", dataRif.AddDays(1).Date); // controllo aggiunta da licenza - lnkCreateNew.Visible = userEnabled; + var licOk = userEnabled; + lnkCreateNew.Visible = licOk; + divAlertLic.Visible = !licOk; } #endregion Private Methods @@ -262,6 +292,7 @@ namespace GPW.WebUserControls protected void Page_Load(object sender, EventArgs e) { + userEnabled = DataProxy.currDipIsActive && checkLicOk && DataProxy.currDipHasPayloadActive; if (!Page.IsPostBack) { // controllo se ho una data selezionata da URL diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.designer.cs b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.designer.cs index 850bfac..d1cd257 100644 --- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.designer.cs @@ -41,6 +41,15 @@ namespace GPW.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblTotOreRA; + /// + /// divAlertLic control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAlertLic; + /// /// grView control. ///