Merge branch 'release/FixCalAdmin'

GPW_Admin/WebUserControls/cmp_calAnnuale.ascx

@@ -2,25 +2,35 @@
 
 
 <div class="row my-2 small">
-    <div class="col-4 bg-danger text-warning mb-1">
+    <div runat="server" id="divFes" class="col bg-danger text-warning mb-1">
         FESTIVITA'
     </div>
-    <div class="col-4 bg-warning mb-1">
+    <div runat="server" id="divCalAz" class="col bg-warning mb-1">
         CHIUSURE AZIENDALI
     </div>
-    <div class="col-4 bg-secondary text-light mb-1">
+    <div class="col bg-secondary text-light mb-1">
         WEEK-END
     </div>
+    <div runat="server" id="divMal" class="col bg-dark text-light mb-1">
+        MALATTIE
+    </div>
 </div>
 <div class="row">
+    <asp:HiddenField runat="server" ID="hfAnno" />
     <asp:Repeater runat="server" ID="repCal" DataSourceID="odsMesi" OnPreRender="repCal_PreRender">
         <ItemTemplate>
             <div class="col-4 mb-2">
-                <asp:Calendar runat="server" ID="calDisplay" VisibleDate='<%# Container.DataItem %>' OnDayRender="calDisplay_DayRender" ShowNextPrevMonth="false" SelectionMode="None" OtherMonthDayStyle-CssClass="text-light"></asp:Calendar>
+                <asp:Calendar runat="server" ID="calDisplay" VisibleDate='<%# Eval("Mese") %>' OnDayRender="calDisplay_DayRender" ShowNextPrevMonth="false" SelectionMode="None" OtherMonthDayStyle-CssClass="text-light"></asp:Calendar>
             </div>
         </ItemTemplate>
     </asp:Repeater>
-    <asp:ObjectDataSource runat="server" ID="odsMesi" TypeName="GPW_Admin.WebUserControls.mod_gestCalendario" SelectMethod="elencoMesi"></asp:ObjectDataSource>
+    <asp:ObjectDataSource runat="server" ID="odsMesi" TypeName="GPW_data.DS_ApplicazioneTableAdapters.CalMesiTableAdapter" SelectMethod="GetData" OldValuesParameterFormatString="original_{0}">
+        <SelectParameters>
+            <asp:ControlParameter ControlID="hfAnno" Name="anno" PropertyName="Value" Type="Int32" />
+            <asp:Parameter DefaultValue="1" Name="mese" Type="Int32" />
+            <asp:Parameter DefaultValue="12" Name="numMonth" Type="Int32" />
+        </SelectParameters>
+    </asp:ObjectDataSource>
 </div>
 <div class="row my-2 small" runat="server" id="divRichDip">
     <div class="col-2 g104Conf">

GPW_Admin/WebUserControls/cmp_calAnnuale.ascx.cs

@@ -16,49 +16,65 @@ namespace GPW_Admin.WebUserControls
             set
             {
                 _anno = value;
-                //doUpdateCal();
                 //odsMesi.DataBind();
                 repCal.DataBind();
             }
         }
 
-        public bool showAll { get; set; } = true;
+        /// <summary>
+        /// Mostra anche richieste (permessi/ferie/104) confermate o solo da confermare
+        /// </summary>
+        public bool showAlsoConf { get; set; } = true;
 
+        /// <summary>
+        /// Mostrare/Colorare sul calendario le chiusure aziendali programmate
+        /// </summary>
+        public bool showCalAz
+        {
+            get => _showCalAz;
+            set
+            {
+                _showCalAz = value;
+                divCalAz.Visible = value;
+                divFes.Visible = value;
+            }
+        }
+
+        /// <summary>
+        /// Mostrare/Colorare sul calendario le malattie ricevute
+        /// </summary>
+        public bool showMal
+        {
+            get => _showMal;
+            set
+            {
+                _showMal = value;
+                divMal.Visible = value;
+            }
+        }
+
+        /// <summary>
+        /// Mostrare/Colorare sul calendario le richieste dipendente
+        /// </summary>
         public bool showRichDip
         {
             get => _showRichDip;
             set
             {
-                if (_showRichDip != value)
-                {
-                    _showRichDip = value;
-                    divRichDip.Visible = value;
-                }
+                _showRichDip = value;
+                divRichDip.Visible = value;
             }
         }
 
         #endregion Public Properties
 
-        #region Public Methods
-
-        public List<DateTime> elencoMesi()
-        {
-            List<DateTime> listaMesi = new List<DateTime>();
-            for (int i = 0; i < 12; i++)
-            {
-                listaMesi.Add(new DateTime(_anno, 1 + i, 1));
-            }
-            return listaMesi;
-        }
-
-        #endregion Public Methods
-
         #region Protected Properties
 
         protected DS_Applicazione.DipendentiDataTable listaDip { get; set; }
 
         protected List<DS_Applicazione.CalendFesteFerieRow> listCFF { get; set; }
 
+        protected List<DS_Applicazione.RegistroMalattieRow> listRM { get; set; }
         protected List<DS_Applicazione.RegistroRichiesteRow> listRR { get; set; }
 
         #endregion Protected Properties
@@ -73,15 +89,51 @@ namespace GPW_Admin.WebUserControls
         protected void calDisplay_DayRender(object sender, System.Web.UI.WebControls.DayRenderEventArgs e)
         {
             bool isColored = false;
-            // coloro se fa parte delle festività/ferie...
-            if (listCFF != null && listCFF.Count > 0)
+            if (showCalAz)
             {
-                // cerco riga...
-                var thisDate = listCFF.Where(x => x.data == e.Day.Date).FirstOrDefault();
-                if (thisDate != null && e.Cell.CssClass != "text-light")
+                // coloro se fa parte delle festività/ferie...
+                if (listCFF != null && listCFF.Count > 0)
                 {
-                    isColored = true;
-                    e.Cell.CssClass = thisDate.codGiust == "FEST" ? "bg-danger text-warning" : "bg-warning";
+                    // cerco riga...
+                    var thisDate = listCFF.Where(x => x.data == e.Day.Date).FirstOrDefault();
+                    if (thisDate != null && e.Cell.CssClass != "text-light")
+                    {
+                        isColored = true;
+                        e.Cell.CssClass = thisDate.codGiust == "FEST" ? "bg-danger text-warning" : "bg-warning";
+                        e.Cell.ToolTip = $"{thisDate.descrizione}";
+                    }
+                }
+            }
+            if (showMal)
+            {
+                // coloro se fa parte delle festività/ferie...
+                if (listRM != null && listRM.Count > 0)
+                {
+                    // cerco riga...
+                    var listMal = listRM.Where(x => e.Day.Date >= x.DtInizio && e.Day.Date < x.DtInizio.AddDays(x.NumGG)).ToList();
+                    var thisDate = listMal.FirstOrDefault();
+                    if (thisDate != null && e.Cell.CssClass != "text-light")
+                    {
+                        isColored = true;
+                        e.Cell.CssClass = "bg-dark text-light";
+                        // se ho 1 sola riga --> metto 1, altrimenti compilo multiplo...
+                        string toolTip = "";
+                        if (listMal.Count == 1)
+                        {
+                            toolTip = $"{datiDip(thisDate.IdxDipendente)}";
+                        }
+                        else
+                        {
+                            foreach (var item in listMal)
+                            {
+                                toolTip += $"{datiDip(item.IdxDipendente)} | ";
+                            }
+                            // elimino ultimo
+                            // <br />
+                            toolTip = toolTip.Substring(0, toolTip.Length - 3);
+                        }
+                        e.Cell.ToolTip = toolTip;
+                    }
                 }
             }
             if (showRichDip)
@@ -119,7 +171,7 @@ namespace GPW_Admin.WebUserControls
                                 }
                             }
                             // se ho 1 sola riga --> metto 1, altrimenti compilo multiplo...
-                            string toolTip = $"";
+                            string toolTip = "";
                             if (listReq.Count == 1)
                             {
                                 toolTip = $"{thisDate.CodGiust}, {datiDip(thisDate.IdxDipendente)}";
@@ -164,11 +216,18 @@ namespace GPW_Admin.WebUserControls
 
         protected void doUpdateCal()
         {
-            listCFF = CffListByAnno(anno);
+            if (showCalAz)
+            {
+                listCFF = CffListByAnno(anno);
+            }
             if (showRichDip)
             {
                 listRR = RRListByAnno(anno);
             }
+            if (showMal)
+            {
+                listRM = RMListByAnno(anno);
+            }
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -187,7 +246,22 @@ namespace GPW_Admin.WebUserControls
 
         #region Private Properties
 
-        private int _anno { get; set; } = DateTime.Today.Year;
+        private int _anno
+        {
+            get
+            {
+                int answ = 0;
+                int.TryParse(hfAnno.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfAnno.Value = $"{value}";
+            }
+        }
+
+        private bool _showCalAz { get; set; } = true;
+        private bool _showMal { get; set; } = false;
         private bool _showRichDip { get; set; } = true;
 
         #endregion Private Properties
@@ -206,6 +280,18 @@ namespace GPW_Admin.WebUserControls
             return result;
         }
 
+        /// <summary>
+        /// Elenco Richieste Dipendenti x anno
+        /// </summary>
+        /// <param name="reqYear"></param>
+        private List<DS_Applicazione.RegistroMalattieRow> RMListByAnno(int reqYear)
+        {
+            DateTime inizio = new DateTime(reqYear, 1, 1);
+            DateTime fine = inizio.AddYears(1);
+            List<DS_Applicazione.RegistroMalattieRow> result = DataProxy.DP.taRM.getPeriod(0, inizio, fine).ToList();
+            return result;
+        }
+
         /// <summary>
         /// Elenco Richieste Dipendenti x anno
         /// </summary>
@@ -214,7 +300,7 @@ namespace GPW_Admin.WebUserControls
         {
             DateTime inizio = new DateTime(reqYear, 1, 1);
             DateTime fine = inizio.AddYears(1);
-            List<DS_Applicazione.RegistroRichiesteRow> result = DataProxy.DP.taRR.getPeriod(0, inizio, fine, showAll).ToList();
+            List<DS_Applicazione.RegistroRichiesteRow> result = DataProxy.DP.taRR.getPeriod(0, inizio, fine, showAlsoConf).ToList();
             return result;
         }
 

GPW_Admin/WebUserControls/cmp_calAnnuale.ascx.designer.cs

@@ -14,6 +14,42 @@ namespace GPW_Admin.WebUserControls
     public partial class cmp_calAnnuale
     {
 
+        /// <summary>
+        /// divFes control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFes;
+
+        /// <summary>
+        /// divCalAz control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCalAz;
+
+        /// <summary>
+        /// divMal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMal;
+
+        /// <summary>
+        /// hfAnno control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfAnno;
+
         /// <summary>
         /// repCal control.
         /// </summary>

GPW_Admin/WebUserControls/cmp_gestMalattia.ascx

@@ -90,6 +90,6 @@
         <asp:HiddenField runat="server" ID="hfFine" />
     </div>
     <div class="col-6 text-center">
-        <uc1:cmp_calAnnuale runat="server" id="cmp_calAnnuale" showRichDip="true" />
+        <uc1:cmp_calAnnuale runat="server" id="cmp_calAnnuale" showRichDip="false" showCalAz="true" showMal="true" />
     </div>
 </div>

GPW_Admin/WebUserControls/cmp_gestMalattia.ascx.cs

@@ -100,7 +100,7 @@ namespace GPW_Admin.WebUserControls
         protected void chkShowAll_CheckedChanged(object sender, EventArgs e)
         {
             chkShowAll.Text = chkShowAll.Checked ? "Mostra Tutti" : "Da Confermare";
-            cmp_calAnnuale.showAll = chkShowAll.Checked;
+            cmp_calAnnuale.showAlsoConf = chkShowAll.Checked;
         }
 
         protected string datiDip(object idxDip)

GPW_Admin/WebUserControls/cmp_gestRichDip.ascx

@@ -104,6 +104,6 @@
         <asp:HiddenField runat="server" ID="hfFine" />
     </div>
     <div class="col-6 text-center">
-        <uc1:cmp_calAnnuale runat="server" id="cmp_calAnnuale" showRichDip="true" />
+        <uc1:cmp_calAnnuale runat="server" id="cmp_calAnnuale" showRichDip="true" showCalAz="true" showMal="false" />
     </div>
 </div>

GPW_Admin/WebUserControls/cmp_gestRichDip.ascx.cs

@@ -102,7 +102,7 @@ namespace GPW_Admin.WebUserControls
         protected void chkShowAll_CheckedChanged(object sender, EventArgs e)
         {
             chkShowAll.Text = chkShowAll.Checked ? "Mostra Tutti" : "Da Confermare";
-            cmp_calAnnuale.showAll = chkShowAll.Checked;
+            cmp_calAnnuale.showAlsoConf = chkShowAll.Checked;
         }
 
         protected string datiDip(object idxDip)

GPW_Admin/WebUserControls/mod_gestCalendario.ascx

@@ -1,14 +1,16 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestCalendario.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_gestCalendario" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="~/WebUserControls/cmp_periodoAnalisi.ascx" TagPrefix="uc1" TagName="cmp_periodoAnalisi" %>
+<%@ Register Src="~/WebUserControls/cmp_calAnnuale.ascx" TagPrefix="uc1" TagName="cmp_calAnnuale" %>
+
 
 <div class="row small table-secondary">
-    <div class="col-5">
-        <uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" />
+    <div class="col-4">
+        <uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" showSmall="true" />
+        <asp:HiddenField runat="server" ID="hfInizio" />
+        <asp:HiddenField runat="server" ID="hfFine" />
     </div>
     <div class="col-2">
-        Anno:
-    <asp:TextBox runat="server" ID="txtAnno"></asp:TextBox>
     </div>
     <div class="col-2">
         <asp:LinkButton runat="server" ID="lbtSetupYear" CssClass="btn btn-sm btn-primary btn-block" OnClick="lbtSetupYear_Click"><i class="fa fa-calendar-check-o" aria-hidden="true"></i> ADD FESTIVITA' (Anno)</asp:LinkButton>
@@ -17,67 +19,34 @@
         <asp:LinkButton runat="server" ID="lbtShowFerie" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtShowFerie_Click">
             <i class="fa fa-calendar-check-o" aria-hidden="true"></i>
             <asp:Label runat="server" ID="lblTestoFerie" />
-        </asp:LinkButton>
-    </div>
-</div>
-<div class="row small table-warning" runat="server" id="divInsFerie" visible="false">
-    <div class="col">
-        Inizio:
-    <asp:TextBox runat="server" ID="txtInizio" TextMode="Date"></asp:TextBox>
-    </div>
-    <div class="col">
-        Fine:
-    <asp:TextBox runat="server" ID="txtFine" TextMode="Date"></asp:TextBox>
-    </div>
+        </asp:LinkButton></div><div class="col-2">
+        <div class="input-group input-group-sm">
+            <div class="input-group-prepend">
+                <span class="input-group-text">Anno</span> </div><asp:TextBox runat="server" ID="txtAnno" CssClass="form-control text-right" TextMode="Number" AutoPostBack="true" OnTextChanged="txtAnno_TextChanged"></asp:TextBox></div></div></div><div class="row small table-warning" runat="server" id="divInsFerie" visible="false">
     <div class="col">
+        Inizio: <asp:TextBox runat="server" ID="txtInizio" TextMode="Date"></asp:TextBox></div><div class="col">
+        Fine: <asp:TextBox runat="server" ID="txtFine" TextMode="Date"></asp:TextBox></div><div class="col">
         <asp:DropDownList runat="server" ID="ddlCodGiustInsNew">
-            <asp:ListItem Value="FER" Text="FERIE"></asp:ListItem>
-        </asp:DropDownList>
-    </div>
-    <div class="col">
-        Descrizione:
-    <asp:TextBox runat="server" ID="txtDescrizione"></asp:TextBox>
-    </div>
-    <div class="col">
-        <asp:LinkButton runat="server" ID="lbtSave" CssClass="btn btn-sm btn-block btn-success" OnClick="lbtSave_Click"><i class="fa fa-check" aria-hidden="true"></i> Aggiungi Ferie</asp:LinkButton>
-    </div>
-</div>
-<div class="row small">
+            <asp:ListItem Value="FER" Text="FERIE"></asp:ListItem></asp:DropDownList></div><div class="col">
+        Descrizione: <asp:TextBox runat="server" ID="txtDescrizione"></asp:TextBox></div><div class="col">
+        <asp:LinkButton runat="server" ID="lbtSave" CssClass="btn btn-sm btn-block btn-success" OnClick="lbtSave_Click"><i class="fa fa-check" aria-hidden="true"></i> Aggiungi Ferie</asp:LinkButton></div></div><div class="row small">
     <div class="col-6">
         <asp:GridView ID="grView" runat="server" AllowPaging="True" AutoGenerateColumns="False" DataKeyNames="data" DataSourceID="ods" CssClass="table table-sm table-striped table-condensed" AllowSorting="True">
             <SelectedRowStyle CssClass="table-info" />
             <Columns>
                 <asp:TemplateField ShowHeader="False">
                     <EditItemTemplate>
-                        <asp:LinkButton ID="lbtUpdate" runat="server" CausesValidation="True" CommandName="Update" Text="Aggiorna" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
-                        &nbsp;<asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" CssClass="btn btn-sm btn-warning"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" Text="Seleziona" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
-                        &nbsp;<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" Text="Modifica" CssClass="btn btn-sm btn-primary" Visible='<%# chkLicOk %>'><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:BoundField DataField="data" HeaderText="data" ReadOnly="True" SortExpression="data" DataFormatString="{0:yyyy-MM-dd}" />
+                        <asp:LinkButton ID="lbtUpdate" runat="server" CausesValidation="True" CommandName="Update" Text="Aggiorna" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>&nbsp;<asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" CssClass="btn btn-sm btn-warning"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton></EditItemTemplate><ItemTemplate>
+                        <asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" Text="Seleziona" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>&nbsp;<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" Text="Modifica" CssClass="btn btn-sm btn-primary" Visible='<%# chkLicOk %>'><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton></ItemTemplate></asp:TemplateField><asp:BoundField DataField="data" HeaderText="data" ReadOnly="True" SortExpression="data" DataFormatString="{0:yyyy-MM-dd}" />
                 <asp:TemplateField HeaderText="codGiust" SortExpression="codGiust">
                     <EditItemTemplate>
                         <asp:DropDownList runat="server" ID="ddlCodGiust" SelectedValue='<%# Bind("codGiust") %>'>
-                            <asp:ListItem Value="FEST" Text="FESTIVO"></asp:ListItem>
-                            <asp:ListItem Value="FER" Text="FERIE"></asp:ListItem>
-                        </asp:DropDownList>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label1" runat="server" Text='<%# Eval("codGiust") %>'></asp:Label>
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
+                            <asp:ListItem Value="FEST" Text="FESTIVO"></asp:ListItem><asp:ListItem Value="FER" Text="FERIE"></asp:ListItem></asp:DropDownList></EditItemTemplate><ItemTemplate>
+                        <asp:Label ID="Label1" runat="server" Text='<%# Eval("codGiust") %>'></asp:Label></ItemTemplate></asp:TemplateField><asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
                 <asp:TemplateField ShowHeader="False">
                     <EditItemTemplate>
-                        <asp:LinkButton ID="lbtUpdate2" runat="server" CausesValidation="True" CommandName="Update" Text="Aggiorna" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
-                        &nbsp;<asp:LinkButton ID="lbtCancel2" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" CssClass="btn btn-sm btn-warning"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:LinkButton ID="lbtDel" runat="server" CausesValidation="False" CommandName="Delete" Text="Elimina" CssClass="btn btn-sm btn-danger" Visible='<%# chkLicOk %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
-                        <asp:ConfirmButtonExtender ID="cbeDelete" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="lbtDel"></asp:ConfirmButtonExtender>
+                        <asp:LinkButton ID="lbtUpdate2" runat="server" CausesValidation="True" CommandName="Update" Text="Aggiorna" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>&nbsp;<asp:LinkButton ID="lbtCancel2" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" CssClass="btn btn-sm btn-warning"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton></EditItemTemplate><ItemTemplate>
+                        <asp:LinkButton ID="lbtDel" runat="server" CausesValidation="False" CommandName="Delete" Text="Elimina" CssClass="btn btn-sm btn-danger" Visible='<%# chkLicOk %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton><asp:ConfirmButtonExtender ID="cbeDelete" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="lbtDel"></asp:ConfirmButtonExtender>
                     </ItemTemplate>
                 </asp:TemplateField>
             </Columns>
@@ -103,26 +72,6 @@
         </asp:ObjectDataSource>
     </div>
     <div class="col-6 text-center">
-        <div class="row my-2">
-            <div class="col-4 bg-danger text-warning">
-                FESTIVITA'
-            </div>
-            <div class="col-4 bg-warning">
-                FERIE
-            </div>
-            <div class="col-4 bg-secondary text-light">
-                WEEK-END
-            </div>
-        </div>
-        <div class="row">
-            <asp:Repeater runat="server" ID="repCal" DataSourceID="odsMesi" OnPreRender="repCal_PreRender">
-                <ItemTemplate>
-                    <div class="col-4 mb-2">
-                        <asp:Calendar runat="server" ID="calDisplay" VisibleDate='<%# Container.DataItem %>' OnDayRender="calDisplay_DayRender" ShowNextPrevMonth="false" SelectionMode="None" OtherMonthDayStyle-CssClass="text-light"></asp:Calendar>
-                    </div>
-                </ItemTemplate>
-            </asp:Repeater>
-        </div>
-        <asp:ObjectDataSource runat="server" ID="odsMesi" TypeName="GPW_Admin.WebUserControls.mod_gestCalendario" SelectMethod="elencoMesi"></asp:ObjectDataSource>
+        <uc1:cmp_calAnnuale runat="server" ID="cmp_calAnnuale" showRichDip="false" showCalAz="true" showMal="false" />
     </div>
 </div>

GPW_Admin/WebUserControls/mod_gestCalendario.ascx.cs

@@ -25,7 +25,6 @@ namespace GPW_Admin.WebUserControls
             // aggiorno!
             grView.PageSize = utils.pageSize;
             grView.DataBind();
-            repCal.DataBind();
         }
 
         public List<DateTime> elencoMesi()
@@ -66,6 +65,48 @@ namespace GPW_Admin.WebUserControls
             }
         }
 
+        protected DateTime Fine
+        {
+            get
+            {
+                DateTime answ = new DateTime(anno + 1, 1, 1);
+                if (!string.IsNullOrEmpty(hfFine.Value))
+                {
+                    DateTime.TryParse(hfFine.Value, out answ);
+                }
+                else
+                {
+                    hfFine.Value = $"{answ}";
+                }
+                return answ;
+            }
+            set
+            {
+                hfFine.Value = $"{value}";
+            }
+        }
+
+        protected DateTime Inizio
+        {
+            get
+            {
+                DateTime answ = new DateTime(anno, 1, 1);
+                if (!string.IsNullOrEmpty(hfInizio.Value))
+                {
+                    DateTime.TryParse(hfInizio.Value, out answ);
+                }
+                else
+                {
+                    hfInizio.Value = $"{answ}";
+                }
+                return answ;
+            }
+            set
+            {
+                hfInizio.Value = $"{value}";
+            }
+        }
+
         protected List<DS_Applicazione.CalendFesteFerieRow> listCFF { get; set; }
 
         #endregion Protected Properties
@@ -156,6 +197,7 @@ namespace GPW_Admin.WebUserControls
             if (!Page.IsPostBack)
             {
                 anno = DateTime.Now.Year;
+                cmp_calAnnuale.anno = anno;
                 intervalloDate currAnno = new intervalloDate
                 {
                     inizio = DateTime.Today.AddYears(-2),
@@ -178,6 +220,12 @@ namespace GPW_Admin.WebUserControls
             doUpdateCal();
         }
 
+        protected void txtAnno_TextChanged(object sender, EventArgs e)
+        {
+            reportAnno();
+            doUpdateCal();
+        }
+
         #endregion Protected Methods
 
         #region Private Properties
@@ -226,6 +274,19 @@ namespace GPW_Admin.WebUserControls
             return result;
         }
 
+        private void reportAnno()
+        {
+            Inizio = new DateTime(anno, 1, 1);
+            Fine = new DateTime(anno + 1, 1, 1);
+            intervalloDate currAnno = new intervalloDate
+            {
+                inizio = Inizio,
+                fine = Fine
+            };
+            cmp_periodoAnalisi.intervalloAnalisi = currAnno;
+            cmp_calAnnuale.anno = anno;
+        }
+
         private void setupFestAnno(int reqYear)
         {
             // recupero elenco festività

GPW_Admin/WebUserControls/mod_gestCalendario.ascx.designer.cs

@@ -24,13 +24,22 @@ namespace GPW_Admin.WebUserControls
         protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi;
 
         /// <summary>
-        /// txtAnno control.
+        /// hfInizio control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtAnno;
+        protected global::System.Web.UI.WebControls.HiddenField hfInizio;
+
+        /// <summary>
+        /// hfFine control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfFine;
 
         /// <summary>
         /// lbtSetupYear control.
@@ -59,6 +68,15 @@ namespace GPW_Admin.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblTestoFerie;
 
+        /// <summary>
+        /// txtAnno control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtAnno;
+
         /// <summary>
         /// divInsFerie control.
         /// </summary>
@@ -132,21 +150,12 @@ namespace GPW_Admin.WebUserControls
         protected global::System.Web.UI.WebControls.ObjectDataSource ods;
 
         /// <summary>
-        /// repCal control.
+        /// cmp_calAnnuale control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Repeater repCal;
-
-        /// <summary>
-        /// odsMesi control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ObjectDataSource odsMesi;
+        protected global::GPW_Admin.WebUserControls.cmp_calAnnuale cmp_calAnnuale;
     }
 }

GPW_Data/DS_Applicazione.Designer.cs

@@ -80,6 +80,8 @@ namespace GPW_data {
         
         private RegistroMalattieDataTable tableRegistroMalattie;
         
+        private CalMesiDataTable tableCalMesi;
+        
         private global::System.Data.DataRelation relationFK_Timbrature_Dipendenti;
         
         private global::System.Data.DataRelation relationFK_AnagFasi_AnagProgetti;
@@ -208,6 +210,9 @@ namespace GPW_data {
                 if ((ds.Tables["RegistroMalattie"] != null)) {
                     base.Tables.Add(new RegistroMalattieDataTable(ds.Tables["RegistroMalattie"]));
                 }
+                if ((ds.Tables["CalMesi"] != null)) {
+                    base.Tables.Add(new CalMesiDataTable(ds.Tables["CalMesi"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -506,6 +511,16 @@ namespace GPW_data {
             }
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public CalMesiDataTable CalMesi {
+            get {
+                return this.tableCalMesi;
+            }
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.BrowsableAttribute(true)]
@@ -657,6 +672,9 @@ namespace GPW_data {
                 if ((ds.Tables["RegistroMalattie"] != null)) {
                     base.Tables.Add(new RegistroMalattieDataTable(ds.Tables["RegistroMalattie"]));
                 }
+                if ((ds.Tables["CalMesi"] != null)) {
+                    base.Tables.Add(new CalMesiDataTable(ds.Tables["CalMesi"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -858,6 +876,12 @@ namespace GPW_data {
                     this.tableRegistroMalattie.InitVars();
                 }
             }
+            this.tableCalMesi = ((CalMesiDataTable)(base.Tables["CalMesi"]));
+            if ((initTable == true)) {
+                if ((this.tableCalMesi != null)) {
+                    this.tableCalMesi.InitVars();
+                }
+            }
             this.relationFK_Timbrature_Dipendenti = this.Relations["FK_Timbrature_Dipendenti"];
             this.relationFK_AnagFasi_AnagProgetti = this.Relations["FK_AnagFasi_AnagProgetti"];
             this.relationFK_RegAttivita_AnagFasi = this.Relations["FK_RegAttivita_AnagFasi"];
@@ -932,6 +956,8 @@ namespace GPW_data {
             base.Tables.Add(this.tableRegistroRichieste);
             this.tableRegistroMalattie = new RegistroMalattieDataTable();
             base.Tables.Add(this.tableRegistroMalattie);
+            this.tableCalMesi = new CalMesiDataTable();
+            base.Tables.Add(this.tableCalMesi);
             this.relationFK_Timbrature_Dipendenti = new global::System.Data.DataRelation("FK_Timbrature_Dipendenti", new global::System.Data.DataColumn[] {
                         this.tableDipendenti.idxDipendenteColumn}, new global::System.Data.DataColumn[] {
                         this.tableTimbrature.idxDipendenteColumn}, false);
@@ -1134,6 +1160,12 @@ namespace GPW_data {
             return false;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        private bool ShouldSerializeCalMesi() {
+            return false;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
@@ -1273,6 +1305,9 @@ namespace GPW_data {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         public delegate void RegistroMalattieRowChangeEventHandler(object sender, RegistroMalattieRowChangeEvent e);
         
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        public delegate void CalMesiRowChangeEventHandler(object sender, CalMesiRowChangeEvent e);
+        
         /// <summary>
         ///Represents the strongly named DataTable class.
         ///</summary>
@@ -12836,6 +12871,254 @@ namespace GPW_data {
             }
         }
         
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class CalMesiDataTable : global::System.Data.TypedTableBase<CalMesiRow> {
+            
+            private global::System.Data.DataColumn columnMese;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiDataTable() {
+                this.TableName = "CalMesi";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal CalMesiDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected CalMesiDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn MeseColumn {
+                get {
+                    return this.columnMese;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiRow this[int index] {
+                get {
+                    return ((CalMesiRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event CalMesiRowChangeEventHandler CalMesiRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event CalMesiRowChangeEventHandler CalMesiRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event CalMesiRowChangeEventHandler CalMesiRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event CalMesiRowChangeEventHandler CalMesiRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void AddCalMesiRow(CalMesiRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiRow AddCalMesiRow(System.DateTime Mese) {
+                CalMesiRow rowCalMesiRow = ((CalMesiRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        Mese};
+                rowCalMesiRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowCalMesiRow);
+                return rowCalMesiRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                CalMesiDataTable cln = ((CalMesiDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new CalMesiDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal void InitVars() {
+                this.columnMese = base.Columns["Mese"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            private void InitClass() {
+                this.columnMese = new global::System.Data.DataColumn("Mese", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMese);
+                this.columnMese.ReadOnly = true;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiRow NewCalMesiRow() {
+                return ((CalMesiRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new CalMesiRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(CalMesiRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.CalMesiRowChanged != null)) {
+                    this.CalMesiRowChanged(this, new CalMesiRowChangeEvent(((CalMesiRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.CalMesiRowChanging != null)) {
+                    this.CalMesiRowChanging(this, new CalMesiRowChangeEvent(((CalMesiRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.CalMesiRowDeleted != null)) {
+                    this.CalMesiRowDeleted(this, new CalMesiRowChangeEvent(((CalMesiRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.CalMesiRowDeleting != null)) {
+                    this.CalMesiRowDeleting(this, new CalMesiRowChangeEvent(((CalMesiRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void RemoveCalMesiRow(CalMesiRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                DS_Applicazione ds = new DS_Applicazione();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "CalMesiDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
         /// <summary>
         ///Represents strongly named DataRow class.
         ///</summary>
@@ -20256,6 +20539,49 @@ namespace GPW_data {
             }
         }
         
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class CalMesiRow : global::System.Data.DataRow {
+            
+            private CalMesiDataTable tableCalMesi;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal CalMesiRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableCalMesi = ((CalMesiDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public System.DateTime Mese {
+                get {
+                    try {
+                        return ((global::System.DateTime)(this[this.tableCalMesi.MeseColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Mese\' in table \'CalMesi\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCalMesi.MeseColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsMeseNull() {
+                return this.IsNull(this.tableCalMesi.MeseColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetMeseNull() {
+                this[this.tableCalMesi.MeseColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
         /// <summary>
         ///Row event argument class
         ///</summary>
@@ -21207,6 +21533,40 @@ namespace GPW_data {
                 }
             }
         }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        public class CalMesiRowChangeEvent : global::System.EventArgs {
+            
+            private CalMesiRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiRowChangeEvent(CalMesiRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public CalMesiRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
     }
 }
 namespace GPW_data.DS_ApplicazioneTableAdapters {
@@ -38661,6 +39021,213 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
         }
     }
     
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class CalMesiTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.SqlClient.SqlDataAdapter _adapter;
+        
+        private global::System.Data.SqlClient.SqlConnection _connection;
+        
+        private global::System.Data.SqlClient.SqlTransaction _transaction;
+        
+        private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        public CalMesiTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        internal global::System.Data.SqlClient.SqlConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        internal global::System.Data.SqlClient.SqlTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "CalMesi";
+            tableMapping.ColumnMappings.Add("Mese", "Mese");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.SqlClient.SqlConnection();
+            this._connection.ConnectionString = global::GPW_data.Properties.Settings.Default.GPWConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "dbo.stp_CAL_getMonths";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@anno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mese", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numMonth", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [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.Fill, true)]
+        public virtual int Fill(DS_Applicazione.CalMesiDataTable dataTable, global::System.Nullable<int> anno, global::System.Nullable<int> mese, global::System.Nullable<int> numMonth) {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            if ((anno.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(anno.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((mese.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(mese.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((numMonth.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((int)(numMonth.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [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.Select, true)]
+        public virtual DS_Applicazione.CalMesiDataTable GetData(global::System.Nullable<int> anno, global::System.Nullable<int> mese, global::System.Nullable<int> numMonth) {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            if ((anno.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(anno.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((mese.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(mese.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((numMonth.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((int)(numMonth.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            DS_Applicazione.CalMesiDataTable dataTable = new DS_Applicazione.CalMesiDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
     /// <summary>
     ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
     ///</summary>
@@ -39168,15 +39735,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private int UpdateUpdatedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
             int result = 0;
-            if ((this._dipendenti2GruppiTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._dipendenti2GruppiTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             if ((this._anagProgettiTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.AnagProgetti.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -39186,6 +39744,15 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
+            if ((this._dipendenti2GruppiTableAdapter != null)) {
+                global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
+                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
+                if (((updatedRows != null) 
+                            && (0 < updatedRows.Length))) {
+                    result = (result + this._dipendenti2GruppiTableAdapter.Update(updatedRows));
+                    allChangedRows.AddRange(updatedRows);
+                }
+            }
             if ((this._anagGruppiTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -39231,6 +39798,15 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
+            if ((this._registroRichiesteTableAdapter != null)) {
+                global::System.Data.DataRow[] updatedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
+                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
+                if (((updatedRows != null) 
+                            && (0 < updatedRows.Length))) {
+                    result = (result + this._registroRichiesteTableAdapter.Update(updatedRows));
+                    allChangedRows.AddRange(updatedRows);
+                }
+            }
             if ((this._listTagDDTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.ListTagDD.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -39258,6 +39834,15 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
+            if ((this._registroMalattieTableAdapter != null)) {
+                global::System.Data.DataRow[] updatedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
+                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
+                if (((updatedRows != null) 
+                            && (0 < updatedRows.Length))) {
+                    result = (result + this._registroMalattieTableAdapter.Update(updatedRows));
+                    allChangedRows.AddRange(updatedRows);
+                }
+            }
             if ((this._giustificativiTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.Giustificativi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -39267,15 +39852,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
-            if ((this._registroRichiesteTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._registroRichiesteTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             if ((this._calendFesteFerieTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.CalendFesteFerie.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -39330,15 +39906,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
-            if ((this._registroMalattieTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._registroMalattieTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             return result;
         }
         
@@ -39349,14 +39916,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private int UpdateInsertedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
             int result = 0;
-            if ((this._dipendenti2GruppiTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._dipendenti2GruppiTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             if ((this._anagProgettiTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.AnagProgetti.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -39365,6 +39924,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allAddedRows.AddRange(addedRows);
                 }
             }
+            if ((this._dipendenti2GruppiTableAdapter != null)) {
+                global::System.Data.DataRow[] addedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Added);
+                if (((addedRows != null) 
+                            && (0 < addedRows.Length))) {
+                    result = (result + this._dipendenti2GruppiTableAdapter.Update(addedRows));
+                    allAddedRows.AddRange(addedRows);
+                }
+            }
             if ((this._anagGruppiTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -39405,6 +39972,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allAddedRows.AddRange(addedRows);
                 }
             }
+            if ((this._registroRichiesteTableAdapter != null)) {
+                global::System.Data.DataRow[] addedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.Added);
+                if (((addedRows != null) 
+                            && (0 < addedRows.Length))) {
+                    result = (result + this._registroRichiesteTableAdapter.Update(addedRows));
+                    allAddedRows.AddRange(addedRows);
+                }
+            }
             if ((this._listTagDDTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.ListTagDD.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -39429,6 +40004,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allAddedRows.AddRange(addedRows);
                 }
             }
+            if ((this._registroMalattieTableAdapter != null)) {
+                global::System.Data.DataRow[] addedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.Added);
+                if (((addedRows != null) 
+                            && (0 < addedRows.Length))) {
+                    result = (result + this._registroMalattieTableAdapter.Update(addedRows));
+                    allAddedRows.AddRange(addedRows);
+                }
+            }
             if ((this._giustificativiTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.Giustificativi.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -39437,14 +40020,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allAddedRows.AddRange(addedRows);
                 }
             }
-            if ((this._registroRichiesteTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._registroRichiesteTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             if ((this._calendFesteFerieTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.CalendFesteFerie.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -39493,14 +40068,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allAddedRows.AddRange(addedRows);
                 }
             }
-            if ((this._registroMalattieTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._registroMalattieTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             return result;
         }
         
@@ -39511,14 +40078,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private int UpdateDeletedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows) {
             int result = 0;
-            if ((this._registroMalattieTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._registroMalattieTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._timbratureExplTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -39567,14 +40126,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
-            if ((this._registroRichiesteTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._registroRichiesteTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._giustificativiTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.Giustificativi.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -39583,6 +40134,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
+            if ((this._registroMalattieTableAdapter != null)) {
+                global::System.Data.DataRow[] deletedRows = dataSet.RegistroMalattie.Select(null, null, global::System.Data.DataViewRowState.Deleted);
+                if (((deletedRows != null) 
+                            && (0 < deletedRows.Length))) {
+                    result = (result + this._registroMalattieTableAdapter.Update(deletedRows));
+                    allChangedRows.AddRange(deletedRows);
+                }
+            }
             if ((this._registroEventiTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.RegistroEventi.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -39607,6 +40166,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
+            if ((this._registroRichiesteTableAdapter != null)) {
+                global::System.Data.DataRow[] deletedRows = dataSet.RegistroRichieste.Select(null, null, global::System.Data.DataViewRowState.Deleted);
+                if (((deletedRows != null) 
+                            && (0 < deletedRows.Length))) {
+                    result = (result + this._registroRichiesteTableAdapter.Update(deletedRows));
+                    allChangedRows.AddRange(deletedRows);
+                }
+            }
             if ((this._timbratureTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -39647,14 +40214,6 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
-            if ((this._anagProgettiTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.AnagProgetti.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._anagProgettiTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._dipendenti2GruppiTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -39663,6 +40222,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
+            if ((this._anagProgettiTableAdapter != null)) {
+                global::System.Data.DataRow[] deletedRows = dataSet.AnagProgetti.Select(null, null, global::System.Data.DataViewRowState.Deleted);
+                if (((deletedRows != null) 
+                            && (0 < deletedRows.Length))) {
+                    result = (result + this._anagProgettiTableAdapter.Update(deletedRows));
+                    allChangedRows.AddRange(deletedRows);
+                }
+            }
             return result;
         }
         

GPW_Data/DS_Applicazione.xsd

@@ -3575,6 +3575,27 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
               </DbSource>
             </Sources>
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="CalMesiTableAdapter" GeneratorDataComponentClassName="CalMesiTableAdapter" Name="CalMesi" UserDataComponentName="CalMesiTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_CAL_getMonths" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_CAL_getMonths</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="@anno" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@mese" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@numMonth" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="Mese" DataSetColumn="Mese" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -4565,7 +4586,7 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroRichieste" msprop:Generator_TableClassName="RegistroRichiesteDataTable" msprop:Generator_RowEvArgName="RegistroRichiesteRowChangeEvent" msprop:Generator_TableVarName="tableRegistroRichieste" msprop:Generator_TablePropName="RegistroRichieste" msprop:Generator_RowDeletingName="RegistroRichiesteRowDeleting" msprop:Generator_RowChangingName="RegistroRichiesteRowChanging" msprop:Generator_RowDeletedName="RegistroRichiesteRowDeleted" msprop:Generator_RowEvHandlerName="RegistroRichiesteRowChangeEventHandler" msprop:Generator_UserTableName="RegistroRichieste" msprop:Generator_RowChangedName="RegistroRichiesteRowChanged" msprop:Generator_RowClassName="RegistroRichiesteRow">
+        <xs:element name="RegistroRichieste" msprop:Generator_TableClassName="RegistroRichiesteDataTable" msprop:Generator_RowEvArgName="RegistroRichiesteRowChangeEvent" msprop:Generator_TableVarName="tableRegistroRichieste" msprop:Generator_TablePropName="RegistroRichieste" msprop:Generator_RowDeletingName="RegistroRichiesteRowDeleting" msprop:Generator_RowChangingName="RegistroRichiesteRowChanging" msprop:Generator_RowDeletedName="RegistroRichiesteRowDeleted" msprop:Generator_RowEvHandlerName="RegistroRichiesteRowChangeEventHandler" msprop:Generator_RowChangedName="RegistroRichiesteRowChanged" msprop:Generator_UserTableName="RegistroRichieste" msprop:Generator_RowClassName="RegistroRichiesteRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxRegRich" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxRegRich" msprop:Generator_ColumnPropNameInRow="IdxRegRich" msprop:Generator_ColumnPropNameInTable="IdxRegRichColumn" msprop:Generator_UserColumnName="IdxRegRich" type="xs:int" />
@@ -4590,7 +4611,7 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroMalattie" msprop:Generator_TableClassName="RegistroMalattieDataTable" msprop:Generator_TableVarName="tableRegistroMalattie" msprop:Generator_TablePropName="RegistroMalattie" msprop:Generator_RowDeletingName="RegistroMalattieRowDeleting" msprop:Generator_RowChangingName="RegistroMalattieRowChanging" msprop:Generator_RowEvHandlerName="RegistroMalattieRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroMalattieRowDeleted" msprop:Generator_UserTableName="RegistroMalattie" msprop:Generator_RowChangedName="RegistroMalattieRowChanged" msprop:Generator_RowEvArgName="RegistroMalattieRowChangeEvent" msprop:Generator_RowClassName="RegistroMalattieRow">
+        <xs:element name="RegistroMalattie" msprop:Generator_TableClassName="RegistroMalattieDataTable" msprop:Generator_TableVarName="tableRegistroMalattie" msprop:Generator_RowChangedName="RegistroMalattieRowChanged" msprop:Generator_TablePropName="RegistroMalattie" msprop:Generator_RowDeletingName="RegistroMalattieRowDeleting" msprop:Generator_RowChangingName="RegistroMalattieRowChanging" msprop:Generator_RowEvHandlerName="RegistroMalattieRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroMalattieRowDeleted" msprop:Generator_RowClassName="RegistroMalattieRow" msprop:Generator_UserTableName="RegistroMalattie" msprop:Generator_RowEvArgName="RegistroMalattieRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxRegMal" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxRegMal" msprop:Generator_ColumnPropNameInRow="IdxRegMal" msprop:Generator_ColumnPropNameInTable="IdxRegMalColumn" msprop:Generator_UserColumnName="IdxRegMal" type="xs:int" />
@@ -4608,6 +4629,13 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="CalMesi" msprop:Generator_TableClassName="CalMesiDataTable" msprop:Generator_TableVarName="tableCalMesi" msprop:Generator_TablePropName="CalMesi" msprop:Generator_RowDeletingName="CalMesiRowDeleting" msprop:Generator_RowChangingName="CalMesiRowChanging" msprop:Generator_RowEvHandlerName="CalMesiRowChangeEventHandler" msprop:Generator_RowDeletedName="CalMesiRowDeleted" msprop:Generator_UserTableName="CalMesi" msprop:Generator_RowChangedName="CalMesiRowChanged" msprop:Generator_RowEvArgName="CalMesiRowChangeEvent" msprop:Generator_RowClassName="CalMesiRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Mese" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMese" msprop:Generator_ColumnPropNameInRow="Mese" msprop:Generator_ColumnPropNameInTable="MeseColumn" msprop:Generator_UserColumnName="Mese" type="xs:dateTime" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -4735,14 +4763,14 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa
   </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_UserChildTable="Timbrature" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_UserParentTable="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_UserChildTable="AnagFasi" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_UserParentTable="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_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_UserParentTable="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_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_UserParentTable="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_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" msprop:Generator_ParentPropName="AnagOrariRow" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_UserParentTable="AnagOrari" />
-      <msdata:Relationship name="FK_RilievoTemp_Dipendenti" msdata:parent="Dipendenti" msdata:child="RilievoTemp" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RilievoTemp" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
-      <msdata:Relationship name="FK_Dipendenti_AnagGruppi" msdata:parent="AnagGruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi" msprop:Generator_UserParentTable="AnagGruppi" msprop:Generator_ParentPropName="AnagGruppiRow" />
-      <msdata:Relationship name="FK_Dipendenti_AnagGruppi1" msdata:parent="Dipendenti2Gruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi1" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi1" msprop:Generator_UserParentTable="Dipendenti2Gruppi" msprop:Generator_ParentPropName="Dipendenti2GruppiRow" />
+      <msdata:Relationship name="FK_Timbrature_Dipendenti" msdata:parent="Dipendenti" msdata:child="Timbrature" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="Timbrature" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
+      <msdata:Relationship name="FK_AnagFasi_AnagProgetti" msdata:parent="AnagProgetti" msdata:child="AnagFasi" msdata:parentkey="idxProgetto" msdata:childkey="idxProgetto" msprop:Generator_UserChildTable="AnagFasi" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" msprop:Generator_ParentPropName="AnagProgettiRow" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_UserParentTable="AnagProgetti" />
+      <msdata:Relationship name="FK_RegAttivita_AnagFasi" msdata:parent="AnagFasi" msdata:child="RegAttivita" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_UserParentTable="AnagFasi" />
+      <msdata:Relationship name="FK_RegAttivita_Dipendenti" msdata:parent="Dipendenti" msdata:child="RegAttivita" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
+      <msdata:Relationship name="FK_Dipendenti_AnagOrari" msdata:parent="AnagOrari" msdata:child="Dipendenti" msdata:parentkey="codOrario" msdata:childkey="codOrario" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_UserParentTable="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_UserChildTable="RilievoTemp" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_UserParentTable="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_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi" msprop:Generator_ParentPropName="AnagGruppiRow" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi" msprop:Generator_UserParentTable="AnagGruppi" />
+      <msdata:Relationship name="FK_Dipendenti_AnagGruppi1" msdata:parent="Dipendenti2Gruppi" msdata:child="Dipendenti" msdata:parentkey="gruppo" msdata:childkey="gruppo" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagGruppi1" msprop:Generator_ParentPropName="Dipendenti2GruppiRow" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagGruppi1" msprop:Generator_UserParentTable="Dipendenti2Gruppi" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

GPW_Data/DS_Applicazione.xss

@@ -4,39 +4,40 @@
      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="-11" ViewPortY="441" 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="-11" ViewPortY="430" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Timbrature" ZOrder="35" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TimbratureExpl" ZOrder="27" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagDevices" ZOrder="10" X="951" Y="215" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:Dipendenti" ZOrder="11" X="285" Y="543" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagClienti" ZOrder="22" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagProgetti" ZOrder="1" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="34" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagFasi" ZOrder="19" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:v_logCommUt" ZOrder="25" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:RegAttivita" ZOrder="23" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="7" X="597" Y="1126" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:AnagOrari" ZOrder="12" X="280" Y="1001" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TimbMeseExpl" ZOrder="30" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Giustificativi" ZOrder="3" X="955" Y="1424" Height="229" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="5" X="8" Y="1311" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="17" X="1" Y="26" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:regAttDayExpl" ZOrder="21" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="29" X="1236" Y="992" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:RegistroEventi" ZOrder="28" X="44" Y="1467" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:RilievoTemp" ZOrder="13" X="-24" Y="566" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:HistTemp" ZOrder="24" X="-23" Y="762" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:CheckVC19" ZOrder="6" X="287" Y="1407" Height="229" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:AnagGruppi" ZOrder="14" X="-14" Y="341" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Dipendenti2Gruppi" ZOrder="16" X="367" Y="370" Height="153" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TagMese" ZOrder="9" X="963" Y="-12" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:ListTagDD" ZOrder="8" X="1289" Y="-21" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:RegistroRichieste" ZOrder="4" X="489" Y="1366" Height="267" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:RegistroMalattie" ZOrder="2" X="751" Y="1369" Height="247" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:Timbrature" ZOrder="36" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TimbratureExpl" ZOrder="28" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagDevices" ZOrder="11" X="951" Y="215" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:Dipendenti" ZOrder="12" X="285" Y="543" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagClienti" ZOrder="23" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagProgetti" ZOrder="2" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="35" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:AnagFasi" ZOrder="20" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:v_logCommUt" ZOrder="26" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RegAttivita" ZOrder="24" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="8" 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="280" Y="1001" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TimbMeseExpl" ZOrder="31" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Giustificativi" ZOrder="4" X="955" Y="1424" Height="229" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="6" X="8" Y="1311" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="18" X="1" Y="26" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:regAttDayExpl" ZOrder="22" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="30" X="1236" Y="992" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RegistroEventi" ZOrder="29" X="44" Y="1467" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:RilievoTemp" ZOrder="14" X="-24" Y="566" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:HistTemp" ZOrder="25" X="-23" Y="762" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:CheckVC19" ZOrder="7" X="287" Y="1407" Height="229" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AnagGruppi" ZOrder="15" X="-14" Y="341" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Dipendenti2Gruppi" ZOrder="17" X="367" Y="370" Height="153" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TagMese" ZOrder="10" X="963" Y="-12" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:ListTagDD" ZOrder="9" X="1289" Y="-21" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:RegistroRichieste" ZOrder="5" X="489" Y="1366" Height="267" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:RegistroMalattie" ZOrder="3" X="751" Y="1369" Height="247" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:CalMesi" ZOrder="1" X="104" Y="1549" Height="96" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="36" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="37" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>391</X>
@@ -48,7 +49,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AnagFasi_AnagProgetti" ZOrder="20" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AnagFasi_AnagProgetti" ZOrder="21" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1046</X>
@@ -60,7 +61,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_RegAttivita_AnagFasi" ZOrder="33" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RegAttivita_AnagFasi" ZOrder="34" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>871</X>
@@ -76,7 +77,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_RegAttivita_Dipendenti" ZOrder="32" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RegAttivita_Dipendenti" ZOrder="33" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>585</X>
@@ -88,7 +89,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagOrari" ZOrder="31" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagOrari" ZOrder="32" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>332</X>
@@ -100,7 +101,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_RilievoTemp_Dipendenti" ZOrder="26" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RilievoTemp_Dipendenti" ZOrder="27" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>285</X>
@@ -112,7 +113,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi" ZOrder="19" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>286</X>
@@ -128,7 +129,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi1" ZOrder="15" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagGruppi1" ZOrder="16" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>428</X>