diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx b/GPW_Admin/WebUserControls/cmp_userLicense.ascx new file mode 100644 index 0000000..1ad845a --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_userLicense.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_userLicense" %> diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs new file mode 100644 index 0000000..da32e01 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.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 GPW_Admin.WebUserControls +{ + public partial class cmp_userLicense : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs new file mode 100644 index 0000000..a25d802 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + +namespace GPW_Admin.WebUserControls +{ + public partial class cmp_userLicense + { + } +} diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx index a600f17..254dbc3 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx @@ -5,13 +5,16 @@ <% } %> -
+
- + Licenze: disponibili <%: numLicenze %> / attivate <%: utentiAttivi %> +
+
+
- + @@ -126,50 +129,60 @@ - + - +
+
+ +
+
+ +
+
+ +
+
+ +
+
- - +
+
+ +
+
+ +
+
+ +
+
+
+
+ + +
+
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+
+
+ + +
+
- + + + --> + @@ -253,6 +269,8 @@ + + diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs index b24ac0a..6f53dd2 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs @@ -14,6 +14,11 @@ namespace GPW_Admin.WebUserControls { #region Public Properties + public int numLicenze + { + get => licenzeGPW.licenzeAttive; + } + public bool showAll { get @@ -22,6 +27,11 @@ namespace GPW_Admin.WebUserControls } } + public int utentiAttivi + { + get => licenzeGPW.utentiAttivi; + } + #endregion Public Properties #region Protected Methods @@ -104,6 +114,11 @@ namespace GPW_Admin.WebUserControls } } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // mostro gestione licenza DIP + } + /// /// annulla inserimento nuovo valore da footer /// diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index dcf4655..3960dd6 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -21809,6 +21809,8 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codOrario", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataAssunzione", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataCessazione", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -23109,7 +23111,24 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] - public virtual int updateQuery(string matricola, string CF, string Cognome, string Nome, global::System.Nullable dataNascita, string luogoNascita, string provNascita, string nazNascita, string email, string dominio, string utente, string codOrario, global::System.Nullable attivo, string gruppo, global::System.Nullable Original_idxDipendente) { + public virtual int updateQuery( + string matricola, + string CF, + string Cognome, + string Nome, + global::System.Nullable dataNascita, + string luogoNascita, + string provNascita, + string nazNascita, + string email, + string dominio, + string utente, + string codOrario, + global::System.Nullable attivo, + string gruppo, + global::System.Nullable dataAssunzione, + global::System.Nullable dataCessazione, + global::System.Nullable Original_idxDipendente) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; if ((matricola == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -23195,12 +23214,24 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p else { command.Parameters[14].Value = ((string)(gruppo)); } - if ((Original_idxDipendente.HasValue == true)) { - command.Parameters[15].Value = ((int)(Original_idxDipendente.Value)); + if ((dataAssunzione.HasValue == true)) { + command.Parameters[15].Value = ((System.DateTime)(dataAssunzione.Value)); } else { command.Parameters[15].Value = global::System.DBNull.Value; } + if ((dataCessazione.HasValue == true)) { + command.Parameters[16].Value = ((System.DateTime)(dataCessazione.Value)); + } + else { + command.Parameters[16].Value = global::System.DBNull.Value; + } + if ((Original_idxDipendente.HasValue == true)) { + command.Parameters[17].Value = ((int)(Original_idxDipendente.Value)); + } + else { + command.Parameters[17].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index bea44af..e1bcf76 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -5,7 +5,7 @@ - + @@ -1077,6 +1077,8 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p + + @@ -3014,7 +3016,7 @@ FROM v_CheckVC19 - + @@ -3038,7 +3040,7 @@ FROM v_CheckVC19 - + @@ -3095,7 +3097,7 @@ FROM v_CheckVC19 - + @@ -3133,7 +3135,7 @@ FROM v_CheckVC19 - + @@ -3261,7 +3263,7 @@ FROM v_CheckVC19 - + @@ -3361,7 +3363,7 @@ FROM v_CheckVC19 - + @@ -3413,7 +3415,7 @@ FROM v_CheckVC19 - + @@ -3427,7 +3429,7 @@ FROM v_CheckVC19 - + @@ -3477,7 +3479,7 @@ FROM v_CheckVC19 - + @@ -3513,7 +3515,7 @@ FROM v_CheckVC19 - + @@ -3533,7 +3535,7 @@ FROM v_CheckVC19 - + @@ -3554,7 +3556,7 @@ FROM v_CheckVC19 - + @@ -3590,7 +3592,7 @@ FROM v_CheckVC19 - + @@ -3615,7 +3617,7 @@ FROM v_CheckVC19 - + @@ -3631,7 +3633,7 @@ FROM v_CheckVC19 - + @@ -3652,7 +3654,7 @@ FROM v_CheckVC19 - + @@ -3718,7 +3720,7 @@ FROM v_CheckVC19 - + @@ -3775,7 +3777,7 @@ FROM v_CheckVC19 - + @@ -3816,7 +3818,7 @@ FROM v_CheckVC19 - + @@ -3837,7 +3839,7 @@ FROM v_CheckVC19 - + @@ -3846,7 +3848,7 @@ FROM v_CheckVC19 - + @@ -3854,7 +3856,7 @@ FROM v_CheckVC19 - + @@ -3985,12 +3987,12 @@ FROM v_CheckVC19 - - - - - - + + + + + + \ No newline at end of file