From ce9278b146dae202f0b626572081f9d7f07adbdd Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sat, 9 Jul 2022 23:37:24 +0000 Subject: [PATCH] --- AyaNovaQBI/FixInvoiceProblems.Designer.cs | 15 ++++++++------- AyaNovaQBI/FixInvoiceProblems.cs | 4 ++++ AyaNovaQBI/FixInvoiceProblems.resx | 2 +- AyaNovaQBI/MainForm.cs | 4 ++-- AyaNovaQBI/WorkOrderStatus.cs | 2 +- AyaNovaQBI/util.cs | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/AyaNovaQBI/FixInvoiceProblems.Designer.cs b/AyaNovaQBI/FixInvoiceProblems.Designer.cs index e72106b..de98d53 100644 --- a/AyaNovaQBI/FixInvoiceProblems.Designer.cs +++ b/AyaNovaQBI/FixInvoiceProblems.Designer.cs @@ -32,7 +32,7 @@ this.btnOK = new System.Windows.Forms.Button(); this.Object = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Fix = new System.Windows.Forms.DataGridViewButtonColumn(); - this.Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ObjectName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Problem = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ObjectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.AyaPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -51,7 +51,7 @@ this.grid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Object, this.Fix, - this.Name, + this.ObjectName, this.Problem, this.ObjectId, this.AyaPrice, @@ -82,15 +82,16 @@ // // Fix // + this.Fix.DataPropertyName = "Fix"; this.Fix.HeaderText = "Fix"; this.Fix.Name = "Fix"; this.Fix.ReadOnly = true; // - // Name + // ObjectName // - this.Name.HeaderText = "Name"; - this.Name.Name = "Name"; - this.Name.ReadOnly = true; + this.ObjectName.HeaderText = "Name"; + this.ObjectName.Name = "ObjectName"; + this.ObjectName.ReadOnly = true; // // Problem // @@ -153,7 +154,7 @@ private System.Windows.Forms.Button btnOK; private System.Windows.Forms.DataGridViewTextBoxColumn Object; private System.Windows.Forms.DataGridViewButtonColumn Fix; - private System.Windows.Forms.DataGridViewTextBoxColumn Name; + private System.Windows.Forms.DataGridViewTextBoxColumn ObjectName; private System.Windows.Forms.DataGridViewTextBoxColumn Problem; private System.Windows.Forms.DataGridViewTextBoxColumn ObjectId; private System.Windows.Forms.DataGridViewTextBoxColumn AyaPrice; diff --git a/AyaNovaQBI/FixInvoiceProblems.cs b/AyaNovaQBI/FixInvoiceProblems.cs index 8089cc7..38694d0 100644 --- a/AyaNovaQBI/FixInvoiceProblems.cs +++ b/AyaNovaQBI/FixInvoiceProblems.cs @@ -12,6 +12,9 @@ namespace AyaNovaQBI { public partial class FixInvoiceProblems : Form { + public List MisMatches { get; set; } + public List PartPriceOverrides { get; set; } + public bool ChangesMade { get; set; } = false; public FixInvoiceProblems() { InitializeComponent(); @@ -19,6 +22,7 @@ namespace AyaNovaQBI private void FixInvoiceProblems_Load(object sender, EventArgs e) { + grid.DataSource = MisMatches; btnOK.Text = util.AyaTranslations["OK"]; } diff --git a/AyaNovaQBI/FixInvoiceProblems.resx b/AyaNovaQBI/FixInvoiceProblems.resx index 2faf1f6..7145ee6 100644 --- a/AyaNovaQBI/FixInvoiceProblems.resx +++ b/AyaNovaQBI/FixInvoiceProblems.resx @@ -123,7 +123,7 @@ True - + True diff --git a/AyaNovaQBI/MainForm.cs b/AyaNovaQBI/MainForm.cs index 9a069fa..115117d 100644 --- a/AyaNovaQBI/MainForm.cs +++ b/AyaNovaQBI/MainForm.cs @@ -111,14 +111,14 @@ namespace AyaNovaQBI } - private void fixProblemsToolStripMenuItem_Click(object sender, EventArgs e) + private async void fixProblemsToolStripMenuItem_Click(object sender, EventArgs e) { FixInvoiceProblems d = new FixInvoiceProblems(); d.MisMatches = _MisMatches; d.PartPriceOverrides = _PartPriceOverrides; d.ShowDialog(); if (d.ChangesMade) - InitInvoices(); + await InitInvoices(); d.Dispose(); } diff --git a/AyaNovaQBI/WorkOrderStatus.cs b/AyaNovaQBI/WorkOrderStatus.cs index 3be7ef1..c29e2f5 100644 --- a/AyaNovaQBI/WorkOrderStatus.cs +++ b/AyaNovaQBI/WorkOrderStatus.cs @@ -1,6 +1,6 @@ namespace AyaNovaQBI { - internal class WorkOrderStatus + public class WorkOrderStatus { public long Id { get; set; } public uint Concurrency { get; set; } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index 8a152d3..07c9d7c 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -14,7 +14,7 @@ using System.Windows.Forms; namespace AyaNovaQBI { - internal class util + public class util { #region API stuff public static Guid QBI_INTEGRATION_ID