diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
index 7aa536e..83896a5 100644
--- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
+++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
@@ -105,16 +105,24 @@ namespace GPW_Commesse.WebUserControls
private void cmp_rilTemp_ehCancel(object sender, EventArgs e)
{
+ cmp_toggleTemp.toggleValue = false;
activeMode = modoCommesse.elenco;
showPanels();
grView.SelectedIndex = -1;
grView.DataBind();
+
+ showCharts(false);
+ raiseEvent(ucEvType.Reset);
}
private void cmp_rilTemp_ehSave(object sender, EventArgs e)
{
+ cmp_toggleTemp.toggleValue = false;
activeMode = modoCommesse.elenco;
showPanels();
+
+ showCharts(false);
+ raiseEvent(ucEvType.Reset);
}
private void Cmp_toggle_ehToggle(object sender, EventArgs e)
@@ -148,6 +156,9 @@ namespace GPW_Commesse.WebUserControls
// imposto modalità
activeMode = modoCommesse.editRilTemp;
showPanels();
+
+ showCharts(true);
+ raiseEvent(ucEvType.ReqUpdateParent);
}
private void editTimbr(string dataRif)
@@ -216,6 +227,7 @@ namespace GPW_Commesse.WebUserControls
protected void lbShowTemp_Click(object sender, EventArgs e)
{
string dataRif = ((LinkButton)sender).CommandArgument;
+ cmp_toggleTemp.toggleValue = true;
// verifico se dip sia attivo...
if (DataProxy.currDipIsActive)
{
@@ -302,8 +314,8 @@ namespace GPW_Commesse.WebUserControls
mod_TagCloudProgetti1.modo = TagCloudMode.standard;
break;
}
+ showPanels();
}
- showPanels();
grView.DataBind();
mod_commUtMancTimbr1.eh_nuovoValore += new EventHandler(mod_commUtMancTimbr1_eh_nuovoValore);
mod_commAttivitaDesk1.eh_nuovoValore += new EventHandler(mod_commAttivitaDesk1_eh_nuovoValore);
@@ -315,6 +327,18 @@ namespace GPW_Commesse.WebUserControls
cmp_rilTemp.ehSave += cmp_rilTemp_ehSave;
}
+ protected void showCharts(bool doShow)
+ {
+ if (doShow)
+ {
+ ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "MyAction", "showCharts();", true);
+ }
+ else
+ {
+ ScriptManager.RegisterStartupScript(upCharts, this.GetType(), "MyAction", "hideCharts();", true);
+ }
+ }
+
///
/// imposta visualizzazione dei pannelli opzionali laterali a seocnda del modo attivo
///
@@ -402,11 +426,11 @@ namespace GPW_Commesse.WebUserControls
pnlEditOre.Visible = timbr;
mod_commAttivitaDesk1.Visible = commesse;
mod_commUtMancTimbr1.Visible = timbr;
- divRilTemp.Visible = temp;
cmp_rilTemp.Visible = temp;
- cmp_chart.Visible = true;
+ showCharts(temp);
upMain.Update();
+ upFilt.Update();
upCharts.Update();
}
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs
index 9155733..413e95d 100644
--- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs
+++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// Codice generato da uno strumento.
+//
+// This code was generated by a tool.
//
-// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls
@@ -15,209 +15,227 @@ namespace GPW_Commesse.WebUserControls
{
///
- /// Controllo hfDataFrom.
+ /// hfDataFrom control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.HiddenField hfDataFrom;
///
- /// Controllo hfDataTo.
+ /// hfDataTo control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.HiddenField hfDataTo;
///
- /// Controllo upFilt.
+ /// upFilt control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.UpdatePanel upFilt;
///
- /// Controllo mod_periodoAnalisi1.
+ /// mod_periodoAnalisi1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::mod_periodoAnalisi mod_periodoAnalisi1;
///
- /// Controllo cmp_toggle.
+ /// cmp_toggleTemp control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggleTemp;
+
+ ///
+ /// cmp_toggle control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle;
///
- /// Controllo upCharts.
+ /// divRilTemp control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.UpdatePanel upCharts;
-
- ///
- /// Controllo divRilTemp.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRilTemp;
///
- /// Controllo cmp_rilTemp.
+ /// upCharts control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.UpdatePanel upCharts;
+
+ ///
+ /// cmp_rilTemp control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.cmp_rilTemp cmp_rilTemp;
///
- /// Controllo cmp_chart.
+ /// divCharts control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCharts;
+
+ ///
+ /// cmp_chart control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.cmp_chart cmp_chart;
///
- /// Controllo upMain.
+ /// upMain control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.UpdatePanel upMain;
///
- /// Controllo divSx.
+ /// divSx control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSx;
///
- /// Controllo pnlEditOre.
+ /// pnlEditOre control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Panel pnlEditOre;
///
- /// Controllo btnCloseTimb.
+ /// btnCloseTimb control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Button btnCloseTimb;
///
- /// Controllo mod_elencoTimbr1.
+ /// mod_elencoTimbr1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.mod_elencoTimbr mod_elencoTimbr1;
///
- /// Controllo mod_commUtMancTimbr1.
+ /// mod_commUtMancTimbr1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.mod_commUtMancTimbr mod_commUtMancTimbr1;
///
- /// Controllo divCn.
+ /// divCn control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCn;
///
- /// Controllo grView.
+ /// grView control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.GridView grView;
///
- /// Controllo ods.
+ /// ods control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// Controllo divDx.
+ /// divDx control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDx;
///
- /// Controllo pnlEditCom.
+ /// pnlEditCom control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Panel pnlEditCom;
///
- /// Controllo btnCloseRA.
+ /// btnCloseRA control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Button btnCloseRA;
///
- /// Controllo mod_TagCloudProgetti1.
+ /// mod_TagCloudProgetti1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.mod_TagCloudProgetti mod_TagCloudProgetti1;
///
- /// Controllo mod_commAttivitaDesk1.
+ /// mod_commAttivitaDesk1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::GPW_Commesse.WebUserControls.mod_commAttivitaDesk mod_commAttivitaDesk1;
}
diff --git a/GPW_Commesse/libmongocrypt.dylib b/GPW_Commesse/libmongocrypt.dylib
deleted file mode 100644
index 91418d4..0000000
Binary files a/GPW_Commesse/libmongocrypt.dylib and /dev/null differ
diff --git a/GPW_Commesse/libmongocrypt.so b/GPW_Commesse/libmongocrypt.so
deleted file mode 100644
index 2e6bae0..0000000
Binary files a/GPW_Commesse/libmongocrypt.so and /dev/null differ
diff --git a/GPW_Commesse/libzstd.dll b/GPW_Commesse/libzstd.dll
deleted file mode 100644
index e669123..0000000
Binary files a/GPW_Commesse/libzstd.dll and /dev/null differ
diff --git a/GPW_Commesse/mongocrypt.dll b/GPW_Commesse/mongocrypt.dll
deleted file mode 100644
index 39d7e01..0000000
Binary files a/GPW_Commesse/mongocrypt.dll and /dev/null differ
diff --git a/GPW_Commesse/snappy32.dll b/GPW_Commesse/snappy32.dll
deleted file mode 100644
index afc82ca..0000000
Binary files a/GPW_Commesse/snappy32.dll and /dev/null differ
diff --git a/GPW_Commesse/snappy64.dll b/GPW_Commesse/snappy64.dll
deleted file mode 100644
index 36cd5fe..0000000
Binary files a/GPW_Commesse/snappy64.dll and /dev/null differ
diff --git a/GPW_Commesse/test01.aspx b/GPW_Commesse/test01.aspx
index 954a46d..99dd90d 100644
--- a/GPW_Commesse/test01.aspx
+++ b/GPW_Commesse/test01.aspx
@@ -1,7 +1,8 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.master" AutoEventWireup="true" CodeBehind="test01.aspx.cs" Inherits="GPW_Commesse.test01" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.master" AutoEventWireup="true" CodeBehind="test01.aspx.cs" Inherits="GPW_Commesse.test01" EnableEventValidation="false" %>
<%@ Register Src="~/WebUserControls/cmp_chart.ascx" TagPrefix="uc1" TagName="cmp_chart" %>
<%@ Register Src="~/WebUserControls/mod_commUtLog.ascx" TagPrefix="uc1" TagName="mod_commUtLog" %>
+<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %>
<%--
@@ -26,12 +27,22 @@
function toggle02() {
$("#div02").toggle();
}
+ function show01() {
+ $("#div01").toggle(true);
+ }
+ function hide01() {
+ $("#div01").toggle(false);
+ }
+
+
+
+
@@ -41,7 +52,7 @@
-
+
diff --git a/GPW_Commesse/test01.aspx.cs b/GPW_Commesse/test01.aspx.cs
index 2d39785..0e19af9 100644
--- a/GPW_Commesse/test01.aspx.cs
+++ b/GPW_Commesse/test01.aspx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -9,6 +10,51 @@ namespace GPW_Commesse
{
public partial class test01 : System.Web.UI.Page
{
+ #region Private Methods
+
+ private void Mod_commUtLog_eh_ucev(object sender, EventArgs e)
+ {
+ // verifico evento: se trovo mostro/nascondo dettagli...
+ ucEvent evento = (ucEvent)e;
+ switch (evento.tipoEvento)
+ {
+ case ucEvType.Delete:
+ break;
+
+ case ucEvType.Edit:
+ break;
+
+ case ucEvType.New:
+ break;
+
+ case ucEvType.Reset:
+ ScriptManager.RegisterStartupScript(
+ upChart,
+ this.GetType(),
+ "MyAction",
+ "hide01();",
+ true);
+ break;
+
+ case ucEvType.ReqUpdateParent:
+ ScriptManager.RegisterStartupScript(
+ upChart,
+ this.GetType(),
+ "MyAction",
+ "show01();",
+ true);
+ break;
+
+ case ucEvType.Selected:
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ #endregion Private Methods
+
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
@@ -16,6 +62,8 @@ namespace GPW_Commesse
cmp_chart.dtRif = DateTime.Today;
hfShow01.Value = "false";
hfShow02.Value = "true";
+
+ mod_commUtLog.eh_ucev += Mod_commUtLog_eh_ucev;
}
#endregion Protected Methods
diff --git a/GPW_Commesse/test01.aspx.designer.cs b/GPW_Commesse/test01.aspx.designer.cs
index 1f619c7..02cd7a2 100644
--- a/GPW_Commesse/test01.aspx.designer.cs
+++ b/GPW_Commesse/test01.aspx.designer.cs
@@ -41,6 +41,24 @@ namespace GPW_Commesse
///
protected global::System.Web.UI.UpdatePanel upChart;
+ ///
+ /// cmp_toggle01 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle01;
+
+ ///
+ /// cmp_toggle02 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle02;
+
///
/// lbt01 control.
///
diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj
index 2353c72..b8192f1 100644
--- a/GPW_Smart/GPW_Smart.csproj
+++ b/GPW_Smart/GPW_Smart.csproj
@@ -559,8 +559,6 @@
-
-
diff --git a/GPW_Smart/snappy32.dll b/GPW_Smart/snappy32.dll
deleted file mode 100644
index afc82ca..0000000
Binary files a/GPW_Smart/snappy32.dll and /dev/null differ
diff --git a/GPW_Smart/snappy64.dll b/GPW_Smart/snappy64.dll
deleted file mode 100644
index 36cd5fe..0000000
Binary files a/GPW_Smart/snappy64.dll and /dev/null differ
diff --git a/Jenkinsfile b/Jenkinsfile
index e4a8180..31e3de9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4151']) {
+ withEnv(['NEXT_BUILD_NUMBER=4152']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'