Fix grafici x mostrare meno date previsionali di impegno + fix su db (stored, filtraggi, indici...)

This commit is contained in:
Samuele E. Locatelli
2016-02-04 16:57:06 +01:00
parent 0f52b932a1
commit cd19a0eb5d
7 changed files with 23 additions and 32 deletions
Binary file not shown.
+2 -2
View File
@@ -12,7 +12,7 @@
<!--parametri base-->
<add key="intUpdatePagina_ms" value="240000" />
<add key="zonaDef" value="Z00" />
<add key="numGgDef" value="20" />
<add key="numGgDef" value="11" />
<add key="minCookieSquadra" value="5" />
<add key="svuotaMatrOp" value="true" />
<add key="svuotaMatrOpMove" value="true" />
@@ -69,7 +69,7 @@
</system.Web>
-->
<system.web>
<globalization culture="it-it" />
<globalization culture="it-IT" />
<compilation debug="true" targetFramework="4.5">
<assemblies>
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
@@ -53,16 +53,11 @@
<asp:LinkButton runat="server" ID="lbMore" OnClick="lbMore_Click"><i class="fa fa-plus-square fa-2x"></i></asp:LinkButton>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel runat="server" ID="upnContenuto" UpdateMode="Always">
<ContentTemplate>
<div class="ui-mini noShadows" style="width: 100%;">
<div style="min-width: 85px; width: 20%; float: left;">
<div style="min-width: 85px; width: 12%; float: left;">
<uc1:mod_dispPeriodo runat="server" ID="mod_dispPeriodo" />
</div>
<div style="width: 80%; float: right;">
<div style="width: 88%; float: right;">
<uc1:mod_giornata runat="server" ID="mod_giornata" />
<div style="width: 100%;">
<div style="width: 75%; float: left;">
@@ -127,7 +127,7 @@ namespace WebSCR.WebUserControls
// ricarico!!!
Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
else if (qsVal("Action") == "EDIT")
{
errorMess = "EDIT";
@@ -158,7 +158,7 @@ namespace WebSCR.WebUserControls
mod_giornata.Visible = true;
}
}
private void tryMove()
{
// verifico di avere MatrOP selezionata
@@ -191,7 +191,7 @@ namespace WebSCR.WebUserControls
{
errorMess = "Prego indicare Matricola Operatore per procedere";
}
}
}
/// <summary>
/// anno selezionato
@@ -313,7 +313,7 @@ namespace WebSCR.WebUserControls
}
else
{
errorMess= "Prego indicare inizio attività per procedere";
errorMess = "Prego indicare inizio attività per procedere";
}
}
else
@@ -378,7 +378,7 @@ namespace WebSCR.WebUserControls
memLayer.ML.setSessionVal("CodSquadra", CodSquadra);
memLayer.ML.setSessionVal("DataImp", DataImp);
}
/// <summary>
/// nuovo record impegno...
@@ -399,16 +399,18 @@ namespace WebSCR.WebUserControls
errorMess = "Selezionato Documento";
lblWarning.Text = errorMess;
refreshDetail();
mod_giornata.doUpdate();
#if false
// 2016.02.03 semplificato udpate a SOLO disp periodo (zona)
//refreshDetail();
//mod_giornata.doUpdate();
// faccio udpate SOLO SE è variata la zona...
if (mod_dispPeriodo.Zona != mod_filtroZona.Zona)
{
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_dispPeriodo.doUpdate();
}
#endif
}
/// <summary>
/// refresh detail
@@ -430,10 +432,13 @@ namespace WebSCR.WebUserControls
{ }
Response.Redirect(string.Format("{0}?Data={1:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, adesso));
}
mod_dispPeriodo.DataFrom = mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd");
mod_dispPeriodo.NumGG = mod_filtroPeriodo.numGG.ToString();
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_dispPeriodo.doUpdate();
if (mod_dispPeriodo.Zona != mod_filtroZona.Zona || mod_dispPeriodo.DataFrom != mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd") || mod_dispPeriodo.NumGG != mod_filtroPeriodo.numGG.ToString())
{
mod_dispPeriodo.DataFrom = mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd");
mod_dispPeriodo.NumGG = mod_filtroPeriodo.numGG.ToString();
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_dispPeriodo.doUpdate();
}
mod_impegno.doUpdate();
mod_dettInt.doUpdate();
}
@@ -84,15 +84,6 @@ namespace WebSCR.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbMore;
/// <summary>
/// upnContenuto control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnContenuto;
/// <summary>
/// mod_dispPeriodo control.
/// </summary>
Binary file not shown.
+2 -2
View File
@@ -12,7 +12,7 @@
<!--parametri base-->
<add key="intUpdatePagina_ms" value="240000" />
<add key="zonaDef" value="Z00" />
<add key="numGgDef" value="20" />
<add key="numGgDef" value="10" />
<add key="minCookieSquadra" value="5" />
<add key="svuotaMatrOp" value="true" />
<add key="svuotaMatrOpMove" value="true" />
@@ -69,7 +69,7 @@
</system.Web>
-->
<system.web>
<globalization culture="it-it" />
<globalization culture="it-IT" />
<compilation debug="true" targetFramework="4.5">
<assemblies>
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />