This commit is contained in:
2022-06-30 22:10:59 +00:00
parent 207d2951f8
commit 4d5c92338e
7 changed files with 440 additions and 12 deletions

View File

@@ -105,6 +105,12 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QBIIntegrationData.cs" />
<Compile Include="SetWOStatus.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="SetWOStatus.Designer.cs">
<DependentUpon>SetWOStatus.cs</DependentUpon>
</Compile>
<Compile Include="tfa.cs">
<SubType>Form</SubType>
</Compile>
@@ -120,6 +126,7 @@
<Compile Include="Waiting.Designer.cs">
<DependentUpon>Waiting.cs</DependentUpon>
</Compile>
<Compile Include="WorkOrderStatus.cs" />
<EmbeddedResource Include="ApproveCompanyFile.resx">
<DependentUpon>ApproveCompanyFile.cs</DependentUpon>
</EmbeddedResource>
@@ -142,6 +149,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="SetWOStatus.resx">
<DependentUpon>SetWOStatus.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tfa.resx">
<DependentUpon>tfa.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -18,8 +18,8 @@ namespace AyaNovaQBI
"InvoiceLoanItemTemplate":"","HasInvoiceHeaderTemplate":false,"HasAnyInvoiceFooterTemplateFields":false,"AutoClose":true,"NothingSet":true}
*/
#region fields
private Guid _PreWOStatus = Guid.Empty;
private Guid _PostWOStatus = Guid.Empty;
private long _PreWOStatus = 0;
private long _PostWOStatus = 0;
private string _OutsideServiceChargeAs = "";
private string _WorkorderItemLoanChargeAs = "";
private string _MiscExpenseChargeAs = "";
@@ -85,7 +85,7 @@ namespace AyaNovaQBI
#endregion
#region Properties
public Guid PreWOStatus
public long PreWOStatus
{
get { return _PreWOStatus; }
set
@@ -98,7 +98,7 @@ namespace AyaNovaQBI
}
}
public Guid PostWOStatus
public long PostWOStatus
{
get { return _PostWOStatus; }
set
@@ -362,8 +362,8 @@ namespace AyaNovaQBI
{
get
{
if (_PreWOStatus == Guid.Empty &&
_PostWOStatus == Guid.Empty &&
if (_PreWOStatus == 0 &&
_PostWOStatus == 0 &&
_OutsideServiceChargeAs == "" &&
_WorkorderItemLoanChargeAs == "" &&
_MiscExpenseChargeAs == "" &&

127
AyaNovaQBI/SetWOStatus.Designer.cs generated Normal file
View File

@@ -0,0 +1,127 @@
namespace AyaNovaQBI
{
partial class SetWOStatus
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.btnOK = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.lblTitle = new System.Windows.Forms.Label();
this.lblDescription = new System.Windows.Forms.Label();
this.lblStatus = new System.Windows.Forms.Label();
this.cbStatus = new System.Windows.Forms.ComboBox();
this.SuspendLayout();
//
// btnOK
//
this.btnOK.Location = new System.Drawing.Point(550, 368);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "OK";
this.btnOK.UseVisualStyleBackColor = true;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(4, 368);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 5;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
// lblTitle
//
this.lblTitle.Dock = System.Windows.Forms.DockStyle.Top;
this.lblTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblTitle.Location = new System.Drawing.Point(0, 0);
this.lblTitle.Name = "lblTitle";
this.lblTitle.Size = new System.Drawing.Size(637, 30);
this.lblTitle.TabIndex = 7;
//
// lblDescription
//
this.lblDescription.Dock = System.Windows.Forms.DockStyle.Top;
this.lblDescription.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblDescription.Location = new System.Drawing.Point(0, 30);
this.lblDescription.Name = "lblDescription";
this.lblDescription.Size = new System.Drawing.Size(637, 165);
this.lblDescription.TabIndex = 8;
//
// lblStatus
//
this.lblStatus.AutoSize = true;
this.lblStatus.Dock = System.Windows.Forms.DockStyle.Top;
this.lblStatus.Location = new System.Drawing.Point(0, 195);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(0, 13);
this.lblStatus.TabIndex = 10;
//
// cbStatus
//
this.cbStatus.Dock = System.Windows.Forms.DockStyle.Top;
this.cbStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbStatus.FormattingEnabled = true;
this.cbStatus.Location = new System.Drawing.Point(0, 208);
this.cbStatus.Name = "cbStatus";
this.cbStatus.Size = new System.Drawing.Size(637, 21);
this.cbStatus.TabIndex = 11;
//
// SetWOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(637, 403);
this.Controls.Add(this.cbStatus);
this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblDescription);
this.Controls.Add(this.lblTitle);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.btnCancel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Name = "SetWOStatus";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "SetWOStatus";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SetWOStatus_FormClosing);
this.Load += new System.EventHandler(this.SetWOStatus_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Label lblTitle;
private System.Windows.Forms.Label lblDescription;
private System.Windows.Forms.Label lblStatus;
private System.Windows.Forms.ComboBox cbStatus;
}
}

88
AyaNovaQBI/SetWOStatus.cs Normal file
View File

@@ -0,0 +1,88 @@
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;
namespace AyaNovaQBI
{
public partial class SetWOStatus : Form
{
public SetWOStatus()
{
InitializeComponent();
}
private long _SelectedStatus = 0;
public long SelectedStatus
{
get
{
return (long)cbStatus.SelectedItem;
}
set
{
_SelectedStatus = value;
}
}
private bool _Pre = true;
/// <summary>
/// Used to indicate if dialog should display for post or pre
/// status
/// </summary>
public bool PreStatus
{
set
{
_Pre = value;
}
}
private void SetWOStatus_Load(object sender, EventArgs e)
{
List<NameIdItem> items = util.AyaWOStatusList.OrderBy(z=>z.Name).Select(z => new NameIdItem { Id = z.Id, Name = z.Name }).ToList();
items.Insert(0, new NameIdItem { Id = 0, Name = _Pre ? "< Any status >" : "< Do not change status >" });
this.cbStatus.DataSource = items;
this.cbStatus.DisplayMember = "Name";
this.cbStatus.ValueMember = "Id";
this.cbStatus.SelectedValue = _SelectedStatus;
this.lblStatus.Text = util.AyaTranslations["WorkOrderStatus"];
////NVCHANGED
//GenericNVList ls = GenericNVList.GetList("aWorkorderStatus", "aID", "aName", true, false, false);
//if (_Pre)
// this.cbStatus.SelectedItem = this.cbStatus.Items.Add(Guid.Empty, "< Any status >");
//else
// this.cbStatus.SelectedItem = this.cbStatus.Items.Add(Guid.Empty, "< Do not change status >");
//foreach (DictionaryEntry d in ls.BindableList)
//{
// Guid gItem = new Guid(d.Key.ToString());
// Infragistics.Win.ValueListItem v = this.cbStatus.Items.Add(gItem, d.Value.ToString());
// if (_SelectedStatus == gItem)
// {
// this.cbStatus.SelectedItem = v;
// }
//}
}
private void SetWOStatus_FormClosing(object sender, FormClosingEventArgs e)
{
}
}
}

120
AyaNovaQBI/SetWOStatus.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AyaNovaQBI
{
internal class WorkOrderStatus
{
public long Id { get; set; }
public uint Concurrency { get; set; }
public string Name { get; set; }
public bool Active { get; set; }
public string Notes { get; set; }
/*
Hexadecimal notation: #RGB[A]
R (red), G (green), B (blue), and A (alpha) are hexadecimal characters (09, AF). A is optional. The three-digit notation (#RGB) is a shorter version of the six-digit form (#RRGGBB). For example, #f09 is the same color as #ff0099. Likewise, the four-digit RGB notation (#RGBA) is a shorter version of the eight-digit form (#RRGGBBAA). For example, #0f38 is the same color as #00ff3388.
*/
public string Color { get; set; }
public AuthorizationRoles SelectRoles { get; set; }
public AuthorizationRoles RemoveRoles { get; set; }
public bool Completed { get; set; }
public bool Locked { get; set; }
}
}

View File

@@ -776,7 +776,7 @@ namespace AyaNovaQBI
if (s0.ShowDialog() == DialogResult.Cancel)
{
await IntegrationLog( "PFC: User cancelled when shown company file currently open - " + QCompanyFile);
await IntegrationLog("PFC: User cancelled when shown company file currently open - " + QCompanyFile);
return pfstat.Cancel;
@@ -787,9 +787,9 @@ namespace AyaNovaQBI
#region WO Pre status
//Validate any existing status
if (SetEverything == false && QDat.PreWOStatus != Guid.Empty)
if (SetEverything == false && QDat.PreWOStatus != 0)
{
if (WorkorderStatus.Exists(QDat.PreWOStatus))
if (AyaWOStatusList.Any(z => z.Id == QDat.PreWOStatus))
goto PRESTATUSOK;
}
else
@@ -832,9 +832,9 @@ namespace AyaNovaQBI
#region WO POST status
//Validate any existing status
if (SetEverything == false && QDat.PostWOStatus != Guid.Empty)
if (SetEverything == false && QDat.PostWOStatus != 0)
{
if (WorkorderStatus.Exists(QDat.PostWOStatus))
if (AyaWOStatusList.Any(z => z.Id == QDat.PostWOStatus))
goto POSTSTATUSOK;
}
else
@@ -3152,6 +3152,9 @@ namespace AyaNovaQBI
w.Step = "Parts";
await PopulateAyaPartList();
w.Step = "WorkOrder status list";
await PopulateAyaWOStatusList();
w.Close();
}
@@ -3261,7 +3264,56 @@ namespace AyaNovaQBI
#endregion ayanova parts
#endregion
#region AyaNova WorkOrder STATUS list
private static List<WorkOrderStatus> _woStatuslist = null;
/// <summary>
/// AyaNova part list
/// </summary>
public static List<WorkOrderStatus> AyaWOStatusList
{
get
{
return _woStatuslist;
}
}
public static async Task PopulateAyaWOStatusList()
{
var a = await GetAsync("work-order-status/list");
_woStatuslist = a.ObjectResponse["data"].ToObject<List<WorkOrderStatus>>();
}
#endregion ayanova WorkOrder STATUS list
#region Translations
private static Dictionary<string,string> _translist = null;
/// <summary>
/// AyaNova part list
/// </summary>
public static Dictionary<string, string> AyaTranslations
{
get
{
return _translist;
}
}
public static async Task PopulateAyaTranslationList()
{
var a = await PostAsync("translation/subset", Newtonsoft.Json.JsonConvert.SerializeObject(new List<string> {
"WorkOrderStatus", "xxxxx"
}));
_translist = a.ObjectResponse["data"].ToObject<Dictionary<string, string>>();
}
//await window.$gz.api.upsert("translation/subset", needIt);
#endregion translations
#endregion ayanova cached lists
#endregion qb specific non-api stuff