Merge branch 'ES3' into develop

ES3/CalDispMac.aspx

@@ -3,6 +3,8 @@
 <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
 <%@ Register Src="~/WebUserControls/cmp_calStop.ascx" TagPrefix="uc1" TagName="cmp_calStop" %>
 <%@ Register Src="~/WebUserControls/cmp_calDisp.ascx" TagPrefix="uc1" TagName="cmp_calDisp" %>
+<%@ Register Src="~/WebUserControls/cmp_dispStats.ascx" TagPrefix="uc1" TagName="cmp_dispStats" %>
+
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
@@ -13,7 +15,8 @@
           <div class="card-header">
             <h4>Calendario STOP</h4>
           </div>
-          <div class="card-body bg-light p-1">
+          <div class="card-body bg-light text-dark p-1">
+            rivedere editing x permettere MODIFICA per singola MACCHINA + DATA su apertura --> così ricalcola con quello stop
             <uc1:cmp_calStop runat="server" ID="cmp_calStop" />
           </div>
           <div class="card-footer text-right">
@@ -39,8 +42,8 @@
           <div class="card-header">
             <h4>Statistiche</h4>
           </div>
-          <div class="card-body bg-light p-1">
-            statistiche disponibilità
+          <div class="card-body bg-light text-dark p-1">
+            <uc1:cmp_dispStats runat="server" id="cmp_dispStats" />
           </div>
           <div class="card-footer text-right">
           </div>

ES3/CalDispMac.aspx.designer.cs

@@ -58,5 +58,14 @@ 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_numRowDisp;
+
+    /// <summary>
+    /// Controllo cmp_dispStats.
+    /// </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_dispStats cmp_dispStats;
   }
 }

ES3/ES3.csproj

@@ -280,6 +280,7 @@
     <Content Include="WebUserControls\cmp_calDisp.ascx" />
     <Content Include="WebUserControls\cmp_calStop.ascx" />
     <Content Include="WebUserControls\cmp_confWeek.ascx" />
+    <Content Include="WebUserControls\cmp_dispStats.ascx" />
     <Content Include="WebUserControls\cmp_machParams.ascx" />
     <Content Include="WebUserControls\cmp_machStats.ascx" />
     <Content Include="WebUserControls\mod_gestPromODL_OUT.ascx" />
@@ -524,6 +525,13 @@
     <Compile Include="WebUserControls\cmp_confWeek.ascx.designer.cs">
       <DependentUpon>cmp_confWeek.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\cmp_dispStats.ascx.cs">
+      <DependentUpon>cmp_dispStats.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_dispStats.ascx.designer.cs">
+      <DependentUpon>cmp_dispStats.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\cmp_machParams.ascx.cs">
       <DependentUpon>cmp_machParams.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

ES3/MachineParams.aspx.cs

@@ -15,7 +15,7 @@ namespace ES3
       if (!Page.IsPostBack)
       {
         cmp_numRowConfWeek.numRowPag = memLayer.ML.CRI("_righeDataGridShort");
-        cmp_numRowParams.numRowPag = memLayer.ML.CRI("_righeDataGridShort");
+        cmp_numRowParams.numRowPag = memLayer.ML.CRI("_righeDataGridLong");
         // sistemo i DataGrid...
         cmp_confWeek.pageSize = cmp_numRowConfWeek.numRowPag;
         cmp_machParams.pageSize = cmp_numRowParams.numRowPag;

ES3/WebUserControls/cmp_dispStats.ascx

@@ -0,0 +1,11 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_dispStats.ascx.cs" Inherits="ES3.WebUserControls.cmp_dispStats" %>
+
+
+
+statistiche disponibilità:<br />
+<ul>
+  <li>specificata x filtro su macchine e periodo (anno/anno+mese)</li>
+  <li>SOMMA ORE CUMULATE di apertura</li>
+  <li>SOMMA ORE CUMULATE già allocate</li>
+  <li>SOMMA ORE CUMULATE disponibili</li>
+</ul>

ES3/WebUserControls/cmp_dispStats.ascx.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace ES3.WebUserControls
+{
+  public partial class cmp_dispStats : System.Web.UI.UserControl
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+  }
+}

ES3/WebUserControls/cmp_dispStats.ascx.designer.cs

@@ -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_dispStats
+  {
+  }
+}