After code cleanup

This commit is contained in:
2022-07-09 04:17:38 +00:00
parent aaed4430f1
commit f9baf2b3df
53 changed files with 255 additions and 465 deletions

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -16,34 +9,34 @@ namespace AyaNovaQBI
{ {
InitializeComponent(); InitializeComponent();
} }
private string _CompanyName; private string _CompanyName;
private string _CompanyPath; private string _CompanyPath;
public string QBCompanyName public string QBCompanyName
{
set
{
_CompanyName = value;
}
}
public string QBCompanyPath
{
set
{
_CompanyPath = value;
}
}
private void ApproveCompanyFile_Load(object sender, EventArgs e)
{ {
this.btnCancel.Text = util.AyaTranslations["Cancel"]; set
this.btnOK.Text = util.AyaTranslations["OK"]; {
this.lblCompany.Text = _CompanyName; _CompanyName = value;
this.lblPath.Text = _CompanyPath; }
} }
public string QBCompanyPath
{
set
{
_CompanyPath = value;
}
}
private void ApproveCompanyFile_Load(object sender, EventArgs e)
{
this.btnCancel.Text = util.AyaTranslations["Cancel"];
this.btnOK.Text = util.AyaTranslations["OK"];
this.lblCompany.Text = _CompanyName;
this.lblPath.Text = _CompanyPath;
}
private void btnOK_Click(object sender, EventArgs e) private void btnOK_Click(object sender, EventArgs e)
{ {
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
this.Close(); this.Close();
} }
} }
} }

View File

@@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {

View File

@@ -1,9 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
/// <summary> /// <summary>
/// All AyaNova types and their attributes indicating what features that type will support (tagging, attachments etc) /// All AyaNova types and their attributes indicating what features that type will support (tagging, attachments etc)

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -16,7 +9,7 @@ namespace AyaNovaQBI
public CopyableMessageBox(string Display) public CopyableMessageBox(string Display)
{ {
InitializeComponent(); InitializeComponent();
mDisplay=Display; mDisplay = Display;
Icon = AyaNovaQBI.Properties.Resources.logo; Icon = AyaNovaQBI.Properties.Resources.logo;
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -11,7 +8,7 @@ namespace AyaNovaQBI
public long Id { get; set; } public long Id { get; set; }
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public string Name { get; set; } public string Name { get; set; }
public bool Active { get; set; } public bool Active { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
@@ -24,18 +21,18 @@ namespace AyaNovaQBI
public string AlertNotes { get; set; } public string AlertNotes { get; set; }
public bool BillHeadOffice { get; set; } public bool BillHeadOffice { get; set; }
public long? HeadOfficeId { get; set; } public long? HeadOfficeId { get; set; }
public string HeadOfficeViz { get; set; } public string HeadOfficeViz { get; set; }
public string TechNotes { get; set; } public string TechNotes { get; set; }
public string AccountNumber { get; set; } public string AccountNumber { get; set; }
//public bool UsesBanking { get; set; } //public bool UsesBanking { get; set; }
public long? ContractId { get; set; } public long? ContractId { get; set; }
public string ContractViz { get; set; } public string ContractViz { get; set; }
public DateTime? ContractExpires { get; set; } public DateTime? ContractExpires { get; set; }
public long? LastWorkOrderViz { get; set; } public long? LastWorkOrderViz { get; set; }
public DateTime? LastServiceDateViz { get; set; } public DateTime? LastServiceDateViz { get; set; }
public string Phone1 { get; set; } public string Phone1 { get; set; }
public string Phone2 { get; set; } public string Phone2 { get; set; }
@@ -68,7 +65,7 @@ namespace AyaNovaQBI
} }
}//eoc }//eoc
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -68,9 +61,9 @@ namespace AyaNovaQBI
if (!menutag.StartsWith("Set"))//skip the two permanently visible ones if (!menutag.StartsWith("Set"))//skip the two permanently visible ones
{ {
t.Visible = edittag == menutag; t.Visible = edittag == menutag;
// System.Diagnostics.Debug.WriteLine($"editField_Enter setting menu item {menutag} to visible= {t.Visible}"); // System.Diagnostics.Debug.WriteLine($"editField_Enter setting menu item {menutag} to visible= {t.Visible}");
} }
} }
} }
private void tbManager_ItemClicked(object sender, ToolStripItemClickedEventArgs e) private void tbManager_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
@@ -78,7 +71,7 @@ namespace AyaNovaQBI
if (e.ClickedItem.Tag == null) return;//probably just a container menu item / not a special menu item if (e.ClickedItem.Tag == null) return;//probably just a container menu item / not a special menu item
string tag = e.ClickedItem.Tag.ToString(); string tag = e.ClickedItem.Tag.ToString();
// System.Diagnostics.Debug.WriteLine($"you clicked on {tag}"); // System.Diagnostics.Debug.WriteLine($"you clicked on {tag}");
if (tag.StartsWith("~")) if (tag.StartsWith("~"))
_CurrentTextEditor.Text = _CurrentTextEditor.Text.Insert(_CurrentTextEditor.SelectionStart, tag); _CurrentTextEditor.Text = _CurrentTextEditor.Text.Insert(_CurrentTextEditor.SelectionStart, tag);
else else

View File

@@ -1,29 +1,23 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
internal class InvoiceableItem internal class InvoiceableItem
{ {
public string Customer { get; set; } public string Customer { get; set; }
public string Status { get; set; } public string Status { get; set; }
public string ServiceNumber { get; set; } public string ServiceNumber { get; set; }
public string ServiceDate { get; set; } public string ServiceDate { get; set; }
public string Project { get; set; } public string Project { get; set; }
public string StatusColor { get; set; } public string StatusColor { get; set; }
public long WorkorderId { get; set; } public long WorkorderId { get; set; }
public bool Linked { get; set; } public bool Linked { get; set; }
public long CustomerId { get; set; } public long CustomerId { get; set; }
/* /*
grid.DisplayLayout.Bands[0].Columns["WorkingID"].Hidden=true; grid.DisplayLayout.Bands[0].Columns["WorkingID"].Hidden=true;
grid.DisplayLayout.Bands[0].Columns["ClientID"].Hidden=true; grid.DisplayLayout.Bands[0].Columns["ClientID"].Hidden=true;
grid.DisplayLayout.Bands[0].Columns["Linked"].Hidden=true; grid.DisplayLayout.Bands[0].Columns["Linked"].Hidden=true;
@@ -34,6 +28,6 @@ namespace AyaNovaQBI
grid.DisplayLayout.Bands[1].Columns["StatusARGB"].Hidden=true; grid.DisplayLayout.Bands[1].Columns["StatusARGB"].Hidden=true;
grid.DisplayLayout.Bands[1].Columns["Linked"].Hidden=true; grid.DisplayLayout.Bands[1].Columns["Linked"].Hidden=true;
*/ */
} }
} }

View File

@@ -1,8 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
@@ -20,7 +18,7 @@ namespace AyaNovaQBI
Icon = AyaNovaQBI.Properties.Resources.logo; Icon = AyaNovaQBI.Properties.Resources.logo;
} }
async private void MainForm_Load(object sender, EventArgs e) private async void MainForm_Load(object sender, EventArgs e)
{ {
//Initialize //Initialize
@@ -465,7 +463,7 @@ namespace AyaNovaQBI
// grid.DisplayLayout.Rows.CollapseAll(false); // grid.DisplayLayout.Rows.CollapseAll(false);
//foreach (UltraGridRow r in grid.Rows) //foreach (UltraGridRow r in grid.Rows)
//{ //{
// foreach (UltraGridRow rr in r.ChildBands[0].Rows) // foreach (UltraGridRow rr in r.ChildBands[0].Rows)

View File

@@ -993,7 +993,7 @@ namespace AyaNovaQBI
private async void updateSelectedItemsToolStripMenuItem_Click(object sender, EventArgs e) private async void updateSelectedItemsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (gridAya.SelectedRows.Count == 0 && gridQB.SelectedRows.Count == 0) return; if (gridAya.SelectedRows.Count == 0 && gridQB.SelectedRows.Count == 0) return;
bool IsAyaGrid = false; bool IsAyaGrid = false;
IsAyaGrid = gridAya.SelectedRows.Count > 0; IsAyaGrid = gridAya.SelectedRows.Count > 0;

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -19,17 +12,19 @@ namespace AyaNovaQBI
public bool ShowUpdatePriceCostOnlyCheckBox { get; set; } = false; public bool ShowUpdatePriceCostOnlyCheckBox { get; set; } = false;
public bool PriceOnly { get public bool PriceOnly
{
get
{ {
return ckUpdatePriceCostOnly.Checked; return ckUpdatePriceCostOnly.Checked;
} }
} }
public string UpdateMessage { get; set; } public string UpdateMessage { get; set; }
private void MapApproveUpdateSelectedItems_Load(object sender, EventArgs e) private void MapApproveUpdateSelectedItems_Load(object sender, EventArgs e)
{ {
ckUpdatePriceCostOnly.Visible = ShowUpdatePriceCostOnlyCheckBox; ckUpdatePriceCostOnly.Visible = ShowUpdatePriceCostOnlyCheckBox;
lblUpdateMessage.Text=UpdateMessage; lblUpdateMessage.Text = UpdateMessage;
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];
} }

View File

@@ -1,11 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -20,7 +14,7 @@ namespace AyaNovaQBI
public string SelectedItemName public string SelectedItemName
{ {
get get
{ {
return ((DataRowView)cbItems.SelectedItem).Row[0].ToString(); return ((DataRowView)cbItems.SelectedItem).Row[0].ToString();
} }
} }
@@ -28,7 +22,7 @@ namespace AyaNovaQBI
public long SelectedItemId public long SelectedItemId
{ {
get get
{ {
return (long)((DataRowView)cbItems.SelectedItem).Row[1]; return (long)((DataRowView)cbItems.SelectedItem).Row[1];
} }
} }
@@ -58,6 +52,6 @@ namespace AyaNovaQBI
Close(); Close();
} }
} }
} }

View File

@@ -1,11 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -39,7 +33,7 @@ namespace AyaNovaQBI
private void MapSelectQBItem_Load(object sender, EventArgs e) private void MapSelectQBItem_Load(object sender, EventArgs e)
{ {
cbQBItems.DataSource = QBItems; cbQBItems.DataSource = QBItems;
cbQBItems.DisplayMember = "name"; cbQBItems.DisplayMember = "name";
cbQBItems.ValueMember = "id"; cbQBItems.ValueMember = "id";
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
public class NameIdActiveChargeCostItem public class NameIdActiveChargeCostItem
{ {
@@ -12,7 +6,7 @@ namespace AyaNovaQBI
public string Name { get; set; } public string Name { get; set; }
public bool Active { get; set; } public bool Active { get; set; }
public decimal Cost { get; set; } public decimal Cost { get; set; }
public decimal Charge { get; set; } public decimal Charge { get; set; }
} }
} }

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
public class NameIdActiveItem public class NameIdActiveItem
{ {

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
public class NameIdItem public class NameIdItem

View File

@@ -1,8 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -43,7 +39,7 @@ namespace AyaNovaQBI
Retail = 0m; Retail = 0m;
} }
}//eoc }//eoc
} }

View File

@@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
public class PartStockLevel public class PartStockLevel
{ {

View File

@@ -1,7 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI

View File

@@ -1,5 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

View File

@@ -1,9 +1,4 @@
using System; using Newtonsoft.Json;
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {

View File

@@ -1,12 +1,8 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
public class ServiceRate public class ServiceRate
{ {
public long Id { get; set; } public long Id { get; set; }
public uint Concurrency { get; set; } public uint Concurrency { get; set; }

View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Data;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -40,7 +39,7 @@ namespace AyaNovaQBI
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];
} }

View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Data;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -19,7 +18,7 @@ namespace AyaNovaQBI
public string OptionDescription { get; set; } public string OptionDescription { get; set; }
private void SetQBClass_load(object sender, EventArgs e) private void SetQBClass_load(object sender, EventArgs e)
{ {
@@ -29,7 +28,7 @@ namespace AyaNovaQBI
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];
} }

View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Data;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -41,7 +40,7 @@ namespace AyaNovaQBI
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];
} }

View File

@@ -1,11 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI

View File

@@ -20,8 +20,8 @@ namespace AyaNovaQBI
public DataTable QBClasses { get; set; } public DataTable QBClasses { get; set; }
public string SelectedQBClass public string SelectedQBClass
{ {

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -18,7 +11,7 @@ namespace AyaNovaQBI
} }
private void SetQBImportServiceRateAccounts_Load(object sender, EventArgs e) private void SetQBImportServiceRateAccounts_Load(object sender, EventArgs e)
{ {
btnCancel.Text = util.AyaTranslations["Cancel"]; btnCancel.Text = util.AyaTranslations["Cancel"];
btnOK.Text = util.AyaTranslations["OK"]; btnOK.Text = util.AyaTranslations["OK"];

View File

@@ -21,7 +21,7 @@ namespace AyaNovaQBI
public DataTable QBInvoiceTemplates { get; set; } public DataTable QBInvoiceTemplates { get; set; }
public string SelectedQBInvoiceTemplate public string SelectedQBInvoiceTemplate
{ {

View File

@@ -21,7 +21,7 @@ namespace AyaNovaQBI
public DataTable QBTerms { get; set; } public DataTable QBTerms { get; set; }
public string SelectedQBTerm public string SelectedQBTerm
{ {
get get

View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Data;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI

View File

@@ -1,11 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI

View File

@@ -1,12 +1,8 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
public class TravelRate public class TravelRate
{ {
public long Id { get; set; } public long Id { get; set; }
public uint Concurrency { get; set; } public uint Concurrency { get; set; }

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
/// <summary> /// <summary>
/// AyaNova User types /// AyaNova User types

View File

@@ -1,17 +1,13 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
public class Vendor public class Vendor
{ {
public long Id { get; set; } public long Id { get; set; }
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public string Name { get; set; } public string Name { get; set; }
public bool Active { get; set; } public bool Active { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
@@ -54,7 +50,7 @@ namespace AyaNovaQBI
Tags = new List<string>(); Tags = new List<string>();
} }
}//eoc }//eoc
} }

View File

@@ -1,12 +1,4 @@
using System; using System.Windows.Forms;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -17,23 +9,23 @@ namespace AyaNovaQBI
InitializeComponent(); InitializeComponent();
} }
public string Ops public string Ops
{ {
set set
{ {
lblOps.Text = value; lblOps.Text = value;
this.Refresh(); this.Refresh();
} }
} }
public string Step public string Step
{ {
set set
{ {
lblStep.Text = value; lblStep.Text = value;
this.Refresh(); this.Refresh();
} }
} }
} }
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -85,7 +82,7 @@ namespace AyaNovaQBI
public decimal? Longitude { get; set; } public decimal? Longitude { get; set; }
public List<WorkOrderItem> Items { get; set; } = new List<WorkOrderItem>(); public List<WorkOrderItem> Items { get; set; } = new List<WorkOrderItem>();
// public List<WorkOrderState> States { get; set; } = new List<WorkOrderState>(); // public List<WorkOrderState> States { get; set; } = new List<WorkOrderState>();
//UTILITY FIELDS //UTILITY FIELDS

View File

@@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -10,15 +6,15 @@ namespace AyaNovaQBI
/// <summary> /// <summary>
/// DTO object to receive list from server of billable workorders /// DTO object to receive list from server of billable workorders
/// </summary> /// </summary>
internal class WorkOrderAccountingListItem public class WorkOrderAccountingListItem
{ {
internal long id { get; set; } public long id { get; set; }
internal long customerId { get; set; } public long customerId { get; set; }
internal string customerName { get; set; } public string customerName { get; set; }
internal string workorderStatusName { get; set; } public string workorderStatusName { get; set; }
internal long serial { get; set; } public long serial { get; set; }
internal DateTime? serviceDate { get; set; } public DateTime? serviceDate { get; set; }
internal string color { get; set; } public string color { get; set; }
internal string projectName { get; set; } public string projectName { get; set; }
} }
} }

View File

@@ -1,25 +1,21 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
/// <summary> /// <summary>
/// Working list for selection by user in grid /// Working list for selection by user in grid
/// </summary> /// </summary>
internal class WorkOrderGridListItem public class WorkOrderGridListItem
{ {
internal long Id { get; set; } public long Id { get; set; }
internal long CustomerId { get; set; } public long CustomerId { get; set; }
internal string CustomerName { get; set; } public string CustomerName { get; set; }
internal string WorkorderStatusName { get; set; } public string WorkorderStatusName { get; set; }
internal long Serial { get; set; } public long Serial { get; set; }
internal DateTime? ServiceDate { get; set; } public DateTime? ServiceDate { get; set; }
internal string Color { get; set; } public string Color { get; set; }
internal string ProjectName { get; set; } public string ProjectName { get; set; }
internal bool Linked { get; set; } public bool Linked { get; set; }
} }
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -15,19 +12,19 @@ namespace AyaNovaQBI
public string CustomFields { get; set; } public string CustomFields { get; set; }
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
public long WorkOrderId { get; set; } public long WorkOrderId { get; set; }
public string TechNotes { get; set; } public string TechNotes { get; set; }
public long? WorkOrderItemStatusId { get; set; } public long? WorkOrderItemStatusId { get; set; }
public string WorkOrderItemStatusNameViz { get; set; } public string WorkOrderItemStatusNameViz { get; set; }
public string WorkOrderItemStatusColorViz { get; set; } public string WorkOrderItemStatusColorViz { get; set; }
public long? WorkOrderItemPriorityId { get; set; } public long? WorkOrderItemPriorityId { get; set; }
public string WorkOrderItemPriorityNameViz { get; set; } public string WorkOrderItemPriorityNameViz { get; set; }
public string WorkOrderItemPriorityColorViz { get; set; } public string WorkOrderItemPriorityColorViz { get; set; }
public DateTime? RequestDate { get; set; } public DateTime? RequestDate { get; set; }
@@ -35,26 +32,26 @@ namespace AyaNovaQBI
public int Sequence { get; set; } public int Sequence { get; set; }
public long? FromCSRId { get; set; } public long? FromCSRId { get; set; }
public string FromCSRViz { get; set; } public string FromCSRViz { get; set; }
//workaround for notification //workaround for notification
public string Name { get; set; } public string Name { get; set; }
//Principle //Principle
public WorkOrder WorkOrder { get; set; } public WorkOrder WorkOrder { get; set; }
//dependents //dependents
public List<WorkOrderItemExpense> Expenses { get; set; } = new List<WorkOrderItemExpense>(); public List<WorkOrderItemExpense> Expenses { get; set; } = new List<WorkOrderItemExpense>();
public List<WorkOrderItemLabor> Labors { get; set; } = new List<WorkOrderItemLabor>(); public List<WorkOrderItemLabor> Labors { get; set; } = new List<WorkOrderItemLabor>();
public List<WorkOrderItemLoan> Loans { get; set; } = new List<WorkOrderItemLoan>(); public List<WorkOrderItemLoan> Loans { get; set; } = new List<WorkOrderItemLoan>();
public List<WorkOrderItemPart> Parts { get; set; } = new List<WorkOrderItemPart>(); public List<WorkOrderItemPart> Parts { get; set; } = new List<WorkOrderItemPart>();
// public List<WorkOrderItemPartRequest> PartRequests { get; set; } = new List<WorkOrderItemPartRequest>(); // public List<WorkOrderItemPartRequest> PartRequests { get; set; } = new List<WorkOrderItemPartRequest>();
// public List<WorkOrderItemScheduledUser> ScheduledUsers { get; set; } = new List<WorkOrderItemScheduledUser>(); // public List<WorkOrderItemScheduledUser> ScheduledUsers { get; set; } = new List<WorkOrderItemScheduledUser>();
// public List<WorkOrderItemTask> Tasks { get; set; } = new List<WorkOrderItemTask>(); // public List<WorkOrderItemTask> Tasks { get; set; } = new List<WorkOrderItemTask>();
public List<WorkOrderItemTravel> Travels { get; set; } = new List<WorkOrderItemTravel>(); public List<WorkOrderItemTravel> Travels { get; set; } = new List<WorkOrderItemTravel>();
// public List<WorkOrderItemUnit> Units { get; set; } = new List<WorkOrderItemUnit>(); // public List<WorkOrderItemUnit> Units { get; set; } = new List<WorkOrderItemUnit>();
public List<WorkOrderItemOutsideService> OutsideServices { get; set; } = new List<WorkOrderItemOutsideService>(); public List<WorkOrderItemOutsideService> OutsideServices { get; set; } = new List<WorkOrderItemOutsideService>();
} }
} }

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
internal class WorkOrderItemExpense internal class WorkOrderItemExpense
{ {
@@ -13,29 +7,29 @@ namespace AyaNovaQBI
public string Description { get; set; } public string Description { get; set; }
public string Name { get; set; } public string Name { get; set; }
public decimal TotalCost { get; set; } public decimal TotalCost { get; set; }
public decimal ChargeAmount { get; set; } public decimal ChargeAmount { get; set; }
public decimal TaxPaid { get; set; } public decimal TaxPaid { get; set; }
public long? ChargeTaxCodeId { get; set; } public long? ChargeTaxCodeId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
public bool ReimburseUser { get; set; } = false; public bool ReimburseUser { get; set; } = false;
public long? UserId { get; set; } public long? UserId { get; set; }
public string UserViz { get; set; } public string UserViz { get; set; }
public bool ChargeToCustomer { get; set; } = false; public bool ChargeToCustomer { get; set; } = false;
public decimal TaxAViz { get; set; } public decimal TaxAViz { get; set; }
public decimal TaxBViz { get; set; } public decimal TaxBViz { get; set; }
public decimal LineTotalViz { get; set; } public decimal LineTotalViz { get; set; }
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -12,47 +8,47 @@ namespace AyaNovaQBI
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public long? UserId { get; set; } public long? UserId { get; set; }
public string UserViz { get; set; } public string UserViz { get; set; }
public DateTime? ServiceStartDate { get; set; } public DateTime? ServiceStartDate { get; set; }
public DateTime? ServiceStopDate { get; set; } public DateTime? ServiceStopDate { get; set; }
public long? ServiceRateId { get; set; } public long? ServiceRateId { get; set; }
public string ServiceRateViz { get; set; } public string ServiceRateViz { get; set; }
public string ServiceDetails { get; set; } public string ServiceDetails { get; set; }
public decimal ServiceRateQuantity { get; set; } public decimal ServiceRateQuantity { get; set; }
public decimal NoChargeQuantity { get; set; } public decimal NoChargeQuantity { get; set; }
//public long? ServiceBankId { get; set; } //public long? ServiceBankId { get; set; }
public long? TaxCodeSaleId { get; set; } public long? TaxCodeSaleId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
//Standard pricing fields (mostly to support printed reports though some show in UI) //Standard pricing fields (mostly to support printed reports though some show in UI)
//some not to be sent with record depending on role (i.e. cost and charge in some cases) //some not to be sent with record depending on role (i.e. cost and charge in some cases)
public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
public string UnitOfMeasureViz { get; set; }//"each", "hour" etc public string UnitOfMeasureViz { get; set; }//"each", "hour" etc
public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
public decimal TaxAViz { get; set; }//total amount of taxA public decimal TaxAViz { get; set; }//total amount of taxA
public decimal TaxBViz { get; set; }//total amount of taxB public decimal TaxBViz { get; set; }//total amount of taxB
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -27,15 +24,15 @@ namespace AyaNovaQBI
// //
// public decimal Charges { get; set; }//removed in favor of ListPRice snapshot which normalizes fields to other objects // public decimal Charges { get; set; }//removed in favor of ListPRice snapshot which normalizes fields to other objects
public long? TaxCodeId { get; set; } public long? TaxCodeId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
public long LoanUnitId { get; set; } public long LoanUnitId { get; set; }
public string LoanUnitViz { get; set; } public string LoanUnitViz { get; set; }
public decimal Quantity { get; set; } public decimal Quantity { get; set; }
public LoanUnitRateUnit Rate { get; set; } public LoanUnitRateUnit Rate { get; set; }
public decimal Cost { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered public decimal Cost { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
@@ -45,25 +42,25 @@ namespace AyaNovaQBI
//some not to be sent with record depending on role (i.e. cost and charge in some cases) //some not to be sent with record depending on role (i.e. cost and charge in some cases)
public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
public string UnitOfMeasureViz { get; set; }//"each", "hour" etc public string UnitOfMeasureViz { get; set; }//"each", "hour" etc
public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
public decimal TaxAViz { get; set; }//total amount of taxA public decimal TaxAViz { get; set; }//total amount of taxA
public decimal TaxBViz { get; set; }//total amount of taxB public decimal TaxBViz { get; set; }//total amount of taxB
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
//workaround for notification //workaround for notification
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
public string Name { get; set; } public string Name { get; set; }
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -12,52 +9,52 @@ namespace AyaNovaQBI
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
public long UnitId { get; set; } public long UnitId { get; set; }
public string UnitViz { get; set; } public string UnitViz { get; set; }
public long? VendorSentToId { get; set; } public long? VendorSentToId { get; set; }
public string VendorSentToViz { get; set; } public string VendorSentToViz { get; set; }
public long? VendorSentViaId { get; set; } public long? VendorSentViaId { get; set; }
public string VendorSentViaViz { get; set; } public string VendorSentViaViz { get; set; }
public string RMANumber { get; set; } public string RMANumber { get; set; }
public string TrackingNumber { get; set; } public string TrackingNumber { get; set; }
public decimal RepairCost { get; set; } public decimal RepairCost { get; set; }
public decimal RepairPrice { get; set; } public decimal RepairPrice { get; set; }
public decimal ShippingCost { get; set; } public decimal ShippingCost { get; set; }
public decimal ShippingPrice { get; set; } public decimal ShippingPrice { get; set; }
public DateTime? SentDate { get; set; } public DateTime? SentDate { get; set; }
public DateTime? ETADate { get; set; } public DateTime? ETADate { get; set; }
public DateTime? ReturnDate { get; set; } public DateTime? ReturnDate { get; set; }
public long? TaxCodeId { get; set; } public long? TaxCodeId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
public decimal CostViz { get; set; }//Total cost shipping + repairs public decimal CostViz { get; set; }//Total cost shipping + repairs
public decimal PriceViz { get; set; }//Total price shipping + repairs public decimal PriceViz { get; set; }//Total price shipping + repairs
public decimal NetViz { get; set; }//=priceViz for standardization not because it's necessary (before taxes line total essentially) public decimal NetViz { get; set; }//=priceViz for standardization not because it's necessary (before taxes line total essentially)
public decimal TaxAViz { get; set; }//total amount of taxA public decimal TaxAViz { get; set; }//total amount of taxA
public decimal TaxBViz { get; set; }//total amount of taxB public decimal TaxBViz { get; set; }//total amount of taxB
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
//workaround for notification //workaround for notification
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
public string Name { get; set; } public string Name { get; set; }
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,8 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -12,23 +8,23 @@ namespace AyaNovaQBI
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public string Description { get; set; } public string Description { get; set; }
public string Serials { get; set; } public string Serials { get; set; }
public long PartId { get; set; } public long PartId { get; set; }
public string PartDescriptionViz { get; set; } public string PartDescriptionViz { get; set; }
public string PartNameViz { get; set; } public string PartNameViz { get; set; }
public string UpcViz { get; set; } public string UpcViz { get; set; }
public long PartWarehouseId { get; set; } public long PartWarehouseId { get; set; }
public string PartWarehouseViz { get; set; } public string PartWarehouseViz { get; set; }
public decimal Quantity { get; set; } public decimal Quantity { get; set; }
public decimal SuggestedQuantity { get; set; } public decimal SuggestedQuantity { get; set; }
public long? TaxPartSaleId { get; set; } public long? TaxPartSaleId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
//NOTE: part prices are volatile and expected to be frequently edited so snapshotted when newly added unlike other things like rates etc that are protected from change //NOTE: part prices are volatile and expected to be frequently edited so snapshotted when newly added unlike other things like rates etc that are protected from change
@@ -40,26 +36,26 @@ namespace AyaNovaQBI
public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
public string UnitOfMeasureViz { get; set; }//"each", "hour" etc public string UnitOfMeasureViz { get; set; }//"each", "hour" etc
public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
public decimal TaxAViz { get; set; }//total amount of taxA public decimal TaxAViz { get; set; }//total amount of taxA
public decimal TaxBViz { get; set; }//total amount of taxB public decimal TaxBViz { get; set; }//total amount of taxB
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
//workaround for notification //workaround for notification
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
public string Name { get; set; } public string Name { get; set; }
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -12,19 +9,19 @@ namespace AyaNovaQBI
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public long? UserId { get; set; } public long? UserId { get; set; }
public string UserViz { get; set; } public string UserViz { get; set; }
public DateTime? TravelStartDate { get; set; } public DateTime? TravelStartDate { get; set; }
public DateTime? TravelStopDate { get; set; } public DateTime? TravelStopDate { get; set; }
public long? TravelRateId { get; set; } public long? TravelRateId { get; set; }
public string TravelRateViz { get; set; } public string TravelRateViz { get; set; }
public string TravelDetails { get; set; } public string TravelDetails { get; set; }
public decimal TravelRateQuantity { get; set; } public decimal TravelRateQuantity { get; set; }
public decimal NoChargeQuantity { get; set; } public decimal NoChargeQuantity { get; set; }
//public long? ServiceBankId { get; set; } //public long? ServiceBankId { get; set; }
public long? TaxCodeSaleId { get; set; } public long? TaxCodeSaleId { get; set; }
public string TaxCodeViz { get; set; } public string TaxCodeViz { get; set; }
public decimal Distance { get; set; } public decimal Distance { get; set; }
@@ -32,30 +29,30 @@ namespace AyaNovaQBI
//Standard pricing fields (mostly to support printed reports though some show in UI) //Standard pricing fields (mostly to support printed reports though some show in UI)
//some not to be sent with record depending on role (i.e. cost and charge in some cases) //some not to be sent with record depending on role (i.e. cost and charge in some cases)
public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
public string UnitOfMeasureViz { get; set; }//"each", "hour" etc public string UnitOfMeasureViz { get; set; }//"each", "hour" etc
public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
public decimal TaxAViz { get; set; }//total amount of taxA public decimal TaxAViz { get; set; }//total amount of taxA
public decimal TaxBViz { get; set; }//total amount of taxB public decimal TaxBViz { get; set; }//total amount of taxB
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
//workaround for notification //workaround for notification
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
public string Name { get; set; } public string Name { get; set; }
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
} }
} }

View File

@@ -1,10 +1,4 @@
using System; namespace AyaNovaQBI
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{ {
internal class WorkOrderStatus internal class WorkOrderStatus
{ {

View File

@@ -65,11 +65,11 @@ namespace AyaNovaQBI
return; return;
} }
// MessageBox.Show($@"TEST - LOGIN SUCCEEDED: \r\ // MessageBox.Show($@"TEST - LOGIN SUCCEEDED: \r\
//AyaNovaUserName: {util.AyaNovaUserName}\r\n //AyaNovaUserName: {util.AyaNovaUserName}\r\n
//JWT: {util.JWT}\r\n //JWT: {util.JWT}\r\n
//AyaNovaUserRoles: {util.AyaNovaUserRoles}\r\n //AyaNovaUserRoles: {util.AyaNovaUserRoles}\r\n
//AyaNovaUserType: {util.AyaNovaUserType}"); //AyaNovaUserType: {util.AyaNovaUserType}");
btnLogin.Enabled = btnTest.Enabled = true; btnLogin.Enabled = btnTest.Enabled = true;

View File

@@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace AyaNovaQBI namespace AyaNovaQBI
@@ -20,13 +13,13 @@ namespace AyaNovaQBI
private void auth_Load(object sender, EventArgs e) private void auth_Load(object sender, EventArgs e)
{ {
} }
private void btnVerifyCode_click(object sender, EventArgs e) private void btnVerifyCode_click(object sender, EventArgs e)
{ {
TFAPin = edTFACode.Text; TFAPin = edTFACode.Text;
if (string.IsNullOrWhiteSpace(TFAPin)) if (string.IsNullOrWhiteSpace(TFAPin))
{ {
@@ -37,7 +30,7 @@ namespace AyaNovaQBI
this.Close(); this.Close();
} }
} }
} }

View File

@@ -1,17 +1,16 @@
using System; using Interop.QBFC15;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using Newtonsoft.Json.Linq; using System.Text;
using Interop.QBFC15;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using System.Data;
using System.Collections;
namespace AyaNovaQBI namespace AyaNovaQBI
{ {
@@ -91,7 +90,7 @@ namespace AyaNovaQBI
} }
public async static Task<bool> AuthenticateAsync(string login, string password = null) public static async Task<bool> AuthenticateAsync(string login, string password = null)
{ {
InitClient(); InitClient();
@@ -202,7 +201,7 @@ namespace AyaNovaQBI
public async static Task<ApiResponse> GetAsync(string route) public static async Task<ApiResponse> GetAsync(string route)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -224,7 +223,7 @@ namespace AyaNovaQBI
throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException);
} }
private async static Task<ApiResponse> TryGetAsync(string route) private static async Task<ApiResponse> TryGetAsync(string route)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + route); var requestMessage = new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + route);
@@ -258,7 +257,7 @@ namespace AyaNovaQBI
public async static Task<ApiResponse> PostAsync(string route, dynamic d) public static async Task<ApiResponse> PostAsync(string route, dynamic d)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -280,7 +279,7 @@ namespace AyaNovaQBI
throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException);
} }
public async static Task<ApiResponse> PostAsync(string route, string s = null) public static async Task<ApiResponse> PostAsync(string route, string s = null)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -303,7 +302,7 @@ namespace AyaNovaQBI
} }
internal async static Task<ApiResponse> TryPostAsync(string route, string postJson = null) internal static async Task<ApiResponse> TryPostAsync(string route, string postJson = null)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route); var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route);
@@ -367,7 +366,7 @@ namespace AyaNovaQBI
public async static Task<ApiResponse> PutAsync(string route, dynamic d) public static async Task<ApiResponse> PutAsync(string route, dynamic d)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -389,7 +388,7 @@ namespace AyaNovaQBI
throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException);
} }
public async static Task<ApiResponse> PutAsync(string route, string s = null) public static async Task<ApiResponse> PutAsync(string route, string s = null)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -411,7 +410,7 @@ namespace AyaNovaQBI
throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException);
} }
public async static Task<ApiResponse> PutAsync(string route) public static async Task<ApiResponse> PutAsync(string route)
{ {
Exception FirstException = null; Exception FirstException = null;
@@ -433,7 +432,7 @@ namespace AyaNovaQBI
throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException);
} }
public async static Task<ApiResponse> TryPutAsync(string route, string putJson = null) public static async Task<ApiResponse> TryPutAsync(string route, string putJson = null)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Put, ApiBaseUrl + route); var requestMessage = new HttpRequestMessage(HttpMethod.Put, ApiBaseUrl + route);
@@ -1384,7 +1383,7 @@ namespace AyaNovaQBI
/// gather info required for future /// gather info required for future
/// transactions /// transactions
/// </summary> /// </summary>
public async static Task<pfstat> QBValidate() public static async Task<pfstat> QBValidate()
{ {
// We want to know if we begun a session so we can end it if an // We want to know if we begun a session so we can end it if an
// error happens // error happens
@@ -1750,7 +1749,7 @@ namespace AyaNovaQBI
/// Populate the cached qb data /// Populate the cached qb data
/// billable /// billable
/// </summary> /// </summary>
internal async static Task PopulateQBItemCacheAsync() internal static async Task PopulateQBItemCacheAsync()
{ {
if (_dtQBItems == null) if (_dtQBItems == null)
{ {
@@ -3144,7 +3143,7 @@ namespace AyaNovaQBI
/// <summary> /// <summary>
/// Populate the cached qb terms list data /// Populate the cached qb terms list data
/// </summary> /// </summary>
private async static Task PopulateQBTermsCache() private static async Task PopulateQBTermsCache()
{ {
if (_dtQBTerms == null) if (_dtQBTerms == null)
{ {
@@ -3411,7 +3410,7 @@ namespace AyaNovaQBI
#endregion QB api helper methods end #endregion QB api helper methods end
#region AyaNova cached lists #region AyaNova cached lists
public async static Task PopulateAyaListCache() public static async Task PopulateAyaListCache()
{ {
//Get the cached QB data //Get the cached QB data
Waiting w = new Waiting(); Waiting w = new Waiting();
@@ -5965,7 +5964,7 @@ namespace AyaNovaQBI
#endregion qbi stuff (anything not api) #endregion qbi stuff (anything not api)
#region general utils #region general utils
static public void OpenWebURL(object oUrl) public static void OpenWebURL(object oUrl)
{ {
if (oUrl == null) return; if (oUrl == null) return;