From e1bdbe80669766558b29f9ed815b5d356def4767 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 15 Feb 2022 15:36:04 +0100
Subject: [PATCH] Update stored x gestione dipendenti con CodHw + mod editing

---
 .../WebUserControls/mod_adminDipendenti.ascx  | 12 +++++
 GPW_Data/DS_Applicazione.Designer.cs          | 14 ++++--
 GPW_Data/DS_Applicazione.xsd                  | 47 ++++++++++---------
 GPW_Data/DS_Applicazione.xss                  | 32 ++++++-------
 4 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
index b393a5c..443e487 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
@@ -151,6 +151,17 @@
                     <asp:TextBox ID="txtCF" runat="server" Text='<%# Bind("CF") %>' Width="10em" />
                 </FooterTemplate>
             </asp:TemplateField>
+            <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Left" HeaderText="CodHw" SortExpression="CodHw">
+                <ItemTemplate>
+                    <asp:Label ID="lblCodHw" runat="server" Text='<%# Eval("CodHw") %>' />
+                </ItemTemplate>
+                <EditItemTemplate>
+                    <asp:TextBox ID="txtCodHw" runat="server" Text='<%# Bind("CodHw") %>' Width="3em" />
+                </EditItemTemplate>
+                <FooterTemplate>
+                    <asp:TextBox ID="txtCodHw" runat="server" Text='<%# Bind("CodHw") %>' Width="3em" />
+                </FooterTemplate>
+            </asp:TemplateField>
             <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Left" HeaderText="datiAnagrafici" SortExpression="dataNascita">
                 <ItemTemplate>
                     <div class="d-flex">
@@ -320,6 +331,7 @@
         <UpdateParameters>
             <asp:Parameter Name="matricola" Type="String"></asp:Parameter>
             <asp:Parameter Name="CF" Type="String" />
+            <asp:Parameter Name="CodHw" Type="String" />
             <asp:Parameter Name="Cognome" Type="String" />
             <asp:Parameter Name="Nome" Type="String" />
             <asp:Parameter Name="dataNascita" Type="DateTime" />
diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs
index d599f5c..7fa975a 100644
--- a/GPW_Data/DS_Applicazione.Designer.cs
+++ b/GPW_Data/DS_Applicazione.Designer.cs
@@ -22934,6 +22934,7 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p
             this._commandCollection[12].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[12].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[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodHw", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12].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, "", "", ""));
         }
         
@@ -24291,6 +24292,7 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p
                     string gruppo, 
                     global::System.Nullable<global::System.DateTime> dataAssunzione, 
                     global::System.Nullable<global::System.DateTime> dataCessazione, 
+                    string CodHw, 
                     global::System.Nullable<int> Original_idxDipendente) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
             if ((matricola == null)) {
@@ -24389,11 +24391,17 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p
             else {
                 command.Parameters[16].Value = global::System.DBNull.Value;
             }
-            if ((Original_idxDipendente.HasValue == true)) {
-                command.Parameters[17].Value = ((int)(Original_idxDipendente.Value));
+            if ((CodHw == null)) {
+                command.Parameters[17].Value = global::System.DBNull.Value;
             }
             else {
-                command.Parameters[17].Value = global::System.DBNull.Value;
+                command.Parameters[17].Value = ((string)(CodHw));
+            }
+            if ((Original_idxDipendente.HasValue == true)) {
+                command.Parameters[18].Value = ((int)(Original_idxDipendente.Value));
+            }
+            else {
+                command.Parameters[18].Value = global::System.DBNull.Value;
             }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd
index ba540fd..608c9bc 100644
--- a/GPW_Data/DS_Applicazione.xsd
+++ b/GPW_Data/DS_Applicazione.xsd
@@ -4,8 +4,8 @@
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
       <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
-          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="GPWConnectionString" IsAppSettingsProperty="true" Modifier="Assembly" Name="GPWConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.GPW_data.Properties.Settings.GlobalReference.Default.GPWConnectionString" Provider="System.Data.SqlClient" />
-          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="ETS_GPWConnectionString" IsAppSettingsProperty="true" Modifier="Assembly" Name="ETS_GPWConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.GPW_data.Properties.Settings.GlobalReference.Default.GPWConnectionString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="GPWConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="GPWConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.GPW_data.Properties.Settings.GlobalReference.Default.GPWConnectionString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="ETS_GPWConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="ETS_GPWConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.GPW_data.Properties.Settings.GlobalReference.Default.GPWConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TimbratureTableAdapter" GeneratorDataComponentClassName="TimbratureTableAdapter" Name="Timbrature" UserDataComponentName="TimbratureTableAdapter">
@@ -1092,6 +1092,7 @@ SELECT idxDipendente, matricola, CF, Cognome, Nome, dataNascita, luogoNascita, p
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@gruppo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dataAssunzione" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dataCessazione" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodHw" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idxDipendente" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -3118,7 +3119,7 @@ SELECT gruppo, descrGruppo, codExt, exportEnab FROM AnagGruppi WHERE (gruppo = @
               <Mapping SourceColumn="exportEnab" DataSetColumn="exportEnab" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_AG_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="deleteQuery">
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_AG_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_AG_delete</CommandText>
@@ -3129,7 +3130,7 @@ SELECT gruppo, descrGruppo, codExt, exportEnab FROM AnagGruppi WHERE (gruppo = @
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_AG_insert" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="insertQuery">
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_AG_insert" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertQuery">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_AG_insert</CommandText>
@@ -3209,7 +3210,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND
               <Mapping SourceColumn="idxDipendente" DataSetColumn="idxDipendente" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_Dip2Gruppi_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="delete" Modifier="Public" Name="delete" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="delete">
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_Dip2Gruppi_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="delete" Modifier="Public" Name="delete" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="delete">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Dip2Gruppi_delete</CommandText>
@@ -3221,7 +3222,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_Dip2Gruppi_insert" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="insertQuery">
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_Dip2Gruppi_insert" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertQuery">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Dip2Gruppi_insert</CommandText>
@@ -3703,7 +3704,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND
               <xs:element name="totOre" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="totOreColumn" msprop:Generator_ColumnPropNameInRow="totOre" msprop:Generator_UserColumnName="totOre" msprop:Generator_ColumnVarNameInTable="columntotOre" type="xs:decimal" minOccurs="0" />
               <xs:element name="budgetTime" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="budgetTimeColumn" msprop:Generator_ColumnPropNameInRow="budgetTime" msprop:Generator_UserColumnName="budgetTime" msprop:Generator_ColumnVarNameInTable="columnbudgetTime" type="xs:decimal" minOccurs="0" />
               <xs:element name="budgetMoney" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="budgetMoneyColumn" msprop:Generator_ColumnPropNameInRow="budgetMoney" msprop:Generator_UserColumnName="budgetMoney" msprop:Generator_ColumnVarNameInTable="columnbudgetMoney" type="xs:decimal" minOccurs="0" />
-              <xs:element name="percOpen" msdata:ReadOnly="true" msprop:Generator_UserColumnName="percOpen" msprop:Generator_ColumnPropNameInTable="percOpenColumn" msprop:Generator_ColumnPropNameInRow="percOpen" msprop:Generator_ColumnVarNameInTable="columnpercOpen" type="xs:double" minOccurs="0" />
+              <xs:element name="percOpen" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="percOpenColumn" msprop:Generator_ColumnPropNameInRow="percOpen" msprop:Generator_UserColumnName="percOpen" msprop:Generator_ColumnVarNameInTable="columnpercOpen" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -4133,45 +4134,45 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagGruppi" msprop:Generator_RowEvHandlerName="AnagGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagGruppiRowDeleted" msprop:Generator_RowDeletingName="AnagGruppiRowDeleting" msprop:Generator_RowEvArgName="AnagGruppiRowChangeEvent" msprop:Generator_TablePropName="AnagGruppi" msprop:Generator_RowChangedName="AnagGruppiRowChanged" msprop:Generator_RowChangingName="AnagGruppiRowChanging" msprop:Generator_TableClassName="AnagGruppiDataTable" msprop:Generator_RowClassName="AnagGruppiRow" msprop:Generator_TableVarName="tableAnagGruppi" msprop:Generator_UserTableName="AnagGruppi">
+        <xs:element name="AnagGruppi" msprop:Generator_RowClassName="AnagGruppiRow" msprop:Generator_RowEvHandlerName="AnagGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagGruppiRowDeleted" msprop:Generator_RowDeletingName="AnagGruppiRowDeleting" msprop:Generator_RowEvArgName="AnagGruppiRowChangeEvent" msprop:Generator_TablePropName="AnagGruppi" msprop:Generator_RowChangedName="AnagGruppiRowChanged" msprop:Generator_UserTableName="AnagGruppi" msprop:Generator_RowChangingName="AnagGruppiRowChanging" msprop:Generator_TableClassName="AnagGruppiDataTable" msprop:Generator_TableVarName="tableAnagGruppi">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="gruppo" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_ColumnVarNameInTable="columngruppo" msprop:Generator_UserColumnName="gruppo">
+              <xs:element name="gruppo" msprop:Generator_UserColumnName="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnVarNameInTable="columngruppo">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="descrGruppo" msprop:Generator_ColumnPropNameInRow="descrGruppo" msprop:Generator_ColumnPropNameInTable="descrGruppoColumn" msprop:Generator_ColumnVarNameInTable="columndescrGruppo" msprop:Generator_UserColumnName="descrGruppo" minOccurs="0">
+              <xs:element name="descrGruppo" msprop:Generator_UserColumnName="descrGruppo" msprop:Generator_ColumnPropNameInTable="descrGruppoColumn" msprop:Generator_ColumnPropNameInRow="descrGruppo" msprop:Generator_ColumnVarNameInTable="columndescrGruppo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="codExt" msprop:Generator_ColumnPropNameInRow="codExt" msprop:Generator_ColumnPropNameInTable="codExtColumn" msprop:Generator_ColumnVarNameInTable="columncodExt" msprop:Generator_UserColumnName="codExt" minOccurs="0">
+              <xs:element name="codExt" msprop:Generator_UserColumnName="codExt" msprop:Generator_ColumnPropNameInTable="codExtColumn" msprop:Generator_ColumnPropNameInRow="codExt" msprop:Generator_ColumnVarNameInTable="columncodExt" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="4" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="exportEnab" msprop:Generator_ColumnPropNameInRow="exportEnab" msprop:Generator_ColumnPropNameInTable="exportEnabColumn" msprop:Generator_ColumnVarNameInTable="columnexportEnab" msprop:Generator_UserColumnName="exportEnab" type="xs:boolean" minOccurs="0" />
+              <xs:element name="exportEnab" msprop:Generator_UserColumnName="exportEnab" msprop:Generator_ColumnPropNameInTable="exportEnabColumn" msprop:Generator_ColumnPropNameInRow="exportEnab" msprop:Generator_ColumnVarNameInTable="columnexportEnab" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Dipendenti2Gruppi" msprop:Generator_RowEvHandlerName="Dipendenti2GruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="Dipendenti2GruppiRowDeleted" msprop:Generator_RowDeletingName="Dipendenti2GruppiRowDeleting" msprop:Generator_RowEvArgName="Dipendenti2GruppiRowChangeEvent" msprop:Generator_TablePropName="Dipendenti2Gruppi" msprop:Generator_RowChangedName="Dipendenti2GruppiRowChanged" msprop:Generator_RowChangingName="Dipendenti2GruppiRowChanging" msprop:Generator_TableClassName="Dipendenti2GruppiDataTable" msprop:Generator_RowClassName="Dipendenti2GruppiRow" msprop:Generator_TableVarName="tableDipendenti2Gruppi" msprop:Generator_UserTableName="Dipendenti2Gruppi">
+        <xs:element name="Dipendenti2Gruppi" msprop:Generator_RowClassName="Dipendenti2GruppiRow" msprop:Generator_RowEvHandlerName="Dipendenti2GruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="Dipendenti2GruppiRowDeleted" msprop:Generator_RowDeletingName="Dipendenti2GruppiRowDeleting" msprop:Generator_RowEvArgName="Dipendenti2GruppiRowChangeEvent" msprop:Generator_TablePropName="Dipendenti2Gruppi" msprop:Generator_RowChangedName="Dipendenti2GruppiRowChanged" msprop:Generator_UserTableName="Dipendenti2Gruppi" msprop:Generator_RowChangingName="Dipendenti2GruppiRowChanging" msprop:Generator_TableClassName="Dipendenti2GruppiDataTable" msprop:Generator_TableVarName="tableDipendenti2Gruppi">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="gruppo" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_ColumnVarNameInTable="columngruppo" msprop:Generator_UserColumnName="gruppo">
+              <xs:element name="gruppo" msprop:Generator_UserColumnName="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnVarNameInTable="columngruppo">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
+              <xs:element name="idxDipendente" msprop:Generator_UserColumnName="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" type="xs:int" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -4284,14 +4285,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_Timbrature_Dipendenti" msdata:parent="Dipendenti" msdata:child="Timbrature" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="Timbrature" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
-      <msdata:Relationship name="FK_AnagFasi_AnagProgetti" msdata:parent="AnagProgetti" msdata:child="AnagFasi" msdata:parentkey="idxProgetto" msdata:childkey="idxProgetto" msprop:Generator_UserParentTable="AnagProgetti" msprop:Generator_UserChildTable="AnagFasi" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" msprop:Generator_ParentPropName="AnagProgettiRow" />
-      <msdata:Relationship name="FK_RegAttivita_AnagFasi" msdata:parent="AnagFasi" msdata:child="RegAttivita" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserParentTable="AnagFasi" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" />
-      <msdata:Relationship name="FK_RegAttivita_Dipendenti" msdata:parent="Dipendenti" msdata:child="RegAttivita" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
-      <msdata:Relationship name="FK_Dipendenti_AnagOrari" msdata:parent="AnagOrari" msdata:child="Dipendenti" msdata:parentkey="codOrario" msdata:childkey="codOrario" msprop:Generator_UserParentTable="AnagOrari" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_ParentPropName="AnagOrariRow" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" />
-      <msdata:Relationship name="FK_RilievoTemp_Dipendenti" msdata:parent="Dipendenti" msdata:child="RilievoTemp" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="RilievoTemp" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" />
-      <msdata:Relationship name="FK_Dipendenti_AnagGruppi" msdata:parent="AnagGruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserParentTable="AnagGruppi" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_ParentPropName="AnagGruppiRow" />
-      <msdata:Relationship name="FK_Dipendenti_AnagGruppi1" msdata:parent="Dipendenti2Gruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserParentTable="Dipendenti2Gruppi" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi1" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi1" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_ParentPropName="Dipendenti2GruppiRow" />
+      <msdata:Relationship name="FK_Timbrature_Dipendenti" msdata:parent="Dipendenti" msdata:child="Timbrature" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="Timbrature" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" />
+      <msdata:Relationship name="FK_AnagFasi_AnagProgetti" msdata:parent="AnagProgetti" msdata:child="AnagFasi" msdata:parentkey="idxProgetto" msdata:childkey="idxProgetto" msprop:Generator_UserParentTable="AnagProgetti" msprop:Generator_UserChildTable="AnagFasi" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_ParentPropName="AnagProgettiRow" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" />
+      <msdata:Relationship name="FK_RegAttivita_AnagFasi" msdata:parent="AnagFasi" msdata:child="RegAttivita" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserParentTable="AnagFasi" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_ParentPropName="AnagFasiRow" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" />
+      <msdata:Relationship name="FK_RegAttivita_Dipendenti" msdata:parent="Dipendenti" msdata:child="RegAttivita" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" />
+      <msdata:Relationship name="FK_Dipendenti_AnagOrari" msdata:parent="AnagOrari" msdata:child="Dipendenti" msdata:parentkey="codOrario" msdata:childkey="codOrario" msprop:Generator_UserParentTable="AnagOrari" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" msprop:Generator_ParentPropName="AnagOrariRow" />
+      <msdata:Relationship name="FK_RilievoTemp_Dipendenti" msdata:parent="Dipendenti" msdata:child="RilievoTemp" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_UserChildTable="RilievoTemp" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
+      <msdata:Relationship name="FK_Dipendenti_AnagGruppi" msdata:parent="AnagGruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserParentTable="AnagGruppi" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_ParentPropName="AnagGruppiRow" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi" />
+      <msdata:Relationship name="FK_Dipendenti_AnagGruppi1" msdata:parent="Dipendenti2Gruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserParentTable="Dipendenti2Gruppi" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi1" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_ParentPropName="Dipendenti2GruppiRow" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi1" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss
index 417c017..8321143 100644
--- a/GPW_Data/DS_Applicazione.xss
+++ b/GPW_Data/DS_Applicazione.xss
@@ -4,32 +4,32 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-29" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-29" ViewPortY="429" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Timbrature" ZOrder="31" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:TimbratureExpl" ZOrder="19" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagDevices" ZOrder="26" X="937" Y="134" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:Dipendenti" ZOrder="1" X="285" Y="543" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagClienti" ZOrder="14" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagProgetti" ZOrder="9" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagProgetti" ZOrder="10" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="30" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagFasi" ZOrder="8" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagFasi" ZOrder="9" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:v_logCommUt" ZOrder="17" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:RegAttivita" ZOrder="15" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:CalendFesteFerie" ZOrder="20" X="597" Y="1126" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:AnagOrari" ZOrder="13" X="278" Y="1055" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagOrari" ZOrder="2" X="280" Y="1001" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TimbMeseExpl" ZOrder="25" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Giustificativi" ZOrder="21" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="24" X="82" Y="1313" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="6" X="1" Y="26" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:regAttDayExpl" ZOrder="12" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="7" X="1" Y="26" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:regAttDayExpl" ZOrder="13" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="23" X="1236" Y="992" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:RegistroEventi" ZOrder="22" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:RilievoTemp" ZOrder="2" X="-24" Y="566" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:RilievoTemp" ZOrder="3" X="-24" Y="566" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:HistTemp" ZOrder="16" X="-23" Y="762" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:CheckVC19" ZOrder="11" X="482" Y="1423" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:AnagGruppi" ZOrder="3" X="-14" Y="341" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Dipendenti2Gruppi" ZOrder="5" X="367" Y="370" Height="134" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:CheckVC19" ZOrder="12" X="482" Y="1423" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AnagGruppi" ZOrder="4" X="-14" Y="341" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Dipendenti2Gruppi" ZOrder="6" X="367" Y="370" Height="134" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="32" LineWidth="11">
@@ -44,7 +44,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AnagFasi_AnagProgetti" ZOrder="10" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AnagFasi_AnagProgetti" ZOrder="11" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1046</X>
@@ -87,11 +87,11 @@
     <Connector ID="DesignRelation:FK_Dipendenti_AnagOrari" ZOrder="27" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>330</X>
-          <Y>1055</Y>
+          <X>332</X>
+          <Y>1001</Y>
         </Point>
         <Point>
-          <X>330</X>
+          <X>332</X>
           <Y>962</Y>
         </Point>
       </RoutePoints>
@@ -108,7 +108,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi" ZOrder="7" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi" ZOrder="8" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>286</X>
@@ -124,7 +124,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi1" ZOrder="4" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi1" ZOrder="5" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>428</X>