diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj
index a222e9b..0c07d5f 100644
--- a/GPW_Admin/GPW_Admin.csproj
+++ b/GPW_Admin/GPW_Admin.csproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
+  <Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -234,6 +239,7 @@
     <Content Include="ExportTimbZucchetti.aspx" />
     <Content Include="fasi.aspx" />
     <Content Include="fonts\fontawesome-webfont.svg" />
+    <Content Include="gestCalendario.aspx" />
     <Content Include="gestOrario.aspx" />
     <Content Include="images\apply_l.png" />
     <Content Include="images\apply_m.png" />
@@ -423,6 +429,7 @@
     <Content Include="WebUserControls\mod_dettaglioProgetto.ascx" />
     <Content Include="WebUserControls\mod_elencoTimbr.ascx" />
     <Content Include="WebUserControls\mod_filtro.ascx" />
+    <Content Include="WebUserControls\mod_gestCalendario.ascx" />
     <Content Include="WebUserControls\mod_login.ascx" />
     <Content Include="WebUserControls\mod_menuBottom.ascx" />
     <Content Include="WebUserControls\mod_menuBottomFullpage.ascx" />
@@ -588,6 +595,13 @@
     <Compile Include="fasi.aspx.designer.cs">
       <DependentUpon>fasi.aspx</DependentUpon>
     </Compile>
+    <Compile Include="gestCalendario.aspx.cs">
+      <DependentUpon>gestCalendario.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="gestCalendario.aspx.designer.cs">
+      <DependentUpon>gestCalendario.aspx</DependentUpon>
+    </Compile>
     <Compile Include="gestOrario.aspx.cs">
       <DependentUpon>gestOrario.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -786,6 +800,13 @@
     <Compile Include="WebUserControls\mod_filtro.ascx.designer.cs">
       <DependentUpon>mod_filtro.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\mod_gestCalendario.ascx.cs">
+      <DependentUpon>mod_gestCalendario.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\mod_gestCalendario.ascx.designer.cs">
+      <DependentUpon>mod_gestCalendario.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\mod_login.ascx.cs">
       <DependentUpon>mod_login.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -905,6 +926,17 @@
   <ItemGroup>
     <TypeScriptCompile Include="Scripts\index.d.ts" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\analyzers\dotnet\cs\Microsoft.CodeAnalysis.VersionCheckAnalyzer.resources.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\analyzers\dotnet\Microsoft.CodeAnalysis.VersionCheckAnalyzer.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Humanizer.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -967,6 +999,16 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/GPW_Admin/Web.config b/GPW_Admin/Web.config
index d857720..6a3f7b0 100644
--- a/GPW_Admin/Web.config
+++ b/GPW_Admin/Web.config
@@ -137,6 +137,7 @@
     <add key="UtenteCdcConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Steamware_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
     <add key="VocabolarioConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GPW_vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />
     <add key="GPWConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GPW;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="DbConfConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GPW;Persist Security Info=True;User ID=sa;Password=keyhammer" />
     <add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
   </appSettings>
   <connectionStrings>
diff --git a/GPW_Admin/WebMasterPages/AjaxTitle.master.cs b/GPW_Admin/WebMasterPages/AjaxTitle.master.cs
index ef61e67..639a9b7 100644
--- a/GPW_Admin/WebMasterPages/AjaxTitle.master.cs
+++ b/GPW_Admin/WebMasterPages/AjaxTitle.master.cs
@@ -13,37 +13,43 @@ using SteamWare;
 public partial class AjaxTitle : System.Web.UI.MasterPage
 {
 
-    protected override void OnLoad(EventArgs e)
-    {
-        base.OnLoad(e);
-        Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina");
-    }
+  protected override void OnLoad(EventArgs e)
+  {
+    base.OnLoad(e);
+    Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina");
+  }
 
-    protected override void OnInit(EventArgs e)
-    {
-        base.OnInit(e);
-        Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx);
-        Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu);
-    }
+  protected override void OnInit(EventArgs e)
+  {
+    base.OnInit(e);
+    Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx);
+    Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu);
+    mod_pageSize1.eh_nuovaSize += Mod_pageSize1_eh_nuovaSize;
+  }
 
-    void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e)
-    {
-        // chiamo update del menu sx...
-        Mod_menuSx1.forzaUpdateMenu();
-    }
+  private void Mod_pageSize1_eh_nuovaSize(object sender, EventArgs e)
+  {
+    Response.Redirect(user_std.pagCorrente);
+  }
 
-    void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e)
-    {
-        // cambio stato visualizzaizone menù laterale...
-        Mod_menuSx1.Visible = !Mod_menuSx1.Visible;
-    }
+  void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e)
+  {
+    // chiamo update del menu sx...
+    Mod_menuSx1.forzaUpdateMenu();
+  }
 
-    protected override void OnUnload(EventArgs e)
-    {
-        base.OnUnload(e);
-        // svuoto tutti gli event handler inseriti...
-        Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx);
-        Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu);
+  void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e)
+  {
+    // cambio stato visualizzaizone menù laterale...
+    Mod_menuSx1.Visible = !Mod_menuSx1.Visible;
+  }
 
-    }
+  protected override void OnUnload(EventArgs e)
+  {
+    base.OnUnload(e);
+    // svuoto tutti gli event handler inseriti...
+    Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx);
+    Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu);
+
+  }
 }
diff --git a/GPW_Admin/WebUserControls/mod_gestCalendario.ascx b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx
new file mode 100644
index 0000000..29ddafb
--- /dev/null
+++ b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx
@@ -0,0 +1,102 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestCalendario.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_gestCalendario" %>
+<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagPrefix="uc1" TagName="mod_periodoAnalisi" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
+
+<div class="row small table-secondary">
+  <div class="col-5">
+    <uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" realtimeUpdate="true" />
+  </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 FESTIVI</asp:LinkButton>
+  </div>
+  <div class="col-2">
+    <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> ADD FERIE</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>
+  <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">
+  <div class="col-12">
+    <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"><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: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"><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>
+    </asp:GridView>
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getPeriod" TypeName="GPW_data.DS_ApplicazioneTableAdapters.CalendFesteFerieTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="upsertQuery" InsertMethod="Insert">
+      <DeleteParameters>
+        <asp:Parameter Name="Original_data" Type="DateTime" />
+      </DeleteParameters>
+      <InsertParameters>
+        <asp:Parameter Name="data" Type="DateTime" />
+        <asp:Parameter Name="codGiust" Type="String" />
+        <asp:Parameter Name="descrizione" Type="String" />
+      </InsertParameters>
+      <SelectParameters>
+        <asp:SessionParameter Name="dataInizio" SessionField="_inizio" Type="DateTime" />
+        <asp:SessionParameter Name="dataFine" SessionField="_fine" Type="DateTime" />
+      </SelectParameters>
+      <UpdateParameters>
+        <asp:Parameter Name="Original_data" Type="DateTime" />
+        <asp:Parameter Name="codGiust" Type="String" />
+        <asp:Parameter Name="descrizione" Type="String" />
+      </UpdateParameters>
+    </asp:ObjectDataSource>
+  </div>
+</div>
diff --git a/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.cs b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.cs
new file mode 100644
index 0000000..707db58
--- /dev/null
+++ b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.cs
@@ -0,0 +1,133 @@
+using GPW_data;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace GPW_Admin.WebUserControls
+{
+  public partial class mod_gestCalendario : System.Web.UI.UserControl
+  {
+
+    /// <summary>
+    /// effettua traduzione del lemma
+    /// </summary>
+    /// <param name="lemma"></param>
+    /// <returns></returns>
+    public string traduci(string lemma)
+    {
+      return user_std.UtSn.Traduci(lemma);
+    }
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      grView.PageSize = utils.pageSize;
+      if (!Page.IsPostBack)
+      {
+        anno = DateTime.Now.Year;
+        intervalloDate currAnno = new intervalloDate
+        {
+          inizio = DateTime.Today.AddYears(-2),
+          fine = DateTime.Today.AddYears(1)
+        };
+        mod_periodoAnalisi.intervalloAnalisi = currAnno;
+        lbtSetupYear.DataBind();
+        DateTime oggi = DateTime.Today;
+        inizioFerie = oggi.AddDays(1);
+        fineFerie = oggi.AddDays(2);
+      }
+    }
+    DateTime inizioFerie
+    {
+      get
+      {
+        DateTime answ = DateTime.Today;
+        DateTime.TryParse(txtInizio.Text, out answ);
+        return answ;
+      }
+      set
+      {
+        txtInizio.Text = value.ToString("yyyy-MM-dd");
+      }
+    }
+    DateTime fineFerie
+    {
+      get
+      {
+        DateTime answ = DateTime.Today;
+        DateTime.TryParse(txtFine.Text, out answ);
+        return answ;
+      }
+      set
+      {
+        txtFine.Text = value.ToString("yyyy-MM-dd");
+      }
+    }
+    /// <summary>
+    /// Anno corrente
+    /// </summary>
+    protected int anno
+    {
+      get
+      {
+        int answ = 0;
+        int.TryParse(txtAnno.Text, out answ);
+        return answ;
+      }
+      set
+      {
+        txtAnno.Text = value.ToString();
+      }
+    }
+    protected void lbtSetupYear_Click(object sender, EventArgs e)
+    {
+      setupFestAnno(anno);
+    }
+
+    private void setupFestAnno(int reqYear)
+    {
+      // recupero elenco festività
+      var elencoFest = calendarMan.elencoFestAnno(reqYear);
+      // inserisco 1:1
+      if (elencoFest.Count > 0)
+      {
+        foreach (var item in elencoFest)
+        {
+          DataProxy.DP.taCFF.upsertQuery(item.when, "FEST", item.what);
+        }
+      }
+      doUpdate();
+    }
+
+    public void doUpdate()
+    {
+      // aggiorno!
+      grView.DataBind();
+    }
+    protected void lbtShowFerie_Click(object sender, EventArgs e)
+    {
+      divInsFerie.Visible = !divInsFerie.Visible;
+    }
+
+    protected void lbtSave_Click(object sender, EventArgs e)
+    {
+      int numGG = (int)fineFerie.Subtract(inizioFerie).TotalDays;
+      DateTime currDate = inizioFerie;
+      int currYear = DateTime.Today.Year;
+      // aggiungo ferie x periodo selezionato...
+      for (int i = 0; i < numGG; i++)
+      {
+        var currDay = inizioFerie.AddDays(i).DayOfWeek;
+        // controllo che NON SIA sabato/domenica...
+        if (currDay != DayOfWeek.Saturday && currDay != DayOfWeek.Sunday)
+        {
+          DataProxy.DP.taCFF.upsertQuery(inizioFerie.AddDays(i), ddlCodGiustInsNew.SelectedValue, txtDescrizione.Text);
+        }
+      }
+      // rieseguo insert festività x anno del periodo...     
+      setupFestAnno(inizioFerie.Year);
+    }
+  }
+}
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.designer.cs
new file mode 100644
index 0000000..1e8486b
--- /dev/null
+++ b/GPW_Admin/WebUserControls/mod_gestCalendario.ascx.designer.cs
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace GPW_Admin.WebUserControls
+{
+
+
+  public partial class mod_gestCalendario
+  {
+
+    /// <summary>
+    /// Controllo mod_periodoAnalisi.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::mod_periodoAnalisi mod_periodoAnalisi;
+
+    /// <summary>
+    /// Controllo txtAnno.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.TextBox txtAnno;
+
+    /// <summary>
+    /// Controllo lbtSetupYear.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtSetupYear;
+
+    /// <summary>
+    /// Controllo lbtShowFerie.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtShowFerie;
+
+    /// <summary>
+    /// Controllo divInsFerie.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.HtmlControls.HtmlGenericControl divInsFerie;
+
+    /// <summary>
+    /// Controllo txtInizio.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.TextBox txtInizio;
+
+    /// <summary>
+    /// Controllo txtFine.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.TextBox txtFine;
+
+    /// <summary>
+    /// Controllo ddlCodGiustInsNew.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.DropDownList ddlCodGiustInsNew;
+
+    /// <summary>
+    /// Controllo txtDescrizione.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.TextBox txtDescrizione;
+
+    /// <summary>
+    /// Controllo lbtSave.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtSave;
+
+    /// <summary>
+    /// Controllo grView.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.GridView grView;
+
+    /// <summary>
+    /// Controllo ods.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+  }
+}
diff --git a/GPW_Admin/WebUserControls/mod_pageSize.ascx.cs b/GPW_Admin/WebUserControls/mod_pageSize.ascx.cs
index 2dbccbd..14cf855 100644
--- a/GPW_Admin/WebUserControls/mod_pageSize.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_pageSize.ascx.cs
@@ -7,53 +7,53 @@ using System.Web.UI.WebControls;
 
 namespace GPW_Admin.WebUserControls
 {
-    public partial class mod_pageSize : System.Web.UI.UserControl
-    {
+  public partial class mod_pageSize : System.Web.UI.UserControl
+  {
 
-        public event EventHandler eh_nuovaSize;
-        /// <summary>
-        /// dim pagina gridView
-        /// </summary>
-        protected int pageSize
+    public event EventHandler eh_nuovaSize;
+    /// <summary>
+    /// dim pagina gridView
+    /// </summary>
+    protected int pageSize
+    {
+      get
+      {
+        int answ = 20;
+        try
         {
-            get
-            {
-                int answ = 20;
-                try
-                {
-                    answ = SteamWare.memLayer.ML.IntSessionObj("pageSize");
-                    if (answ <= 0) answ = 20;
-                }
-                catch
-                { }
-                return answ;
-            }
-            set
-            {
-                SteamWare.memLayer.ML.setSessionVal("pageSize", value, true);
-            }
-        }
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!Page.IsPostBack)
-            {
-                ddlPageSize.SelectedValue = pageSize.ToString(); ;
-            }
-        }
-        /// <summary>
-        /// cambio page size!
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            // salvo pageSize desiderata
-            SteamWare.memLayer.ML.setSessionVal("pageSize", ddlPageSize.SelectedValue);
-            // raise dell'evento
-            if (eh_nuovaSize != null)
-            {
-                eh_nuovaSize(this, new EventArgs());
-            }
+          answ = SteamWare.memLayer.ML.IntSessionObj("pageSize");
+          if (answ <= 0) answ = 20;
         }
+        catch
+        { }
+        return answ;
+      }
+      set
+      {
+        SteamWare.memLayer.ML.setSessionVal("pageSize", value, true);
+      }
     }
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      if (!Page.IsPostBack)
+      {
+        ddlPageSize.SelectedValue = pageSize.ToString(); ;
+      }
+    }
+    /// <summary>
+    /// cambio page size!
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+    {
+      // salvo pageSize desiderata
+      SteamWare.memLayer.ML.setSessionVal("pageSize", ddlPageSize.SelectedValue);
+      // raise dell'evento
+      if (eh_nuovaSize != null)
+      {
+        eh_nuovaSize(this, new EventArgs());
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/GPW_Admin/gestCalendario.aspx b/GPW_Admin/gestCalendario.aspx
new file mode 100644
index 0000000..9a0c18c
--- /dev/null
+++ b/GPW_Admin/gestCalendario.aspx
@@ -0,0 +1,7 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" CodeBehind="gestCalendario.aspx.cs" Inherits="GPW_Admin.gestCalendario" %>
+
+<%@ Register Src="~/WebUserControls/mod_gestCalendario.ascx" TagPrefix="uc1" TagName="mod_gestCalendario" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="cph1" runat="server">
+  <uc1:mod_gestCalendario runat="server" ID="mod_gestCalendario" />
+</asp:Content>
diff --git a/GPW_Admin/gestCalendario.aspx.cs b/GPW_Admin/gestCalendario.aspx.cs
new file mode 100644
index 0000000..cbe9721
--- /dev/null
+++ b/GPW_Admin/gestCalendario.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace GPW_Admin
+{
+  public partial class gestCalendario : System.Web.UI.Page
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+  }
+}
\ No newline at end of file
diff --git a/GPW_Admin/gestCalendario.aspx.designer.cs b/GPW_Admin/gestCalendario.aspx.designer.cs
new file mode 100644
index 0000000..63b651d
--- /dev/null
+++ b/GPW_Admin/gestCalendario.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace GPW_Admin
+{
+
+
+  public partial class gestCalendario
+  {
+
+    /// <summary>
+    /// Controllo mod_gestCalendario.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::GPW_Admin.WebUserControls.mod_gestCalendario mod_gestCalendario;
+  }
+}
diff --git a/GPW_Admin/gestOrario.aspx.designer.cs b/GPW_Admin/gestOrario.aspx.designer.cs
index f0c162c..36fc70d 100644
--- a/GPW_Admin/gestOrario.aspx.designer.cs
+++ b/GPW_Admin/gestOrario.aspx.designer.cs
@@ -1,24 +1,26 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
+// <generato automaticamente>
+//     Codice generato da uno strumento.
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace GPW_Admin {
-    
-    
-    public partial class gestOrario {
-        
-        /// <summary>
-        /// mod_adminOrario1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::GPW_Admin.WebUserControls.mod_adminOrario mod_adminOrario1;
-    }
+namespace GPW_Admin
+{
+
+
+  public partial class gestOrario
+  {
+
+    /// <summary>
+    /// Controllo mod_adminOrario1.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::GPW_Admin.WebUserControls.mod_adminOrario mod_adminOrario1;
+  }
 }
diff --git a/GPW_Admin/packages.config b/GPW_Admin/packages.config
index 5e181bc..540f0ee 100644
--- a/GPW_Admin/packages.config
+++ b/GPW_Admin/packages.config
@@ -18,6 +18,11 @@
   <package id="Microsoft.AspNet.SessionState.SessionStateModule" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.8" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.CodeQuality.Analyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.NetCore.Analyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.NetFramework.Analyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
   <package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
   <package id="Modernizr" version="2.8.3" targetFramework="net462" />
diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs
index 6f1c8d5..faec144 100644
--- a/GPW_Data/DS_Applicazione.Designer.cs
+++ b/GPW_Data/DS_Applicazione.Designer.cs
@@ -5519,6 +5519,8 @@ namespace GPW_data {
             
             private global::System.Data.DataColumn columndata;
             
+            private global::System.Data.DataColumn columncodGiust;
+            
             private global::System.Data.DataColumn columndescrizione;
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5562,6 +5564,14 @@ namespace GPW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn codGiustColumn {
+                get {
+                    return this.columncodGiust;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public global::System.Data.DataColumn descrizioneColumn {
@@ -5607,10 +5617,11 @@ namespace GPW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public CalendFesteFerieRow AddCalendFesteFerieRow(System.DateTime data, string descrizione) {
+            public CalendFesteFerieRow AddCalendFesteFerieRow(System.DateTime data, string codGiust, string descrizione) {
                 CalendFesteFerieRow rowCalendFesteFerieRow = ((CalendFesteFerieRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         data,
+                        codGiust,
                         descrizione};
                 rowCalendFesteFerieRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowCalendFesteFerieRow);
@@ -5642,6 +5653,7 @@ namespace GPW_data {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             internal void InitVars() {
                 this.columndata = base.Columns["data"];
+                this.columncodGiust = base.Columns["codGiust"];
                 this.columndescrizione = base.Columns["descrizione"];
             }
             
@@ -5650,12 +5662,16 @@ namespace GPW_data {
             private void InitClass() {
                 this.columndata = new global::System.Data.DataColumn("data", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columndata);
+                this.columncodGiust = new global::System.Data.DataColumn("codGiust", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columncodGiust);
                 this.columndescrizione = new global::System.Data.DataColumn("descrizione", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columndescrizione);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columndata}, true));
                 this.columndata.AllowDBNull = false;
                 this.columndata.Unique = true;
+                this.columncodGiust.AllowDBNull = false;
+                this.columncodGiust.MaxLength = 5;
                 this.columndescrizione.MaxLength = 50;
             }
             
@@ -12887,6 +12903,17 @@ namespace GPW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string codGiust {
+                get {
+                    return ((string)(this[this.tableCalendFesteFerie.codGiustColumn]));
+                }
+                set {
+                    this[this.tableCalendFesteFerie.codGiustColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public string descrizione {
@@ -25413,32 +25440,38 @@ SELECT idxRA, idxDipendente, idxFase, inizio, fine, descrizione, oreTot, importo
             tableMapping.SourceTable = "Table";
             tableMapping.DataSetTable = "CalendFesteFerie";
             tableMapping.ColumnMappings.Add("data", "data");
+            tableMapping.ColumnMappings.Add("codGiust", "codGiust");
             tableMapping.ColumnMappings.Add("descrizione", "descrizione");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[CalendFesteFerie] WHERE (([data] = @Original_data) AND ((@IsNu" +
-                "ll_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_desc" +
-                "rizione)))";
+            this._adapter.DeleteCommand.CommandText = "DELETE FROM [CalendFesteFerie] WHERE (([data] = @Original_data) AND ([codGiust] =" +
+                " @Original_codGiust) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR" +
+                " ([descrizione] = @Original_descrizione)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_codGiust", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codGiust", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[CalendFesteFerie] ([data], [descrizione]) VALUES (@data, @desc" +
-                "rizione);\r\nSELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
+            this._adapter.InsertCommand.CommandText = "INSERT INTO [CalendFesteFerie] ([data], [codGiust], [descrizione]) VALUES (@data," +
+                " @codGiust, @descrizione);\r\nSELECT data, codGiust, descrizione FROM CalendFesteF" +
+                "erie WHERE (data = @data)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@data", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@data", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codGiust", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codGiust", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[CalendFesteFerie] SET [data] = @data, [descrizione] = @descrizione WHERE (([data] = @Original_data) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)));
-SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [CalendFesteFerie] SET [data] = @data, [codGiust] = @codGiust, [descrizione] = @descrizione WHERE (([data] = @Original_data) AND ([codGiust] = @Original_codGiust) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)));
+SELECT data, codGiust, descrizione FROM CalendFesteFerie WHERE (data = @data)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@data", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@data", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codGiust", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codGiust", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_codGiust", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codGiust", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
@@ -25453,11 +25486,32 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
         [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 = new global::System.Data.SqlClient.SqlCommand[4];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT data, descrizione FROM dbo.CalendFesteFerie";
+            this._commandCollection[0].CommandText = "SELECT * \r\nFROM CalendFesteFerie";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[1].Connection = this.Connection;
+            this._commandCollection[1].CommandText = "dbo.stp_CFF_deleteQuery";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[2].Connection = this.Connection;
+            this._commandCollection[2].CommandText = "dbo.stp_CFF_getPeriod";
+            this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataInizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataFine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[3].Connection = this.Connection;
+            this._commandCollection[3].CommandText = "dbo.stp_CFF_upsertQuery";
+            this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codGiust", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -25484,6 +25538,29 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
             return dataTable;
         }
         
+        [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, false)]
+        public virtual DS_Applicazione.CalendFesteFerieDataTable getPeriod(global::System.Nullable<global::System.DateTime> dataInizio, global::System.Nullable<global::System.DateTime> dataFine) {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
+            if ((dataInizio.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(dataInizio.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((dataFine.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dataFine.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            DS_Applicazione.CalendFesteFerieDataTable dataTable = new DS_Applicazione.CalendFesteFerieDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [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")]
@@ -25517,15 +25594,21 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
         [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.Delete, true)]
-        public virtual int Delete(System.DateTime Original_data, string Original_descrizione) {
+        public virtual int Delete(System.DateTime Original_data, string Original_codGiust, string Original_descrizione) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((System.DateTime)(Original_data));
-            if ((Original_descrizione == null)) {
-                this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
-                this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value;
+            if ((Original_codGiust == null)) {
+                throw new global::System.ArgumentNullException("Original_codGiust");
             }
             else {
-                this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
-                this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_descrizione));
+                this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_codGiust));
+            }
+            if ((Original_descrizione == null)) {
+                this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_descrizione));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -25547,13 +25630,19 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
         [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.Insert, true)]
-        public virtual int Insert(System.DateTime data, string descrizione) {
+        public virtual int Insert(System.DateTime data, string codGiust, string descrizione) {
             this.Adapter.InsertCommand.Parameters[0].Value = ((System.DateTime)(data));
-            if ((descrizione == null)) {
-                this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value;
+            if ((codGiust == null)) {
+                throw new global::System.ArgumentNullException("codGiust");
             }
             else {
-                this.Adapter.InsertCommand.Parameters[1].Value = ((string)(descrizione));
+                this.Adapter.InsertCommand.Parameters[1].Value = ((string)(codGiust));
+            }
+            if ((descrizione == null)) {
+                this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[2].Value = ((string)(descrizione));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -25575,22 +25664,34 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(System.DateTime data, string descrizione, System.DateTime Original_data, string Original_descrizione) {
+        public virtual int Update(System.DateTime data, string codGiust, string descrizione, System.DateTime Original_data, string Original_codGiust, string Original_descrizione) {
             this.Adapter.UpdateCommand.Parameters[0].Value = ((System.DateTime)(data));
+            if ((codGiust == null)) {
+                throw new global::System.ArgumentNullException("codGiust");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(codGiust));
+            }
             if ((descrizione == null)) {
-                this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(descrizione));
+                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(descrizione));
+            }
+            this.Adapter.UpdateCommand.Parameters[3].Value = ((System.DateTime)(Original_data));
+            if ((Original_codGiust == null)) {
+                throw new global::System.ArgumentNullException("Original_codGiust");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_codGiust));
             }
-            this.Adapter.UpdateCommand.Parameters[2].Value = ((System.DateTime)(Original_data));
             if ((Original_descrizione == null)) {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_descrizione));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_descrizione));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -25612,8 +25713,76 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string descrizione, System.DateTime Original_data, string Original_descrizione) {
-            return this.Update(Original_data, descrizione, Original_data, Original_descrizione);
+        public virtual int Update(string codGiust, string descrizione, System.DateTime Original_data, string Original_codGiust, string Original_descrizione) {
+            return this.Update(Original_data, codGiust, descrizione, Original_data, Original_codGiust, Original_descrizione);
+        }
+        
+        [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")]
+        public virtual int deleteQuery(global::System.Nullable<global::System.DateTime> Original_data) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+            if ((Original_data.HasValue == true)) {
+                command.Parameters[1].Value = ((System.DateTime)(Original_data.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            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")]
+        public virtual int upsertQuery(global::System.Nullable<global::System.DateTime> Original_data, string codGiust, string descrizione) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+            if ((Original_data.HasValue == true)) {
+                command.Parameters[1].Value = ((System.DateTime)(Original_data.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((codGiust == null)) {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[2].Value = ((string)(codGiust));
+            }
+            if ((descrizione == null)) {
+                command.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[3].Value = ((string)(descrizione));
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
         }
     }
     
diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd
index e63a09c..a3ea245 100644
--- a/GPW_Data/DS_Applicazione.xsd
+++ b/GPW_Data/DS_Applicazione.xsd
@@ -1955,9 +1955,10 @@ SELECT idxRA, idxDipendente, idxFase, inizio, fine, descrizione, oreTot, importo
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.CalendFesteFerie" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[CalendFesteFerie] WHERE (([data] = @Original_data) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)))</CommandText>
+                    <CommandText>DELETE FROM [CalendFesteFerie] WHERE (([data] = @Original_data) AND ([codGiust] = @Original_codGiust) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)))</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_data" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_data" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_codGiust" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codGiust" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_descrizione" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -1965,28 +1966,32 @@ SELECT idxRA, idxDipendente, idxFase, inizio, fine, descrizione, oreTot, importo
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[CalendFesteFerie] ([data], [descrizione]) VALUES (@data, @descrizione);
-SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)</CommandText>
+                    <CommandText>INSERT INTO [CalendFesteFerie] ([data], [codGiust], [descrizione]) VALUES (@data, @codGiust, @descrizione);
+SELECT data, codGiust, descrizione FROM CalendFesteFerie WHERE (data = @data)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@data" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@data" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@codGiust" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codGiust" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT data, descrizione FROM dbo.CalendFesteFerie</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT * 
+FROM CalendFesteFerie</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[CalendFesteFerie] SET [data] = @data, [descrizione] = @descrizione WHERE (([data] = @Original_data) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)));
-SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)</CommandText>
+                    <CommandText>UPDATE [CalendFesteFerie] SET [data] = @data, [codGiust] = @codGiust, [descrizione] = @descrizione WHERE (([data] = @Original_data) AND ([codGiust] = @Original_codGiust) AND ((@IsNull_descrizione = 1 AND [descrizione] IS NULL) OR ([descrizione] = @Original_descrizione)));
+SELECT data, codGiust, descrizione FROM CalendFesteFerie WHERE (data = @data)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@data" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@data" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@codGiust" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codGiust" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_data" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_data" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="data" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_codGiust" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codGiust" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_descrizione" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="descrizione" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -1996,9 +2001,47 @@ SELECT data, descrizione FROM CalendFesteFerie WHERE (data = @data)</CommandText
             </MainSource>
             <Mappings>
               <Mapping SourceColumn="data" DataSetColumn="data" />
+              <Mapping SourceColumn="codGiust" DataSetColumn="codGiust" />
               <Mapping SourceColumn="descrizione" DataSetColumn="descrizione" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_CFF_deleteQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_CFF_deleteQuery</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="datetime" DbType="DateTime" Direction="Input" ParameterName="@Original_data" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_CFF_getPeriod" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getPeriod" GetMethodModifier="Public" GetMethodName="getPeriod" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getPeriod" UserSourceName="getPeriod">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_CFF_getPeriod</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="datetime" DbType="DateTime" Direction="Input" ParameterName="@dataInizio" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dataFine" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_CFF_upsertQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="upsertQuery" Modifier="Public" Name="upsertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="upsertQuery">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_CFF_upsertQuery</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="datetime" DbType="DateTime" Direction="Input" ParameterName="@Original_data" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@codGiust" Precision="0" ProviderType="NVarChar" Scale="0" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AnagOrariTableAdapter" GeneratorDataComponentClassName="AnagOrariTableAdapter" Name="AnagOrari" UserDataComponentName="AnagOrariTableAdapter">
             <MainSource>
@@ -3175,6 +3218,13 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra)
           <xs:complexType>
             <xs:sequence>
               <xs:element name="data" msprop:Generator_ColumnVarNameInTable="columndata" msprop:Generator_ColumnPropNameInRow="data" msprop:Generator_ColumnPropNameInTable="dataColumn" msprop:Generator_UserColumnName="data" type="xs:dateTime" />
+              <xs:element name="codGiust" msprop:Generator_ColumnVarNameInTable="columncodGiust" msprop:Generator_ColumnPropNameInRow="codGiust" msprop:Generator_ColumnPropNameInTable="codGiustColumn" msprop:Generator_UserColumnName="codGiust">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="5" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
               <xs:element name="descrizione" msprop:Generator_ColumnVarNameInTable="columndescrizione" msprop:Generator_ColumnPropNameInRow="descrizione" msprop:Generator_ColumnPropNameInTable="descrizioneColumn" msprop:Generator_UserColumnName="descrizione" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss
index f55977b..ef4f7cc 100644
--- a/GPW_Data/DS_Applicazione.xss
+++ b/GPW_Data/DS_Applicazione.xss
@@ -4,27 +4,27 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="473" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="408" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Timbrature" ZOrder="24" X="279" Y="76" Height="345" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TimbratureExpl" ZOrder="14" X="604" Y="119" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagDevices" ZOrder="17" X="937" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:Dipendenti" ZOrder="6" X="279" Y="478" Height="457" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:AnagClienti" ZOrder="8" X="1234" Y="528" Height="438" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
-    <Shape ID="DesignTable:AnagProgetti" ZOrder="2" X="886" Y="976" Height="490" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="23" X="579" Y="943" Height="153" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagFasi" ZOrder="1" X="871" Y="528" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:v_logCommUt" ZOrder="9" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:RegAttivita" ZOrder="3" X="598" Y="591" Height="352" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="19" X="584" Y="1151" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagOrari" ZOrder="12" X="278" Y="1055" Height="343" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TimbMeseExpl" ZOrder="16" X="1249" Y="134" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:Giustificativi" ZOrder="15" X="564" Y="1326" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="13" X="82" Y="1313" Height="134" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="5" X="-3" Y="176" Height="704" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="636" />
-    <Shape ID="DesignTable:regAttDayExpl" ZOrder="10" X="19" Y="886" Height="381" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="7" X="1236" Y="992" Height="286" Width="258" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:RegistroEventi" ZOrder="4" X="85" Y="1476" Height="153" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Timbrature" ZOrder="24" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TimbratureExpl" ZOrder="16" X="604" Y="119" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagDevices" ZOrder="18" X="937" Y="134" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:Dipendenti" ZOrder="8" X="279" Y="478" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagClienti" ZOrder="10" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagProgetti" ZOrder="4" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="23" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:AnagFasi" ZOrder="3" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:v_logCommUt" ZOrder="11" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RegAttivita" ZOrder="5" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="1" X="597" Y="1126" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:AnagOrari" ZOrder="14" X="278" Y="1055" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TimbMeseExpl" ZOrder="17" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Giustificativi" ZOrder="2" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="15" X="82" Y="1313" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="7" X="-3" Y="176" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:regAttDayExpl" ZOrder="12" X="19" Y="886" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="9" X="1236" Y="992" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:RegistroEventi" ZOrder="6" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="25" LineWidth="11">
@@ -35,19 +35,19 @@
         </Point>
         <Point>
           <X>385</X>
-          <Y>421</Y>
+          <Y>343</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AnagProgetti_AnagClienti" ZOrder="11" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AnagProgetti_AnagClienti" ZOrder="13" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1234</X>
-          <Y>947</Y>
+          <Y>909</Y>
         </Point>
         <Point>
           <X>1216</X>
-          <Y>947</Y>
+          <Y>909</Y>
         </Point>
         <Point>
           <X>1216</X>
@@ -71,11 +71,11 @@
         </Point>
         <Point>
           <X>1224</X>
-          <Y>968</Y>
+          <Y>909</Y>
         </Point>
         <Point>
           <X>1171</X>
-          <Y>968</Y>
+          <Y>909</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -83,18 +83,22 @@
       <RoutePoints>
         <Point>
           <X>871</X>
-          <Y>649</Y>
+          <Y>574</Y>
         </Point>
         <Point>
-          <X>814</X>
-          <Y>649</Y>
+          <X>854</X>
+          <Y>574</Y>
+        </Point>
+        <Point>
+          <X>854</X>
+          <Y>591</Y>
         </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:FK_RegAttivita_Dipendenti" ZOrder="20" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>532</X>
+          <X>579</X>
           <Y>743</Y>
         </Point>
         <Point>
@@ -103,7 +107,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Dipendenti_AnagOrari" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Dipendenti_AnagOrari" ZOrder="19" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>324</X>
@@ -111,7 +115,7 @@
         </Point>
         <Point>
           <X>324</X>
-          <Y>935</Y>
+          <Y>859</Y>
         </Point>
       </RoutePoints>
     </Connector>
diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs
index 5390047..3e55a82 100644
--- a/GPW_Data/DataProxy.cs
+++ b/GPW_Data/DataProxy.cs
@@ -26,6 +26,7 @@ namespace GPW_data
     public DS_ApplicazioneTableAdapters.stp_DipendentiAndAnomalieTableAdapter taDipAnom;
     public DS_ApplicazioneTableAdapters.TE_RA_ExplTableAdapter taTimbRegAtt;
     public DS_ApplicazioneTableAdapters.RegistroEventiTableAdapter taRE;
+    public DS_ApplicazioneTableAdapters.CalendFesteFerieTableAdapter taCFF;
 
     public DS_UtilityTableAdapters.nextValContatoreTableAdapter taNextVal;
     public DS_UtilityTableAdapters.AnagKeyValueTableAdapter taAKV;
@@ -56,6 +57,7 @@ namespace GPW_data
       taDipAnom = new DS_ApplicazioneTableAdapters.stp_DipendentiAndAnomalieTableAdapter();
       taTimbRegAtt = new DS_ApplicazioneTableAdapters.TE_RA_ExplTableAdapter();
       taRE = new DS_ApplicazioneTableAdapters.RegistroEventiTableAdapter();
+      taCFF = new DS_ApplicazioneTableAdapters.CalendFesteFerieTableAdapter();
       taNextVal = new DS_UtilityTableAdapters.nextValContatoreTableAdapter();
       taAKV = new DS_UtilityTableAdapters.AnagKeyValueTableAdapter();
       taVSProjFasiSearch = new DS_UtilityTableAdapters.stp_VSProjFasi_searchTableAdapter();
@@ -85,6 +87,7 @@ namespace GPW_data
       taDipAnom.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
       taTimbRegAtt.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
       taRE.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
+      taCFF.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
       taNextVal.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
       taAKV.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
       taVSProjFasiSearch.Connection.ConnectionString = memLayer.ML.confReadString("GPWConnectionString");
diff --git a/Jenkinsfile b/Jenkinsfile
index a94efcf..919c4c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=4095']) {
+        withEnv(['NEXT_BUILD_NUMBER=4097']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'GPW'