Merge branch 'develop'

2020-01-02 23:22:04 +01:00
parent d212b63221 318e0c6729
commit 56c04589c6
14 changed files with 1960 additions and 34 deletions
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
  <Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" />
  <Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" />
  <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
  <Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
-  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -72,6 +72,9 @@
    <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="MongoDB.Bson, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\MongoDB.Bson.2.10.0\lib\net452\MongoDB.Bson.dll</HintPath>
@@ -208,9 +211,6 @@
    <Reference Include="System.Web.Http.WebHost">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
-      <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Content Include="About.aspx" />
@@ -280,6 +280,8 @@
    <Content Include="WebUserControls\cmp_calDisp.ascx" />
    <Content Include="WebUserControls\cmp_calStop.ascx" />
    <Content Include="WebUserControls\cmp_confWeek.ascx" />
+    <Content Include="WebUserControls\cmp_machParams.ascx" />
+    <Content Include="WebUserControls\cmp_machStats.ascx" />
    <Content Include="WebUserControls\mod_gestPromODL_OUT.ascx" />
    <Content Include="WebUserControls\mod_login.ascx" />
    <Content Include="WebUserControls\mod_main_help.ascx" />
@@ -522,6 +524,20 @@
    <Compile Include="WebUserControls\cmp_confWeek.ascx.designer.cs">
      <DependentUpon>cmp_confWeek.ascx</DependentUpon>
    </Compile>
+    <Compile Include="WebUserControls\cmp_machParams.ascx.cs">
+      <DependentUpon>cmp_machParams.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_machParams.ascx.designer.cs">
+      <DependentUpon>cmp_machParams.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_machStats.ascx.cs">
+      <DependentUpon>cmp_machStats.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_machStats.ascx.designer.cs">
+      <DependentUpon>cmp_machStats.ascx</DependentUpon>
+    </Compile>
    <Compile Include="WebUserControls\mod_gestPromODL_OUT.ascx.cs">
      <DependentUpon>mod_gestPromODL_OUT.ascx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -694,7 +710,6 @@
    <PropertyGroup>
      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets'))" />
    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
@@ -702,6 +717,7 @@
    <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props'))" />
    <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
  </Target>
  <Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
  <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
@@ -2,6 +2,11 @@

 <%@ Register Src="~/WebUserControls/cmp_confWeek.ascx" TagPrefix="uc1" TagName="cmp_confWeek" %>
 <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
+<%@ Register Src="~/WebUserControls/cmp_machParams.ascx" TagPrefix="uc1" TagName="cmp_machParams" %>
+<%@ Register Src="~/WebUserControls/cmp_machStats.ascx" TagPrefix="uc1" TagName="cmp_machStats" %>
+
+
+

 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
  <div runat="server" id="divContent">
@@ -19,6 +24,32 @@
          </div>
        </div>
      </div>
+      <div class="col-4">
+        <div class="card">
+          <div class="card-header">
+            <h4>Parametri Assegnati</h4>
+          </div>
+          <div class="card-body p-1">
+            <uc1:cmp_machParams runat="server" ID="cmp_machParams" />
+          </div>
+          <div class="card-footer text-right">
+            <uc1:cmp_numRow runat="server" ID="cmp_numRowParams" />
+          </div>
+        </div>
+      </div>
+      <div class="col-4">
+        <div class="card">
+          <div class="card-header">
+            <h4>Statistiche Parametri</h4>
+          </div>
+          <div class="card-body p-1">
+            <uc1:cmp_machStats runat="server" id="cmp_machStats" />
+          </div>
+          <div class="card-footer text-right">
+            <%--<uc1:cmp_numRow runat="server" ID="cmp_numRow2" />--%>
+          </div>
+        </div>
+      </div>
    </div>
  </div>
 </asp:Content>
@@ -15,11 +15,20 @@ namespace ES3
      if (!Page.IsPostBack)
      {
        cmp_numRowConfWeek.numRowPag = memLayer.ML.CRI("_righeDataGridShort");
+        cmp_numRowParams.numRowPag = memLayer.ML.CRI("_righeDataGridShort");
        // sistemo i DataGrid...
        cmp_confWeek.pageSize = cmp_numRowConfWeek.numRowPag;
+        cmp_machParams.pageSize = cmp_numRowParams.numRowPag;
      }
      cmp_numRowConfWeek.eh_newNum += Cmp_numRowConfWeek_eh_newNum;
+      cmp_numRowParams.eh_newNum += Cmp_numRowParams_eh_newNum;
    }
+
+    private void Cmp_numRowParams_eh_newNum(object sender, EventArgs e)
+    {
+      cmp_machParams.pageSize = cmp_numRowParams.numRowPag;
+    }
+
    private void Cmp_numRowConfWeek_eh_newNum(object sender, EventArgs e)
    {
      cmp_confWeek.pageSize = cmp_numRowConfWeek.numRowPag;
@@ -40,5 +40,32 @@ namespace ES3
    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
    /// </remarks>
    protected global::ES3.WebUserControls.cmp_numRow cmp_numRowConfWeek;
+
+    /// <summary>
+    /// Controllo cmp_machParams.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::ES3.WebUserControls.cmp_machParams cmp_machParams;
+
+    /// <summary>
+    /// Controllo cmp_numRowParams.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::ES3.WebUserControls.cmp_numRow cmp_numRowParams;
+
+    /// <summary>
+    /// Controllo cmp_machStats.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::ES3.WebUserControls.cmp_machStats cmp_machStats;
  }
 }
@@ -127,12 +127,6 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
-    </compilers>
-  </system.codedom>
 <elmah>
    <!--
        See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for 
@@ -159,4 +153,11 @@
        <add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
      </handlers>
    </system.webServer>
-  </location></configuration>
+  </location>
+<system.codedom>
+<compilers>
+<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+</compilers>
+</system.codedom>
+</configuration>
@@ -0,0 +1,55 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_machParams.ascx.cs" Inherits="ES3.WebUserControls.cmp_machParams" %>
+
+<div class="row">
+  <div class="col-4">
+    Impianto&nbsp;<asp:DropDownList runat="server" ID="ddlMacchine" DataSourceID="odsMacc" DataTextField="label" DataValueField="value" AppendDataBoundItems="true" AutoPostBack="True">
+      <asp:ListItem Text="--- TUTTI ---" Value=""></asp:ListItem>
+    </asp:DropDownList>
+    <asp:ObjectDataSource ID="odsMacc" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
+  </div>
+  <div class="col-4">
+    <asp:LinkButton runat="server" ID="lbtClonaSel" CssClass="btn btn-sm btn-block btn-info"><i class="fa fa-magic" aria-hidden="true"></i> Clona</asp:LinkButton>
+  </div>
+  <div class="col-4">
+    <asp:LinkButton runat="server" ID="lbtAddNew" CssClass="btn btn-sm btn-block btn-success"><i class="fa fa-plus-square" aria-hidden="true"></i> Nuovo</asp:LinkButton>
+  </div>
+  <div class="col-12">
+    aggiungere select + edit
+    <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="IdxMacchina" DataSourceID="ods" CssClass="table table-sm table-striped" AllowPaging="True">
+      <HeaderStyle CssClass="table-primary" />
+      <PagerStyle CssClass="active GridPager" />
+      <PagerSettings Mode="NumericFirstLast" />
+      <SelectedRowStyle CssClass="table-info" />
+      <EmptyDataTemplate>
+        No records found
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:TemplateField ShowHeader="False">
+          <HeaderTemplate>
+            <asp:LinkButton runat="server" ID="lbtReset" CausesValidation="false" OnClick="btnReset_Click" ToolTip="Reset selezione" CssClass="btn btn-sm btn-warning"><i class="fa fa-refresh"></i></asp:LinkButton>
+          </HeaderTemplate>
+          <ItemTemplate>
+            <asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
+            <asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" CssClass="btn btn-sm btn-info"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
+          </ItemTemplate>
+          <EditItemTemplate>
+
+          </EditItemTemplate>
+        </asp:TemplateField>
+        <asp:BoundField DataField="IdxMacchina" HeaderText="impianto" ReadOnly="True" SortExpression="IdxMacchina" />
+        <asp:BoundField DataField="CodConfAper" HeaderText="Apertura" SortExpression="CodConfAper" />
+        <asp:BoundField DataField="OEE" HeaderText="OEE" SortExpression="OEE" DataFormatString="{0:P1}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" >
+<HeaderStyle HorizontalAlign="Right"></HeaderStyle>
+
+<ItemStyle HorizontalAlign="Right"></ItemStyle>
+        </asp:BoundField>
+        <asp:BoundField DataField="SetupTime" HeaderText="Setup (min)" SortExpression="SetupTime" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" >
+<HeaderStyle HorizontalAlign="Right"></HeaderStyle>
+
+<ItemStyle HorizontalAlign="Right"></ItemStyle>
+        </asp:BoundField>
+      </Columns>
+    </asp:GridView>
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_PlanTableAdapters.MachineParamsTableAdapter"></asp:ObjectDataSource>
+  </div>
+</div>
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace ES3.WebUserControls
+{
+  public partial class cmp_machParams : System.Web.UI.UserControl
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+    /// <summary>
+    /// Dim pagina
+    /// </summary>
+    public int pageSize
+    {
+      get
+      {
+        return grView.PageSize;
+      }
+      set
+      {
+        grView.PageSize = value;
+        doUpdate();
+      }
+    }
+    /// <summary>
+    /// Forza update controllo
+    /// </summary>
+    public void doUpdate()
+    {
+      grView.DataBind();
+    }
+    /// <summary>
+    /// reset della selezione
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void btnReset_Click(object sender, EventArgs e)
+    {
+      resetSelezione();
+    }
+    /// <summary>
+    /// resetta la selezione dei valori in caso di modifiche su altri controlli
+    /// </summary>
+    public void resetSelezione()
+    {
+#if false
+      memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); 
+#endif
+      grView.SelectedIndex = -1;
+      grView.DataBind();
+#if false
+      divEditQta.Visible = false;
+      mod_newPromessaODL.Visible = false;
+      lbtNewPODL.Visible = true;
+      lblWarning.Visible = false;
+      if (eh_resetSelezione != null)
+      {
+        eh_resetSelezione(this, new EventArgs());
+      } 
+#endif
+    }
+  }
+}
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace ES3.WebUserControls
+{
+
+
+  public partial class cmp_machParams
+  {
+
+    /// <summary>
+    /// Controllo ddlMacchine.
+    /// </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 ddlMacchine;
+
+    /// <summary>
+    /// Controllo odsMacc.
+    /// </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 odsMacc;
+
+    /// <summary>
+    /// Controllo lbtClonaSel.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtClonaSel;
+
+    /// <summary>
+    /// Controllo lbtAddNew.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtAddNew;
+
+    /// <summary>
+    /// Controllo grView.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.GridView grView;
+
+    /// <summary>
+    /// Controllo ods.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+  }
+}
@@ -0,0 +1,12 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_machStats.ascx.cs" Inherits="ES3.WebUserControls.cmp_machStats" %>
+
+<div class="row">
+  <div class="col-12">
+    Statistiche SINGOLA macchina:
+    <ul>
+      <li>OEE 1Y/3M/1M/1W</li>
+      <li>Setup 1Y/3M/1M/1W</li>
+      <li>Ore/Week 1Y/3M/1M/1W</li>
+    </ul>
+  </div>
+</div>
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace ES3.WebUserControls
+{
+  public partial class cmp_machStats : System.Web.UI.UserControl
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+  }
+}
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace ES3.WebUserControls
+{
+
+
+  public partial class cmp_machStats
+  {
+  }
+}
@@ -633,6 +633,52 @@ FROM CalDisp</CommandText>
              </DbSource>
            </Sources>
          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ConfWeek1TableAdapter" GeneratorDataComponentClassName="ConfWeek1TableAdapter" Name="ConfWeek1" UserDataComponentName="ConfWeek1TableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="MoonPro_ES3ConnectionString (Settings)" DbObjectName="MoonPro_ES3.dbo.ConfWeek" DbObjectType="Table" 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="false">
+                    <CommandText>SELECT *
+FROM ConfWeek</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="CodConfAper" DataSetColumn="CodConfAper" />
+              <Mapping SourceColumn="G1" DataSetColumn="G1" />
+              <Mapping SourceColumn="G2" DataSetColumn="G2" />
+              <Mapping SourceColumn="G3" DataSetColumn="G3" />
+              <Mapping SourceColumn="G4" DataSetColumn="G4" />
+              <Mapping SourceColumn="G5" DataSetColumn="G5" />
+              <Mapping SourceColumn="G6" DataSetColumn="G6" />
+              <Mapping SourceColumn="G7" DataSetColumn="G7" />
+              <Mapping SourceColumn="OreWeek" DataSetColumn="OreWeek" />
+              <Mapping SourceColumn="PercApert" DataSetColumn="PercApert" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="MachineParamsTableAdapter" GeneratorDataComponentClassName="MachineParamsTableAdapter" Name="MachineParams" UserDataComponentName="MachineParamsTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="MoonPro_ES3ConnectionString (Settings)" DbObjectName="MoonPro_ES3.dbo.MachineParams" DbObjectType="Table" 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">
+                    <CommandText>SELECT *
+FROM     MachineParams</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="IdxMacchina" DataSetColumn="IdxMacchina" />
+              <Mapping SourceColumn="CodConfAper" DataSetColumn="CodConfAper" />
+              <Mapping SourceColumn="OEE" DataSetColumn="OEE" />
+              <Mapping SourceColumn="SetupTime" DataSetColumn="SetupTime" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
        </Tables>
        <Sources />
      </DataSource>
@@ -641,7 +687,7 @@ FROM CalDisp</CommandText>
  <xs:element name="DS_Plan" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Plan" msprop:Generator_UserDSName="DS_Plan">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="planStatsGlobal" msprop:Generator_TableClassName="planStatsGlobalDataTable" msprop:Generator_TableVarName="tableplanStatsGlobal" msprop:Generator_TablePropName="planStatsGlobal" msprop:Generator_RowDeletingName="planStatsGlobalRowDeleting" msprop:Generator_RowChangingName="planStatsGlobalRowChanging" msprop:Generator_RowEvHandlerName="planStatsGlobalRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsGlobalRowDeleted" msprop:Generator_UserTableName="planStatsGlobal" msprop:Generator_RowChangedName="planStatsGlobalRowChanged" msprop:Generator_RowEvArgName="planStatsGlobalRowChangeEvent" msprop:Generator_RowClassName="planStatsGlobalRow">
+        <xs:element name="planStatsGlobal" msprop:Generator_TableClassName="planStatsGlobalDataTable" msprop:Generator_TableVarName="tableplanStatsGlobal" msprop:Generator_RowChangedName="planStatsGlobalRowChanged" msprop:Generator_TablePropName="planStatsGlobal" msprop:Generator_RowDeletingName="planStatsGlobalRowDeleting" msprop:Generator_RowChangingName="planStatsGlobalRowChanging" msprop:Generator_RowEvHandlerName="planStatsGlobalRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsGlobalRowDeleted" msprop:Generator_RowClassName="planStatsGlobalRow" msprop:Generator_UserTableName="planStatsGlobal" msprop:Generator_RowEvArgName="planStatsGlobalRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="NumRows" msprop:Generator_ColumnVarNameInTable="columnNumRows" msprop:Generator_ColumnPropNameInRow="NumRows" msprop:Generator_ColumnPropNameInTable="NumRowsColumn" msprop:Generator_UserColumnName="NumRows" type="xs:int" minOccurs="0" />
@@ -652,7 +698,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="planStatsArt" msprop:Generator_TableClassName="planStatsArtDataTable" msprop:Generator_TableVarName="tableplanStatsArt" msprop:Generator_TablePropName="planStatsArt" msprop:Generator_RowDeletingName="planStatsArtRowDeleting" msprop:Generator_RowChangingName="planStatsArtRowChanging" msprop:Generator_RowEvHandlerName="planStatsArtRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsArtRowDeleted" msprop:Generator_UserTableName="planStatsArt" msprop:Generator_RowChangedName="planStatsArtRowChanged" msprop:Generator_RowEvArgName="planStatsArtRowChangeEvent" msprop:Generator_RowClassName="planStatsArtRow">
+        <xs:element name="planStatsArt" msprop:Generator_TableClassName="planStatsArtDataTable" msprop:Generator_TableVarName="tableplanStatsArt" msprop:Generator_RowChangedName="planStatsArtRowChanged" msprop:Generator_TablePropName="planStatsArt" msprop:Generator_RowDeletingName="planStatsArtRowDeleting" msprop:Generator_RowChangingName="planStatsArtRowChanging" msprop:Generator_RowEvHandlerName="planStatsArtRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsArtRowDeleted" msprop:Generator_RowClassName="planStatsArtRow" msprop:Generator_UserTableName="planStatsArt" msprop:Generator_RowEvArgName="planStatsArtRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_UserColumnName="CodArticolo">
@@ -682,7 +728,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="planStatsGroup" msprop:Generator_TableClassName="planStatsGroupDataTable" msprop:Generator_TableVarName="tableplanStatsGroup" msprop:Generator_TablePropName="planStatsGroup" msprop:Generator_RowDeletingName="planStatsGroupRowDeleting" msprop:Generator_RowChangingName="planStatsGroupRowChanging" msprop:Generator_RowEvHandlerName="planStatsGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsGroupRowDeleted" msprop:Generator_UserTableName="planStatsGroup" msprop:Generator_RowChangedName="planStatsGroupRowChanged" msprop:Generator_RowEvArgName="planStatsGroupRowChangeEvent" msprop:Generator_RowClassName="planStatsGroupRow">
+        <xs:element name="planStatsGroup" msprop:Generator_TableClassName="planStatsGroupDataTable" msprop:Generator_TableVarName="tableplanStatsGroup" msprop:Generator_RowChangedName="planStatsGroupRowChanged" msprop:Generator_TablePropName="planStatsGroup" msprop:Generator_RowDeletingName="planStatsGroupRowDeleting" msprop:Generator_RowChangingName="planStatsGroupRowChanging" msprop:Generator_RowEvHandlerName="planStatsGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsGroupRowDeleted" msprop:Generator_RowClassName="planStatsGroupRow" msprop:Generator_UserTableName="planStatsGroup" msprop:Generator_RowEvArgName="planStatsGroupRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CodGruppo" msprop:Generator_ColumnVarNameInTable="columnCodGruppo" msprop:Generator_ColumnPropNameInRow="CodGruppo" msprop:Generator_ColumnPropNameInTable="CodGruppoColumn" msprop:Generator_UserColumnName="CodGruppo">
@@ -705,7 +751,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="planStatsMacc" msprop:Generator_TableClassName="planStatsMaccDataTable" msprop:Generator_TableVarName="tableplanStatsMacc" msprop:Generator_TablePropName="planStatsMacc" msprop:Generator_RowDeletingName="planStatsMaccRowDeleting" msprop:Generator_RowChangingName="planStatsMaccRowChanging" msprop:Generator_RowEvHandlerName="planStatsMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsMaccRowDeleted" msprop:Generator_UserTableName="planStatsMacc" msprop:Generator_RowChangedName="planStatsMaccRowChanged" msprop:Generator_RowEvArgName="planStatsMaccRowChangeEvent" msprop:Generator_RowClassName="planStatsMaccRow">
+        <xs:element name="planStatsMacc" msprop:Generator_TableClassName="planStatsMaccDataTable" msprop:Generator_TableVarName="tableplanStatsMacc" msprop:Generator_RowChangedName="planStatsMaccRowChanged" msprop:Generator_TablePropName="planStatsMacc" msprop:Generator_RowDeletingName="planStatsMaccRowDeleting" msprop:Generator_RowChangingName="planStatsMaccRowChanging" msprop:Generator_RowEvHandlerName="planStatsMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="planStatsMaccRowDeleted" msprop:Generator_RowClassName="planStatsMaccRow" msprop:Generator_UserTableName="planStatsMacc" msprop:Generator_RowEvArgName="planStatsMaccRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -728,7 +774,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Richieste" msprop:Generator_TableClassName="RichiesteDataTable" msprop:Generator_TableVarName="tableRichieste" msprop:Generator_RowChangedName="RichiesteRowChanged" msprop:Generator_TablePropName="Richieste" msprop:Generator_RowDeletingName="RichiesteRowDeleting" msprop:Generator_RowChangingName="RichiesteRowChanging" msprop:Generator_RowEvHandlerName="RichiesteRowChangeEventHandler" msprop:Generator_RowDeletedName="RichiesteRowDeleted" msprop:Generator_RowClassName="RichiesteRow" msprop:Generator_UserTableName="Richieste" msprop:Generator_RowEvArgName="RichiesteRowChangeEvent">
+        <xs:element name="Richieste" msprop:Generator_TableClassName="RichiesteDataTable" msprop:Generator_TableVarName="tableRichieste" msprop:Generator_TablePropName="Richieste" msprop:Generator_RowDeletingName="RichiesteRowDeleting" msprop:Generator_RowChangingName="RichiesteRowChanging" msprop:Generator_RowEvHandlerName="RichiesteRowChangeEventHandler" msprop:Generator_RowDeletedName="RichiesteRowDeleted" msprop:Generator_UserTableName="Richieste" msprop:Generator_RowChangedName="RichiesteRowChanged" msprop:Generator_RowEvArgName="RichiesteRowChangeEvent" msprop:Generator_RowClassName="RichiesteRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="idxPromessa" msprop:Generator_ColumnVarNameInTable="columnidxPromessa" msprop:Generator_ColumnPropNameInRow="idxPromessa" msprop:Generator_ColumnPropNameInTable="idxPromessaColumn" msprop:Generator_UserColumnName="idxPromessa" type="xs:int" />
@@ -822,7 +868,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PromesseIN" msprop:Generator_TableClassName="PromesseINDataTable" msprop:Generator_TableVarName="tablePromesseIN" msprop:Generator_TablePropName="PromesseIN" msprop:Generator_RowDeletingName="PromesseINRowDeleting" msprop:Generator_RowChangingName="PromesseINRowChanging" msprop:Generator_RowEvHandlerName="PromesseINRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseINRowDeleted" msprop:Generator_UserTableName="PromesseIN" msprop:Generator_RowChangedName="PromesseINRowChanged" msprop:Generator_RowEvArgName="PromesseINRowChangeEvent" msprop:Generator_RowClassName="PromesseINRow">
+        <xs:element name="PromesseIN" msprop:Generator_TableClassName="PromesseINDataTable" msprop:Generator_TableVarName="tablePromesseIN" msprop:Generator_RowChangedName="PromesseINRowChanged" msprop:Generator_TablePropName="PromesseIN" msprop:Generator_RowDeletingName="PromesseINRowDeleting" msprop:Generator_RowChangingName="PromesseINRowChanging" msprop:Generator_RowEvHandlerName="PromesseINRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseINRowDeleted" msprop:Generator_RowClassName="PromesseINRow" msprop:Generator_UserTableName="PromesseIN" msprop:Generator_RowEvArgName="PromesseINRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="idxPromessa" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxPromessa" msprop:Generator_ColumnPropNameInRow="idxPromessa" msprop:Generator_ColumnPropNameInTable="idxPromessaColumn" msprop:Generator_UserColumnName="idxPromessa" type="xs:int" />
@@ -878,7 +924,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PromesseOUT" msprop:Generator_TableClassName="PromesseOUTDataTable" msprop:Generator_TableVarName="tablePromesseOUT" msprop:Generator_TablePropName="PromesseOUT" msprop:Generator_RowDeletingName="PromesseOUTRowDeleting" msprop:Generator_RowChangingName="PromesseOUTRowChanging" msprop:Generator_RowEvHandlerName="PromesseOUTRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseOUTRowDeleted" msprop:Generator_UserTableName="PromesseOUT" msprop:Generator_RowChangedName="PromesseOUTRowChanged" msprop:Generator_RowEvArgName="PromesseOUTRowChangeEvent" msprop:Generator_RowClassName="PromesseOUTRow">
+        <xs:element name="PromesseOUT" msprop:Generator_TableClassName="PromesseOUTDataTable" msprop:Generator_TableVarName="tablePromesseOUT" msprop:Generator_RowChangedName="PromesseOUTRowChanged" msprop:Generator_TablePropName="PromesseOUT" msprop:Generator_RowDeletingName="PromesseOUTRowDeleting" msprop:Generator_RowChangingName="PromesseOUTRowChanging" msprop:Generator_RowEvHandlerName="PromesseOUTRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseOUTRowDeleted" msprop:Generator_RowClassName="PromesseOUTRow" msprop:Generator_UserTableName="PromesseOUT" msprop:Generator_RowEvArgName="PromesseOUTRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="idxPromessa" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxPromessa" msprop:Generator_ColumnPropNameInRow="idxPromessa" msprop:Generator_ColumnPropNameInTable="idxPromessaColumn" msprop:Generator_UserColumnName="idxPromessa" type="xs:int" />
@@ -955,7 +1001,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ConfWeek" msprop:Generator_TableClassName="ConfWeekDataTable" msprop:Generator_TableVarName="tableConfWeek" msprop:Generator_RowChangedName="ConfWeekRowChanged" msprop:Generator_TablePropName="ConfWeek" msprop:Generator_RowDeletingName="ConfWeekRowDeleting" msprop:Generator_RowChangingName="ConfWeekRowChanging" msprop:Generator_RowEvHandlerName="ConfWeekRowChangeEventHandler" msprop:Generator_RowDeletedName="ConfWeekRowDeleted" msprop:Generator_RowClassName="ConfWeekRow" msprop:Generator_UserTableName="ConfWeek" msprop:Generator_RowEvArgName="ConfWeekRowChangeEvent">
+        <xs:element name="ConfWeek" msprop:Generator_TableClassName="ConfWeekDataTable" msprop:Generator_TableVarName="tableConfWeek" msprop:Generator_TablePropName="ConfWeek" msprop:Generator_RowDeletingName="ConfWeekRowDeleting" msprop:Generator_RowChangingName="ConfWeekRowChanging" msprop:Generator_RowEvHandlerName="ConfWeekRowChangeEventHandler" msprop:Generator_RowDeletedName="ConfWeekRowDeleted" msprop:Generator_UserTableName="ConfWeek" msprop:Generator_RowChangedName="ConfWeekRowChanged" msprop:Generator_RowEvArgName="ConfWeekRowChangeEvent" msprop:Generator_RowClassName="ConfWeekRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CodConfAper" msprop:Generator_ColumnVarNameInTable="columnCodConfAper" msprop:Generator_ColumnPropNameInRow="CodConfAper" msprop:Generator_ColumnPropNameInTable="CodConfAperColumn" msprop:Generator_UserColumnName="CodConfAper">
@@ -977,7 +1023,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="CalStop" msprop:Generator_TableClassName="CalStopDataTable" msprop:Generator_TableVarName="tableCalStop" msprop:Generator_TablePropName="CalStop" msprop:Generator_RowDeletingName="CalStopRowDeleting" msprop:Generator_RowChangingName="CalStopRowChanging" msprop:Generator_RowEvHandlerName="CalStopRowChangeEventHandler" msprop:Generator_RowDeletedName="CalStopRowDeleted" msprop:Generator_UserTableName="CalStop" msprop:Generator_RowChangedName="CalStopRowChanged" msprop:Generator_RowEvArgName="CalStopRowChangeEvent" msprop:Generator_RowClassName="CalStopRow">
+        <xs:element name="CalStop" msprop:Generator_TableClassName="CalStopDataTable" msprop:Generator_TableVarName="tableCalStop" msprop:Generator_RowChangedName="CalStopRowChanged" msprop:Generator_TablePropName="CalStop" msprop:Generator_RowDeletingName="CalStopRowDeleting" msprop:Generator_RowChangingName="CalStopRowChanging" msprop:Generator_RowEvHandlerName="CalStopRowChangeEventHandler" msprop:Generator_RowDeletedName="CalStopRowDeleted" msprop:Generator_RowClassName="CalStopRow" msprop:Generator_UserTableName="CalStop" msprop:Generator_RowEvArgName="CalStopRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="DataRif" msprop:Generator_ColumnVarNameInTable="columnDataRif" msprop:Generator_ColumnPropNameInRow="DataRif" msprop:Generator_ColumnPropNameInTable="DataRifColumn" msprop:Generator_UserColumnName="DataRif" type="xs:dateTime" />
@@ -991,7 +1037,7 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="CalDisp" msprop:Generator_TableClassName="CalDispDataTable" msprop:Generator_TableVarName="tableCalDisp" msprop:Generator_TablePropName="CalDisp" msprop:Generator_RowDeletingName="CalDispRowDeleting" msprop:Generator_RowChangingName="CalDispRowChanging" msprop:Generator_RowEvHandlerName="CalDispRowChangeEventHandler" msprop:Generator_RowDeletedName="CalDispRowDeleted" msprop:Generator_UserTableName="CalDisp" msprop:Generator_RowChangedName="CalDispRowChanged" msprop:Generator_RowEvArgName="CalDispRowChangeEvent" msprop:Generator_RowClassName="CalDispRow">
+        <xs:element name="CalDisp" msprop:Generator_TableClassName="CalDispDataTable" msprop:Generator_TableVarName="tableCalDisp" msprop:Generator_RowChangedName="CalDispRowChanged" msprop:Generator_TablePropName="CalDisp" msprop:Generator_RowDeletingName="CalDispRowDeleting" msprop:Generator_RowChangingName="CalDispRowChanging" msprop:Generator_RowEvHandlerName="CalDispRowChangeEventHandler" msprop:Generator_RowDeletedName="CalDispRowDeleted" msprop:Generator_RowClassName="CalDispRow" msprop:Generator_UserTableName="CalDisp" msprop:Generator_RowEvArgName="CalDispRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="DataRif" msprop:Generator_ColumnVarNameInTable="columnDataRif" msprop:Generator_ColumnPropNameInRow="DataRif" msprop:Generator_ColumnPropNameInTable="DataRifColumn" msprop:Generator_UserColumnName="DataRif" type="xs:dateTime" />
@@ -1007,6 +1053,50 @@ FROM CalDisp</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
+        <xs:element name="ConfWeek1" msprop:Generator_TableClassName="ConfWeek1DataTable" msprop:Generator_TableVarName="tableConfWeek1" msprop:Generator_TablePropName="ConfWeek1" msprop:Generator_RowDeletingName="ConfWeek1RowDeleting" msprop:Generator_RowChangingName="ConfWeek1RowChanging" msprop:Generator_RowEvHandlerName="ConfWeek1RowChangeEventHandler" msprop:Generator_RowDeletedName="ConfWeek1RowDeleted" msprop:Generator_UserTableName="ConfWeek1" msprop:Generator_RowChangedName="ConfWeek1RowChanged" msprop:Generator_RowEvArgName="ConfWeek1RowChangeEvent" msprop:Generator_RowClassName="ConfWeek1Row">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="CodConfAper" msprop:Generator_ColumnVarNameInTable="columnCodConfAper" msprop:Generator_ColumnPropNameInRow="CodConfAper" msprop:Generator_ColumnPropNameInTable="CodConfAperColumn" msprop:Generator_UserColumnName="CodConfAper">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="G1" msprop:Generator_ColumnVarNameInTable="columnG1" msprop:Generator_ColumnPropNameInRow="G1" msprop:Generator_ColumnPropNameInTable="G1Column" msprop:Generator_UserColumnName="G1" type="xs:int" />
+              <xs:element name="G2" msprop:Generator_ColumnVarNameInTable="columnG2" msprop:Generator_ColumnPropNameInRow="G2" msprop:Generator_ColumnPropNameInTable="G2Column" msprop:Generator_UserColumnName="G2" type="xs:int" />
+              <xs:element name="G3" msprop:Generator_ColumnVarNameInTable="columnG3" msprop:Generator_ColumnPropNameInRow="G3" msprop:Generator_ColumnPropNameInTable="G3Column" msprop:Generator_UserColumnName="G3" type="xs:int" />
+              <xs:element name="G4" msprop:Generator_ColumnVarNameInTable="columnG4" msprop:Generator_ColumnPropNameInRow="G4" msprop:Generator_ColumnPropNameInTable="G4Column" msprop:Generator_UserColumnName="G4" type="xs:int" />
+              <xs:element name="G5" msprop:Generator_ColumnVarNameInTable="columnG5" msprop:Generator_ColumnPropNameInRow="G5" msprop:Generator_ColumnPropNameInTable="G5Column" msprop:Generator_UserColumnName="G5" type="xs:int" />
+              <xs:element name="G6" msprop:Generator_ColumnVarNameInTable="columnG6" msprop:Generator_ColumnPropNameInRow="G6" msprop:Generator_ColumnPropNameInTable="G6Column" msprop:Generator_UserColumnName="G6" type="xs:int" />
+              <xs:element name="G7" msprop:Generator_ColumnVarNameInTable="columnG7" msprop:Generator_ColumnPropNameInRow="G7" msprop:Generator_ColumnPropNameInTable="G7Column" msprop:Generator_UserColumnName="G7" type="xs:int" />
+              <xs:element name="OreWeek" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnOreWeek" msprop:Generator_ColumnPropNameInRow="OreWeek" msprop:Generator_ColumnPropNameInTable="OreWeekColumn" msprop:Generator_UserColumnName="OreWeek" type="xs:int" minOccurs="0" />
+              <xs:element name="PercApert" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnPercApert" msprop:Generator_ColumnPropNameInRow="PercApert" msprop:Generator_ColumnPropNameInTable="PercApertColumn" msprop:Generator_UserColumnName="PercApert" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="MachineParams" msprop:Generator_TableClassName="MachineParamsDataTable" msprop:Generator_TableVarName="tableMachineParams" msprop:Generator_TablePropName="MachineParams" msprop:Generator_RowDeletingName="MachineParamsRowDeleting" msprop:Generator_RowChangingName="MachineParamsRowChanging" msprop:Generator_RowEvHandlerName="MachineParamsRowChangeEventHandler" msprop:Generator_RowDeletedName="MachineParamsRowDeleted" msprop:Generator_UserTableName="MachineParams" msprop:Generator_RowChangedName="MachineParamsRowChanged" msprop:Generator_RowEvArgName="MachineParamsRowChangeEvent" msprop:Generator_RowClassName="MachineParamsRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CodConfAper" msprop:Generator_ColumnVarNameInTable="columnCodConfAper" msprop:Generator_ColumnPropNameInRow="CodConfAper" msprop:Generator_ColumnPropNameInTable="CodConfAperColumn" msprop:Generator_UserColumnName="CodConfAper">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="OEE" msprop:Generator_ColumnVarNameInTable="columnOEE" msprop:Generator_ColumnPropNameInRow="OEE" msprop:Generator_ColumnPropNameInTable="OEEColumn" msprop:Generator_UserColumnName="OEE" type="xs:double" />
+              <xs:element name="SetupTime" msprop:Generator_ColumnVarNameInTable="columnSetupTime" msprop:Generator_ColumnPropNameInRow="SetupTime" msprop:Generator_ColumnPropNameInTable="SetupTimeColumn" msprop:Generator_UserColumnName="SetupTime" type="xs:int" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:choice>
    </xs:complexType>
    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -1035,5 +1125,19 @@ FROM CalDisp</CommandText>
      <xs:field xpath="mstns:DataRif" />
      <xs:field xpath="mstns:IdxMacchina" />
    </xs:unique>
+    <xs:unique name="ConfWeek1_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:ConfWeek1" />
+      <xs:field xpath="mstns:CodConfAper" />
+    </xs:unique>
+    <xs:unique name="MachineParams_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:MachineParams" />
+      <xs:field xpath="mstns:IdxMacchina" />
+    </xs:unique>
  </xs:element>
+  <xs:annotation>
+    <xs:appinfo>
+      <msdata:Relationship name="FK_MachineParams_ConfWeek" msdata:parent="ConfWeek" msdata:child="MachineParams" msdata:parentkey="CodConfAper" msdata:childkey="CodConfAper" msprop:Generator_UserChildTable="MachineParams" msprop:Generator_ChildPropName="GetMachineParamsRows" msprop:Generator_UserRelationName="FK_MachineParams_ConfWeek" msprop:Generator_ParentPropName="ConfWeekRow" msprop:Generator_RelationVarName="relationFK_MachineParams_ConfWeek" msprop:Generator_UserParentTable="ConfWeek" />
+      <msdata:Relationship name="FK_MachineParams_ConfWeek1" msdata:parent="ConfWeek1" msdata:child="MachineParams" msdata:parentkey="CodConfAper" msdata:childkey="CodConfAper" msprop:Generator_UserChildTable="MachineParams" msprop:Generator_ChildPropName="GetMachineParamsRows" msprop:Generator_UserRelationName="FK_MachineParams_ConfWeek1" msprop:Generator_ParentPropName="ConfWeek1Row" msprop:Generator_RelationVarName="relationFK_MachineParams_ConfWeek1" msprop:Generator_UserParentTable="ConfWeek1" />
+    </xs:appinfo>
+  </xs:annotation>
 </xs:schema>
@@ -4,18 +4,53 @@
     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="13" 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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
-    <Shape ID="DesignTable:planStatsGlobal" ZOrder="7" X="108" Y="55" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:planStatsArt" ZOrder="9" X="448" Y="61" Height="250" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:planStatsGroup" ZOrder="10" X="113" Y="292" Height="204" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:planStatsMacc" ZOrder="8" X="437" Y="357" Height="227" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:Richieste" ZOrder="4" X="91" Y="651" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:PromesseIN" ZOrder="6" X="484" Y="681" Height="365" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:PromesseOUT" ZOrder="5" X="833" Y="591" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:ConfWeek" ZOrder="3" X="739" Y="56" Height="267" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:CalStop" ZOrder="2" X="950" Y="61" Height="153" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:CalDisp" ZOrder="1" X="944" Y="259" Height="191" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:planStatsGlobal" ZOrder="11" X="108" Y="55" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:planStatsArt" ZOrder="13" X="448" Y="61" Height="250" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
+    <Shape ID="DesignTable:planStatsGroup" ZOrder="14" X="113" Y="292" Height="204" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:planStatsMacc" ZOrder="12" X="437" Y="357" Height="227" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:Richieste" ZOrder="8" X="91" Y="651" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignTable:PromesseIN" ZOrder="10" X="484" Y="681" Height="365" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignTable:PromesseOUT" ZOrder="9" X="833" Y="591" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignTable:ConfWeek" ZOrder="7" X="739" Y="56" Height="267" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:CalStop" ZOrder="6" X="950" Y="61" Height="215" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="89" />
+    <Shape ID="DesignTable:CalDisp" ZOrder="1" X="1169" Y="630" Height="191" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ConfWeek1" ZOrder="5" X="1207" Y="71" Height="319" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
+    <Shape ID="DesignTable:MachineParams" ZOrder="4" X="899" Y="342" Height="181" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
  </Shapes>
-  <Connectors />
+  <Connectors>
+    <Connector ID="DesignRelation:FK_MachineParams_ConfWeek" ZOrder="3" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>826</X>
+          <Y>323</Y>
+        </Point>
+        <Point>
+          <X>826</X>
+          <Y>359</Y>
+        </Point>
+        <Point>
+          <X>899</X>
+          <Y>359</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_MachineParams_ConfWeek1" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1441</X>
+          <Y>390</Y>
+        </Point>
+        <Point>
+          <X>1441</X>
+          <Y>482</Y>
+        </Point>
+        <Point>
+          <X>1179</X>
+          <Y>482</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
 </DiagramLayout>