diff --git a/WebSites/WebGIM/Web.config b/WebSites/WebGIM/Web.config
index f7a5855..260663d 100644
--- a/WebSites/WebGIM/Web.config
+++ b/WebSites/WebGIM/Web.config
@@ -109,7 +109,10 @@
     <add key="dbAuthVers" value="1"/>
     <add key="dbVocabVers" value="1"/>
     <add key="dbAppVers" value="2"/>
-    <add key="dbAppCreaEnab" />
+    <add key="dbAppCreaEnab" value="false" />
+    <add key="sqlFileFormat" value="{0}_{1:0000}.sql"/>
+    <add key="sqlScriptDir" value="sql"/>
+    <add key="appFilePre" value="GIM"/>
     <!-- Gestione Auto-enroll-->
     <add key="autoEnrollEnabled" value="true"/>
     <add key="autoEnrollCdc" value="X999"/>
diff --git a/WebSites/WebGIM/macchine.aspx b/WebSites/WebGIM/macchine.aspx
index 3d2b537..1f8fed7 100644
--- a/WebSites/WebGIM/macchine.aspx
+++ b/WebSites/WebGIM/macchine.aspx
@@ -1,8 +1,10 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="macchine.aspx.cs" Inherits="macchine" %>
 
 <%@ Register src="mod_macchine.ascx" tagname="mod_macchine" tagprefix="uc1" %>
+<%@ Register Src="mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <uc1:mod_macchine ID="mod_macchine1" runat="server" />
+    <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
 </asp:Content>
 
diff --git a/WebSites/WebGIM/mod_macchine.ascx b/WebSites/WebGIM/mod_macchine.ascx
index bd6bad6..64a194d 100644
--- a/WebSites/WebGIM/mod_macchine.ascx
+++ b/WebSites/WebGIM/mod_macchine.ascx
@@ -52,11 +52,11 @@
         <asp:TemplateField HeaderText="codMacchina" SortExpression="codMacchina">
             <FooterTemplate>
                 <asp:TextBox ID="txtcodMacchina" runat="server" Text='<%# Bind("codMacchina") %>'
-                    Width="8em" />
+                    Width="6em" />
             </FooterTemplate>
             <EditItemTemplate>
                 <asp:TextBox ID="txtcodMacchina" runat="server" Text='<%# Bind("codMacchina") %>'
-                    Width="8em" />
+                    Width="6em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label3" runat="server" Text='<%# Bind("codMacchina") %>' />
@@ -77,42 +77,54 @@
         </asp:TemplateField>
         <asp:TemplateField HeaderText="modello" SortExpression="modello">
             <FooterTemplate>
-                <asp:TextBox ID="txtmodello" runat="server" Text='<%# Bind("modello") %>' />
+                <asp:TextBox ID="txtmodello" runat="server" Text='<%# Bind("modello") %>' Width="8em" />
             </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="txtmodello" runat="server" Text='<%# Bind("modello") %>' />
+                <asp:TextBox ID="txtmodello" runat="server" Text='<%# Bind("modello") %>' Width="8em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label5" runat="server" Text='<%# Bind("modello") %>' />
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="matricola" SortExpression="matricola">
+            <FooterTemplate>
+                <asp:TextBox ID="txtmatricola" runat="server" Text='<%# Bind("matricola") %>' Width="4em" />
+            </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox2" runat="server" Text='<%# Bind("matricola") %>'></asp:TextBox>
+                <asp:TextBox ID="txtmatricola" runat="server" Text='<%# Bind("matricola") %>' Width="4em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label7" runat="server" Text='<%# Bind("matricola") %>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="anno" SortExpression="anno">
+            <FooterTemplate>
+                <asp:TextBox ID="TextBox3" runat="server" Text='<%# Bind("anno") %>' Width="4em" />
+        </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox3" runat="server" Text='<%# Bind("anno") %>'></asp:TextBox>
+                <asp:TextBox ID="TextBox3" runat="server" Text='<%# Bind("anno") %>' Width="4em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label8" runat="server" Text='<%# Bind("anno") %>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="kgPeso" SortExpression="kgPeso">
+            <FooterTemplate>
+                <asp:TextBox ID="TextBox4" runat="server" Text='<%# Bind("kgPeso") %>' Width="4em" />
+            </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox4" runat="server" Text='<%# Bind("kgPeso") %>'></asp:TextBox>
+                <asp:TextBox ID="TextBox4" runat="server" Text='<%# Bind("kgPeso") %>' Width="4em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label9" runat="server" Text='<%# Bind("kgPeso") %>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="kwConsumo" SortExpression="kwConsumo">
+            <FooterTemplate>
+                <asp:TextBox ID="TextBox5" runat="server" Text='<%# Bind("kwConsumo") %>' Width="4em" />
+            </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox5" runat="server" Text='<%# Bind("kwConsumo") %>'></asp:TextBox>
+                <asp:TextBox ID="TextBox5" runat="server" Text='<%# Bind("kwConsumo") %>' Width="4em" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label10" runat="server" Text='<%# Bind("kwConsumo") %>'></asp:Label>
@@ -157,11 +169,16 @@
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="idxImpianto" SortExpression="idxImpianto">
+            <FooterTemplate>
+                <uc1:mod_selettore_ajax ID="selAjax_idxImpianto" runat="server" valore='<%# Bind("idxImpianto") %>'
+                    tipo="impianti" isValueVisible="false" vistaModulo="editing" />
+            </FooterTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("idxImpianto") %>'></asp:TextBox>
+                <uc1:mod_selettore_ajax ID="selAjax_idxImpianto" runat="server" valore='<%# Bind("idxImpianto") %>'
+                    tipo="impianti" isValueVisible="false" vistaModulo="editing" />
             </EditItemTemplate>
             <ItemTemplate>
-                <asp:Label ID="Label6" runat="server" Text='<%# Bind("idxImpianto") %>'></asp:Label>
+                <asp:Label ID="Label6" runat="server" Text='<%# Eval("descrImpianto") %>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField ShowHeader="False">
@@ -170,7 +187,7 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
-                    CommandArgument='<%# Eval("idxImpianto") %>' ToolTip='<%# traduci("Delete") %>'
+                    CommandArgument='<%# Eval("idxMacchina") %>' ToolTip='<%# traduci("Delete") %>'
                     ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>' />
                 <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>'
                     TargetControlID="imgDelete">
@@ -193,8 +210,8 @@
     </Columns>
 </asp:GridView>
 <asp:ObjectDataSource ID="ods" runat="server" DeleteMethod="DeleteQuery" InsertMethod="Insert"
-    OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="DS_applicazioneTableAdapters.AnagMacchineTableAdapter"
-    OnInserting="recuperaFooter" FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR modello LIKE '%{0}%' OR matricola LIKE '%{0}%' "
+    OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="DS_applicazioneTableAdapters.v_macchineTableAdapter"
+    OnInserting="recuperaFooter" FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR modello LIKE '%{0}%' OR matricola LIKE '%{0}%' OR descrImpianto LIKE '%{0}%' "
     UpdateMethod="Update" OnInserted="ods_Updated" OnUpdated="ods_Updated">
     <FilterParameters>
         <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
@@ -229,4 +246,4 @@
     </InsertParameters>
 </asp:ObjectDataSource>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
\ No newline at end of file
+<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
diff --git a/WebSites/WebGIM/mod_macchine.ascx.cs b/WebSites/WebGIM/mod_macchine.ascx.cs
index 220bc6e..c07be1b 100644
--- a/WebSites/WebGIM/mod_macchine.ascx.cs
+++ b/WebSites/WebGIM/mod_macchine.ascx.cs
@@ -292,7 +292,7 @@ public partial class mod_macchine : ApplicationUserControl
     /// <returns></returns>
     protected DataColumnCollection colonneObj()
     {
-        DS_applicazione.AnagMacchineDataTable tabella = new DS_applicazione.AnagMacchineDataTable();
+        DS_applicazione.v_macchineDataTable tabella = new DS_applicazione.v_macchineDataTable();
         DataColumnCollection colonne = tabella.Columns;
         return colonne;
     }
@@ -317,7 +317,7 @@ public partial class mod_macchine : ApplicationUserControl
         {
             // ottengo  la riga tipizzata...
             System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
-            DS_applicazione.AnagMacchineRow riga = (DS_applicazione.AnagMacchineRow)_drv.Row;
+            DS_applicazione.v_macchineRow riga = (DS_applicazione.v_macchineRow)_drv.Row;
             if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxImpianto.ToString())
             {
                 grView.SelectedIndex = e.Row.RowIndex;
diff --git a/WebSites/WebGIM/mod_menuBottom.ascx b/WebSites/WebGIM/mod_menuBottom.ascx
index d3d0019..d803d8e 100644
--- a/WebSites/WebGIM/mod_menuBottom.ascx
+++ b/WebSites/WebGIM/mod_menuBottom.ascx
@@ -1,4 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_menuBottom.ascx.cs"
     Inherits="mod_menuBottom" %>
-<asp:Label runat="server" ID="lblApp" Text="."></asp:Label><asp:Label ID="lblrev" runat="server">10 - </asp:Label>
+<asp:Label runat="server" ID="lblApp" Text="."></asp:Label><asp:Label ID="lblrev" runat="server">15 - </asp:Label>
 <asp:Label runat="server" ID="lblCopyRight" Text="..."></asp:Label>
diff --git a/WebSites/WebGIM/mod_selettore_ajax.ascx b/WebSites/WebGIM/mod_selettore_ajax.ascx
index f325598..f84be65 100644
--- a/WebSites/WebGIM/mod_selettore_ajax.ascx
+++ b/WebSites/WebGIM/mod_selettore_ajax.ascx
@@ -63,7 +63,7 @@
                             </Columns>
                         </asp:GridView>
                         <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>&nbsp;&nbsp;
-                        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getSelAllUsers" TypeName="selettori"
+                        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getSelAllUsers" TypeName="selData"
                             FilterExpression=" (label LIKE '%{0}%') OR (value LIKE '%{0}%')">
                             <FilterParameters>
                                 <asp:SessionParameter DefaultValue="*" Name="ricercaPopup" SessionField="ricercaPopup" />
diff --git a/WebSites/WebGIM/mod_selettore_ajax.ascx.cs b/WebSites/WebGIM/mod_selettore_ajax.ascx.cs
index 66c5725..e83fea4 100644
--- a/WebSites/WebGIM/mod_selettore_ajax.ascx.cs
+++ b/WebSites/WebGIM/mod_selettore_ajax.ascx.cs
@@ -264,6 +264,12 @@ public partial class mod_selettore_ajax : ApplicationUserControl
             case tipoSelettore.cdc:
                 _selectMethod = "getSelAllCdC";
                 break;
+            case tipoSelettore.impianti:
+                _selectMethod = "getSelImpianti";
+                break;
+            case tipoSelettore.macchine:
+                _selectMethod = "getSelMacchine";
+                break;
             case tipoSelettore.utentiAll:
                 _selectMethod = "getSelAllUsers";
                 break;
@@ -494,6 +500,8 @@ public partial class mod_selettore_ajax : ApplicationUserControl
 public enum tipoSelettore
 {
     cdc,
+    impianti,
+    macchine,
     utentiAll,
     utentiCdc
 }
\ No newline at end of file