From 7bc4eca2fdb802c84ac04732ca042b2102c8f760 Mon Sep 17 00:00:00 2001
From: samuele <samuele@3e04ef4b-3b25-4b6c-be27-bb5389ca777b>
Date: Tue, 10 Feb 2009 10:08:35 +0000
Subject: [PATCH] - corretto errore calcolo "modulo" della divisione - corretto
 periodo mostrato con selettore periodo

git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@85 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
---
 WebSites/WebGIM/App_Code/WebGimUtils.cs    | 4 ++--
 WebSites/WebGIM/mod_menuBottom.ascx        | 2 +-
 WebSites/WebGIM/mod_periodoAnalisi.ascx    | 6 +++---
 WebSites/WebGIM/mod_periodoAnalisi.ascx.cs | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/WebSites/WebGIM/App_Code/WebGimUtils.cs b/WebSites/WebGIM/App_Code/WebGimUtils.cs
index 0b42ba1..fda93ff 100644
--- a/WebSites/WebGIM/App_Code/WebGimUtils.cs
+++ b/WebSites/WebGIM/App_Code/WebGimUtils.cs
@@ -33,8 +33,8 @@ public class WebGimUtils
         int ggSett = (int)periodo.inizio.DayOfWeek;
         for (int i = 0; i < numGgRimanenti; i++)
         {
-            // il primo giorno è pari al giorno iniziale...
-            answ = answ + (double)tabOre[i + ggSett].apertura;
+            // il primo giorno è pari al giorno iniziale... e poi calcolo il "modulo" a 7 (con "%")
+            answ = answ + (double)tabOre[(i + ggSett)%7].apertura;
         }
         // cerco eventuali festività che cadano nel periodo e le tolgo
         foreach (DS_applicazione.CalendFesteFerieRow riga in tabCalFF)
diff --git a/WebSites/WebGIM/mod_menuBottom.ascx b/WebSites/WebGIM/mod_menuBottom.ascx
index f6cd813..afdffe1 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">76 - </asp:Label>
+<asp:Label runat="server" ID="lblApp" Text="."></asp:Label><asp:Label ID="lblrev" runat="server">84 - </asp:Label>
 <asp:Label runat="server" ID="lblCopyRight" Text="..."></asp:Label>
diff --git a/WebSites/WebGIM/mod_periodoAnalisi.ascx b/WebSites/WebGIM/mod_periodoAnalisi.ascx
index 76fcec0..62a49a3 100644
--- a/WebSites/WebGIM/mod_periodoAnalisi.ascx
+++ b/WebSites/WebGIM/mod_periodoAnalisi.ascx
@@ -2,17 +2,17 @@
     Inherits="mod_periodoAnalisi" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
 <div style="float: right;">
-    <div style="float: left;">
+    <div style="float: left; padding-right:4px;">
         <asp:Label ID="lblPeriodo" runat="server"></asp:Label>
     </div>
-    <div style="float: left;">
+    <div style="float: left; padding-right:4px;">
         <asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="6em" MaxLength="10"
             AutoPostBack="True" OnTextChanged="txtInizio_TextChanged"></asp:TextBox>
         <cc1:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="txtInizio"
             FirstDayOfWeek="Monday" Format="dd/MM/yyyy">
         </cc1:CalendarExtender>
     </div>
-    <div style="float: left;">
+    <div style="float: left; padding-right:4px;">
         <asp:TextBox ID="txtFine" TabIndex="2" runat="server" Width="6em" MaxLength="10"
             AutoPostBack="True" OnTextChanged="txtFine_TextChanged"></asp:TextBox>
         <cc1:CalendarExtender ID="CalendarExtender2" runat="server" TargetControlID="txtFine"
diff --git a/WebSites/WebGIM/mod_periodoAnalisi.ascx.cs b/WebSites/WebGIM/mod_periodoAnalisi.ascx.cs
index 250de50..bc791f8 100644
--- a/WebSites/WebGIM/mod_periodoAnalisi.ascx.cs
+++ b/WebSites/WebGIM/mod_periodoAnalisi.ascx.cs
@@ -71,7 +71,7 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
     private void aggiornaDateMostrate()
     {
         txtInizio.Text = intervalloAnalisi.inizio.ToShortDateString();
-        txtFine.Text = intervalloAnalisi.fine.ToShortDateString();
+        txtFine.Text = intervalloAnalisi.fine.AddDays(-1).ToShortDateString(); // mostro 1 gg in meno xché termina alle 00:00...
         reportUpdate();
     }
 
@@ -85,8 +85,8 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
         catch
         {
             _intervallo = new intervalloDate();
-            _intervallo.inizio = DateTime.Now.AddDays(-7);
-            _intervallo.fine = DateTime.Now;
+            _intervallo.fine = DateTime.Now.Subtract(DateTime.Now.TimeOfDay).AddDays(1);
+            _intervallo.inizio = _intervallo.fine.AddDays(-8);
             Session["_intervallo"] = _intervallo;
             Session["_inizio"] = _intervallo.inizio;
             Session["_fine"] = _intervallo.fine;
@@ -124,7 +124,8 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
     {
         _intervallo = new intervalloDate();
         _intervallo.inizio = Convert.ToDateTime(txtInizio.Text);
-        _intervallo.fine = ((DateTime)Convert.ToDateTime(txtFine.Text)).Date.AddDays(1).AddMinutes(-1);
+        _intervallo.fine = ((DateTime)Convert.ToDateTime(txtFine.Text)).Date.AddDays(1);
+        //_intervallo.fine = ((DateTime)Convert.ToDateTime(txtFine.Text)).Date.AddDays(1).AddMinutes(-1);
         intervalloAnalisi = _intervallo;
         reportUpdate();