From 0f9dc0e9cd89443a5871ceef210ba458af3a4cac Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 25 Sep 2019 21:48:56 +0200 Subject: [PATCH] Nuova versione con FLUXLOG inserito in DettaglioMacchina --- Jenkinsfile | 2 +- MP-Site/MP-Site.csproj | 8 + .../WebUserControls/mod_listaStatiEventi.ascx | 148 +++++------------- .../mod_listaStatiEventi.ascx.designer.cs | 18 +++ MP-Site/WebUserControls/mod_logFluxData.ascx | 62 ++++++++ .../WebUserControls/mod_logFluxData.ascx.cs | 50 ++++++ .../mod_logFluxData.ascx.designer.cs | 33 ++++ .../WebUserControls/mod_statoMacchina.ascx | 1 + .../WebUserControls/mod_statoMacchina.ascx.cs | 12 +- .../mod_statoMacchina.ascx.designer.cs | 9 ++ MapoDb/DS_applicazione.Designer.cs | 58 ++++++- MapoDb/DS_applicazione.xsd | 74 +++++---- MapoDb/DS_applicazione.xss | 95 +++++------ MapoDb/resoconti.cs | 38 ++--- 14 files changed, 392 insertions(+), 216 deletions(-) create mode 100644 MP-Site/WebUserControls/mod_logFluxData.ascx create mode 100644 MP-Site/WebUserControls/mod_logFluxData.ascx.cs create mode 100644 MP-Site/WebUserControls/mod_logFluxData.ascx.designer.cs diff --git a/Jenkinsfile b/Jenkinsfile index 4bfc69c8..68621256 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1229']) { + withEnv(['NEXT_BUILD_NUMBER=1231']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index c912a8c8..4ca6c889 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -293,6 +293,7 @@ + @@ -661,6 +662,13 @@ mod_logEventi.ascx + + mod_logFluxData.ascx + ASPXCodeBehind + + + mod_logFluxData.ascx + mod_logScarti.ascx ASPXCodeBehind diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx index eee43606..784e14d3 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx @@ -7,6 +7,8 @@ <%@ Register Src="~/WebUserControls/mod_logEventi.ascx" TagPrefix="uc1" TagName="mod_logEventi" %> <%@ Register Src="~/WebUserControls/mod_logScarti.ascx" TagPrefix="uc1" TagName="mod_logScarti" %> <%@ Register Src="~/WebUserControls/mod_logControlli.ascx" TagPrefix="uc1" TagName="mod_logControlli" %> +<%@ Register Src="~/WebUserControls/mod_logFluxData.ascx" TagPrefix="uc1" TagName="mod_logFluxData" %> + @@ -16,139 +18,63 @@ Produzione - - - - - - - - - - - - - - - - - - - - - - - + + + + + Dati Confermati - - - - - - - - - + + - - - - - - - - - + + Log Stati - - - - - - - - - + + - - - - - - - - - + + Log Eventi - - - - - - - - - + + - - - - - - - - - + + Log Controlli - - - - - - - + +
- - - - - - - - - + + Log Scarti - - - - - - - - - + +
- - - - - - - - - + + + + + Log FlussoDati + + +
+ +
+ + diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.designer.cs b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.designer.cs index 5e3ba714..ced32e7a 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.designer.cs @@ -128,5 +128,23 @@ namespace MP_SITE.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MP_SITE.WebUserControls.mod_logScarti mod_logScarti; + + /// + /// Controllo TabFluxLog. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::AjaxControlToolkit.TabPanel TabFluxLog; + + /// + /// Controllo mod_logFluxData. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_SITE.WebUserControls.mod_logFluxData mod_logFluxData; } } diff --git a/MP-Site/WebUserControls/mod_logFluxData.ascx b/MP-Site/WebUserControls/mod_logFluxData.ascx new file mode 100644 index 00000000..5f32a8cd --- /dev/null +++ b/MP-Site/WebUserControls/mod_logFluxData.ascx @@ -0,0 +1,62 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logFluxData.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logFluxData" %> + + + + + + + + Nessun record trovato + + + <%----%> + + + + + <%-- + +
+
+
+ Art: + +
+
+ <%# Eval("Descrizione") %>' +
+
+
+ + <%# Eval("Qta") %> + pz +
+
+
+ + +
+
+ + + +
+
+
+ Nota: + + +
+
+ + --%> + + + + + + + + + + diff --git a/MP-Site/WebUserControls/mod_logFluxData.ascx.cs b/MP-Site/WebUserControls/mod_logFluxData.ascx.cs new file mode 100644 index 00000000..77e86b84 --- /dev/null +++ b/MP-Site/WebUserControls/mod_logFluxData.ascx.cs @@ -0,0 +1,50 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_SITE.WebUserControls +{ + public partial class mod_logFluxData : baseProdControl + { + public override void aggiornamento() + { + if (memLayer.ML.CRI("_logLevel") > 5) + { + logger.lg.scriviLog("inizio caricamento dati FluxLog", tipoLog.INFO); + } + grView.PageSize = _numRighe; + ods.DataBind(); + if (memLayer.ML.CRI("_logLevel") > 5) + { + logger.lg.scriviLog("fine caricamento dati FluxLog", tipoLog.INFO); + } + if (!Page.IsPostBack) + { + fixMacchina(); + } + } + public void reportUpdt(object sender, EventArgs e) + { + reportUpdate(); + } + + private void fixMacchina() + { + string IdxMacc = memLayer.ML.StringSessionObj("IdxMacchina"); + int idx = 0; + if (isMulti(IdxMacc)) + { + idx = IdxMacc.IndexOf("#"); + if (idx > 0) + { + IdxMacc = IdxMacc.Substring(0, IdxMacc.IndexOf("#")); + } + } + memLayer.ML.setSessionVal("IdxMacchinaFluxFlog", IdxMacc); + } + } +} \ No newline at end of file diff --git a/MP-Site/WebUserControls/mod_logFluxData.ascx.designer.cs b/MP-Site/WebUserControls/mod_logFluxData.ascx.designer.cs new file mode 100644 index 00000000..354f75d6 --- /dev/null +++ b/MP-Site/WebUserControls/mod_logFluxData.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_SITE.WebUserControls { + + + public partial class mod_logFluxData { + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx b/MP-Site/WebUserControls/mod_statoMacchina.ascx index c1d21743..e165724b 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx @@ -2,6 +2,7 @@ CodeBehind="mod_statoMacchina.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +
diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index deaedb90..5f1939e4 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -12,7 +12,17 @@ namespace MP_SITE.WebUserControls /// /// seriale associato alla macchina da controllare /// - protected string _IdxMacchina; + protected string _IdxMacchina + { + get + { + return hfIdxMacchina.Value; + } + set + { + hfIdxMacchina.Value = value.Trim(); + } + } /// /// posizione macchina nella tabella /// diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs index 12195dd1..21e95024 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs @@ -21,6 +21,15 @@ namespace MP_SITE.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlMacchina; + /// + /// Controllo hfIdxMacchina. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfIdxMacchina; + /// /// Controllo divData. /// diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs index 4d5c8d41..07b2916c 100644 --- a/MapoDb/DS_applicazione.Designer.cs +++ b/MapoDb/DS_applicazione.Designer.cs @@ -26968,21 +26968,30 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.FluxLog"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_FL_InsNew"; + this._commandCollection[1].CommandText = "dbo.stp_FL_getFilt"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEvento", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFlux", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Count", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_FL_InsNew"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEvento", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFlux", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Count", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -27009,6 +27018,41 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_applicazione.FluxLogDataTable getFilt(string IdxMacchina, global::System.Nullable dtFrom, global::System.Nullable dtTo, global::System.Nullable showMulti) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((IdxMacchina == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina)); + } + if ((dtFrom.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dtFrom.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((dtTo.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dtTo.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((showMulti.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + DS_applicazione.FluxLogDataTable dataTable = new DS_applicazione.FluxLogDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -27193,7 +27237,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int InsNew(string IdxMacchina, global::System.Nullable dtEvento, string CodFlux, string Valore, global::System.Nullable Count) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; if ((IdxMacchina == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd index be3df2d8..8c3335d8 100644 --- a/MapoDb/DS_applicazione.xsd +++ b/MapoDb/DS_applicazione.xsd @@ -2526,6 +2526,20 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = + + + + dbo.stp_FL_getFilt + + + + + + + + + + @@ -3088,7 +3102,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3110,7 +3124,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3146,7 +3160,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3182,7 +3196,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3199,7 +3213,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3223,7 +3237,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3265,7 +3279,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3344,7 +3358,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3373,7 +3387,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3401,7 +3415,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3532,26 +3546,26 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss index 263c5766..05ca2494 100644 --- a/MapoDb/DS_applicazione.xss +++ b/MapoDb/DS_applicazione.xss @@ -4,37 +4,38 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 667 @@ -46,7 +47,7 @@ - + 699 @@ -58,7 +59,7 @@ - + 815 @@ -70,7 +71,7 @@ - + 636 @@ -86,7 +87,7 @@ - + 444 @@ -102,7 +103,7 @@ - + 580 @@ -122,7 +123,7 @@ - + 890 @@ -134,7 +135,7 @@ - + 1285 @@ -158,7 +159,7 @@ - + 1285 @@ -170,7 +171,7 @@ - + 356 @@ -182,7 +183,7 @@ - + 619 @@ -194,7 +195,7 @@ - + 1444 @@ -206,7 +207,7 @@ - + 716 @@ -218,7 +219,7 @@ - + 943 @@ -230,7 +231,7 @@ - + 1285 @@ -250,7 +251,7 @@ - + 960 @@ -266,7 +267,7 @@ - + 965 @@ -282,7 +283,7 @@ - + 1108 @@ -294,7 +295,7 @@ - + 982 @@ -310,7 +311,7 @@ - + 627 diff --git a/MapoDb/resoconti.cs b/MapoDb/resoconti.cs index f3c4061f..dc431473 100644 --- a/MapoDb/resoconti.cs +++ b/MapoDb/resoconti.cs @@ -81,8 +81,8 @@ public class resoconti protected MapoDb.DS_applicazioneTableAdapters.MacchineTableAdapter taMacchine; protected MapoDb.DS_ProdTempiTableAdapters.TempiCicloRilevatiTableAdapter taTempiCiclo; - protected MapoDb.DS_applicazione.MacchineDataTable _Macchine; - protected MapoDb.DS_applicazione.MacchineDataTable Macchine + protected DS_applicazione.MacchineDataTable _Macchine; + protected DS_applicazione.MacchineDataTable Macchine { get { @@ -102,8 +102,8 @@ public class resoconti } } protected MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter taStatoMacchine; - protected MapoDb.DS_applicazione.StatoMacchineDataTable _StatoMacchine; - protected MapoDb.DS_applicazione.StatoMacchineDataTable StatoMacchine + protected DS_applicazione.StatoMacchineDataTable _StatoMacchine; + protected DS_applicazione.StatoMacchineDataTable StatoMacchine { get { @@ -179,8 +179,8 @@ public class resoconti } } protected MapoDb.DS_applicazioneTableAdapters.AnagArticoliTableAdapter taAnagArt; - protected MapoDb.DS_applicazione.AnagArticoliDataTable _AnagArt; - protected MapoDb.DS_applicazione.AnagArticoliDataTable AnagArt + protected DS_applicazione.AnagArticoliDataTable _AnagArt; + protected DS_applicazione.AnagArticoliDataTable AnagArt { get { @@ -200,8 +200,8 @@ public class resoconti } } protected MapoDb.DS_applicazioneTableAdapters.AnagraficaOperatoriTableAdapter taAnagOpr; - protected MapoDb.DS_applicazione.AnagraficaOperatoriDataTable _AnagOpr; - protected MapoDb.DS_applicazione.AnagraficaOperatoriDataTable AnagOpr + protected DS_applicazione.AnagraficaOperatoriDataTable _AnagOpr; + protected DS_applicazione.AnagraficaOperatoriDataTable AnagOpr { get { @@ -269,16 +269,16 @@ public class resoconti public string locazioneDaIdx(string idx) { - MapoDb.DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); + DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); return string.Format("{0}", riga.locazione); } public string idxDaLocazione(string locazione) { string answ = ""; - MapoDb.DS_applicazione.MacchineRow riga = null; + DS_applicazione.MacchineRow riga = null; try { - riga = (MapoDb.DS_applicazione.MacchineRow)Macchine.Select(string.Format("locazione = '{0}'", locazione))[0]; + riga = (DS_applicazione.MacchineRow)Macchine.Select(string.Format("locazione = '{0}'", locazione))[0]; answ = string.Format("{0}", riga.IdxMacchina); } catch @@ -289,7 +289,7 @@ public class resoconti public string nomeMacchina(string idx) { string answ = ""; - MapoDb.DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); + DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); try { answ = string.Format("{0} ({1} - {2})", riga.Nome, riga.CodMacchina, riga.Descrizione); @@ -300,13 +300,13 @@ public class resoconti } public string macchinaDaIdx(string idx) { - MapoDb.DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); + DS_applicazione.MacchineRow riga = Macchine.FindByIdxMacchina(idx); return string.Format("{0}", riga.CodMacchina); } public string urlMacchina(string idx) { string answ = ""; - MapoDb.DS_applicazione.MacchineRow riga = null; + DS_applicazione.MacchineRow riga = null; try { riga = Macchine.FindByIdxMacchina(idx); @@ -361,7 +361,7 @@ public class resoconti string answ = "nd"; try { - MapoDb.DS_applicazione.AnagraficaOperatoriRow riga = AnagOpr.FindByMatrOpr(matr); + DS_applicazione.AnagraficaOperatoriRow riga = AnagOpr.FindByMatrOpr(matr); answ = string.Format("{0} {1}", riga.Cognome, riga.Nome); } catch @@ -385,7 +385,7 @@ public class resoconti else { string _colore = ""; - foreach (MapoDb.DS_applicazione.AnagraficaStatiRow item in Stati) + foreach (DS_applicazione.AnagraficaStatiRow item in Stati) { switch (item.Semaforo) { @@ -431,7 +431,7 @@ public class resoconti } else { - foreach (MapoDb.DS_applicazione.AnagraficaStatiRow item in Stati) + foreach (DS_applicazione.AnagraficaStatiRow item in Stati) { answ.Add(item.IdxStato, item.Semaforo); } @@ -510,7 +510,7 @@ public class resoconti // leggo i dati e costituisco una collezione... DataLayer_generic.serieDatiDataTable punti = new DataLayer_generic.serieDatiDataTable(); // seleziono i dati... - MapoDb.DS_applicazione.ParetoDurateDataTable tabPareto; + DS_applicazione.ParetoDurateDataTable tabPareto; if (hideSpenta) { tabPareto = taParetoDurate.GetParetoDurateHideSpenta(idx, minDurata, _intervallo.fine, _intervallo.inizio); @@ -527,7 +527,7 @@ public class resoconti catch { } - foreach (MapoDb.DS_applicazione.ParetoDurateRow riga in tabPareto.Rows) + foreach (DS_applicazione.ParetoDurateRow riga in tabPareto.Rows) { punti.AddserieDatiRow((float)((Math.Round(((float)riga.DurataMinuti) / totale * 1000)) / 1000), coloreDaIdx(riga.IdxStato), statoDaIdx(riga.IdxStato), riga.InizioStato); }