Completata review commesse UT

GPW_Commesse/Content/Style.css

@@ -7,20 +7,26 @@
 /* Move down content because we have a fixed navbar that is 50px tall */
 body {
   /*font-family: 'Open Sans Condensed', sans-serif;*/
+  font-family: 'Roboto', sans-serif;
   /*font-family: 'Roboto Condensed', sans-serif;*/
 }
-/* Wrapping element */
-/* Set some basic padding to keep content from hitting the edges */
-/*.body-content {
-  padding-left: 15px;
-  padding-right: 15px;
-}*/
 /* Set widths on the form inputs since otherwise they're 100% wide */
 input,
 select,
 textarea {
   max-width: 280px;
 }
+.textCondens {
+  font-family: 'Roboto Condensed', sans-serif;
+  /*font-family: 'Open Sans Condensed', sans-serif;*/
+}
+.textNormal {
+  font-family: 'Roboto', sans-serif;
+  /*font-family: 'Open Sans', sans-serif;*/
+}
+.textBig {
+  font-size: 1.5em;
+}
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
   .jumbotron {

GPW_Commesse/Content/Style.less

@@ -7,69 +7,74 @@
 
 /* Move down content because we have a fixed navbar that is 50px tall */
 body {
-  /*font-family: 'Open Sans Condensed', sans-serif;*/
-  /*font-family: 'Roboto Condensed', sans-serif;*/
+    /*font-family: 'Open Sans Condensed', sans-serif;*/
+    font-family: 'Roboto', sans-serif;
+    /*font-family: 'Roboto Condensed', sans-serif;*/
 }
 
-/* Wrapping element */
-/* Set some basic padding to keep content from hitting the edges */
-/*.body-content {
-  padding-left: 15px;
-  padding-right: 15px;
-}*/
-
 /* Set widths on the form inputs since otherwise they're 100% wide */
 input,
 select,
 textarea {
-  max-width: 280px;
+    max-width: 280px;
 }
 
+.textCondens {
+    font-family: 'Roboto Condensed', sans-serif;
+    /*font-family: 'Open Sans Condensed', sans-serif;*/
+}
+
+.textNormal {
+    font-family: 'Roboto', sans-serif;
+    /*font-family: 'Open Sans', sans-serif;*/
+}
+
+.textBig {
+    font-size: 1.5em;
+}
 
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
-  .jumbotron {
-    margin-top: 20px;
-  }
+    .jumbotron {
+        margin-top: 20px;
+    }
 
-  .body-content {
-    padding: 0;
-  }
+    .body-content {
+        padding: 0;
+    }
 
-  /* Set widths on the form inputs since otherwise they're 100% wide */
-  input,
-  select,
-  textarea {
-    max-width: 100%;
-  }
+    /* Set widths on the form inputs since otherwise they're 100% wide */
+    input,
+    select,
+    textarea {
+        max-width: 100%;
+    }
 }
 
-
 .elTimbSmart {
-  padding: 0.2em;
-  font-size: 1.1em;
-  line-height: 1.3em;
+    padding: 0.2em;
+    font-size: 1.1em;
+    line-height: 1.3em;
 }
 
 .ui-input-btn input {
-  opacity: .5;
+    opacity: .5;
 }
 
-
 * {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-*:before,
-*:after {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
-.logo
-{
+*:before,
+*:after {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.logo {
     background-image: url(../images/logo_sw.png);
     -khtml-opacity: .50;
     -moz-opacity: .50;
@@ -80,11 +85,11 @@ textarea {
     width: 800px;
     height: 300px;
     margin: 50px auto 50px auto;
-    vertical-align:middle;
+    vertical-align: middle;
     background-repeat: no-repeat;
 }
-.logo:hover
-{
+
+.logo:hover {
     background-image: url(../images/logo_sw.png);
     -khtml-opacity: 1.0;
     -moz-opacity: 1.0;
@@ -95,26 +100,25 @@ textarea {
     width: 800px;
     height: 300px;
     margin: 50px auto 50px auto;
-    vertical-align:middle;
+    vertical-align: middle;
     background-repeat: no-repeat;
 }
-.bodyCenter
-{
+
+.bodyCenter {
     vertical-align: middle;
     text-align: center;
     height: 100%;
     width: 100%;
 }
-.centerMenu
-{
+
+.centerMenu {
     background-color: White;
     text-align: center;
     border-width: thin;
     border-style: groove;
     border-color: Blue;
 }
-A:hover
-{
-    color: red;
-}
 
+A:hover {
+    color: red;
+}

GPW_Commesse/Content/Style.min.css

@@ -1 +1 @@
-input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}
+body{font-family:'Roboto',sans-serif;}input,select,textarea{max-width:280px;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}

GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx

@@ -3,39 +3,49 @@
 <%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc1" %>
 <%@ Register Src="mod_autocomplete.ascx" TagPrefix="uc2" TagName="mod_autocomplete" %>
 
-<asp:Panel runat="server" ID="pnlHeader" class="bg-success text-light text-center py-1 px-2" Style="font-size: 1.8em;">
-    <asp:Label runat="server" ID="lblTitle" />
-    <div class="divDx" style="display: block;">
-        <asp:LinkButton runat="server" ID="lnkNew" CausesValidation="False" ToolTip='<%# traduci("AddNew") %>' OnClick="lnkNew_Click" CssClass="text-warning"><i class="fa fa-plus-square" aria-hidden="true"></i></asp:LinkButton>
+<asp:Panel runat="server" ID="pnlHeader" class="row bg-success text-light text-center py-1">
+    <div class="col-4">
+        <asp:DropDownList runat="server" ID="ddlGruppo" DataSourceID="odsGruppi" DataTextField="label" AutoPostBack="true" OnSelectedIndexChanged="ddlGruppo_SelectedIndexChanged" DataValueField="value" CssClass="btn btn-secondary btn-sm btn-block" />
+        <asp:ObjectDataSource runat="server" ID="odsGruppi" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
+            TypeName="GPW_data.DS_UtilityTableAdapters.v_selGruppiTableAdapter"></asp:ObjectDataSource>
+    </div>
+    <div class="col-4">
+        <asp:Label runat="server" ID="lblSubtitle" CssClass="font-weight-bold textBig"><%: valoreDateTime.ToString("dddd dd") %></asp:Label>
+        <br />
+        <asp:Label runat="server" ID="lblTitle"><%: valoreDateTime.ToString("MMMM yyyy") %></asp:Label>
+    </div>
+    <div class="col-4">
+        <asp:LinkButton runat="server" ID="lnkNew" CausesValidation="False" ToolTip='<%# traduci("AddNew") %>' OnClick="lnkNew_Click" CssClass="btn btn-sm btn-block btn-warning"><i class="fa fa-plus" aria-hidden="true"></i></asp:LinkButton>
     </div>
 </asp:Panel>
-<div class="dataBlockReset">
-    <asp:GridView ID="grView" runat="server" DataSourceID="odsRA" AutoGenerateColumns="False" OnRowDeleted="grView_RowDeleted"
-        OnRowCommand="grView_RowCommand" DataKeyNames="idxRA" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing"
-        ShowHeader="false" Width="100%" OnRowUpdated="grView_RowUpdated" CssClass="table table-sm table-striped table-borderless">
-        <EditRowStyle CssClass="bg-primary" />
-        <FooterStyle CssClass="bg-warning" />
-        <RowStyle CssClass="text-light" />
-        <EmptyDataTemplate>
-            <div style="background-color: #ACACAC;">
-                Nessun record COMMESSA
-            </div>
-        </EmptyDataTemplate>
-        <Columns>
-            <asp:TemplateField ShowHeader="False">
-                <ItemTemplate>
-                    <asp:LinkButton runat="server" ID="lnkClona" CausesValidation="False" CommandArgument='<%# Eval("idxRA") %>' CommandName="Update" ToolTip='<%# traduci("Duplica") %>' Visible='<%# enableFull %>' OnClick="lnkClona_Click" CssClass="btn btn-sm btn-primary"><i class="fa fa-magic fa-2x" aria-hidden="true"></i></asp:LinkButton>
-                </ItemTemplate>
-                <EditItemTemplate>
-                </EditItemTemplate>
-                <FooterTemplate>
-                </FooterTemplate>
-                <HeaderTemplate>
-                </HeaderTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField HeaderText="Record Commesse">
-                <ItemTemplate>
-                    <asp:LinkButton ID="lnkEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit") %>' CssClass="noLink" Enabled='<%# enableFull %>'>
+<div class="row">
+    <div class="col-12">
+        <asp:GridView ID="grView" runat="server" DataSourceID="odsRA" AutoGenerateColumns="False" OnRowDeleted="grView_RowDeleted"
+            OnRowCommand="grView_RowCommand" DataKeyNames="idxRA" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing"
+            ShowHeader="false" Width="100%" OnRowUpdated="grView_RowUpdated" CssClass="table table-sm table-striped table-borderless" OnRowCancelingEdit="grView_RowCancelingEdit">
+            <EditRowStyle CssClass="bg-primary" />
+            <FooterStyle CssClass="bg-warning" />
+            <RowStyle CssClass="text-light" />
+            <EmptyDataTemplate>
+                <div style="background-color: #ACACAC;">
+                    Nessun record COMMESSA
+                </div>
+            </EmptyDataTemplate>
+            <Columns>
+                <asp:TemplateField ShowHeader="False">
+                    <ItemTemplate>
+                        <asp:LinkButton runat="server" ID="lnkClona" CausesValidation="False" CommandArgument='<%# Eval("idxRA") %>' CommandName="Update" ToolTip='<%# traduci("Duplica") %>' Visible='<%# enableFull %>' OnClick="lnkClona_Click" CssClass="btn btn-sm btn-primary"><i class="fa fa-magic fa-2x" aria-hidden="true"></i></asp:LinkButton>
+                    </ItemTemplate>
+                    <EditItemTemplate>
+                    </EditItemTemplate>
+                    <FooterTemplate>
+                    </FooterTemplate>
+                    <HeaderTemplate>
+                    </HeaderTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField HeaderText="Record Commesse">
+                    <ItemTemplate>
+                        <asp:LinkButton ID="lnkEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit") %>' CssClass="noLink" Enabled='<%# enableFull %>'>
             <div class="row mx-0">
               <div class="col-9 text-left">
                 <div class="text-dark">
@@ -56,184 +66,178 @@
             </div>
             <div class="row mx-0">
               <div class="col-12">
-                <div class="text-secondary" style="font-size:0.9em;">
+                <div class="text-secondary textCondens">
                   <%# Eval("descrizione").ToString().Replace(Environment.NewLine,"<br />").Replace("\n","<br />") %>
                 </div>
               </div>
             </div>
-                    </asp:LinkButton>
-                </ItemTemplate>
-                <EditItemTemplate>
-                    <div class="row text-light">
-                        <div class="col-12 text-left">
-                            <label for="ddlGruppo" class="small">
-                                Gruppo
-                            </label>
-                            <asp:DropDownList runat="server" ID="ddlGruppo" DataSourceID="odsGruppi" DataTextField="label" OnSelectedIndexChanged="ddlGruppo_SelectedIndexChanged" DataValueField="value" SelectedValue='<%# Eval("gruppo") %>' CssClass="btn btn-secondary btn-sm btn-block" />
-                        </div>
-                        <div class="col-8 text-left">
+                        </asp:LinkButton>
+                    </ItemTemplate>
+                    <EditItemTemplate>
+                        <div class="row text-light">
+                            <div class="col-12 text-left">
+                            </div>
+                            <div class="col-8 text-left">
 
-                            <div>
-                                <label for="ddlProgetto" style="font-size: x-small;">
-                                    Progetto
-                                </label>
-                                <asp:DropDownList ID="ddlProgetto" runat="server" DataSourceID="odsProgetto" DataTextField="label" DataValueField="value"
-                                    AutoPostBack="True" OnSelectedIndexChanged="ddlProgetto_SelectedIndexChanged" Font-Size="8pt" Width="100%" CssClass="btn btn-dark">
-                                </asp:DropDownList>
+                                <div>
+                                    <label for="ddlProgetto" style="font-size: x-small;">
+                                        Progetto
+                                    </label>
+                                    <asp:DropDownList ID="ddlProgetto" runat="server" DataSourceID="odsProgetto" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlProgetto_SelectedIndexChanged" CssClass="btn btn-dark btn-sm btn-block">
+                                    </asp:DropDownList>
+                                </div>
+                                <div class="my-1">
+                                    <label for="ddlFase" style="font-size: x-small;">
+                                        Fase
+                                    </label>
+                                    <asp:DropDownList ID="ddlFase" runat="server" DataSourceID="odsFase" DataTextField="label" DataValueField="value" OnDataBound="ddlFase_DataBound" CssClass="btn btn-light btn-sm btn-block">
+                                    </asp:DropDownList>
+                                </div>
                             </div>
-                            <div class="my-1">
-                                <label for="ddlFase" style="font-size: x-small;">
-                                    Fase
-                                </label>
-                                <asp:DropDownList ID="ddlFase" runat="server" DataSourceID="odsFase" DataTextField="label" DataValueField="value" Font-Size="8pt"
-                                    OnDataBound="ddlFase_DataBound" Width="100%" CssClass="btn btn-light">
-                                </asp:DropDownList>
+                            <div class="col-4 text-right">
+                                <label for="txtSearchFase" style="font-size: x-small;">
+                                    <-- Search</label>
+                                <br />
+                                <asp:TextBox runat="server" ID="txtSearchFase" AutoPostBack="true" Width="100%" Font-Size="8pt" OnTextChanged="txtSearchFase_TextChanged" TextMode="MultiLine" />
                             </div>
                         </div>
-                        <div class="col-4 text-right">
-                            <label for="txtSearchFase" style="font-size: x-small;">
-                                <-- Search</label>
-                            <br />
-                            <asp:TextBox runat="server" ID="txtSearchFase" AutoPostBack="true" Width="100%" Font-Size="8pt" OnTextChanged="txtSearchFase_TextChanged" TextMode="MultiLine" />
-                        </div>
-                    </div>
-                    <div class="row text-light my-2">
-                        <div class="col-12">
-                            Periodo
-                        </div>
-                        <div class="col-6 text-left">
-                            <uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
-                        </div>
-                        <div class="col-6 text-right">
-                            <uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
-                        </div>
-                    </div>
-                    <div class="row text-light my-2">
-                        <div class="col-12">
-                            <label for="txtDescrizione" style="font-size: x-small;">
-                                descrizione
-                            </label>
-                            <asp:TextBox ID="txtDescrizione" runat="server" Text='<%# Bind("descrizione") %>' TextMode="MultiLine" Height="6em" Width="100%" />
-                        </div>
-                    </div>
-                    <div class="row my-2">
-                        <div class="col-6 text-center">
-                            <asp:Button runat="server" ID="btnInsert" Text="Aggiorna" CssClass="btn btn-success btn-block ui-corner-all shadowBox btnNew" CommandName="Update"
-                                CausesValidation="true" />
-                        </div>
-                        <div class="col-6 text-center">
-                            <asp:Button runat="server" ID="btnInsertCancel" Text="Annulla" CssClass="btn btn-danger btn-block ui-corner-all shadowBox btnChiudi" CommandName="Cancel" />
-                        </div>
-                    </div>
-                </EditItemTemplate>
-                <FooterTemplate>
-                    <div class="row text-light">
-                        <div class="col-8 text-left">
-                            <div>
-                                <label for="ddlProgetto" style="font-size: x-small;">
-                                    Progetto
-                                </label>
-                                <asp:DropDownList ID="ddlProgetto" runat="server" DataSourceID="odsProgetto" DataTextField="label" DataValueField="value"
-                                    AutoPostBack="True" OnSelectedIndexChanged="ddlProgetto_SelectedIndexChanged" Font-Size="8pt" Width="100%" CssClass="btn btn-dark">
-                                </asp:DropDownList>
+                        <div class="row text-light my-2">
+                            <div class="col-12">
+                                Periodo
                             </div>
-                            <div class="my-1">
-                                <label for="ddlFase" style="font-size: x-small;">
-                                    Fase
-                                </label>
-                                <asp:DropDownList ID="ddlFase" runat="server" DataSourceID="odsFase" DataTextField="label" DataValueField="value" Font-Size="8pt"
-                                    OnDataBound="ddlFase_DataBound" Width="100%" CssClass="btn btn-light">
-                                </asp:DropDownList>
+                            <div class="col-6 text-left">
+                                <uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
+                            </div>
+                            <div class="col-6 text-right">
+                                <uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
                             </div>
                         </div>
-                        <div class="col-4 text-right">
-                            <label for="txtSearchFase" style="font-size: x-small;">
-                                <-- Search</label>
-                            <br />
-                            <asp:TextBox runat="server" ID="txtSearchFase" AutoPostBack="true" Width="100%" Font-Size="8pt" OnTextChanged="txtSearchFase_TextChanged" TextMode="MultiLine" />
+                        <div class="row text-light my-2">
+                            <div class="col-12">
+                                <label for="txtDescrizione" style="font-size: x-small;">
+                                    descrizione
+                                </label>
+                                <asp:TextBox ID="txtDescrizione" runat="server" Text='<%# Bind("descrizione") %>' TextMode="MultiLine" Height="6em" Width="100%" />
+                            </div>
                         </div>
-                    </div>
-                    <div class="row text-light my-2">
-                        <div class="col-12">
-                            Periodo
+                        <div class="row my-2">
+                            <div class="col-6 text-center">
+                                <asp:Button runat="server" ID="btnInsert" Text="Aggiorna" CssClass="btn btn-success btn-block ui-corner-all shadowBox btnNew" CommandName="Update"
+                                    CausesValidation="true" />
+                            </div>
+                            <div class="col-6 text-center">
+                                <asp:Button runat="server" ID="btnInsertCancel" Text="Annulla" CssClass="btn btn-danger btn-block ui-corner-all shadowBox btnChiudi" CommandName="Cancel" />
+                            </div>
                         </div>
-                        <div class="col-6 text-left">
-                            <uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
+                    </EditItemTemplate>
+                    <FooterTemplate>
+                        <div class="row text-light">
+                            <div class="col-8 text-left">
+                                <div>
+                                    <label for="ddlProgetto" style="font-size: x-small;">
+                                        Progetto
+                                    </label>
+                                    <asp:DropDownList ID="ddlProgetto" runat="server" DataSourceID="odsProgetto" DataTextField="label" DataValueField="value"
+                                        AutoPostBack="True" OnSelectedIndexChanged="ddlProgetto_SelectedIndexChanged" Font-Size="8pt" Width="100%" CssClass="btn btn-dark">
+                                    </asp:DropDownList>
+                                </div>
+                                <div class="my-1">
+                                    <label for="ddlFase" style="font-size: x-small;">
+                                        Fase
+                                    </label>
+                                    <asp:DropDownList ID="ddlFase" runat="server" DataSourceID="odsFase" DataTextField="label" DataValueField="value" Font-Size="8pt"
+                                        OnDataBound="ddlFase_DataBound" Width="100%" CssClass="btn btn-light">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <div class="col-4 text-right">
+                                <label for="txtSearchFase" style="font-size: x-small;">
+                                    <-- Search</label>
+                                <br />
+                                <asp:TextBox runat="server" ID="txtSearchFase" AutoPostBack="true" Width="100%" Font-Size="8pt" OnTextChanged="txtSearchFase_TextChanged" TextMode="MultiLine" />
+                            </div>
                         </div>
-                        <div class="col-6 text-right">
-                            <uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
+                        <div class="row text-light my-2">
+                            <div class="col-12">
+                                Periodo
+                            </div>
+                            <div class="col-6 text-left">
+                                <uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
+                            </div>
+                            <div class="col-6 text-right">
+                                <uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
+                            </div>
                         </div>
-                    </div>
-                    <div class="row text-light my-2">
-                        <div class="col-12">
-                            <label for="txtDescrizione" style="font-size: x-small;">
-                                descrizione
-                            </label>
-                            <asp:TextBox ID="txtDescrizione" runat="server" Text='<%# Bind("descrizione") %>' TextMode="MultiLine" Height="6em" Width="100%" />
+                        <div class="row text-light my-2">
+                            <div class="col-12">
+                                <label for="txtDescrizione" style="font-size: x-small;">
+                                    descrizione
+                                </label>
+                                <asp:TextBox ID="txtDescrizione" runat="server" Text='<%# Bind("descrizione") %>' TextMode="MultiLine" Height="6em" Width="100%" />
+                            </div>
                         </div>
-                    </div>
-                    <div class="row my-2">
-                        <div class="col-6 text-center">
-                            <asp:Button runat="server" ID="btnInsert" Text="Salva" CssClass="btn btn-success btn-block ui-corner-all shadowBox btnNew" CommandName="Insert"
-                                CausesValidation="true" />
+                        <div class="row my-2">
+                            <div class="col-6 text-center">
+                                <asp:Button runat="server" ID="btnInsert" Text="Salva" CssClass="btn btn-success btn-block ui-corner-all shadowBox btnNew" CommandName="Insert"
+                                    CausesValidation="true" />
+                            </div>
+                            <div class="col-6 text-center">
+                                <asp:Button runat="server" ID="btnInsertCancel" Text="Annulla" CssClass="btn btn-danger btn-block ui-corner-all shadowBox btnChiudi" CommandName="Cancel" />
+                            </div>
                         </div>
-                        <div class="col-6 text-center">
-                            <asp:Button runat="server" ID="btnInsertCancel" Text="Annulla" CssClass="btn btn-danger btn-block ui-corner-all shadowBox btnChiudi" CommandName="Cancel" />
-                        </div>
-                    </div>
-                </FooterTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField ShowHeader="False">
-                <ItemTemplate>
-                    <asp:LinkButton runat="server" ID="lnkDelete" CausesValidation="False" CommandArgument='<%# Eval("idxRA") %>' CommandName="Delete" ToolTip='<%# traduci("Delete") %>' Visible='<%# enableFull %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash fa-2x" aria-hidden="true"></i></asp:LinkButton><asp:ConfirmButtonExtender ID="cbeLnk" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="lnkDelete"></asp:ConfirmButtonExtender>
-                </ItemTemplate>
-                <EditItemTemplate>
-                </EditItemTemplate>
-                <FooterTemplate>
-                </FooterTemplate>
-            </asp:TemplateField>
-        </Columns>
-    </asp:GridView>
-    <asp:ObjectDataSource ID="odsRA" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_ApplicazioneTableAdapters.regAttDayExplTableAdapter"
-        DeleteMethod="deleteQuery" InsertMethod="insertQuery" OnInserted="odsRA_Inserted" UpdateMethod="updateQuery" OnUpdating="odsRA_Updating">
-        <DeleteParameters>
-            <asp:Parameter Name="Original_idxRA" Type="Int32" />
-        </DeleteParameters>
-        <SelectParameters>
-            <asp:SessionParameter Name="idxDipendente" SessionField="idxDipCurr" Type="Int32" />
-            <asp:SessionParameter Name="dataRif" SessionField="dataRif" Type="DateTime" />
-        </SelectParameters>
-        <InsertParameters>
-            <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
-            <asp:Parameter Name="idxFase" Type="Int32" />
-            <asp:Parameter Name="inizio" Type="DateTime" />
-            <asp:Parameter Name="fine" Type="DateTime" />
-            <asp:Parameter Name="descrizione" Type="String" />
-            <asp:Parameter Name="importo" Type="Decimal" DefaultValue="0" />
-        </InsertParameters>
-        <UpdateParameters>
-            <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
-            <asp:Parameter Name="idxFase" Type="Int32" />
-            <asp:Parameter Name="inizio" Type="DateTime" />
-            <asp:Parameter Name="fine" Type="DateTime" />
-            <asp:Parameter Name="descrizione" Type="String" />
-            <asp:Parameter Name="importo" Type="Decimal" DefaultValue="0" />
-            <asp:Parameter Name="Original_idxRA" Type="Int32" />
-        </UpdateParameters>
-    </asp:ObjectDataSource>
-    <asp:ObjectDataSource ID="odsProgetto" runat="server" SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selProgettiTableAdapter">
-        <SelectParameters>
-            <asp:SessionParameter SessionField="gruppoSel" DefaultValue="" Name="conditio" Type="String" />
-            <asp:Parameter DefaultValue="true" Name="soloAttivi" Type="Boolean" />
-        </SelectParameters>
-    </asp:ObjectDataSource>
-    <asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio"
-        TypeName="GPW_data.DS_UtilityTableAdapters.v_selFasiOptTableAdapter">
-        <SelectParameters>
-            <asp:SessionParameter SessionField="idxProjSel" DefaultValue="0" Name="conditio" Type="Int32" />
-            <asp:Parameter DefaultValue="false" Name="soloAttivi" Type="Boolean" />
-        </SelectParameters>
-    </asp:ObjectDataSource>
-    <asp:ObjectDataSource runat="server" ID="odsGruppi" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
-        TypeName="GPW_data.DS_UtilityTableAdapters.v_selGruppiTableAdapter"></asp:ObjectDataSource>
+                    </FooterTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField ShowHeader="False">
+                    <ItemTemplate>
+                        <asp:LinkButton runat="server" ID="lnkDelete" CausesValidation="False" CommandArgument='<%# Eval("idxRA") %>' CommandName="Delete" ToolTip='<%# traduci("Delete") %>' Visible='<%# enableFull %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash fa-2x" aria-hidden="true"></i></asp:LinkButton><asp:ConfirmButtonExtender ID="cbeLnk" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="lnkDelete"></asp:ConfirmButtonExtender>
+                    </ItemTemplate>
+                    <EditItemTemplate>
+                    </EditItemTemplate>
+                    <FooterTemplate>
+                    </FooterTemplate>
+                </asp:TemplateField>
+            </Columns>
+        </asp:GridView>
+        <asp:ObjectDataSource ID="odsRA" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_ApplicazioneTableAdapters.regAttDayExplTableAdapter"
+            DeleteMethod="deleteQuery" InsertMethod="insertQuery" OnInserted="odsRA_Inserted" UpdateMethod="updateQuery" OnUpdating="odsRA_Updating">
+            <DeleteParameters>
+                <asp:Parameter Name="Original_idxRA" Type="Int32" />
+            </DeleteParameters>
+            <SelectParameters>
+                <asp:SessionParameter Name="idxDipendente" SessionField="idxDipCurr" Type="Int32" />
+                <asp:SessionParameter Name="dataRif" SessionField="dataRif" Type="DateTime" />
+            </SelectParameters>
+            <InsertParameters>
+                <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
+                <asp:Parameter Name="idxFase" Type="Int32" />
+                <asp:Parameter Name="inizio" Type="DateTime" />
+                <asp:Parameter Name="fine" Type="DateTime" />
+                <asp:Parameter Name="descrizione" Type="String" />
+                <asp:Parameter Name="importo" Type="Decimal" DefaultValue="0" />
+            </InsertParameters>
+            <UpdateParameters>
+                <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
+                <asp:Parameter Name="idxFase" Type="Int32" />
+                <asp:Parameter Name="inizio" Type="DateTime" />
+                <asp:Parameter Name="fine" Type="DateTime" />
+                <asp:Parameter Name="descrizione" Type="String" />
+                <asp:Parameter Name="importo" Type="Decimal" DefaultValue="0" />
+                <asp:Parameter Name="Original_idxRA" Type="Int32" />
+            </UpdateParameters>
+        </asp:ObjectDataSource>
+        <asp:ObjectDataSource ID="odsProgetto" runat="server" SelectMethod="getByGruppo" TypeName="GPW_data.DS_UtilityTableAdapters.v_selProgettiTableAdapter">
+            <SelectParameters>
+                <asp:SessionParameter SessionField="gruppoSel" DefaultValue="" Name="gruppo" Type="String" />
+                <%--<asp:ControlParameter ControlID="ddlGruppo" DefaultValue="" Name="gruppo" Type="String" />--%>
+                <asp:Parameter DefaultValue="true" Name="soloAttivi" Type="Boolean" />
+            </SelectParameters>
+        </asp:ObjectDataSource>
+        <asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio"
+            TypeName="GPW_data.DS_UtilityTableAdapters.v_selFasiOptTableAdapter">
+            <SelectParameters>
+                <asp:SessionParameter SessionField="idxProjSel" DefaultValue="0" Name="conditio" Type="Int32" />
+                <asp:Parameter DefaultValue="false" Name="soloAttivi" Type="Boolean" />
+            </SelectParameters>
+        </asp:ObjectDataSource>
+    </div>
 </div>

GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs

@@ -176,7 +176,8 @@ namespace GPW_Commesse.WebUserControls
             set
             {
                 memLayer.ML.setSessionVal("dataRif", value);
-                lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", value);
+                lblTitle.Text = string.Format("{0:dd/MM/yyyy}", value);
+                lblSubtitle.Text = string.Format("{0:dddd}", value);
             }
         }
 
@@ -329,15 +330,18 @@ namespace GPW_Commesse.WebUserControls
             while (li != null)
             {
                 li = ddlFase_int.Items.FindByValue("0");
-                try
+                if (li != null)
                 {
-                    li.Attributes.Add("style", "color:gray;");
-                    li.Attributes.Add("disabled", "true");
-                    li.Value = "-1";
-                    li.Text = string.Format("[ {0} ]", li.Text);
+                    try
+                    {
+                        li.Attributes.Add("style", "color:gray;");
+                        li.Attributes.Add("disabled", "true");
+                        li.Value = "-1";
+                        li.Text = string.Format("[ {0} ]", li.Text);
+                    }
+                    catch
+                    { }
                 }
-                catch
-                { }
             }
             try
             {
@@ -356,8 +360,6 @@ namespace GPW_Commesse.WebUserControls
             // salvo in session idxProjSel!
             DropDownList ddlGrp_int = (DropDownList)sender;
             gruppoSel = ddlGrp_int.SelectedValue;
-            // ricarico dati progetto
-            odsProgetto.DataBind();
             // se in insert salvo orari e testo...
             DateTime inizio = DateTime.Now;
             DateTime fine = DateTime.Now;
@@ -376,7 +378,6 @@ namespace GPW_Commesse.WebUserControls
                 fine = ((mod_dateTime)grView.Rows[idx].FindControl("dtFine")).valoreDateTime;
                 descr = ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text;
             }
-            refreshControlli();
             // se in insert riporto orari e testo...
             if (stato == statoControllo.insert)
             {
@@ -385,8 +386,13 @@ namespace GPW_Commesse.WebUserControls
                 ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text = descr;
                 try
                 {
+                    DropDownList ddlProj_int = (DropDownList)grView.FooterRow.FindControl("ddlProgetto");
+                    ddlProj_int.SelectedIndex = 0;
+                    ddlProj_int.DataBind();
+                    idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue);
                     DropDownList ddlFase_int = (DropDownList)grView.FooterRow.FindControl("ddlFase");
                     ddlFase_int.SelectedIndex = 1;
+                    ddlFase_int.DataBind();
                 }
                 catch
                 { }
@@ -400,10 +406,15 @@ namespace GPW_Commesse.WebUserControls
                 ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text = descr;
                 try
                 {
+                    DropDownList ddlProj_int = (DropDownList)grView.Rows[idx].FindControl("ddlProgetto");
+                    ddlProj_int.SelectedIndex = 0;
+                    ddlProj_int.DataBind();
+                    idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue);
                     DropDownList ddlFase_int = (DropDownList)grView.Rows[idx].FindControl("ddlFase");
                     ddlFase_int.SelectedIndex = 1;
+                    ddlFase_int.DataBind();
                 }
-                catch
+                catch (Exception exc)
                 { }
             }
         }
@@ -496,6 +507,11 @@ namespace GPW_Commesse.WebUserControls
             DataProxy.DP.taRA.Insert(idxDip, idxFase, inizio, fine, descr, 0);
         }
 
+        protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+        {
+            ddlGruppo.Visible = false;
+        }
+
         /// <summary>
         /// generico comando riga
         /// </summary>
@@ -530,24 +546,29 @@ namespace GPW_Commesse.WebUserControls
         {
             // controllo la riga
             GridViewRow riga = e.Row;
-            if (grView.EditIndex >= 0 || grView.ShowFooter)
+            if ((grView.EditIndex >= 0 && riga.RowIndex == grView.EditIndex) || grView.ShowFooter)
             {
-                try
+                //pre-seleziono idx progetto x ods fase...
+                DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto");
+                if (idxProjSel >= 0 && (ddlProj_int != null))
                 {
-                    //pre-seleziono idx progetto x ods fase...
-                    DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto");
-                    if (idxProjSel >= 0 && (ddlProj_int != null))
+                    try
                     {
                         ddlProj_int.SelectedValue = idxProjSel.ToString();
                     }
-                    DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase");
-                    if (idxFaseSel >= 0 && (ddlFase_int != null))
+                    catch
+                    { }
+                }
+                DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase");
+                if (idxFaseSel >= 0 && (ddlFase_int != null))
+                {
+                    try
                     {
                         ddlFase_int.SelectedValue = idxFaseSel.ToString();
                     }
+                    catch
+                    { }
                 }
-                catch
-                { }
             }
         }
 
@@ -559,6 +580,7 @@ namespace GPW_Commesse.WebUserControls
         protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e)
         {
             updateControl();
+            ddlGruppo.Visible = false;
         }
 
         /// <summary>
@@ -571,8 +593,16 @@ namespace GPW_Commesse.WebUserControls
             grView.SelectedIndex = e.NewEditIndex;
             int idxRASel = Convert.ToInt32(grView.SelectedDataKey["idxRA"]);
             // salvo in sessione valori selezionati
-            idxFaseSel = DataProxy.DP.taRA.getByKey(idxRASel)[0].idxFase;
-            idxProjSel = idxPrjByFase(idxFaseSel);
+            var tabRAD = DataProxy.DP.taRAExpl.getByKey(idxRASel);
+            if (tabRAD.Rows.Count > 0)
+            {
+                idxFaseSel = tabRAD[0].idxFase;
+                idxProjSel = tabRAD[0].idxProgetto;
+                // imposto gruppo
+                ddlGruppo.Visible = true;
+                ddlGruppo.SelectedValue = tabRAD[0].gruppo;
+                gruppoSel = tabRAD[0].gruppo;
+            }
         }
 
         /// <summary>
@@ -583,6 +613,7 @@ namespace GPW_Commesse.WebUserControls
         protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e)
         {
             updateControl();
+            ddlGruppo.Visible = false;
         }
 
         protected void lnkClona_Click(object sender, EventArgs e)
@@ -607,6 +638,7 @@ namespace GPW_Commesse.WebUserControls
         /// <param name="e"></param>
         protected void lnkNew_Click(object sender, EventArgs e)
         {
+            ddlGruppo.Visible = true;
             createNew();
         }
 
@@ -638,7 +670,9 @@ namespace GPW_Commesse.WebUserControls
             {
                 refreshControlli();
                 pnlHeader.Visible = enableFull;
-                lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", valoreDateTime);
+                lblTitle.Text = string.Format("{0:dd/MM/yyyy}", valoreDateTime);
+                lblSubtitle.Text = string.Format("{0:dddd}", valoreDateTime);
+                ddlGruppo.Visible = false;
             }
         }
 

GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.designer.cs

@@ -23,6 +23,33 @@ namespace GPW_Commesse.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlHeader;
 
+        /// <summary>
+        /// Controllo ddlGruppo.
+        /// </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 ddlGruppo;
+
+        /// <summary>
+        /// Controllo odsGruppi.
+        /// </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 odsGruppi;
+
+        /// <summary>
+        /// Controllo lblSubtitle.
+        /// </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.Label lblSubtitle;
+
         /// <summary>
         /// Controllo lblTitle.
         /// </summary>
@@ -76,14 +103,5 @@ namespace GPW_Commesse.WebUserControls
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsFase;
-
-        /// <summary>
-        /// Controllo odsGruppi.
-        /// </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 odsGruppi;
     }
 }

GPW_Commesse/WebUserControls/mod_commUtLog.ascx

@@ -115,8 +115,8 @@
                                         </div>
                                     </HeaderTemplate>
                                     <ItemTemplate>
-                                        <div class="text-right">
-                                            <asp:Label ID="Label1" runat="server" Text='<%# Eval("Progetti") %>' CssClass='<%# cssClassProgetti %>' Style="max-width: 20em;" />
+                                        <div class="text-right textCondens">
+                                            <asp:Label ID="Label1" runat="server" Text='<%# Eval("Progetti") %>' CssClass='<%# cssClassProgetti %>' Style="max-width: 20em;" ToolTip='<%# Eval("Progetti") %>' />
                                         </div>
                                     </ItemTemplate>
                                     <ItemStyle HorizontalAlign="Right" />

GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs

@@ -10,348 +10,395 @@ using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using SteamWare;
 
-
 public partial class mod_periodoAnalisi : System.Web.UI.UserControl
 {
-  #region area protected
+    #region Protected Fields
 
-  protected intervalloDate _intervallo;
+    protected intervalloDate _intervallo;
 
-  public string uid
-  {
-    get
+    #endregion Protected Fields
+
+    #region Public Events
+
+    public event EventHandler eh_doUpdate;
+
+    #endregion Public Events
+
+    #region Protected Properties
+
+    /// <summary>
+    /// definisce se sia da mostrare il selettore delle ore nel controllo
+    /// </summary>
+    protected bool mostraSelOra
     {
-      return this.UniqueID.Replace("$", "_").Replace("-", "_");
+        get
+        {
+            bool answ = false;
+            if (memLayer.ML.isInSessionObject("mostraSelOra"))
+            {
+                answ = memLayer.ML.BoolSessionObj("mostraSelOra");
+            }
+            else
+            {
+                // leggo da sessione e salvo...
+                try
+                {
+                    answ = memLayer.ML.confReadBool("mostraSelOra");
+                }
+                catch
+                { }
+                memLayer.ML.setSessionVal("mostraSelOra", answ);
+            }
+            return answ;
+        }
     }
-  }
 
-  /// <summary>
-  /// avvio componente
-  /// </summary>
-  /// <param name="e"></param>
-  protected override void OnInit(EventArgs e)
-  {
-    base.OnInit(e);
-    setIntervallo();
-    setDurataMin();
-  }
-  /// <summary>
-  /// definisce se sia da mostrare il selettore delle ore nel controllo
-  /// </summary>
-  protected bool mostraSelOra
-  {
-    get
+    #endregion Protected Properties
+
+    #region Public Properties
+
+    public intervalloDate intervalloAnalisi
     {
-      bool answ = false;
-      if (memLayer.ML.isInSessionObject("mostraSelOra"))
-      {
-        answ = memLayer.ML.BoolSessionObj("mostraSelOra");
-      }
-      else
-      {
-        // leggo da sessione e salvo...
+        get
+        {
+            intervalloDate answ = new intervalloDate();
+            if (memLayer.ML.isInSessionObject("_intervallo"))
+            {
+                answ = (intervalloDate)Session["_intervallo"];
+            }
+            return answ;
+        }
+        set
+        {
+            intervalloDate interv = value;
+            Session["_intervallo"] = interv;
+            Session["_inizio"] = interv.inizio;
+            Session["_fine"] = interv.fine;
+            aggiornaDateMostrate(false);
+        }
+    }
+
+    /// <summary>
+    /// imposta realtime update (non mostra button am fa subito update)
+    /// </summary>
+    public bool realtimeUpdate
+    {
+        get
+        {
+            return memLayer.ML.BoolSessionObj("rltUpdatePeriodo");
+        }
+        set
+        {
+            memLayer.ML.setSessionVal("rltUpdatePeriodo", value);
+        }
+    }
+
+    public string uid
+    {
+        get
+        {
+            return this.UniqueID.Replace("$", "_").Replace("-", "_");
+        }
+    }
+
+    #endregion Public Properties
+
+    #region Private Methods
+
+    /// <summary>
+    /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...)
+    /// </summary>
+    /// <param name="doReportUpdate"></param>
+    private void aggiornaDateMostrate(bool doReportUpdate)
+    {
+        scriviDate();
+        if (doReportUpdate)
+        {
+            reportUpdate();
+        }
+    }
+
+    private void aggiornaPeriodo()
+    {
+        _intervallo = new intervalloDate();
+        // calcolo tempi arrotondati
+        int oraInizio = 0;
+        int oraFine = 0;
+        if (mostraSelOra)
+        {
+            oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue);
+            oraFine = Convert.ToInt32(ddlOraFine.SelectedValue);
+        }
+        _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio);
+        _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine);
+        verificaCoerenzaDate();
+        int _durataMin;
+        _durataMin = Convert.ToInt32(txtDurataMin.Text);
+        Session["_durataMin"] = _durataMin;
+        reportUpdate();
+    }
+
+    /// <summary>
+    /// controlla se aggiornare subito o mostrare update (a seconda del valore di realtime update...)
+    /// </summary>
+    private void checkIfUpdate()
+    {
+        // se richiesto realtime
+        if (realtimeUpdate)
+        {
+            aggiornaPeriodo();
+            // nascondo btn update
+            btnUpdate.Visible = false;
+        }
+        else
+        {
+            // altrimenti mostro btn update
+            btnUpdate.Visible = true;
+        }
+    }
+
+    /// <summary>
+    /// scrive nuove date in controllo
+    /// </summary>
+    private void scriviDate()
+    {
+        // se intervallo non è valorizzato leggo da sessione...
+        if (!_intervallo.isValid)
+        {
+            _intervallo = intervalloAnalisi;
+        }
+        txtInizio.Text = _intervallo.inizio.ToShortDateString();
+        ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
+        txtFine.Text = _intervallo.fine.ToShortDateString();
+        ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
+        if (mostraSelOra)
+        {
+            ddlOraInizio.Visible = true;
+            ddlOraFine.Visible = true;
+        }
+        else
+        {
+            ddlOraInizio.Visible = false;
+            ddlOraFine.Visible = false;
+        }
+    }
+
+    /// <summary>
+    /// imposta durata minima
+    /// </summary>
+    private void setDurataMin()
+    {
+        int _durataMin = 0;
         try
         {
-          answ = memLayer.ML.confReadBool("mostraSelOra");
+            if (memLayer.ML.isInSessionObject("_intervallo"))
+            {
+                _durataMin = memLayer.ML.IntSessionObj("_durataMin");
+            }
         }
         catch
-        { }
-        memLayer.ML.setSessionVal("mostraSelOra", answ);
-      }
-      return answ;
+        {
+            _durataMin = 0;
+            Session["_durataMin"] = _durataMin;
+        }
+        txtDurataMin.Text = _durataMin.ToString();
     }
-  }
 
-  /// <summary>
-  /// gestione del selettore rapido dell'intervallo temporale...
-  /// </summary>
-  /// <param name="sender"></param>
-  /// <param name="e"></param>
-  protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
-  {
-    // verifico cosa sia cambiato ed imposto date...
-    datario _datario = new datario();
-    switch (DropDownList1.SelectedValue)
+    /// <summary>
+    /// imposta intervallo da sessione o di default
+    /// </summary>
+    private void setIntervallo()
     {
-      case "oggi":
-        _intervallo = _datario.giornata(DateTime.Now);
-        break;
-      case "ieri":
-        _intervallo = _datario.giornata(DateTime.Now.AddDays(-1));
-        break;
-      case "ultimi 7gg":
-        _intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
-        break;
-      case "questa settimana":
-        _intervallo = _datario.questaSett(DateTime.Now);
-        break;
-      case "ultimi 30gg":
-        _intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
-        break;
-      case "questo mese":
-        _intervallo = _datario.questoMese(DateTime.Now);
-        break;
-      case "mese precedente":
-        _intervallo = _datario.mesePrecedente(DateTime.Now);
-        break;
-      case "questo anno":
-        _intervallo = _datario.estremiAnno(DateTime.Now);
-        break;
-      case "1 anno":
-        _intervallo = _datario.ultimiGiorni(DateTime.Now, 366);
-        break;
-      default:
-        break;
+        intervalloDate _intervallo;
+        try
+        {
+            if (memLayer.ML.isInSessionObject("_intervallo"))
+            {
+                _intervallo = (intervalloDate)Session["_intervallo"];
+            }
+        }
+        catch
+        {
+            _intervallo = new intervalloDate();
+            _intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom"));
+            _intervallo.fine = DateTime.Now.AddDays(1);
+            Session["_intervallo"] = _intervallo;
+            Session["_inizio"] = _intervallo.inizio;
+            Session["_fine"] = _intervallo.fine;
+        }
+        scriviDate();
     }
-    if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine))
-    {
-      verificaCoerenzaDate();
-      aggiornaDateMostrate(realtimeUpdate);
-      // mostro btn update
-      btnUpdate.Visible = !realtimeUpdate;
-    }
-  }
-  /// <summary>
-  /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...)
-  /// </summary>
-  /// <param name="doReportUpdate"></param>
-  private void aggiornaDateMostrate(bool doReportUpdate)
-  {
-    scriviDate();
-    if (doReportUpdate)
-    {
-      reportUpdate();
-    }
-  }
-  /// <summary>
-  /// scrive nuove date in controllo
-  /// </summary>
-  private void scriviDate()
-  {
-    // se intervallo non è valorizzato leggo da sessione...
-    if (!_intervallo.isValid)
-    {
-      _intervallo = intervalloAnalisi;
-    }
-    txtInizio.Text = _intervallo.inizio.ToShortDateString();
-    ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
-    txtFine.Text = _intervallo.fine.ToShortDateString();
-    ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
-    if (mostraSelOra)
-    {
-      ddlOraInizio.Visible = true;
-      ddlOraFine.Visible = true;
-    }
-    else
-    {
-      ddlOraInizio.Visible = false;
-      ddlOraFine.Visible = false;
-    }
-  }
-  /// <summary>
-  /// imposta intervallo da sessione o di default
-  /// </summary>
-  private void setIntervallo()
-  {
-    intervalloDate _intervallo;
-    try
-    {
-      _intervallo = (intervalloDate)Session["_intervallo"];
-    }
-    catch
-    {
-      _intervallo = new intervalloDate();
-      _intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom"));
-      _intervallo.fine = DateTime.Now.AddDays(1);
-      Session["_intervallo"] = _intervallo;
-      Session["_inizio"] = _intervallo.inizio;
-      Session["_fine"] = _intervallo.fine;
-    }
-    scriviDate();
-  }
-  /// <summary>
-  /// imposta durata minima
-  /// </summary>
-  private void setDurataMin()
-  {
-    int _durataMin;
-    try
-    {
-      _durataMin = (int)Session["_durataMin"];
-    }
-    catch
-    {
-      _durataMin = 0;
-      Session["_durataMin"] = _durataMin;
-    }
-    txtDurataMin.Text = _durataMin.ToString();
-  }
-  protected void Page_Load(object sender, EventArgs e)
-  {
-    lblPeriodo.Text = "Periodo";
-    txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati";
-    txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati";
-    lblDurataMin.Text = "Visualizza eventi con durata superiore a";
-  }
 
-
-  private void aggiornaPeriodo()
-  {
-    _intervallo = new intervalloDate();
-    // calcolo tempi arrotondati
-    int oraInizio = 0;
-    int oraFine = 0;
-    if (mostraSelOra)
+    /// <summary>
+    /// verifica che le date dell'intervallo siano coerenti (inizio < fine)
+    /// </summary>
+    private void verificaCoerenzaDate()
     {
-      oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue);
-      oraFine = Convert.ToInt32(ddlOraFine.SelectedValue);
+        // controllo date siano coerenti (fine > inizio)...
+        if (_intervallo.inizio >= _intervallo.fine)
+        {
+            // controllo non siano date successive ad oggi...
+            if (_intervallo.fine > DateTime.Now)
+            {
+                _intervallo.fine = DateTime.Now;
+            }
+            _intervallo.fine = _intervallo.inizio.AddDays(1);
+        }
+        //intervalloAnalisi = _intervallo;
+        aggiornaDateMostrate(false);
     }
-    _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio);
-    _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine);
-    verificaCoerenzaDate();
-    int _durataMin;
-    _durataMin = Convert.ToInt32(txtDurataMin.Text);
-    Session["_durataMin"] = _durataMin;
-    reportUpdate();
 
-  }
-  /// <summary>
-  /// verifica che le date dell'intervallo siano coerenti (inizio < fine)
-  /// </summary>
-  private void verificaCoerenzaDate()
-  {
-    // controllo date siano coerenti (fine > inizio)...
-    if (_intervallo.inizio >= _intervallo.fine)
+    #endregion Private Methods
+
+    #region Protected Methods
+
+    /// <summary>
+    /// in questo caso faccio udpate periodo mostrato
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void btnUpdate_Click(object sender, EventArgs e)
     {
-      // controllo non siano date successive ad oggi...
-      if (_intervallo.fine > DateTime.Now)
-      {
-        _intervallo.fine = DateTime.Now;
-      }
-      _intervallo.fine = _intervallo.inizio.AddDays(1);
+        aggiornaPeriodo();
+        // nascondo btn update
+        btnUpdate.Visible = false;
     }
-    //intervalloAnalisi = _intervallo;
-    aggiornaDateMostrate(false);
-  }
-  /// <summary>
-  /// evento cambio testo data inizio
-  /// </summary>
-  /// <param name="sender"></param>
-  /// <param name="e"></param>
-  protected void txtInizio_TextChanged(object sender, EventArgs e)
-  {
-    // imposto il selettore a discesa...
-    setPeriodoFree();
-    checkIfUpdate();
-  }
-  /// <summary>
-  /// evento cambio testo data fine
-  /// </summary>
-  /// <param name="sender"></param>
-  /// <param name="e"></param>
-  protected void txtFine_TextChanged(object sender, EventArgs e)
-  {
-    // imposto il selettore a discesa...
-    setPeriodoFree();
-    checkIfUpdate();
-  }
-  /// <summary>
-  /// controlla se aggiornare subito o mostrare update (a seconda del valore di realtime update...)
-  /// </summary>
-  private void checkIfUpdate()
-  {
-    // se richiesto realtime
-    if (realtimeUpdate)
+
+    /// <summary>
+    /// gestione del selettore rapido dell'intervallo temporale...
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
     {
-      aggiornaPeriodo();
-      // nascondo btn update
-      btnUpdate.Visible = false;
+        // verifico cosa sia cambiato ed imposto date...
+        datario _datario = new datario();
+        switch (DropDownList1.SelectedValue)
+        {
+            case "oggi":
+                _intervallo = _datario.giornata(DateTime.Now);
+                break;
+
+            case "ieri":
+                _intervallo = _datario.giornata(DateTime.Now.AddDays(-1));
+                break;
+
+            case "ultimi 7gg":
+                _intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
+                break;
+
+            case "questa settimana":
+                _intervallo = _datario.questaSett(DateTime.Now);
+                break;
+
+            case "ultimi 30gg":
+                _intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
+                break;
+
+            case "questo mese":
+                _intervallo = _datario.questoMese(DateTime.Now);
+                break;
+
+            case "mese precedente":
+                _intervallo = _datario.mesePrecedente(DateTime.Now);
+                break;
+
+            case "questo anno":
+                _intervallo = _datario.estremiAnno(DateTime.Now);
+                break;
+
+            case "1 anno":
+                _intervallo = _datario.ultimiGiorni(DateTime.Now, 366);
+                break;
+
+            default:
+                break;
+        }
+        if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine))
+        {
+            verificaCoerenzaDate();
+            aggiornaDateMostrate(realtimeUpdate);
+            // mostro btn update
+            btnUpdate.Visible = !realtimeUpdate;
+        }
     }
-    else
+
+    /// <summary>
+    /// avvio componente
+    /// </summary>
+    /// <param name="e"></param>
+    protected override void OnInit(EventArgs e)
     {
-      // altrimenti mostro btn update
-      btnUpdate.Visible = true;
+        base.OnInit(e);
+        setIntervallo();
+        setDurataMin();
     }
-  }
-  /// <summary>
-  /// in questo caso faccio udpate periodo mostrato
-  /// </summary>
-  /// <param name="sender"></param>
-  /// <param name="e"></param>
-  protected void btnUpdate_Click(object sender, EventArgs e)
-  {
-    aggiornaPeriodo();
-    // nascondo btn update
-    btnUpdate.Visible = false;
-  }
-  /// <summary>
-  /// riporta aggiornamento a controller
-  /// </summary>
-  protected void reportUpdate()
-  {
-    intervalloAnalisi = _intervallo;
-    // alzo l'evento d update/inserimento e ricarico cache...
-    if (eh_doUpdate != null)
+
+    protected void Page_Load(object sender, EventArgs e)
     {
-      eh_doUpdate(this, new EventArgs());
+        lblPeriodo.Text = "Periodo";
+        txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati";
+        txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati";
+        lblDurataMin.Text = "Visualizza eventi con durata superiore a";
     }
-  }
 
-  #endregion
-
-  #region area public
-
-  public intervalloDate intervalloAnalisi
-  {
-    get
+    /// <summary>
+    /// riporta aggiornamento a controller
+    /// </summary>
+    protected void reportUpdate()
     {
-      return (intervalloDate)Session["_intervallo"];
+        intervalloAnalisi = _intervallo;
+        // alzo l'evento d update/inserimento e ricarico cache...
+        if (eh_doUpdate != null)
+        {
+            eh_doUpdate(this, new EventArgs());
+        }
     }
-    set
+
+    /// <summary>
+    /// evento cambio testo data fine
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void txtFine_TextChanged(object sender, EventArgs e)
     {
-      intervalloDate interv = value;
-      Session["_intervallo"] = interv;
-      Session["_inizio"] = interv.inizio;
-      Session["_fine"] = interv.fine;
-      aggiornaDateMostrate(false);
+        // imposto il selettore a discesa...
+        setPeriodoFree();
+        checkIfUpdate();
     }
-  }
-  /// <summary>
-  /// effettua update
-  /// </summary>
-  /// <param name="doReportUpdate"></param>
-  public void doUpdate(bool doReportUpdate)
-  {
-    aggiornaDateMostrate(doReportUpdate);
-  }
-  /// <summary>
-  /// imposta periodo libero di selezione
-  /// </summary>
-  public void setPeriodoFree()
-  {
-    DropDownList1.SelectedIndex = 0;
-  }
-  /// <summary>
-  /// imposta realtime update (non mostra button am fa subito update)
-  /// </summary>
-  public bool realtimeUpdate
-  {
-    get
+
+    /// <summary>
+    /// evento cambio testo data inizio
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void txtInizio_TextChanged(object sender, EventArgs e)
     {
-      return memLayer.ML.BoolSessionObj("rltUpdatePeriodo");
+        // imposto il selettore a discesa...
+        setPeriodoFree();
+        checkIfUpdate();
     }
-    set
+
+    #endregion Protected Methods
+
+    #region Public Methods
+
+    /// <summary>
+    /// effettua update
+    /// </summary>
+    /// <param name="doReportUpdate"></param>
+    public void doUpdate(bool doReportUpdate)
     {
-      memLayer.ML.setSessionVal("rltUpdatePeriodo", value);
+        aggiornaDateMostrate(doReportUpdate);
     }
-  }
 
-  #region gestione eventi
+    /// <summary>
+    /// imposta periodo libero di selezione
+    /// </summary>
+    public void setPeriodoFree()
+    {
+        DropDownList1.SelectedIndex = 0;
+    }
 
-  public event EventHandler eh_doUpdate;
-
-  #endregion
-
-
-  #endregion
-}
+    #endregion Public Methods
+}

GPW_Data/DS_Applicazione.Designer.cs

@@ -8422,6 +8422,10 @@ namespace GPW_data {
             
             private global::System.Data.DataColumn columngruppo;
             
+            private global::System.Data.DataColumn columnidxFase;
+            
+            private global::System.Data.DataColumn columnidxProgetto;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public regAttDayExplDataTable() {
@@ -8559,6 +8563,22 @@ 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 idxFaseColumn {
+                get {
+                    return this.columnidxFase;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn idxProgettoColumn {
+                get {
+                    return this.columnidxProgetto;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -8596,7 +8616,7 @@ namespace GPW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo) {
+            public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo, int idxProgetto) {
                 regAttDayExplRow rowregAttDayExplRow = ((regAttDayExplRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         idxDipendente,
@@ -8611,7 +8631,9 @@ namespace GPW_data {
                         minTot,
                         null,
                         CognomeNome,
-                        gruppo};
+                        gruppo,
+                        null,
+                        idxProgetto};
                 rowregAttDayExplRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowregAttDayExplRow);
                 return rowregAttDayExplRow;
@@ -8654,6 +8676,8 @@ namespace GPW_data {
                 this.columnidxRA = base.Columns["idxRA"];
                 this.columnCognomeNome = base.Columns["CognomeNome"];
                 this.columngruppo = base.Columns["gruppo"];
+                this.columnidxFase = base.Columns["idxFase"];
+                this.columnidxProgetto = base.Columns["idxProgetto"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8685,6 +8709,10 @@ namespace GPW_data {
                 base.Columns.Add(this.columnCognomeNome);
                 this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columngruppo);
+                this.columnidxFase = new global::System.Data.DataColumn("idxFase", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnidxFase);
+                this.columnidxProgetto = new global::System.Data.DataColumn("idxProgetto", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnidxProgetto);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidxRA}, true));
                 this.columnidxDipendente.AllowDBNull = false;
@@ -8708,6 +8736,11 @@ namespace GPW_data {
                 this.columnCognomeNome.MaxLength = 101;
                 this.columngruppo.AllowDBNull = false;
                 this.columngruppo.MaxLength = 50;
+                this.columnidxFase.AutoIncrement = true;
+                this.columnidxFase.AutoIncrementSeed = -1;
+                this.columnidxFase.AutoIncrementStep = -1;
+                this.columnidxFase.AllowDBNull = false;
+                this.columnidxFase.ReadOnly = true;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16153,6 +16186,33 @@ namespace GPW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int idxFase {
+                get {
+                    return ((int)(this[this.tableregAttDayExpl.idxFaseColumn]));
+                }
+                set {
+                    this[this.tableregAttDayExpl.idxFaseColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int idxProgetto {
+                get {
+                    try {
+                        return ((int)(this[this.tableregAttDayExpl.idxProgettoColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("Il valore della colonna \'idxProgetto\' nella tabella \'regAttDayExpl\' è DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableregAttDayExpl.idxProgettoColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsdescrizioneNull() {
@@ -16236,6 +16296,18 @@ namespace GPW_data {
             public void SetCognomeNomeNull() {
                 this[this.tableregAttDayExpl.CognomeNomeColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsidxProgettoNull() {
+                return this.IsNull(this.tableregAttDayExpl.idxProgettoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetidxProgettoNull() {
+                this[this.tableregAttDayExpl.idxProgettoColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -30269,6 +30341,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
             tableMapping.ColumnMappings.Add("idxRA", "idxRA");
             tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome");
             tableMapping.ColumnMappings.Add("gruppo", "gruppo");
+            tableMapping.ColumnMappings.Add("idxFase", "idxFase");
+            tableMapping.ColumnMappings.Add("idxProgetto", "idxProgetto");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -30282,7 +30356,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
         [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[6];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "dbo.stp_RAD_Expl_getByIdxDipData";
@@ -30310,34 +30384,40 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAncest", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].CommandText = "dbo.stp_RA_InsertQuery";
+            this._commandCollection[3].CommandText = "dbo.stp_RAD_Expl_getByKey";
             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("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", 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("@fine", 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("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, 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("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxRa", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
-            this._commandCollection[4].CommandText = "dbo.stp_RA_updateFase";
+            this._commandCollection[4].CommandText = "dbo.stp_RA_InsertQuery";
             this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
-            this._commandCollection[5].CommandText = "dbo.stp_RA_updateQuery";
+            this._commandCollection[5].CommandText = "dbo.stp_RA_updateFase";
             this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[6].Connection = this.Connection;
+            this._commandCollection[6].CommandText = "dbo.stp_RA_updateQuery";
+            this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -30441,6 +30521,23 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
             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.regAttDayExplDataTable getByKey(global::System.Nullable<int> idxRa) {
+            this.Adapter.SelectCommand = this.CommandCollection[3];
+            if ((idxRa.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxRa.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            DS_Applicazione.regAttDayExplDataTable dataTable = new DS_Applicazione.regAttDayExplDataTable();
+            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")]
@@ -30474,7 +30571,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)]
         public virtual int insertQuery(global::System.Nullable<int> idxDipendente, global::System.Nullable<int> idxFase, global::System.Nullable<global::System.DateTime> inizio, global::System.Nullable<global::System.DateTime> fine, string descrizione, global::System.Nullable<decimal> importo) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
             if ((idxDipendente.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(idxDipendente.Value));
             }
@@ -30532,7 +30629,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateFase(global::System.Nullable<int> idxFase, global::System.Nullable<int> Original_idxRA) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
             if ((idxFase.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(idxFase.Value));
             }
@@ -30566,7 +30663,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateQuery(global::System.Nullable<int> idxDipendente, global::System.Nullable<int> idxFase, global::System.Nullable<global::System.DateTime> inizio, global::System.Nullable<global::System.DateTime> fine, string descrizione, global::System.Nullable<decimal> importo, global::System.Nullable<int> Original_idxRA) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
             if ((idxDipendente.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(idxDipendente.Value));
             }

GPW_Data/DS_Applicazione.xsd

@@ -2618,6 +2618,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
               <Mapping SourceColumn="idxRA" DataSetColumn="idxRA" />
               <Mapping SourceColumn="CognomeNome" DataSetColumn="CognomeNome" />
               <Mapping SourceColumn="gruppo" DataSetColumn="gruppo" />
+              <Mapping SourceColumn="idxFase" DataSetColumn="idxFase" />
+              <Mapping SourceColumn="idxProgetto" DataSetColumn="idxProgetto" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_RA_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">
@@ -2648,6 +2650,17 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_RAD_Expl_getByKey" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByKey" GetMethodModifier="Public" GetMethodName="getByKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByKey" UserSourceName="getByKey">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_RAD_Expl_getByKey</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxRa" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertQuery">
                 <InsertCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -3673,6 +3686,8 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="idxFase" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxFase" msprop:Generator_ColumnPropNameInRow="idxFase" msprop:Generator_ColumnPropNameInTable="idxFaseColumn" msprop:Generator_UserColumnName="idxFase" type="xs:int" />
+              <xs:element name="idxProgetto" msprop:Generator_ColumnVarNameInTable="columnidxProgetto" msprop:Generator_ColumnPropNameInRow="idxProgetto" msprop:Generator_ColumnPropNameInTable="idxProgettoColumn" msprop:Generator_UserColumnName="idxProgetto" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

GPW_Data/DS_Applicazione.xss

@@ -4,12 +4,12 @@
      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="-39" ViewPortY="-47" 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="-39" 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="26" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:TimbratureExpl" ZOrder="12" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagDevices" ZOrder="20" X="937" Y="134" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:Dipendenti" ZOrder="2" X="279" Y="478" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Dipendenti" ZOrder="3" X="279" Y="478" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagClienti" ZOrder="6" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagProgetti" ZOrder="5" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="25" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -21,8 +21,8 @@
     <Shape ID="DesignTable:TimbMeseExpl" ZOrder="19" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Giustificativi" ZOrder="14" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="18" 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="1" X="-3" Y="176" Height="305" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:regAttDayExpl" ZOrder="3" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TE_RA_Expl" ZOrder="2" X="-3" Y="176" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:regAttDayExpl" ZOrder="1" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="17" X="1236" Y="992" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:RegistroEventi" ZOrder="16" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:RilievoTemp" ZOrder="11" X="-29" Y="522" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />

GPW_Data/DS_Utility.Designer.cs

@@ -1954,6 +1954,8 @@ namespace GPW_data {
             
             private global::System.Data.DataColumn columnAttivo;
             
+            private global::System.Data.DataColumn columngruppo;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public v_selProgettiDataTable() {
@@ -2019,6 +2021,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 gruppoColumn {
+                get {
+                    return this.columngruppo;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2056,13 +2066,14 @@ namespace GPW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public v_selProgettiRow Addv_selProgettiRow(int value, string label, long conditio, bool Attivo) {
+            public v_selProgettiRow Addv_selProgettiRow(int value, string label, int conditio, bool Attivo, string gruppo) {
                 v_selProgettiRow rowv_selProgettiRow = ((v_selProgettiRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         value,
                         label,
                         conditio,
-                        Attivo};
+                        Attivo,
+                        gruppo};
                 rowv_selProgettiRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowv_selProgettiRow);
                 return rowv_selProgettiRow;
@@ -2096,6 +2107,7 @@ namespace GPW_data {
                 this.columnlabel = base.Columns["label"];
                 this.columnconditio = base.Columns["conditio"];
                 this.columnAttivo = base.Columns["Attivo"];
+                this.columngruppo = base.Columns["gruppo"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2105,18 +2117,22 @@ namespace GPW_data {
                 base.Columns.Add(this.columnvalue);
                 this.columnlabel = new global::System.Data.DataColumn("label", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnlabel);
-                this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(long), null, global::System.Data.MappingType.Element);
+                this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnconditio);
                 this.columnAttivo = new global::System.Data.DataColumn("Attivo", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnAttivo);
+                this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columngruppo);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnvalue}, true));
                 this.columnvalue.AllowDBNull = false;
                 this.columnvalue.Unique = true;
                 this.columnlabel.ReadOnly = true;
-                this.columnlabel.MaxLength = 130;
+                this.columnlabel.MaxLength = 303;
                 this.columnconditio.AllowDBNull = false;
                 this.columnAttivo.AllowDBNull = false;
+                this.columngruppo.AllowDBNull = false;
+                this.columngruppo.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6566,9 +6582,9 @@ namespace GPW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public long conditio {
+            public int conditio {
                 get {
-                    return ((long)(this[this.tablev_selProgetti.conditioColumn]));
+                    return ((int)(this[this.tablev_selProgetti.conditioColumn]));
                 }
                 set {
                     this[this.tablev_selProgetti.conditioColumn] = value;
@@ -6586,6 +6602,17 @@ namespace GPW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string gruppo {
+                get {
+                    return ((string)(this[this.tablev_selProgetti.gruppoColumn]));
+                }
+                set {
+                    this[this.tablev_selProgetti.gruppoColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IslabelNull() {
@@ -9443,6 +9470,7 @@ namespace GPW_data.DS_UtilityTableAdapters {
             tableMapping.ColumnMappings.Add("label", "label");
             tableMapping.ColumnMappings.Add("conditio", "conditio");
             tableMapping.ColumnMappings.Add("Attivo", "Attivo");
+            tableMapping.ColumnMappings.Add("gruppo", "gruppo");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -9456,7 +9484,7 @@ namespace GPW_data.DS_UtilityTableAdapters {
         [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[3];
+            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 * FROM v_selProgetti";
@@ -9470,10 +9498,17 @@ namespace GPW_data.DS_UtilityTableAdapters {
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, 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_VSPrj";
+            this._commandCollection[2].CommandText = "dbo.stp_VSPrj_byGruppo";
             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("@gruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[3].Connection = this.Connection;
+            this._commandCollection[3].CommandText = "dbo.stp_VSPrj";
+            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("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -9527,8 +9562,31 @@ namespace GPW_data.DS_UtilityTableAdapters {
         [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_Utility.v_selProgettiDataTable getGrouped(global::System.Nullable<bool> soloAttivi) {
+        public virtual DS_Utility.v_selProgettiDataTable getByGruppo(string gruppo, global::System.Nullable<bool> soloAttivi) {
             this.Adapter.SelectCommand = this.CommandCollection[2];
+            if ((gruppo == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gruppo));
+            }
+            if ((soloAttivi.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(soloAttivi.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            DS_Utility.v_selProgettiDataTable dataTable = new DS_Utility.v_selProgettiDataTable();
+            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")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_Utility.v_selProgettiDataTable getGrouped(global::System.Nullable<bool> soloAttivi) {
+            this.Adapter.SelectCommand = this.CommandCollection[3];
             if ((soloAttivi.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((bool)(soloAttivi.Value));
             }

GPW_Data/DS_Utility.xsd

@@ -100,7 +100,7 @@ ORDER BY label</CommandText>
             <MainSource>
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.v_selProgetti" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT * FROM v_selProgetti</CommandText>
                     <Parameters />
                   </DbCommand>
@@ -112,6 +112,7 @@ ORDER BY label</CommandText>
               <Mapping SourceColumn="label" DataSetColumn="label" />
               <Mapping SourceColumn="conditio" DataSetColumn="conditio" />
               <Mapping SourceColumn="Attivo" DataSetColumn="Attivo" />
+              <Mapping SourceColumn="gruppo" DataSetColumn="gruppo" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_VSPrj_byConditio" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByConditio" GetMethodModifier="Public" GetMethodName="getByConditio" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByConditio" UserSourceName="getByConditio">
@@ -126,6 +127,18 @@ ORDER BY label</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_VSPrj_byGruppo" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByGruppo" GetMethodModifier="Public" GetMethodName="getByGruppo" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByGruppo" UserSourceName="getByGruppo">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_VSPrj_byGruppo</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="nvarchar" DbType="String" Direction="Input" ParameterName="@gruppo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@soloAttivi" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_VSPrj" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getGrouped" GetMethodModifier="Public" GetMethodName="getGrouped" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getGrouped" UserSourceName="getGrouped">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -592,12 +605,19 @@ ORDER BY ordinal</CommandText>
               <xs:element name="label" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnlabel" msprop:Generator_ColumnPropNameInRow="label" msprop:Generator_ColumnPropNameInTable="labelColumn" msprop:Generator_UserColumnName="label" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
-                    <xs:maxLength value="130" />
+                    <xs:maxLength value="303" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="conditio" msprop:Generator_ColumnVarNameInTable="columnconditio" msprop:Generator_ColumnPropNameInRow="conditio" msprop:Generator_ColumnPropNameInTable="conditioColumn" msprop:Generator_UserColumnName="conditio" type="xs:long" />
+              <xs:element name="conditio" msprop:Generator_ColumnVarNameInTable="columnconditio" msprop:Generator_ColumnPropNameInRow="conditio" msprop:Generator_ColumnPropNameInTable="conditioColumn" msprop:Generator_UserColumnName="conditio" type="xs:int" />
               <xs:element name="Attivo" msprop:Generator_ColumnVarNameInTable="columnAttivo" msprop:Generator_ColumnPropNameInRow="Attivo" msprop:Generator_ColumnPropNameInTable="AttivoColumn" msprop:Generator_UserColumnName="Attivo" type="xs:boolean" />
+              <xs:element name="gruppo" msprop:Generator_ColumnVarNameInTable="columngruppo" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_UserColumnName="gruppo">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

GPW_Data/DS_Utility.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="42" ViewPortY="-10" 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="34" ViewPortY="-7" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:v_selDipendenti" ZOrder="19" X="424" Y="540" Height="134" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_getLastDays" ZOrder="18" X="797" Y="762" Height="97" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:stp_getMin" ZOrder="3" X="1061" Y="717" Height="97" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:stp_getHours" ZOrder="17" X="1063" Y="287" Height="97" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:v_selProgetti" ZOrder="12" X="498" Y="987" Height="191" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:v_selFasi" ZOrder="11" X="755" Y="531" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:v_selDipendenti" ZOrder="19" X="424" Y="540" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:stp_getLastDays" ZOrder="18" X="797" Y="760" Height="97" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:stp_getMin" ZOrder="4" X="1061" Y="715" Height="97" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:stp_getHours" ZOrder="17" X="1063" Y="285" Height="97" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:v_selProgetti" ZOrder="1" X="504" Y="940" Height="228" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:v_selFasi" ZOrder="12" X="755" Y="531" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:v_selClienti" ZOrder="16" X="662" Y="342" Height="153" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:stp_statsProj" ZOrder="15" X="286" Y="721" Height="191" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:v_selCodGiust" ZOrder="14" X="1021" Y="481" Height="115" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:nextValContatore" ZOrder="13" X="562" Y="132" Height="97" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:v_selFasiOpt" ZOrder="8" X="814" Y="972" Height="153" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:AnagKeyValue" ZOrder="4" X="198" Y="992" Height="191" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:v_selCodOrario" ZOrder="10" X="86" Y="668" Height="115" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:v_selPageSize" ZOrder="9" X="115" Y="449" Height="134" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:stp_VSProjFasi_search" ZOrder="7" X="522" Y="723" Height="115" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:freqProgetti" ZOrder="6" X="303" Y="117" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:v_selProjFasi" ZOrder="5" X="782" Y="137" Height="134" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:v_selListVal" ZOrder="2" X="1041" Y="93" Height="134" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:v_selGruppi" ZOrder="1" X="1112" Y="938" Height="153" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:nextValContatore" ZOrder="13" X="562" Y="130" Height="97" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:v_selFasiOpt" ZOrder="9" X="814" Y="972" Height="153" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:AnagKeyValue" ZOrder="5" X="198" Y="992" Height="191" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:v_selCodOrario" ZOrder="11" X="86" Y="668" Height="115" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:v_selPageSize" ZOrder="10" X="115" Y="449" Height="134" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:stp_VSProjFasi_search" ZOrder="8" X="522" Y="723" Height="115" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:freqProgetti" ZOrder="7" X="303" Y="117" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:v_selProjFasi" ZOrder="6" X="782" Y="137" Height="134" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:v_selListVal" ZOrder="3" X="1041" Y="93" Height="134" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:v_selGruppi" ZOrder="2" X="1112" Y="938" Height="153" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
   </Shapes>
   <Connectors />
 </DiagramLayout>