Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test con timer x charts

Browse Source
This commit is contained in:
Samuele Locatelli
2021-03-22 18:42:58 +01:00
parent 0b1825b8d3
commit ace54ad4b1
7 changed files with 127 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Commesse/Web.config
+1 -1
View File
@@ -77,7 +77,7 @@
<add key="firstHour2Check" value="6" />
<add key="enableDailyCheck" value="true" />
<!--Timeout vari-->
<add key="intUpdatePagina_ms" value="5000" />
<add key="intUpdatePagina_ms" value="15000" />
<add key="maxRefreshToReload" value="30" />
<!--Abilitazione link timbrature-->
<add key="showRepTimb" value="true" />
GPW_Commesse/WebUserControls/cmp_chart.ascx
+4 -7
View File
@@ -3,10 +3,12 @@
<script type="text/javascript">
redrawAll();
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_pageLoaded(function () {
redrawAll();
//console.log('add_pageLoaded!');
console.log('add_pageLoaded!');
});
//prm.add_endRequest(function () {
// redrawAll();
@@ -152,11 +154,6 @@
plotTS();
plotHist();
}
//// funzione di drawing ad OGNI pageload!
//function pageLoad() {
// //redrawAll();
//}
</script>
<asp:HiddenField runat="server" ID="hfIdxDip" />
@@ -176,7 +173,7 @@
</asp:DropDownList>
</div>
</div>
<div class="row">
<div class="row" runat="server" id="divGraphs">
<div class="col-12 col-md-6">
<canvas id="myChartTS" width="300" height="120"></canvas>
</div>
GPW_Commesse/WebUserControls/cmp_chart.ascx.cs
+9 -3
View File
@@ -11,12 +11,12 @@ namespace GPW_Commesse.WebUserControls
{
public partial class cmp_chart : BaseUserControl
{
#region Public Properties
public DateTime dtRif
{
get
{
DateTime answ = DateTime.Today.AddYears(-10);
DateTime.TryParse(hfData.Value, out answ);
return answ;
@@ -28,11 +28,15 @@ namespace GPW_Commesse.WebUserControls
}
}
#endregion Public Properties
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
if (!Page.IsPostBack)
{
if(DateTime.Today.Subtract(dtRif).TotalDays>3650)
if (DateTime.Today.Subtract(dtRif).TotalDays > 3650)
{
dtRif = DateTime.Today;
}
@@ -40,5 +44,7 @@ namespace GPW_Commesse.WebUserControls
// imposto valori...
hfIdxDip.Value = $"{DataProxy.idxDipendente}";
}
#endregion Protected Methods
}
}
GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs
Generated
+9
View File
@@ -40,5 +40,14 @@ namespace GPW_Commesse.WebUserControls
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlMaxNum;
/// <summary>
/// divGraphs control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divGraphs;
}
}
GPW_Commesse/WebUserControls/mod_commUtLog.ascx
+39 -16
View File
@@ -23,39 +23,62 @@
<div class="p-2 flex-grow-1">
<uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" realtimeUpdate="true" />
</div>
<div class="p-2 small">
Temp:
<uc2:cmp_toggle runat="server" ID="cmp_toggleTemp" classOn="text-dark" classOff="text-secondary" />
</div>
<div class="p-2 small">
Sel globale:
<uc2:cmp_toggle runat="server" ID="cmp_toggle" classOn="text-dark" classOff="text-secondary" />
<uc2:cmp_toggle runat="server" ID="cmp_toggle" classOn="text-dark" classOff="text-secondary" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<script>
<script type="text/javascript">
window.setTimeout(showCharts, 10);
window.setTimeout(hideCharts, 100);
//checkVisible();
function checkVisible() {
console.log("checkVisible");
var element = $("#<%:divRilTemp.ClientID%>");
if (element.is(':visible')) {
showCharts();
}
else {
hideCharts();
}
}
function toggleCharts() {
$("#<%:divRilTemp.ClientID%>").toggle();
$("#<%:divCharts.ClientID%>").toggle();
//console.log("toggleCharts");
console.log("toggleCharts");
}
function showCharts() {
$("#<%:divRilTemp.ClientID%>").toggle(true);
$("#<%:divCharts.ClientID%>").toggle(true);
//console.log("showCharts");
console.log("showCharts");
}
function hideCharts() {
$("#<%:divRilTemp.ClientID%>").toggle(false);
$("#<%:divCharts.ClientID%>").toggle(false);
//console.log("hideCharts");
console.log("hideCharts");
}
</script>
<div class="py-1 mx-0 row bg-light">
<div class="col-4" id="divRilTemp" runat="server">
<asp:UpdatePanel ID="upCharts" runat="server" UpdateMode="Conditional" RenderMode="Block">
<ContentTemplate>
<asp:UpdatePanel ID="upCharts" runat="server" UpdateMode="Conditional" RenderMode="Block">
<ContentTemplate>
<div class="py-1 mx-0 row bg-light">
<div class="col-4" id="divRilTemp" runat="server">
<uc2:cmp_rilTemp runat="server" ID="cmp_rilTemp" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-8" runat="server" id="divCharts">
<uc2:cmp_chart runat="server" ID="cmp_chart" />
</div>
</div>
</div>
<div class="col-8" runat="server" id="divCharts">
<uc2:cmp_chart runat="server" ID="cmp_chart" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Block">
<ContentTemplate>
<div class="row">
GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
+47 -12
View File
@@ -52,6 +52,18 @@ namespace GPW_Commesse.WebUserControls
}
}
protected bool tempVisible
{
get
{
return cmp_toggleTemp.toggleValue;
}
set
{
cmp_toggleTemp.toggleValue = value;
}
}
#endregion Protected Properties
#region Public Properties
@@ -103,24 +115,26 @@ namespace GPW_Commesse.WebUserControls
#region Private Methods
private void cmp_rilTemp_ehCancel(object sender, EventArgs e)
private void closeEditTemp()
{
activeMode = modoCommesse.elenco;
grView.SelectedIndex = -1;
grView.DataBind();
tempVisible = false;
//showCharts(false);
showPanels();
raiseEvent(ucEvType.Reset);
}
private void cmp_rilTemp_ehCancel(object sender, EventArgs e)
{
closeEditTemp();
}
private void cmp_rilTemp_ehSave(object sender, EventArgs e)
{
activeMode = modoCommesse.elenco;
//showCharts(false);
showPanels();
raiseEvent(ucEvType.Reset);
closeEditTemp();
}
private void Cmp_toggle_ehToggle(object sender, EventArgs e)
@@ -128,6 +142,16 @@ namespace GPW_Commesse.WebUserControls
showPanels();
}
private void Cmp_toggleTemp_ehToggle(object sender, EventArgs e)
{
if (!cmp_toggleTemp.toggleValue)
{
grView.SelectedIndex = -1;
grView.DataBind();
}
showPanels();
}
private void editCommDay(string dataRif)
{
CultureInfo ita = new CultureInfo("it-IT");
@@ -152,10 +176,10 @@ namespace GPW_Commesse.WebUserControls
//salvo in sessione dati x detail timbrature
memLayer.ML.setSessionVal("idxDip_det", DataProxy.idxDipendente);
// imposto modalità
tempVisible = true;
activeMode = modoCommesse.editRilTemp;
showPanels();
showCharts(true);
raiseEvent(ucEvType.ReqUpdateParent);
}
@@ -219,6 +243,7 @@ namespace GPW_Commesse.WebUserControls
{
activeMode = modoCommesse.elenco;
showPanels();
grView.SelectedIndex = -1;
grView.DataBind();
}
@@ -313,9 +338,10 @@ namespace GPW_Commesse.WebUserControls
mod_TagCloudProgetti1.modo = TagCloudMode.standard;
break;
}
showCharts(false);
showPanels();
tempVisible = true;
}
showPanels();
showCharts(tempVisible);
grView.DataBind();
mod_commUtMancTimbr1.eh_nuovoValore += new EventHandler(mod_commUtMancTimbr1_eh_nuovoValore);
mod_commAttivitaDesk1.eh_nuovoValore += new EventHandler(mod_commAttivitaDesk1_eh_nuovoValore);
@@ -323,20 +349,27 @@ namespace GPW_Commesse.WebUserControls
mod_TagCloudProgetti1.eh_refresh += mod_TagCloudProgetti1_eh_refresh;
mod_periodoAnalisi1.eh_doUpdate += mod_periodoAnalisi1_eh_doUpdate;
cmp_toggle.ehToggle += Cmp_toggle_ehToggle;
cmp_toggleTemp.ehToggle += Cmp_toggleTemp_ehToggle;
cmp_rilTemp.ehCancel += cmp_rilTemp_ehCancel;
cmp_rilTemp.ehSave += cmp_rilTemp_ehSave;
}
protected void showCharts(bool doShow)
{
divRilTemp.Visible = doShow;
#if false
ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "ShowHideCharts", "checkVisible();", true);
divCharts.Visible = true;
if (doShow)
{
ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "MyAction", "showCharts();", true);
ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "ShowHideCharts", "showCharts();", true);
}
else
{
ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "MyAction", "hideCharts();", true);
ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "ShowHideCharts", "hideCharts();", true);
}
#endif
divCharts.Visible = doShow;
}
/// <summary>
@@ -426,8 +459,10 @@ namespace GPW_Commesse.WebUserControls
pnlEditOre.Visible = timbr;
mod_commAttivitaDesk1.Visible = commesse;
mod_commUtMancTimbr1.Visible = timbr;
#if false
cmp_rilTemp.Visible = temp;
showCharts(temp);
#endif
showCharts(temp && tempVisible);
upMain.Update();
upFilt.Update();
GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs
Generated
+18 -9
View File
@@ -50,6 +50,15 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::mod_periodoAnalisi mod_periodoAnalisi1;
/// <summary>
/// cmp_toggleTemp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggleTemp;
/// <summary>
/// cmp_toggle control.
/// </summary>
@@ -59,15 +68,6 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle;
/// <summary>
/// divRilTemp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRilTemp;
/// <summary>
/// upCharts control.
/// </summary>
@@ -77,6 +77,15 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::System.Web.UI.UpdatePanel upCharts;
/// <summary>
/// divRilTemp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRilTemp;
/// <summary>
/// cmp_rilTemp control.
/// </summary>