diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index bb5565c73..baf6c603e 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/Results/Entities/WaterMeterResult.cs b/Results/Entities/WaterMeterResult.cs index 5870fd306..6940e4daa 100644 --- a/Results/Entities/WaterMeterResult.cs +++ b/Results/Entities/WaterMeterResult.cs @@ -12,19 +12,45 @@ namespace Results.Entities private readonly MeterTestResult firstMeterTestResult; /// - /// Water meter data + /// Hard water meter data /// public string SerialNr; /// iPerl : This is PCB Number public int SerialNrEx; /// iPerl : This is the serial number assigned later public int BenchId; public int BatchNr { get { return firstMeterTestResult.TestResult.BatchNr; } } - public string PurchaseOrder { get { return firstMeterTestResult.TestResult.PurchaseOrder; } } - public string ProcedureName { get { return firstMeterTestResult.TestResult.ProcedureName; } } - public string ProtocolTitle { get { return firstMeterTestResult.TestResult.ProtocolTitle; } } + public string ProcedureName { get { return firstMeterTestResult.TestResult.ProcedureName; } } public DateTime TestStart; public DateTime TestEnd; public IList MeterTestResults; + /// + /// Soft water meter data + /// + public string Type; + public string TypeApproval; + public string MetrologicalClass; + public string ProtocolTitle { get { return firstMeterTestResult.TestResult.ProtocolTitle; } } + public string PurchaseOrder; + + + public TestResult TestResult(string testName) + { + foreach (var tr in MeterTestResults) + { + if (tr.TestResult.TestName.ToLower().Equals(testName.ToLower())) return tr.TestResult; + } + return null; + } + + public MeterTestResult MeterTestResult(string testName) + { + foreach (var tr in MeterTestResults) + { + if (tr.TestResult.TestName.ToLower().Equals(testName.ToLower())) return tr; + } + return null; + } + /// /// Private constructor, initializes a list, used as a base @@ -44,7 +70,7 @@ namespace Results.Entities MeterTestResults.Add(firstMeterTestResult = meterTestResult); SerialNr = meterTestResult.SerialNr; - BenchId = benchId; + BenchId = (benchId == 5) ? 20033 : ((benchId == 6) ? 20034 : 0); TestStart = meterTestResult.TestResult.TimeStart; TestEnd = meterTestResult.TestResult.TimeEnd; } @@ -80,7 +106,7 @@ namespace Results.Entities sb.AppendFormat("PCB:{0} s/n:{1} ", SerialNr, SerialNrEx); foreach (var tr in MeterTestResults) sb.AppendFormat(" {0}:{1}%", tr.TestResult.TestName, tr.VolumeErrorPct.ToString("F1")); - sb.AppendFormat(" test start: {0} {1}", TestStart.ToShortDateString(), TestStart.ToShortTimeString()); + sb.AppendFormat(" test start: {0} {1} batch={2}", TestStart.ToShortDateString(), TestStart.ToShortTimeString(), BatchNr); return sb.ToString(); } } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 10120f6be..6dc5c1d97 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/ResultsBrowser/DataDeposit.cs b/ResultsBrowser/DataDeposit.cs index e31f80eff..2148cd963 100644 --- a/ResultsBrowser/DataDeposit.cs +++ b/ResultsBrowser/DataDeposit.cs @@ -42,9 +42,9 @@ namespace ResultsBrowser IList batchNrs = new List(); foreach (var tr in testResults) { - if (!tr.DoNotPublish && !tr.DoNotEvaluate && tr.TestName.ToLower().Contains("q") && tr.TestName.Length == 2) + if (tr.TestName.ToLower().Contains("q") && !tr.TestName.ToLower().Contains("adj") /*&& tr.TestName.Length == 2*/) { - selectedTestResults.Add(tr); + selectedTestResults.Insert(0, tr); if (!batchNrs.Contains(tr.BatchNr)) { @@ -65,40 +65,45 @@ namespace ResultsBrowser foreach (var tr in selectedTestResults) { - if (tr.BatchNr == batchNr) - { - if (!waterMetersCreated) - { - foreach (var mtr in tr.Meters) wmResults.Add(new Results.Entities.WaterMeterResult(mtr, 5)); - waterMetersCreated = true; - } - else - { - for (int i = 0; i < Math.Min(tr.Meters.Count, wmResults.Count); i++) - { - wmResults[i].Append(tr.Meters[i]); - } - } - } + //if (tr.TestName.ToLower().Contains("q2")) + { + if (tr.BatchNr == batchNr) + { + if (!waterMetersCreated) + { + foreach (var mtr in tr.Meters) wmResults.Add(new Results.Entities.WaterMeterResult(mtr, 5)); + waterMetersCreated = true; + } + else + { + for (int i = 0; i < Math.Min(tr.Meters.Count, wmResults.Count); i++) + { + wmResults[i].Append(tr.Meters[i]); + } + } + } + } } - /// Exclude 'failed' water meters - for (int i = wmResults.Count - 1; i >= 0; i--) - { - if (string.IsNullOrEmpty(wmResults[i].SerialNr) || !wmResults[i].Passed()) - { - wmResults.RemoveAt(i); - } - } + /// Exclude 'failed' water meters + for (int i = wmResults.Count - 1; i >= 0; i--) + { + if (string.IsNullOrEmpty(wmResults[i].SerialNr) || !wmResults[i].Passed()) + { + wmResults.RemoveAt(i); + } + } - AddWMResultsAvoidDuplicates(wmResults, resolveManually); + int added = AddWMResultsAvoidDuplicates(wmResults, resolveManually); + Console.WriteLine("batch={0} added={1}", batchNr, added); } foreach (var tr in selectedTestResults) QueryTestResults.Add(tr); } - public static void AddWMResultsAvoidDuplicates(IList wmResults, bool resolveManually) + public static int AddWMResultsAvoidDuplicates(IList wmResults, bool resolveManually) { + int added = 0; foreach (var wmr in wmResults) { Results.Entities.WaterMeterResult foundWM = null; @@ -115,6 +120,7 @@ namespace ResultsBrowser if (foundWM == null) { QueryWaterMeterResults.Add(wmr); + added++; } else if (resolveManually) { @@ -123,9 +129,12 @@ namespace ResultsBrowser { QueryWaterMeterResults.Remove(foundWM); QueryWaterMeterResults.Add(wmr); + added++; } } } + + return added; } public static void AddQueryToReport() diff --git a/ResultsBrowser/Forms/AdditionalDataDlg.Designer.cs b/ResultsBrowser/Forms/AdditionalDataDlg.Designer.cs new file mode 100644 index 000000000..4f74448ef --- /dev/null +++ b/ResultsBrowser/Forms/AdditionalDataDlg.Designer.cs @@ -0,0 +1,142 @@ +namespace ResultsBrowser.Forms +{ + partial class AdditionalDataDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.typeApprovalTextBox = new System.Windows.Forms.TextBox(); + this.metrologicalClassTextBox = new System.Windows.Forms.TextBox(); + this.okButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.typeTextBox = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(34, 56); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(75, 13); + this.label1.TabIndex = 2; + this.label1.Text = "Type approval"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(34, 88); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(91, 13); + this.label2.TabIndex = 4; + this.label2.Text = "Metrological class"; + // + // typeApprovalTextBox + // + this.typeApprovalTextBox.Location = new System.Drawing.Point(154, 53); + this.typeApprovalTextBox.Name = "typeApprovalTextBox"; + this.typeApprovalTextBox.Size = new System.Drawing.Size(133, 20); + this.typeApprovalTextBox.TabIndex = 3; + // + // metrologicalClassTextBox + // + this.metrologicalClassTextBox.Location = new System.Drawing.Point(154, 85); + this.metrologicalClassTextBox.Name = "metrologicalClassTextBox"; + this.metrologicalClassTextBox.Size = new System.Drawing.Size(133, 20); + this.metrologicalClassTextBox.TabIndex = 5; + // + // okButton + // + this.okButton.Location = new System.Drawing.Point(246, 200); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(75, 50); + this.okButton.TabIndex = 6; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // cancelButton + // + this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.Location = new System.Drawing.Point(337, 200); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.Size = new System.Drawing.Size(75, 50); + this.cancelButton.TabIndex = 7; + this.cancelButton.Text = "Cancel"; + this.cancelButton.UseVisualStyleBackColor = true; + // + // typeTextBox + // + this.typeTextBox.Location = new System.Drawing.Point(154, 21); + this.typeTextBox.Name = "typeTextBox"; + this.typeTextBox.Size = new System.Drawing.Size(133, 20); + this.typeTextBox.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(34, 24); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 13); + this.label3.TabIndex = 0; + this.label3.Text = "Type"; + // + // AdditionalDataDlg + // + this.AcceptButton = this.okButton; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.cancelButton; + this.ClientSize = new System.Drawing.Size(428, 262); + this.Controls.Add(this.typeTextBox); + this.Controls.Add(this.label3); + this.Controls.Add(this.cancelButton); + this.Controls.Add(this.okButton); + this.Controls.Add(this.metrologicalClassTextBox); + this.Controls.Add(this.typeApprovalTextBox); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "AdditionalDataDlg"; + this.Text = "AdditionalDataDlg"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox typeApprovalTextBox; + private System.Windows.Forms.TextBox metrologicalClassTextBox; + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.Button cancelButton; + private System.Windows.Forms.TextBox typeTextBox; + private System.Windows.Forms.Label label3; + } +} \ No newline at end of file diff --git a/ResultsBrowser/Forms/AdditionalDataDlg.cs b/ResultsBrowser/Forms/AdditionalDataDlg.cs new file mode 100644 index 000000000..5988d3f2a --- /dev/null +++ b/ResultsBrowser/Forms/AdditionalDataDlg.cs @@ -0,0 +1,23 @@ +using System; +using System.Windows.Forms; + +namespace ResultsBrowser.Forms +{ + public partial class AdditionalDataDlg : Form + { + public string Type { get { return typeTextBox.Text; } } + public string TypeApproval { get { return typeApprovalTextBox.Text; } } + public string MetrologicalClass { get { return metrologicalClassTextBox.Text; } } + + public AdditionalDataDlg() + { + InitializeComponent(); + } + + private void okButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + Close(); + } + } +} diff --git a/ResultsBrowser/Forms/AdditionalDataDlg.resx b/ResultsBrowser/Forms/AdditionalDataDlg.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/ResultsBrowser/Forms/AdditionalDataDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ResultsBrowser/MainWnd.Designer.cs b/ResultsBrowser/MainWnd.Designer.cs index 8e8fb9802..58c235346 100644 --- a/ResultsBrowser/MainWnd.Designer.cs +++ b/ResultsBrowser/MainWnd.Designer.cs @@ -28,403 +28,415 @@ /// private void InitializeComponent() { - this.queryButton = new System.Windows.Forms.Button(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.removeFromQueryButton = new System.Windows.Forms.Button(); - this.addToReportButton = new System.Windows.Forms.Button(); - this.resolveManuallyCheckBox = new System.Windows.Forms.CheckBox(); - this.procedureGroupBox = new System.Windows.Forms.GroupBox(); - this.procedureCheckBox = new System.Windows.Forms.CheckBox(); - this.procedureComboBox = new System.Windows.Forms.ComboBox(); - this.clearButton = new System.Windows.Forms.Button(); - this.fromGroupBox = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.filterDateCheckBox = new System.Windows.Forms.CheckBox(); - this.toDateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.fromDateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.purchaseOrderGroupBox = new System.Windows.Forms.GroupBox(); - this.purchaseOrderCheckBox = new System.Windows.Forms.CheckBox(); - this.purchaseOrderComboBox = new System.Windows.Forms.ComboBox(); - this.queryResultsListBox = new System.Windows.Forms.ListBox(); - this.configReportButton = new System.Windows.Forms.Button(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.removeFromReportButton = new System.Windows.Forms.Button(); - this.reportFileGroupBox = new System.Windows.Forms.GroupBox(); - this.browseFileButton = new System.Windows.Forms.Button(); - this.reportFileComboBox = new System.Windows.Forms.ComboBox(); - this.makeReportButton = new System.Windows.Forms.Button(); - this.addOracleDataButton = new System.Windows.Forms.Button(); - this.reportListBox = new System.Windows.Forms.ListBox(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.procedureGroupBox.SuspendLayout(); - this.fromGroupBox.SuspendLayout(); - this.purchaseOrderGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.Panel2.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); - this.splitContainer3.Panel1.SuspendLayout(); - this.splitContainer3.Panel2.SuspendLayout(); - this.splitContainer3.SuspendLayout(); - this.reportFileGroupBox.SuspendLayout(); - this.SuspendLayout(); - // - // queryButton - // - this.queryButton.Location = new System.Drawing.Point(15, 162); - this.queryButton.Name = "queryButton"; - this.queryButton.Size = new System.Drawing.Size(108, 40); - this.queryButton.TabIndex = 3; - this.queryButton.Text = "Query"; - this.queryButton.UseVisualStyleBackColor = true; - this.queryButton.Click += new System.EventHandler(this.queryButton_Click); - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.IsSplitterFixed = true; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.removeFromQueryButton); - this.splitContainer1.Panel1.Controls.Add(this.addToReportButton); - this.splitContainer1.Panel1.Controls.Add(this.resolveManuallyCheckBox); - this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); - this.splitContainer1.Panel1.Controls.Add(this.clearButton); - this.splitContainer1.Panel1.Controls.Add(this.fromGroupBox); - this.splitContainer1.Panel1.Controls.Add(this.queryButton); - this.splitContainer1.Panel1.Controls.Add(this.purchaseOrderGroupBox); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.queryResultsListBox); - this.splitContainer1.Size = new System.Drawing.Size(604, 624); - this.splitContainer1.SplitterDistance = 220; - this.splitContainer1.TabIndex = 5; - // - // removeFromQueryButton - // - this.removeFromQueryButton.Location = new System.Drawing.Point(453, 162); - this.removeFromQueryButton.Name = "removeFromQueryButton"; - this.removeFromQueryButton.Size = new System.Drawing.Size(46, 40); - this.removeFromQueryButton.TabIndex = 9; - this.removeFromQueryButton.Text = "Delete"; - this.removeFromQueryButton.UseVisualStyleBackColor = true; - this.removeFromQueryButton.Click += new System.EventHandler(this.removeFromQueryButton_Click); - // - // addToReportButton - // - this.addToReportButton.Location = new System.Drawing.Point(558, 162); - this.addToReportButton.Name = "addToReportButton"; - this.addToReportButton.Size = new System.Drawing.Size(46, 40); - this.addToReportButton.TabIndex = 8; - this.addToReportButton.Text = ">>>"; - this.addToReportButton.UseVisualStyleBackColor = true; - this.addToReportButton.Click += new System.EventHandler(this.addToReportButton_Click); - // - // resolveManuallyCheckBox - // - this.resolveManuallyCheckBox.AutoSize = true; - this.resolveManuallyCheckBox.Location = new System.Drawing.Point(282, 129); - this.resolveManuallyCheckBox.Name = "resolveManuallyCheckBox"; - this.resolveManuallyCheckBox.Size = new System.Drawing.Size(158, 17); - this.resolveManuallyCheckBox.TabIndex = 7; - this.resolveManuallyCheckBox.Text = "Resolve duplicities manually"; - this.resolveManuallyCheckBox.UseVisualStyleBackColor = true; - // - // procedureGroupBox - // - this.procedureGroupBox.Controls.Add(this.procedureCheckBox); - this.procedureGroupBox.Controls.Add(this.procedureComboBox); - this.procedureGroupBox.Location = new System.Drawing.Point(15, 83); - this.procedureGroupBox.Name = "procedureGroupBox"; - this.procedureGroupBox.Size = new System.Drawing.Size(242, 63); - this.procedureGroupBox.TabIndex = 6; - this.procedureGroupBox.TabStop = false; - // - // procedureCheckBox - // - this.procedureCheckBox.AutoSize = true; - this.procedureCheckBox.Location = new System.Drawing.Point(19, 0); - this.procedureCheckBox.Name = "procedureCheckBox"; - this.procedureCheckBox.Size = new System.Drawing.Size(99, 17); - this.procedureCheckBox.TabIndex = 1; - this.procedureCheckBox.Text = "Filter procedure"; - this.procedureCheckBox.UseVisualStyleBackColor = true; - this.procedureCheckBox.CheckedChanged += new System.EventHandler(this.procedureCheckBox_CheckedChanged); - // - // procedureComboBox - // - this.procedureComboBox.FormattingEnabled = true; - this.procedureComboBox.Location = new System.Drawing.Point(18, 26); - this.procedureComboBox.Name = "procedureComboBox"; - this.procedureComboBox.Size = new System.Drawing.Size(201, 21); - this.procedureComboBox.TabIndex = 0; - // - // clearButton - // - this.clearButton.Location = new System.Drawing.Point(149, 162); - this.clearButton.Name = "clearButton"; - this.clearButton.Size = new System.Drawing.Size(108, 40); - this.clearButton.TabIndex = 4; - this.clearButton.Text = "Clear"; - this.clearButton.UseVisualStyleBackColor = true; - this.clearButton.Click += new System.EventHandler(this.clearButton_Click); - // - // fromGroupBox - // - this.fromGroupBox.Controls.Add(this.label2); - this.fromGroupBox.Controls.Add(this.label1); - this.fromGroupBox.Controls.Add(this.filterDateCheckBox); - this.fromGroupBox.Controls.Add(this.toDateTimePicker); - this.fromGroupBox.Controls.Add(this.fromDateTimePicker); - this.fromGroupBox.Location = new System.Drawing.Point(263, 14); - this.fromGroupBox.Name = "fromGroupBox"; - this.fromGroupBox.Size = new System.Drawing.Size(242, 98); - this.fromGroupBox.TabIndex = 3; - this.fromGroupBox.TabStop = false; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(16, 65); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(20, 13); - this.label2.TabIndex = 3; - this.label2.Text = "To"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 33); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(30, 13); - this.label1.TabIndex = 2; - this.label1.Text = "From"; - // - // filterDateCheckBox - // - this.filterDateCheckBox.AutoSize = true; - this.filterDateCheckBox.Location = new System.Drawing.Point(19, -1); - this.filterDateCheckBox.Name = "filterDateCheckBox"; - this.filterDateCheckBox.Size = new System.Drawing.Size(72, 17); - this.filterDateCheckBox.TabIndex = 1; - this.filterDateCheckBox.Text = "Filter date"; - this.filterDateCheckBox.UseVisualStyleBackColor = true; - // - // toDateTimePicker - // - this.toDateTimePicker.Location = new System.Drawing.Point(68, 62); - this.toDateTimePicker.Name = "toDateTimePicker"; - this.toDateTimePicker.Size = new System.Drawing.Size(151, 20); - this.toDateTimePicker.TabIndex = 0; - // - // fromDateTimePicker - // - this.fromDateTimePicker.Location = new System.Drawing.Point(68, 29); - this.fromDateTimePicker.Name = "fromDateTimePicker"; - this.fromDateTimePicker.Size = new System.Drawing.Size(151, 20); - this.fromDateTimePicker.TabIndex = 0; - // - // purchaseOrderGroupBox - // - this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderCheckBox); - this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderComboBox); - this.purchaseOrderGroupBox.Location = new System.Drawing.Point(15, 14); - this.purchaseOrderGroupBox.Name = "purchaseOrderGroupBox"; - this.purchaseOrderGroupBox.Size = new System.Drawing.Size(242, 63); - this.purchaseOrderGroupBox.TabIndex = 2; - this.purchaseOrderGroupBox.TabStop = false; - // - // purchaseOrderCheckBox - // - this.purchaseOrderCheckBox.AutoSize = true; - this.purchaseOrderCheckBox.Location = new System.Drawing.Point(19, 0); - this.purchaseOrderCheckBox.Name = "purchaseOrderCheckBox"; - this.purchaseOrderCheckBox.Size = new System.Drawing.Size(122, 17); - this.purchaseOrderCheckBox.TabIndex = 1; - this.purchaseOrderCheckBox.Text = "Filter purchase order"; - this.purchaseOrderCheckBox.UseVisualStyleBackColor = true; - // - // purchaseOrderComboBox - // - this.purchaseOrderComboBox.FormattingEnabled = true; - this.purchaseOrderComboBox.Location = new System.Drawing.Point(18, 26); - this.purchaseOrderComboBox.Name = "purchaseOrderComboBox"; - this.purchaseOrderComboBox.Size = new System.Drawing.Size(201, 21); - this.purchaseOrderComboBox.TabIndex = 0; - // - // queryResultsListBox - // - this.queryResultsListBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.queryResultsListBox.FormattingEnabled = true; - this.queryResultsListBox.Location = new System.Drawing.Point(0, 0); - this.queryResultsListBox.Name = "queryResultsListBox"; - this.queryResultsListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.queryResultsListBox.Size = new System.Drawing.Size(604, 400); - this.queryResultsListBox.TabIndex = 0; - // - // configReportButton - // - this.configReportButton.Location = new System.Drawing.Point(334, 95); - this.configReportButton.Name = "configReportButton"; - this.configReportButton.Size = new System.Drawing.Size(103, 47); - this.configReportButton.TabIndex = 5; - this.configReportButton.Text = "Configure Report"; - this.configReportButton.UseVisualStyleBackColor = true; - this.configReportButton.Click += new System.EventHandler(this.configReportButton_Click); - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.splitContainer1); - // - // splitContainer2.Panel2 - // - this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer2.Size = new System.Drawing.Size(1284, 624); - this.splitContainer2.SplitterDistance = 604; - this.splitContainer2.TabIndex = 6; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer3.IsSplitterFixed = true; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.removeFromReportButton); - this.splitContainer3.Panel1.Controls.Add(this.reportFileGroupBox); - this.splitContainer3.Panel1.Controls.Add(this.makeReportButton); - this.splitContainer3.Panel1.Controls.Add(this.addOracleDataButton); - this.splitContainer3.Panel1.Controls.Add(this.configReportButton); - // - // splitContainer3.Panel2 - // - this.splitContainer3.Panel2.Controls.Add(this.reportListBox); - this.splitContainer3.Size = new System.Drawing.Size(676, 624); - this.splitContainer3.SplitterDistance = 220; - this.splitContainer3.TabIndex = 6; - // - // removeFromReportButton - // - this.removeFromReportButton.Location = new System.Drawing.Point(58, 162); - this.removeFromReportButton.Name = "removeFromReportButton"; - this.removeFromReportButton.Size = new System.Drawing.Size(46, 40); - this.removeFromReportButton.TabIndex = 10; - this.removeFromReportButton.Text = "Delete"; - this.removeFromReportButton.UseVisualStyleBackColor = true; - this.removeFromReportButton.Click += new System.EventHandler(this.removeFromReportButton_Click); - // - // reportFileGroupBox - // - this.reportFileGroupBox.Controls.Add(this.browseFileButton); - this.reportFileGroupBox.Controls.Add(this.reportFileComboBox); - this.reportFileGroupBox.Location = new System.Drawing.Point(18, 14); - this.reportFileGroupBox.Name = "reportFileGroupBox"; - this.reportFileGroupBox.Size = new System.Drawing.Size(546, 63); - this.reportFileGroupBox.TabIndex = 8; - this.reportFileGroupBox.TabStop = false; - this.reportFileGroupBox.Text = "Report file name"; - // - // browseFileButton - // - this.browseFileButton.Location = new System.Drawing.Point(453, 22); - this.browseFileButton.Name = "browseFileButton"; - this.browseFileButton.Size = new System.Drawing.Size(75, 27); - this.browseFileButton.TabIndex = 2; - this.browseFileButton.Text = "Browse"; - this.browseFileButton.UseVisualStyleBackColor = true; - this.browseFileButton.Click += new System.EventHandler(this.browseFileButton_Click); - // - // reportFileComboBox - // - this.reportFileComboBox.FormattingEnabled = true; - this.reportFileComboBox.Location = new System.Drawing.Point(20, 25); - this.reportFileComboBox.Name = "reportFileComboBox"; - this.reportFileComboBox.Size = new System.Drawing.Size(414, 21); - this.reportFileComboBox.TabIndex = 1; - // - // makeReportButton - // - this.makeReportButton.Location = new System.Drawing.Point(443, 95); - this.makeReportButton.Name = "makeReportButton"; - this.makeReportButton.Size = new System.Drawing.Size(103, 47); - this.makeReportButton.TabIndex = 7; - this.makeReportButton.Text = "Make Report"; - this.makeReportButton.UseVisualStyleBackColor = true; - this.makeReportButton.Click += new System.EventHandler(this.makeReportButton_Click); - // - // addOracleDataButton - // - this.addOracleDataButton.Location = new System.Drawing.Point(225, 95); - this.addOracleDataButton.Name = "addOracleDataButton"; - this.addOracleDataButton.Size = new System.Drawing.Size(103, 47); - this.addOracleDataButton.TabIndex = 6; - this.addOracleDataButton.Text = "Add Oracle Data"; - this.addOracleDataButton.UseVisualStyleBackColor = true; - this.addOracleDataButton.Click += new System.EventHandler(this.addOracleDataButton_Click); - // - // reportListBox - // - this.reportListBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.reportListBox.FormattingEnabled = true; - this.reportListBox.Location = new System.Drawing.Point(0, 0); - this.reportListBox.Name = "reportListBox"; - this.reportListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.reportListBox.Size = new System.Drawing.Size(676, 400); - this.reportListBox.TabIndex = 0; - // - // MainWnd - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1284, 624); - this.Controls.Add(this.splitContainer2); - this.Name = "MainWnd"; - this.Text = "Form1"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); - this.Load += new System.EventHandler(this.MainWnd_Load); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel1.PerformLayout(); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.procedureGroupBox.ResumeLayout(false); - this.procedureGroupBox.PerformLayout(); - this.fromGroupBox.ResumeLayout(false); - this.fromGroupBox.PerformLayout(); - this.purchaseOrderGroupBox.ResumeLayout(false); - this.purchaseOrderGroupBox.PerformLayout(); - this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); - this.splitContainer2.ResumeLayout(false); - this.splitContainer3.Panel1.ResumeLayout(false); - this.splitContainer3.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); - this.splitContainer3.ResumeLayout(false); - this.reportFileGroupBox.ResumeLayout(false); - this.ResumeLayout(false); + this.queryButton = new System.Windows.Forms.Button(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.removeFromQueryButton = new System.Windows.Forms.Button(); + this.addToReportButton = new System.Windows.Forms.Button(); + this.resolveManuallyCheckBox = new System.Windows.Forms.CheckBox(); + this.procedureGroupBox = new System.Windows.Forms.GroupBox(); + this.procedureCheckBox = new System.Windows.Forms.CheckBox(); + this.procedureComboBox = new System.Windows.Forms.ComboBox(); + this.clearButton = new System.Windows.Forms.Button(); + this.fromGroupBox = new System.Windows.Forms.GroupBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.filterDateCheckBox = new System.Windows.Forms.CheckBox(); + this.toDateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.fromDateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.purchaseOrderGroupBox = new System.Windows.Forms.GroupBox(); + this.purchaseOrderCheckBox = new System.Windows.Forms.CheckBox(); + this.purchaseOrderComboBox = new System.Windows.Forms.ComboBox(); + this.queryResultsListBox = new System.Windows.Forms.ListBox(); + this.configReportButton = new System.Windows.Forms.Button(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.removeFromReportButton = new System.Windows.Forms.Button(); + this.reportFileGroupBox = new System.Windows.Forms.GroupBox(); + this.browseFileButton = new System.Windows.Forms.Button(); + this.reportFileComboBox = new System.Windows.Forms.ComboBox(); + this.makeReportButton = new System.Windows.Forms.Button(); + this.addOracleDataButton = new System.Windows.Forms.Button(); + this.reportListBox = new System.Windows.Forms.ListBox(); + this.button1 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.procedureGroupBox.SuspendLayout(); + this.fromGroupBox.SuspendLayout(); + this.purchaseOrderGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + this.reportFileGroupBox.SuspendLayout(); + this.SuspendLayout(); + // + // queryButton + // + this.queryButton.Location = new System.Drawing.Point(15, 162); + this.queryButton.Name = "queryButton"; + this.queryButton.Size = new System.Drawing.Size(108, 40); + this.queryButton.TabIndex = 3; + this.queryButton.Text = "Query"; + this.queryButton.UseVisualStyleBackColor = true; + this.queryButton.Click += new System.EventHandler(this.queryButton_Click); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.button1); + this.splitContainer1.Panel1.Controls.Add(this.removeFromQueryButton); + this.splitContainer1.Panel1.Controls.Add(this.addToReportButton); + this.splitContainer1.Panel1.Controls.Add(this.resolveManuallyCheckBox); + this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); + this.splitContainer1.Panel1.Controls.Add(this.clearButton); + this.splitContainer1.Panel1.Controls.Add(this.fromGroupBox); + this.splitContainer1.Panel1.Controls.Add(this.queryButton); + this.splitContainer1.Panel1.Controls.Add(this.purchaseOrderGroupBox); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.queryResultsListBox); + this.splitContainer1.Size = new System.Drawing.Size(604, 624); + this.splitContainer1.SplitterDistance = 220; + this.splitContainer1.TabIndex = 5; + // + // removeFromQueryButton + // + this.removeFromQueryButton.Location = new System.Drawing.Point(453, 162); + this.removeFromQueryButton.Name = "removeFromQueryButton"; + this.removeFromQueryButton.Size = new System.Drawing.Size(46, 40); + this.removeFromQueryButton.TabIndex = 9; + this.removeFromQueryButton.Text = "Delete"; + this.removeFromQueryButton.UseVisualStyleBackColor = true; + this.removeFromQueryButton.Click += new System.EventHandler(this.removeFromQueryButton_Click); + // + // addToReportButton + // + this.addToReportButton.Location = new System.Drawing.Point(558, 162); + this.addToReportButton.Name = "addToReportButton"; + this.addToReportButton.Size = new System.Drawing.Size(46, 40); + this.addToReportButton.TabIndex = 8; + this.addToReportButton.Text = ">>>"; + this.addToReportButton.UseVisualStyleBackColor = true; + this.addToReportButton.Click += new System.EventHandler(this.addToReportButton_Click); + // + // resolveManuallyCheckBox + // + this.resolveManuallyCheckBox.AutoSize = true; + this.resolveManuallyCheckBox.Location = new System.Drawing.Point(282, 129); + this.resolveManuallyCheckBox.Name = "resolveManuallyCheckBox"; + this.resolveManuallyCheckBox.Size = new System.Drawing.Size(158, 17); + this.resolveManuallyCheckBox.TabIndex = 7; + this.resolveManuallyCheckBox.Text = "Resolve duplicities manually"; + this.resolveManuallyCheckBox.UseVisualStyleBackColor = true; + // + // procedureGroupBox + // + this.procedureGroupBox.Controls.Add(this.procedureCheckBox); + this.procedureGroupBox.Controls.Add(this.procedureComboBox); + this.procedureGroupBox.Location = new System.Drawing.Point(15, 83); + this.procedureGroupBox.Name = "procedureGroupBox"; + this.procedureGroupBox.Size = new System.Drawing.Size(242, 63); + this.procedureGroupBox.TabIndex = 6; + this.procedureGroupBox.TabStop = false; + // + // procedureCheckBox + // + this.procedureCheckBox.AutoSize = true; + this.procedureCheckBox.Location = new System.Drawing.Point(19, 0); + this.procedureCheckBox.Name = "procedureCheckBox"; + this.procedureCheckBox.Size = new System.Drawing.Size(99, 17); + this.procedureCheckBox.TabIndex = 1; + this.procedureCheckBox.Text = "Filter procedure"; + this.procedureCheckBox.UseVisualStyleBackColor = true; + this.procedureCheckBox.CheckedChanged += new System.EventHandler(this.procedureCheckBox_CheckedChanged); + // + // procedureComboBox + // + this.procedureComboBox.FormattingEnabled = true; + this.procedureComboBox.Location = new System.Drawing.Point(18, 26); + this.procedureComboBox.Name = "procedureComboBox"; + this.procedureComboBox.Size = new System.Drawing.Size(201, 21); + this.procedureComboBox.TabIndex = 0; + // + // clearButton + // + this.clearButton.Location = new System.Drawing.Point(149, 162); + this.clearButton.Name = "clearButton"; + this.clearButton.Size = new System.Drawing.Size(108, 40); + this.clearButton.TabIndex = 4; + this.clearButton.Text = "Clear"; + this.clearButton.UseVisualStyleBackColor = true; + this.clearButton.Click += new System.EventHandler(this.clearButton_Click); + // + // fromGroupBox + // + this.fromGroupBox.Controls.Add(this.label2); + this.fromGroupBox.Controls.Add(this.label1); + this.fromGroupBox.Controls.Add(this.filterDateCheckBox); + this.fromGroupBox.Controls.Add(this.toDateTimePicker); + this.fromGroupBox.Controls.Add(this.fromDateTimePicker); + this.fromGroupBox.Location = new System.Drawing.Point(263, 14); + this.fromGroupBox.Name = "fromGroupBox"; + this.fromGroupBox.Size = new System.Drawing.Size(242, 98); + this.fromGroupBox.TabIndex = 3; + this.fromGroupBox.TabStop = false; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(16, 65); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(20, 13); + this.label2.TabIndex = 3; + this.label2.Text = "To"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 33); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(30, 13); + this.label1.TabIndex = 2; + this.label1.Text = "From"; + // + // filterDateCheckBox + // + this.filterDateCheckBox.AutoSize = true; + this.filterDateCheckBox.Location = new System.Drawing.Point(19, -1); + this.filterDateCheckBox.Name = "filterDateCheckBox"; + this.filterDateCheckBox.Size = new System.Drawing.Size(72, 17); + this.filterDateCheckBox.TabIndex = 1; + this.filterDateCheckBox.Text = "Filter date"; + this.filterDateCheckBox.UseVisualStyleBackColor = true; + // + // toDateTimePicker + // + this.toDateTimePicker.Location = new System.Drawing.Point(68, 62); + this.toDateTimePicker.Name = "toDateTimePicker"; + this.toDateTimePicker.Size = new System.Drawing.Size(151, 20); + this.toDateTimePicker.TabIndex = 0; + // + // fromDateTimePicker + // + this.fromDateTimePicker.Location = new System.Drawing.Point(68, 29); + this.fromDateTimePicker.Name = "fromDateTimePicker"; + this.fromDateTimePicker.Size = new System.Drawing.Size(151, 20); + this.fromDateTimePicker.TabIndex = 0; + // + // purchaseOrderGroupBox + // + this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderCheckBox); + this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderComboBox); + this.purchaseOrderGroupBox.Location = new System.Drawing.Point(15, 14); + this.purchaseOrderGroupBox.Name = "purchaseOrderGroupBox"; + this.purchaseOrderGroupBox.Size = new System.Drawing.Size(242, 63); + this.purchaseOrderGroupBox.TabIndex = 2; + this.purchaseOrderGroupBox.TabStop = false; + // + // purchaseOrderCheckBox + // + this.purchaseOrderCheckBox.AutoSize = true; + this.purchaseOrderCheckBox.Location = new System.Drawing.Point(19, 0); + this.purchaseOrderCheckBox.Name = "purchaseOrderCheckBox"; + this.purchaseOrderCheckBox.Size = new System.Drawing.Size(122, 17); + this.purchaseOrderCheckBox.TabIndex = 1; + this.purchaseOrderCheckBox.Text = "Filter purchase order"; + this.purchaseOrderCheckBox.UseVisualStyleBackColor = true; + // + // purchaseOrderComboBox + // + this.purchaseOrderComboBox.FormattingEnabled = true; + this.purchaseOrderComboBox.Location = new System.Drawing.Point(18, 26); + this.purchaseOrderComboBox.Name = "purchaseOrderComboBox"; + this.purchaseOrderComboBox.Size = new System.Drawing.Size(201, 21); + this.purchaseOrderComboBox.TabIndex = 0; + // + // queryResultsListBox + // + this.queryResultsListBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.queryResultsListBox.FormattingEnabled = true; + this.queryResultsListBox.Location = new System.Drawing.Point(0, 0); + this.queryResultsListBox.Name = "queryResultsListBox"; + this.queryResultsListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; + this.queryResultsListBox.Size = new System.Drawing.Size(604, 400); + this.queryResultsListBox.TabIndex = 0; + // + // configReportButton + // + this.configReportButton.Location = new System.Drawing.Point(334, 95); + this.configReportButton.Name = "configReportButton"; + this.configReportButton.Size = new System.Drawing.Size(103, 47); + this.configReportButton.TabIndex = 5; + this.configReportButton.Text = "Configure Report"; + this.configReportButton.UseVisualStyleBackColor = true; + this.configReportButton.Click += new System.EventHandler(this.configReportButton_Click); + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer2.Size = new System.Drawing.Size(1284, 624); + this.splitContainer2.SplitterDistance = 604; + this.splitContainer2.TabIndex = 6; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer3.IsSplitterFixed = true; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.removeFromReportButton); + this.splitContainer3.Panel1.Controls.Add(this.reportFileGroupBox); + this.splitContainer3.Panel1.Controls.Add(this.makeReportButton); + this.splitContainer3.Panel1.Controls.Add(this.addOracleDataButton); + this.splitContainer3.Panel1.Controls.Add(this.configReportButton); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.reportListBox); + this.splitContainer3.Size = new System.Drawing.Size(676, 624); + this.splitContainer3.SplitterDistance = 220; + this.splitContainer3.TabIndex = 6; + // + // removeFromReportButton + // + this.removeFromReportButton.Location = new System.Drawing.Point(58, 162); + this.removeFromReportButton.Name = "removeFromReportButton"; + this.removeFromReportButton.Size = new System.Drawing.Size(46, 40); + this.removeFromReportButton.TabIndex = 10; + this.removeFromReportButton.Text = "Delete"; + this.removeFromReportButton.UseVisualStyleBackColor = true; + this.removeFromReportButton.Click += new System.EventHandler(this.removeFromReportButton_Click); + // + // reportFileGroupBox + // + this.reportFileGroupBox.Controls.Add(this.browseFileButton); + this.reportFileGroupBox.Controls.Add(this.reportFileComboBox); + this.reportFileGroupBox.Location = new System.Drawing.Point(18, 14); + this.reportFileGroupBox.Name = "reportFileGroupBox"; + this.reportFileGroupBox.Size = new System.Drawing.Size(546, 63); + this.reportFileGroupBox.TabIndex = 8; + this.reportFileGroupBox.TabStop = false; + this.reportFileGroupBox.Text = "Report file name"; + // + // browseFileButton + // + this.browseFileButton.Location = new System.Drawing.Point(453, 22); + this.browseFileButton.Name = "browseFileButton"; + this.browseFileButton.Size = new System.Drawing.Size(75, 27); + this.browseFileButton.TabIndex = 2; + this.browseFileButton.Text = "Browse"; + this.browseFileButton.UseVisualStyleBackColor = true; + this.browseFileButton.Click += new System.EventHandler(this.browseFileButton_Click); + // + // reportFileComboBox + // + this.reportFileComboBox.FormattingEnabled = true; + this.reportFileComboBox.Location = new System.Drawing.Point(20, 25); + this.reportFileComboBox.Name = "reportFileComboBox"; + this.reportFileComboBox.Size = new System.Drawing.Size(414, 21); + this.reportFileComboBox.TabIndex = 1; + // + // makeReportButton + // + this.makeReportButton.Location = new System.Drawing.Point(443, 95); + this.makeReportButton.Name = "makeReportButton"; + this.makeReportButton.Size = new System.Drawing.Size(103, 47); + this.makeReportButton.TabIndex = 7; + this.makeReportButton.Text = "Make Report"; + this.makeReportButton.UseVisualStyleBackColor = true; + this.makeReportButton.Click += new System.EventHandler(this.makeReportButton_Click); + // + // addOracleDataButton + // + this.addOracleDataButton.Location = new System.Drawing.Point(225, 95); + this.addOracleDataButton.Name = "addOracleDataButton"; + this.addOracleDataButton.Size = new System.Drawing.Size(103, 47); + this.addOracleDataButton.TabIndex = 6; + this.addOracleDataButton.Text = "Add Oracle Data"; + this.addOracleDataButton.UseVisualStyleBackColor = true; + this.addOracleDataButton.Click += new System.EventHandler(this.addOracleDataButton_Click); + // + // reportListBox + // + this.reportListBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.reportListBox.FormattingEnabled = true; + this.reportListBox.Location = new System.Drawing.Point(0, 0); + this.reportListBox.Name = "reportListBox"; + this.reportListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; + this.reportListBox.Size = new System.Drawing.Size(676, 400); + this.reportListBox.TabIndex = 0; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(321, 173); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 10; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // MainWnd + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1284, 624); + this.Controls.Add(this.splitContainer2); + this.Name = "MainWnd"; + this.Text = "Form1"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); + this.Load += new System.EventHandler(this.MainWnd_Load); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.procedureGroupBox.ResumeLayout(false); + this.procedureGroupBox.PerformLayout(); + this.fromGroupBox.ResumeLayout(false); + this.fromGroupBox.PerformLayout(); + this.purchaseOrderGroupBox.ResumeLayout(false); + this.purchaseOrderGroupBox.PerformLayout(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + this.reportFileGroupBox.ResumeLayout(false); + this.ResumeLayout(false); } @@ -459,6 +471,7 @@ private System.Windows.Forms.Button removeFromQueryButton; private System.Windows.Forms.Button addToReportButton; private System.Windows.Forms.Button removeFromReportButton; + private System.Windows.Forms.Button button1; } } diff --git a/ResultsBrowser/MainWnd.cs b/ResultsBrowser/MainWnd.cs index 224b594a6..a76cd1d7d 100644 --- a/ResultsBrowser/MainWnd.cs +++ b/ResultsBrowser/MainWnd.cs @@ -102,22 +102,42 @@ namespace ResultsBrowser ISession session = FluentCommon.CreateSession(Database.Procedures); IList testResults; + IList partialTestResults; if (procedureCheckBox.Checked) { if (filterDateCheckBox.Checked) { if (purchaseOrderCheckBox.Checked) - { - testResults = session.QueryOver() - .WhereRestrictionOn(x => x.TimeStart) - .IsBetween(fromDateTimePicker.Value) - .And(toDateTimePicker.Value) - .Where(x => (x.PurchaseOrder == purchaseOrderComboBox.Text)) - .Where(x => (x.ProcedureName == procedureComboBox.Text)) - .OrderBy(x => x.BatchNr).Desc - .List(); - } + { + //testResults = session.QueryOver() + // .WhereRestrictionOn(x => x.TimeStart) + // .IsBetween(fromDateTimePicker.Value) + // .And(toDateTimePicker.Value) + // .Where(x => (x.PurchaseOrder == purchaseOrderComboBox.Text)) + // .Where(x => (x.ProcedureName == procedureComboBox.Text)) + // .OrderBy(x => x.BatchNr).Desc + // .List(); + testResults = new List(); + //{ + // int bb = 757; + // partialTestResults = session.QueryOver() + // .Where(x => (x.BatchNr == bb)) + // //.Where(x => (x.ProcedureName == "IPRT02AB - MI120 - Q2s")) + // .List(); + + // foreach (var tr in partialTestResults) testResults.Add(tr); + //} + for (int b = 796; b <= 807; b++) + { + partialTestResults = session.QueryOver() + .Where(x => (x.BatchNr == b)) + //.Where(x => (x.ProcedureName == "IPRT02AB - MI120 - Q2s")) + .List(); + + foreach (var tr in partialTestResults) testResults.Add(tr); + } + } else { testResults = session.QueryOver() @@ -180,7 +200,12 @@ namespace ResultsBrowser DataDeposit.ProcessQueryTestResults(testResults, resolveManuallyCheckBox.Checked); - foreach (var wm in DataDeposit.QueryWaterMeterResults) queryResultsListBox.Items.Add(wm.ToString()); + int cnt = 1; + foreach (var wm in DataDeposit.QueryWaterMeterResults) + { + queryResultsListBox.Items.Add(cnt.ToString() + " " + wm.ToString()); + cnt++; + } } catch (Exception exc) { @@ -312,12 +337,23 @@ namespace ResultsBrowser return; } + Forms.AdditionalDataDlg dlg = new Forms.AdditionalDataDlg(); + if (dlg.ShowDialog() == DialogResult.OK) + { + foreach (var wm in DataDeposit.ReportWaterMeterResults) + { + wm.Type = dlg.Type; + wm.TypeApproval = dlg.TypeApproval; + wm.MetrologicalClass = dlg.MetrologicalClass; + } + } + using (TextWriter report = new StreamWriter(reportFileComboBox.Text, true)) { foreach (var wm in DataDeposit.ReportWaterMeterResults) { - bool first = true; - StringBuilder sb = new StringBuilder(); +#if false + bool first = true; foreach (var mtr in wm.MeterTestResults) { foreach (var item in ReportItems_Single) @@ -328,11 +364,117 @@ namespace ResultsBrowser sb.Append(item.Print(mtr)); } } - report.WriteLine(sb); +#else + try + { + StringBuilder sb = new StringBuilder(); + sb.Append(wm.SerialNrEx); + sb.Append(';'); sb.Append(wm.Type); + sb.Append(';'); sb.Append(wm.TypeApproval); + sb.Append(';'); sb.Append(wm.MetrologicalClass); + sb.Append(';'); sb.Append("0"); + sb.Append(';'); sb.Append((1000 * (wm.TestResult("q1") != null ? wm.TestResult("q1").Qfrom : 0)).ToString("F0")); /// Q1 nominal + sb.Append(';'); sb.Append((1000 * (wm.TestResult("q2") != null ? wm.TestResult("q2").Qfrom : 0)).ToString("F0")); /// Q2 nominal + sb.Append(';'); sb.Append((1000 * (wm.TestResult("q3") != null ? wm.TestResult("q3").Qto : 0)).ToString("F0")); /// Q3 nominal + sb.Append(';'); sb.Append("0"); /// Q4 nominal + sb.Append(';'); sb.Append("6"); /// Worker code + sb.Append(';'); sb.Append(ToShortStr(wm.TestEnd)); + sb.Append(';'); sb.Append((wm.MeterTestResult("q1") != null ? wm.MeterTestResult("q1").VolumeErrorPct : 99).ToString("F1")); /// Q1 Error [%] + sb.Append(';'); sb.Append((wm.MeterTestResult("q2") != null ? wm.MeterTestResult("q2").VolumeErrorPct : 99).ToString("F1")); /// Q2 Error [%] + sb.Append(';'); sb.Append((wm.MeterTestResult("q3") != null ? wm.MeterTestResult("q3").VolumeErrorPct : 99).ToString("F1")); /// Q3 Error [%] + sb.Append(';'); sb.Append("0"); /// Q4 Error [%] + sb.Append(';'); sb.Append(wm.BenchId.ToString()); /// + sb.Append(';'); sb.Append(wm.PurchaseOrder); + sb.Append(';'); sb.Append(""); + sb.Append(';'); sb.Append("10000"); + sb.Append(';'); sb.Append(wm.ProcedureName.Substring(0, 8)); + sb.Append(";\""); sb.Append(wm.SerialNr); sb.Append('"'); +#endif + report.WriteLine(sb); + } + catch (Exception exc) + { + string msg = exc.Message; + } } } MessageBox.Show("Report saved", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + static string ToShortStr(DateTime date) + { + return (((date.Year % 100) * 100 + date.Month) * 100 + date.Day).ToString(); + } + + + + + private void button1_Click(object sender, EventArgs e) + { + //DataDeposit.QueryWaterMeterResults = new List(); + //for (int sn = 20075000; sn < 20075179; sn++) + //{ + // Results.Entities.WaterMeterResult wm = new Results.Entities.WaterMeterResult>(); + + // OracleParameter parm = new OracleParameter(); + // parm.OracleDbType = OracleDbType.Varchar2; + // parm.Value = wm.SerialNr; /// PCB Nr. + + // OracleCommand cmd1 = new OracleCommand("SELECT Zaehlernummer FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); + // cmd1.Parameters.Add(parm); + + // OracleDataReader dr = cmd1.ExecuteReader(); + + // if (dr.Read()) + // { + // wm.SerialNrEx = dr.GetInt32(0); + // } + + + //const int Step = 100; + //for (int i = 0; i < DataDeposit.ReportWaterMeterResults.Count; i += Step) + //{ + // try + // { + // /// Oracle database connection + // OracleConnection conn = new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;"); + // conn.Open(); + + // for (int j = i; j < Math.Min(j + Step, DataDeposit.ReportWaterMeterResults.Count); j++) + // { + // Results.Entities.WaterMeterResult wm = DataDeposit.ReportWaterMeterResults[j]; + + // IList serialNrExes = new List(); + // { + // OracleParameter parm = new OracleParameter(); + // parm.OracleDbType = OracleDbType.Varchar2; + // parm.Value = wm.SerialNr; /// PCB Nr. + + // OracleCommand cmd1 = new OracleCommand("SELECT Zaehlernummer FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); + // cmd1.Parameters.Add(parm); + + // OracleDataReader dr = cmd1.ExecuteReader(); + + // if (dr.Read()) + // { + // wm.SerialNrEx = dr.GetInt32(0); + // } + // } + // } + + // conn.Close(); + // } + // catch (Exception exc) + // { + // MessageBox.Show(string.Format("Error when querying Oracle database:\r\n{0}", exc.Message), + // "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); + // RedrawLists(); + // return; + // } + //} + + + } } } diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 03e41f59c..0d5d221b6 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index b4332eefa..ee5864895 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -86,6 +86,12 @@ DatabaseSettingsDlg.cs + + Form + + + AdditionalDataDlg.cs + Form @@ -126,6 +132,9 @@ DatabaseSettingsDlg.cs + + AdditionalDataDlg.cs + LoginDlg.cs diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 9e1c12037..eab2b4241 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.0.165.1")] -[assembly: AssemblyFileVersion("2.0.165.1")] +[assembly: AssemblyVersion("2.0.167.1")] +[assembly: AssemblyFileVersion("2.0.167.1")]