From f81c9eccb0278c24bd2d328d8101dd18a21719c7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 8 Nov 2018 08:38:05 +0100 Subject: [PATCH] Fix errore binding storico allarmi --- CMS-OMR.sln | 2 +- CMS-OMR/DS_App.xss | 26 +++--- CMS-OMR/MainForm.Designer.cs | 176 +++++++++++++++++------------------ CMS-OMR/MainForm.resx | 20 ++-- 4 files changed, 115 insertions(+), 109 deletions(-) diff --git a/CMS-OMR.sln b/CMS-OMR.sln index c0ec16c..78489db 100644 --- a/CMS-OMR.sln +++ b/CMS-OMR.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2048 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS-OMR", "CMS-OMR\CMS-OMR.csproj", "{1CD15179-915C-472B-9FC4-A27EE07FEA7C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS-OMR", "..\..\Visual Studio 2017\Projects\CMS-OMR\CMS-OMR\CMS-OMR.csproj", "{1CD15179-915C-472B-9FC4-A27EE07FEA7C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CMS-OMR/DS_App.xss b/CMS-OMR/DS_App.xss index 29359ce..a9eadea 100644 --- a/CMS-OMR/DS_App.xss +++ b/CMS-OMR/DS_App.xss @@ -4,29 +4,29 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - + + + + + + - + 371 - 697 + 680 - 471 - 697 + 495 + 680 - + 459 @@ -38,7 +38,7 @@ - + 796 diff --git a/CMS-OMR/MainForm.Designer.cs b/CMS-OMR/MainForm.Designer.cs index 845f92b..ee8e8a5 100644 --- a/CMS-OMR/MainForm.Designer.cs +++ b/CMS-OMR/MainForm.Designer.cs @@ -80,11 +80,6 @@ this.currStatusDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.anagAllarmiBindingSource = new System.Windows.Forms.BindingSource(this.components); this.dgvAlarmLog = new System.Windows.Forms.DataGridView(); - this.dtEventoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.codAllarmeDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.attivoDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.descrizioneDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.vStoricoAllarmiExpBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tabPage3 = new System.Windows.Forms.TabPage(); this.label7 = new System.Windows.Forms.Label(); this.btnPurgeOld = new System.Windows.Forms.Button(); @@ -93,6 +88,11 @@ this.tabOperazioniTableAdapter = new DemoApp.DS_AppTableAdapters.TabOperazioniTableAdapter(); this.anagAllarmiTableAdapter = new DemoApp.DS_AppTableAdapters.AnagAllarmiTableAdapter(); this.StoricoAllarmiExpTableAdapter = new DemoApp.DS_AppTableAdapters.StoricoAllarmiExpTableAdapter(); + this.storicoAllarmiExpBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.dtEventoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.codAllarmeDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.attivoDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.descrizioneDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -117,8 +117,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dgvAnagAlarm)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.anagAllarmiBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvAlarmLog)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.vStoricoAllarmiExpBindingSource)).BeginInit(); this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.storicoAllarmiExpBindingSource)).BeginInit(); this.SuspendLayout(); // // txtBCode @@ -311,7 +311,7 @@ // btnReloadOpr // this.btnReloadOpr.Location = new System.Drawing.Point(655, 64); - this.btnReloadOpr.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnReloadOpr.Margin = new System.Windows.Forms.Padding(4); this.btnReloadOpr.Name = "btnReloadOpr"; this.btnReloadOpr.Size = new System.Drawing.Size(196, 28); this.btnReloadOpr.TabIndex = 12; @@ -459,7 +459,7 @@ this.datamatrixDataGridViewTextBoxColumn}); this.dgvOpr.DataSource = this.tabOperazioniBindingSource; this.dgvOpr.Location = new System.Drawing.Point(8, 112); - this.dgvOpr.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dgvOpr.Margin = new System.Windows.Forms.Padding(4); this.dgvOpr.Name = "dgvOpr"; this.dgvOpr.Size = new System.Drawing.Size(848, 242); this.dgvOpr.TabIndex = 6; @@ -534,7 +534,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.splitContainer3.Location = new System.Drawing.Point(4, 6); - this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.splitContainer3.Margin = new System.Windows.Forms.Padding(4); this.splitContainer3.Name = "splitContainer3"; // // splitContainer3.Panel1 @@ -555,7 +555,7 @@ // btnSendAlarms // this.btnSendAlarms.Location = new System.Drawing.Point(9, 34); - this.btnSendAlarms.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnSendAlarms.Margin = new System.Windows.Forms.Padding(4); this.btnSendAlarms.Name = "btnSendAlarms"; this.btnSendAlarms.Size = new System.Drawing.Size(100, 60); this.btnSendAlarms.TabIndex = 6; @@ -574,7 +574,7 @@ "00004", "00005"}); this.lbAllarmi.Location = new System.Drawing.Point(141, 10); - this.lbAllarmi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lbAllarmi.Margin = new System.Windows.Forms.Padding(4); this.lbAllarmi.Name = "lbAllarmi"; this.lbAllarmi.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; this.lbAllarmi.Size = new System.Drawing.Size(143, 84); @@ -606,7 +606,7 @@ this.currStatusDataGridViewCheckBoxColumn}); this.dgvAnagAlarm.DataSource = this.anagAllarmiBindingSource; this.dgvAnagAlarm.Location = new System.Drawing.Point(3, 102); - this.dgvAnagAlarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dgvAnagAlarm.Margin = new System.Windows.Forms.Padding(4); this.dgvAnagAlarm.Name = "dgvAnagAlarm"; this.dgvAnagAlarm.Size = new System.Drawing.Size(356, 240); this.dgvAnagAlarm.TabIndex = 0; @@ -661,14 +661,86 @@ this.codAllarmeDataGridViewTextBoxColumn1, this.attivoDataGridViewCheckBoxColumn, this.descrizioneDataGridViewTextBoxColumn1}); - this.dgvAlarmLog.DataSource = this.vStoricoAllarmiExpBindingSource; + this.dgvAlarmLog.DataSource = this.storicoAllarmiExpBindingSource; this.dgvAlarmLog.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvAlarmLog.Location = new System.Drawing.Point(0, 0); - this.dgvAlarmLog.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dgvAlarmLog.Margin = new System.Windows.Forms.Padding(4); this.dgvAlarmLog.Name = "dgvAlarmLog"; this.dgvAlarmLog.Size = new System.Drawing.Size(483, 346); this.dgvAlarmLog.TabIndex = 0; // + // tabPage3 + // + this.tabPage3.Controls.Add(this.label7); + this.tabPage3.Controls.Add(this.btnPurgeOld); + this.tabPage3.Controls.Add(this.txtDay2keep); + this.tabPage3.Controls.Add(this.btnEmptyTabOpr); + this.tabPage3.Location = new System.Drawing.Point(4, 25); + this.tabPage3.Margin = new System.Windows.Forms.Padding(4); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(863, 361); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Utils"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(489, 18); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(128, 17); + this.label7.TabIndex = 3; + this.label7.Text = "# gg da mantenere"; + // + // btnPurgeOld + // + this.btnPurgeOld.Location = new System.Drawing.Point(627, 18); + this.btnPurgeOld.Margin = new System.Windows.Forms.Padding(4); + this.btnPurgeOld.Name = "btnPurgeOld"; + this.btnPurgeOld.Size = new System.Drawing.Size(229, 64); + this.btnPurgeOld.TabIndex = 2; + this.btnPurgeOld.Text = "SVECCHIAMENTO DataBase"; + this.btnPurgeOld.UseVisualStyleBackColor = true; + this.btnPurgeOld.Click += new System.EventHandler(this.btnPurgeOld_Click); + // + // txtDay2keep + // + this.txtDay2keep.Location = new System.Drawing.Point(485, 39); + this.txtDay2keep.Margin = new System.Windows.Forms.Padding(4); + this.txtDay2keep.Name = "txtDay2keep"; + this.txtDay2keep.Size = new System.Drawing.Size(132, 22); + this.txtDay2keep.TabIndex = 1; + this.txtDay2keep.Text = "365"; + // + // btnEmptyTabOpr + // + this.btnEmptyTabOpr.Location = new System.Drawing.Point(13, 18); + this.btnEmptyTabOpr.Margin = new System.Windows.Forms.Padding(4); + this.btnEmptyTabOpr.Name = "btnEmptyTabOpr"; + this.btnEmptyTabOpr.Size = new System.Drawing.Size(229, 64); + this.btnEmptyTabOpr.TabIndex = 0; + this.btnEmptyTabOpr.Text = "ELIMINA TabOperazioni"; + this.btnEmptyTabOpr.UseVisualStyleBackColor = true; + this.btnEmptyTabOpr.Click += new System.EventHandler(this.btnEmptyTabOpr_Click); + // + // tabOperazioniTableAdapter + // + this.tabOperazioniTableAdapter.ClearBeforeFill = true; + // + // anagAllarmiTableAdapter + // + this.anagAllarmiTableAdapter.ClearBeforeFill = true; + // + // StoricoAllarmiExpTableAdapter + // + this.StoricoAllarmiExpTableAdapter.ClearBeforeFill = true; + // + // storicoAllarmiExpBindingSource + // + this.storicoAllarmiExpBindingSource.DataMember = "StoricoAllarmiExp"; + this.storicoAllarmiExpBindingSource.DataSource = this.dS_App; + // // dtEventoDataGridViewTextBoxColumn1 // this.dtEventoDataGridViewTextBoxColumn1.DataPropertyName = "DtEvento"; @@ -693,78 +765,6 @@ this.descrizioneDataGridViewTextBoxColumn1.HeaderText = "Descrizione"; this.descrizioneDataGridViewTextBoxColumn1.Name = "descrizioneDataGridViewTextBoxColumn1"; // - // vStoricoAllarmiExpBindingSource - // - this.vStoricoAllarmiExpBindingSource.DataMember = "vStoricoAllarmiExp"; - this.vStoricoAllarmiExpBindingSource.DataSource = this.dS_App; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.label7); - this.tabPage3.Controls.Add(this.btnPurgeOld); - this.tabPage3.Controls.Add(this.txtDay2keep); - this.tabPage3.Controls.Add(this.btnEmptyTabOpr); - this.tabPage3.Location = new System.Drawing.Point(4, 25); - this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(863, 361); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Utils"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(489, 18); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(128, 17); - this.label7.TabIndex = 3; - this.label7.Text = "# gg da mantenere"; - // - // btnPurgeOld - // - this.btnPurgeOld.Location = new System.Drawing.Point(627, 18); - this.btnPurgeOld.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.btnPurgeOld.Name = "btnPurgeOld"; - this.btnPurgeOld.Size = new System.Drawing.Size(229, 64); - this.btnPurgeOld.TabIndex = 2; - this.btnPurgeOld.Text = "SVECCHIAMENTO DataBase"; - this.btnPurgeOld.UseVisualStyleBackColor = true; - this.btnPurgeOld.Click += new System.EventHandler(this.btnPurgeOld_Click); - // - // txtDay2keep - // - this.txtDay2keep.Location = new System.Drawing.Point(485, 39); - this.txtDay2keep.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.txtDay2keep.Name = "txtDay2keep"; - this.txtDay2keep.Size = new System.Drawing.Size(132, 22); - this.txtDay2keep.TabIndex = 1; - this.txtDay2keep.Text = "365"; - // - // btnEmptyTabOpr - // - this.btnEmptyTabOpr.Location = new System.Drawing.Point(13, 18); - this.btnEmptyTabOpr.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.btnEmptyTabOpr.Name = "btnEmptyTabOpr"; - this.btnEmptyTabOpr.Size = new System.Drawing.Size(229, 64); - this.btnEmptyTabOpr.TabIndex = 0; - this.btnEmptyTabOpr.Text = "ELIMINA TabOperazioni"; - this.btnEmptyTabOpr.UseVisualStyleBackColor = true; - this.btnEmptyTabOpr.Click += new System.EventHandler(this.btnEmptyTabOpr_Click); - // - // tabOperazioniTableAdapter - // - this.tabOperazioniTableAdapter.ClearBeforeFill = true; - // - // anagAllarmiTableAdapter - // - this.anagAllarmiTableAdapter.ClearBeforeFill = true; - // - // StoricoAllarmiExpTableAdapter - // - this.StoricoAllarmiExpTableAdapter.ClearBeforeFill = true; - // // MainForm // this.AccessibleName = ""; @@ -808,9 +808,9 @@ ((System.ComponentModel.ISupportInitialize)(this.dgvAnagAlarm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.anagAllarmiBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvAlarmLog)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.vStoricoAllarmiExpBindingSource)).EndInit(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.storicoAllarmiExpBindingSource)).EndInit(); this.ResumeLayout(false); } @@ -875,12 +875,12 @@ private System.Windows.Forms.DataGridViewTextBoxColumn lastStartDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn lastEndDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewCheckBoxColumn currStatusDataGridViewCheckBoxColumn; - private System.Windows.Forms.BindingSource vStoricoAllarmiExpBindingSource; private DS_AppTableAdapters.StoricoAllarmiExpTableAdapter StoricoAllarmiExpTableAdapter; private System.Windows.Forms.DataGridViewTextBoxColumn dtEventoDataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn codAllarmeDataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewCheckBoxColumn attivoDataGridViewCheckBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn descrizioneDataGridViewTextBoxColumn1; + private System.Windows.Forms.BindingSource storicoAllarmiExpBindingSource; } } diff --git a/CMS-OMR/MainForm.resx b/CMS-OMR/MainForm.resx index 0175973..a6e4942 100644 --- a/CMS-OMR/MainForm.resx +++ b/CMS-OMR/MainForm.resx @@ -118,21 +118,27 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 110, 17 + 393, 17 - 17, 17 + 285, 17 - 520, 17 + 890, 17 - - 17, 56 + + 1355, 17 - 318, 17 + 645, 17 - 715, 17 + 1126, 17 + + + 17, 17 + + + 95 \ No newline at end of file