diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index e49e1fd..888a03f 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll
index 587d6b4..02c7366 100644
Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ
diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs
index ef13d9d..7d6787b 100644
--- a/VersGen/WebSC.cs
+++ b/VersGen/WebSC.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.0.086.306")]
-[assembly: AssemblyFileVersion("2.0.086.306")]
+[assembly: AssemblyVersion("2.0.091.306")]
+[assembly: AssemblyFileVersion("2.0.091.306")]
 [assembly: AssemblyCopyright("Steamware © 2015-2016")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt
index 1e20eaa..4b2b929 100644
--- a/VersGen/WebSC.tt
+++ b/VersGen/WebSC.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.0.086.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.0.086.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.0.091.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.0.091.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+
diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll
index fbe2bf5..6f322a3 100644
Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ
diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll
index f03591d..b352c77 100644
Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ
diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll
index fbe2bf5..6f322a3 100644
Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ
diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx
index 74aba0a..6d2edeb 100644
--- a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx
+++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx
@@ -37,7 +37,7 @@
                                 <b>
                                     <asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
                                 | <i class="fa fa-building-o"></i>
-                                <asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
+                                <asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato").ToString()=="1" %>' Text=" | Ritiro Usato" />
                             </div>
                             <div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
                                 <asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx b/WebSCR/WebUserControls/mod_Interventi.ascx
index 948d875..ab3eb7a 100644
--- a/WebSCR/WebUserControls/mod_Interventi.ascx
+++ b/WebSCR/WebUserControls/mod_Interventi.ascx
@@ -175,7 +175,13 @@
             </asp:TemplateField>
             <asp:TemplateField HeaderText="Usato" SortExpression="RitUsato" ItemStyle-HorizontalAlign="Center">
                 <ItemTemplate>
-                    <asp:CheckBox ID="CheckBox1" runat="server" Checked='<%# Eval("RitUsato") %>' CssClass="ui-state-disabled" />
+                    <asp:DropDownList runat="server" ID="ddlRitUs" DataSourceID="odsRitUs" DataTextField="label" DataValueField="value" SelectedValue='<%# Eval("RitUsato") %>' CssClass="ui-state-disabled"></asp:DropDownList>
+                    <asp:ObjectDataSource ID="odsRitUs" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
+                        <SelectParameters>
+                            <asp:Parameter DefaultValue="Impegni" Name="TableName" Type="String" />
+                            <asp:Parameter DefaultValue="RitUsato" Name="FieldName" Type="String" />
+                        </SelectParameters>
+                    </asp:ObjectDataSource>
                 </ItemTemplate>
                 <ItemStyle HorizontalAlign="Center"></ItemStyle>
             </asp:TemplateField>
diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx b/WebSCR/WebUserControls/mod_compSquadra.ascx
index 0bdd3de..415c816 100644
--- a/WebSCR/WebUserControls/mod_compSquadra.ascx
+++ b/WebSCR/WebUserControls/mod_compSquadra.ascx
@@ -3,8 +3,7 @@
 <div class="ui-mini">
     <div class="ui-grid-solo" style="padding: 2px;">
         <div class="ui-block-a ui-shadow ui-corner-all">
-            COMPOSIZIONE SQUADRA: TO BE DONE
-            <asp:GridView ID="grView" runat="server" DataSourceID="ods" Width="100%" AutoGenerateColumns="False" DataKeyNames="DataFrom,CodSquadra,Matr" Visible="false">
+            <asp:GridView ID="grView" runat="server" DataSourceID="ods" Width="100%" AutoGenerateColumns="False" DataKeyNames="Data,Slot,CodSquadra,Matr">
                 <AlternatingRowStyle BackColor="White" />
                 <EditRowStyle BackColor="#2461BF" />
                 <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
@@ -20,18 +19,18 @@
                     Nessun componente squadra assegnato
                 </EmptyDataTemplate>
                 <Columns>
-                    <%--<asp:BoundField DataField="Matr" HeaderText="Matr" ReadOnly="True" SortExpression="Matr" />--%>
-                    <asp:BoundField DataField="CognomeNome" HeaderText="Cognome Nome" ReadOnly="True" SortExpression="Matr" />
-                    <asp:BoundField DataField="DataFrom" HeaderText="Inizio" ReadOnly="True" SortExpression="DataFrom" DataFormatString="{0:ddd dd/MM/yyyy}" HtmlEncode="false" />
-                    <asp:BoundField DataField="DataTo" HeaderText="Fine" SortExpression="DataTo" DataFormatString="{0:ddd dd/MM/yyyy}" HtmlEncode="false" />
+                    <%--<asp:BoundField DataField="Data" HeaderText="Data" ReadOnly="True" SortExpression="Data" />
+                    <asp:BoundField DataField="Slot" HeaderText="Slot" ReadOnly="True" SortExpression="Slot" />
+                    <asp:BoundField DataField="CodSquadra" HeaderText="CodSquadra" SortExpression="CodSquadra" ReadOnly="True" />
+                    <asp:BoundField DataField="Matr" HeaderText="Matr" ReadOnly="True" SortExpression="Matr" />
+                    <asp:BoundField DataField="DescrSquadra" HeaderText="DescrSquadra" ReadOnly="True" SortExpression="DescrSquadra" />--%>
+                    <%--<asp:BoundField DataField="CssColor" HeaderText="CssColor" SortExpression="CssColor" />--%>
+                    <asp:BoundField DataField="CognomeNome" HeaderText="Cognome Nome" SortExpression="CognomeNome" />
                 </Columns>
             </asp:GridView>
-            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetByCodSqData" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.AssegnSquadreTableAdapter">
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByImpegno" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.AssegnSlotSquadreDipTableAdapter">
                 <SelectParameters>
-                    <%--<asp:ControlParameter ControlID="ddlSquadre" DefaultValue="" Name="CodSquadra" PropertyName="SelectedValue" Type="String" />--%>
-                    <asp:SessionParameter SessionField="CodSquadra" Name="CodSquadra" Type="String" />
-                    <%--<asp:CookieParameter CookieName="DataRif" Name="Data" Type="DateTime" />--%>
-                    <asp:SessionParameter SessionField="DataImp" Name="Data" Type="DateTime" />
+                    <asp:QueryStringParameter Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
                 </SelectParameters>
             </asp:ObjectDataSource>
         </div>
diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx
index 2eb0c26..407d45d 100644
--- a/WebSCR/WebUserControls/mod_consegne.ascx
+++ b/WebSCR/WebUserControls/mod_consegne.ascx
@@ -49,7 +49,7 @@
                                             <b>
                                                 <asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
                                             | <i class="fa fa-building-o"></i>
-                                            <asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
+                                            <asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato").ToString()=="1" %>' Text=" | Ritiro Usato" />
                                         </div>
                                         <div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
                                             <asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
diff --git a/WebSCR/WebUserControls/mod_cronologico.ascx b/WebSCR/WebUserControls/mod_cronologico.ascx
index 57a29ae..a53f91e 100644
--- a/WebSCR/WebUserControls/mod_cronologico.ascx
+++ b/WebSCR/WebUserControls/mod_cronologico.ascx
@@ -122,7 +122,13 @@
             </asp:TemplateField>
             <asp:TemplateField HeaderText="Usato" SortExpression="RitUsato" ItemStyle-HorizontalAlign="Center">
                 <ItemTemplate>
-                    <asp:CheckBox ID="CheckBox1" runat="server" Checked='<%# Eval("RitUsato") %>' CssClass="ui-state-disabled" />
+                    <asp:DropDownList runat="server" ID="ddlRitUs" DataSourceID="odsRitUs" DataTextField="label" DataValueField="value" SelectedValue='<%# Eval("RitUsato") %>' CssClass="ui-state-disabled"></asp:DropDownList>
+                    <asp:ObjectDataSource ID="odsRitUs" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
+                        <SelectParameters>
+                            <asp:Parameter DefaultValue="Impegni" Name="TableName" Type="String" />
+                            <asp:Parameter DefaultValue="RitUsato" Name="FieldName" Type="String" />
+                        </SelectParameters>
+                    </asp:ObjectDataSource>
                 </ItemTemplate>
                 <ItemStyle HorizontalAlign="Center"></ItemStyle>
             </asp:TemplateField>
diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs
index 98e6f4d..517a995 100644
--- a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs
+++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs
@@ -82,7 +82,7 @@ namespace WebSCR.WebUserControls
                 string answ = "";
                 try
                 {
-                    answ = txtCerca.Text.Trim();
+                    answ = txtCerca.Text.Trim().ToUpper();
                 }
                 catch
                 { }
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx
index a18b00a..5ddb410 100644
--- a/WebSCR/WebUserControls/mod_impegno.ascx
+++ b/WebSCR/WebUserControls/mod_impegno.ascx
@@ -10,19 +10,12 @@
                 <div class="ui-block-a">
                     <asp:DropDownList runat="server" ID="ddlSquadra" DataSourceID="odsSquadre" DataTextField="DescrSquadra" DataValueField="CodSquadra" SelectedValue='<%# Bind("CodSquadra") %>'></asp:DropDownList>
                 </div>
-                <div class="ui-block-b" style="text-align: right;">
-                    <%--<div class="ui-grid-a">
-                        <div class="ui-block-a">
-                            <asp:TextBox runat="server" ID="lblDataFrom" type="date" Text='<%# Eval("DataOra","{0:yyyy-MM-dd}") %>' Enabled="false" />
-                        </div>
-                        <div class="ui-block-b">
-                            <asp:DropDownList runat="server" ID="ddlOrario" DataSourceID="odsOrario" DataTextField="Orario" DataValueField="Orario" SelectedValue='<%# Eval("DataOra","{0:HH:mm:00}") %>' Enabled="false"></asp:DropDownList>
-                        </div>
-                    </div>--%>
+                <div class="ui-block-b" style="text-align: center; background-color: #CDFFFF;">
+                    <label for="mod_selDataOra1">INIZIO EFFETTIVO</label>
                     <uc1:mod_selDataOra runat="server" ID="mod_selDataOra1" dataOraSel='<%# Bind("DataOra") %>' />
                 </div>
                 <div class="ui-block-c text-center">
-                    <%--<label for="lblOrarioCom">ORARIO COMUNICATO</label>--%>
+                    <label for="lblOrarioCom">ORARIO COMUNICATO</label>
                     <uc1:mod_selDataOra runat="server" ID="mod_selDataOraFrom" dataOraSel='<%# Bind("DataOraComFrom") %>' />
                     <uc1:mod_selDataOra runat="server" ID="mod_selDataOraTo" dataOraSel='<%# Bind("DataOraComTo") %>' />
                 </div>
@@ -46,13 +39,17 @@
                     </div>
                 </div>
                 <div class="ui-block-b">
-                    <div class="ui-grid-a">
+                    <div class="ui-grid-b">
                         <div class="ui-block-a">
                             <label for="chkIntAperto">aperto</label>
                             <br />
                             <asp:CheckBox ID="chkIntAperto" runat="server" Checked='<%# Bind("IntAperto") %>' />
                         </div>
                         <div class="ui-block-b">
+                            <label for="lblMatr">Matr.</label>
+                            <asp:Label runat="server" ID="lblMatr" Text='<%# Eval("MatrOp") %>' />
+                        </div>
+                        <div class="ui-block-c">
                             <label for="ddlRitUs">rit. usato</label>
                             <asp:DropDownList runat="server" ID="ddlRitUs" DataSourceID="odsRitUs" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("RitUsato") %>'></asp:DropDownList>
                             <asp:ObjectDataSource ID="odsRitUs" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
@@ -175,13 +172,17 @@
                     </div>
                 </div>
                 <div class="ui-block-b">
-                    <div class="ui-grid-a">
+                    <div class="ui-grid-b">
                         <div class="ui-block-a">
                             <label for="chkIntAperto">aperto</label>
                             <br />
                             <asp:CheckBox ID="chkIntAperto" runat="server" Checked='<%# Eval("IntAperto") %>' />
                         </div>
                         <div class="ui-block-b">
+                            <label for="lblMatr">Matr.</label>
+                            <asp:Label runat="server" ID="lblMatr" Text='<%# Eval("MatrOp") %>' />
+                        </div>
+                        <div class="ui-block-c">
                             <label for="ddlRitUs">rit. usato</label>
                             <asp:DropDownList runat="server" ID="ddlRitUs" DataSourceID="odsRitUs" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("RitUsato") %>'></asp:DropDownList>
                             <asp:ObjectDataSource ID="odsRitUs" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
index a57117c..3207173 100644
--- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
+++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
@@ -15,6 +15,8 @@ namespace WebSCR.WebUserControls
             if (!Page.IsPostBack)
             {
                 fixVisibility(false);
+                // reimposto selezione squadre...
+                mod_selSquadre.selezionaDaSession();
             }
             //aggancio modifica data e salvo...
             mod_selData.eh_update += Mod_selData_eh_update;
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index dc3eee6..1354ae0 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ
diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll
index 63d1055..b0d0a6b 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs
index 393b861..4047244 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -2397,6 +2397,8 @@ namespace WebSCR_data {
             
             private global::System.Data.DataColumn columnAnnoOC;
             
+            private global::System.Data.DataColumn columnMatrOp;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public ImpegniDataTable() {
@@ -2782,6 +2784,14 @@ namespace WebSCR_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MatrOpColumn {
+                get {
+                    return this.columnMatrOp;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2863,7 +2873,8 @@ namespace WebSCR_data {
                         bool IntAperto, 
                         string DettImpegno, 
                         string Tel, 
-                        int AnnoOC) {
+                        int AnnoOC, 
+                        string MatrOp) {
                 ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         IdxImpegno,
@@ -2909,7 +2920,8 @@ namespace WebSCR_data {
                         IntAperto,
                         DettImpegno,
                         Tel,
-                        AnnoOC};
+                        AnnoOC,
+                        MatrOp};
                 rowImpegniRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowImpegniRow);
                 return rowImpegniRow;
@@ -2983,6 +2995,7 @@ namespace WebSCR_data {
                 this.columnDettImpegno = base.Columns["DettImpegno"];
                 this.columnTel = base.Columns["Tel"];
                 this.columnAnnoOC = base.Columns["AnnoOC"];
+                this.columnMatrOp = base.Columns["MatrOp"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3076,6 +3089,8 @@ namespace WebSCR_data {
                 base.Columns.Add(this.columnTel);
                 this.columnAnnoOC = new global::System.Data.DataColumn("AnnoOC", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnAnnoOC);
+                this.columnMatrOp = new global::System.Data.DataColumn("MatrOp", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMatrOp);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnIdxImpegno}, true));
                 this.columnIdxImpegno.AllowDBNull = false;
@@ -3137,6 +3152,8 @@ namespace WebSCR_data {
                 this.columnTel.ReadOnly = true;
                 this.columnTel.MaxLength = 103;
                 this.columnAnnoOC.AllowDBNull = false;
+                this.columnMatrOp.AllowDBNull = false;
+                this.columnMatrOp.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8274,6 +8291,17 @@ namespace WebSCR_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string MatrOp {
+                get {
+                    return ((string)(this[this.tableImpegni.MatrOpColumn]));
+                }
+                set {
+                    this[this.tableImpegni.MatrOpColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public bool IsCodClienteNull() {
@@ -13559,6 +13587,9 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
             tableMapping.ColumnMappings.Add("DettImpegno", "DettImpegno");
             tableMapping.ColumnMappings.Add("Tel", "Tel");
             tableMapping.ColumnMappings.Add("AnnoOC", "AnnoOC");
+            tableMapping.ColumnMappings.Add("DataOraComFrom", "DataOraComFrom");
+            tableMapping.ColumnMappings.Add("DataOraComTo", "DataOraComTo");
+            tableMapping.ColumnMappings.Add("MatrOp", "MatrOp");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -17360,7 +17391,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT * FROM v_ASSD";
@@ -17382,15 +17413,13 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].CommandText = "dbo.stp_ASSD_getByDateSlot";
+            this._commandCollection[3].CommandText = "dbo.stp_ASSD_getByImpegno";
             this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
-            this._commandCollection[4].CommandText = "dbo.stp_ASS_getByDateSlot";
+            this._commandCollection[4].CommandText = "dbo.stp_ASSD_getByDateSlot";
             this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -17398,20 +17427,28 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
-            this._commandCollection[5].CommandText = "dbo.stp_ASSD_insMiss";
+            this._commandCollection[5].CommandText = "dbo.stp_ASS_getByDateSlot";
             this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[6].Connection = this.Connection;
-            this._commandCollection[6].CommandText = "dbo.stp_ASSD_updateSquadra";
+            this._commandCollection[6].CommandText = "dbo.stp_ASSD_insMiss";
             this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[7].Connection = this.Connection;
+            this._commandCollection[7].CommandText = "dbo.stp_ASSD_updateSquadra";
+            this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17442,8 +17479,25 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_Applicazione.AssegnSlotSquadreDipDataTable getBySlotSq(string CodSquadra, global::System.Nullable<global::System.DateTime> Data, string Slot) {
+        public virtual DS_Applicazione.AssegnSlotSquadreDipDataTable getByImpegno(global::System.Nullable<int> IdxImpegno) {
             this.Adapter.SelectCommand = this.CommandCollection[3];
+            if ((IdxImpegno.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxImpegno.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            DS_Applicazione.AssegnSlotSquadreDipDataTable dataTable = new DS_Applicazione.AssegnSlotSquadreDipDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_Applicazione.AssegnSlotSquadreDipDataTable getBySlotSq(string CodSquadra, global::System.Nullable<global::System.DateTime> Data, string Slot) {
+            this.Adapter.SelectCommand = this.CommandCollection[4];
             if ((CodSquadra == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -17472,7 +17526,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_Applicazione.AssegnSlotSquadreDipDataTable getSquadre_byDateSlot(string CodSquadra, global::System.Nullable<global::System.DateTime> Data, string Slot) {
-            this.Adapter.SelectCommand = this.CommandCollection[4];
+            this.Adapter.SelectCommand = this.CommandCollection[5];
             if ((CodSquadra == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -17575,7 +17629,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int insMiss(global::System.Nullable<global::System.DateTime> Data) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
             if ((Data.HasValue == true)) {
                 command.Parameters[1].Value = ((System.DateTime)(Data.Value));
             }
@@ -17603,7 +17657,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateSquadra(string Original_CodSquadra, global::System.Nullable<global::System.DateTime> Original_Data, string Original_Slot, string Original_Matr, string CodSquadra) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
             if ((Original_CodSquadra == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 7d56a20..d796b22 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -610,6 +610,9 @@ FROM v_elencoImpegni</CommandText>
               <Mapping SourceColumn="DettImpegno" DataSetColumn="DettImpegno" />
               <Mapping SourceColumn="Tel" DataSetColumn="Tel" />
               <Mapping SourceColumn="AnnoOC" DataSetColumn="AnnoOC" />
+              <Mapping SourceColumn="DataOraComFrom" DataSetColumn="DataOraComFrom" />
+              <Mapping SourceColumn="DataOraComTo" DataSetColumn="DataOraComTo" />
+              <Mapping SourceColumn="MatrOp" DataSetColumn="MatrOp" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" 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">
@@ -1389,6 +1392,17 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)</Co
                   </DbCommand>
                 </DeleteCommand>
               </DbSource>
+              <DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.stp_ASSD_getByImpegno" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByImpegno" GetMethodModifier="Public" GetMethodName="getByImpegno" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByImpegno" UserSourceName="getByImpegno">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_ASSD_getByImpegno</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IdxImpegno" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.stp_ASSD_getByDateSlot" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getBySlotSq" GetMethodModifier="Public" GetMethodName="getBySlotSq" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getBySlotSq" UserSourceName="getBySlotSq">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -1789,6 +1803,13 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)</Co
                 </xs:simpleType>
               </xs:element>
               <xs:element name="AnnoOC" msprop:Generator_ColumnVarNameInTable="columnAnnoOC" msprop:Generator_ColumnPropNameInRow="AnnoOC" msprop:Generator_ColumnPropNameInTable="AnnoOCColumn" msprop:Generator_UserColumnName="AnnoOC" type="xs:int" />
+              <xs:element name="MatrOp" msprop:Generator_ColumnVarNameInTable="columnMatrOp" msprop:Generator_ColumnPropNameInRow="MatrOp" msprop:Generator_ColumnPropNameInTable="MatrOpColumn" msprop:Generator_UserColumnName="MatrOp">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss
index bc16bf6..f21cd42 100644
--- a/WebSCR_data/DS_Applicazione.xss
+++ b/WebSCR_data/DS_Applicazione.xss
@@ -4,13 +4,13 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="244" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="152" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:AnagSquadre" ZOrder="13" X="579" Y="415" Height="305" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:AnagZone" ZOrder="19" X="556" Y="160" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:AnagTipoConsegne" ZOrder="18" X="919" Y="164" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:AnagClienti" ZOrder="14" X="330" Y="139" Height="362" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Impegni" ZOrder="3" X="13" Y="159" Height="609" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
+    <Shape ID="DesignTable:Impegni" ZOrder="1" X="9" Y="189" Height="573" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="351" />
     <Shape ID="DesignTable:DispImpTot" ZOrder="16" X="890" Y="469" Height="172" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DispImpSquadre" ZOrder="17" X="931" Y="666" Height="153" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:v_ImpegniCal" ZOrder="5" X="1245" Y="871" Height="210" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
@@ -21,7 +21,7 @@
     <Shape ID="DesignTable:AssegnSquadre" ZOrder="9" X="333" Y="730" Height="191" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:Dipendenti" ZOrder="8" X="339" Y="514" Height="153" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:v_resImp" ZOrder="6" X="1216" Y="700" Height="134" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AssegnSlotSquadreDip" ZOrder="1" X="343" Y="931" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AssegnSlotSquadreDip" ZOrder="3" X="343" Y="931" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_Disponibilita_AnagSquadre" ZOrder="15" LineWidth="11">
diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll
index 63d1055..b0d0a6b 100644
Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index 65a4f1e..767ebce 100644
Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll
index 63d1055..b0d0a6b 100644
Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ