From 72c1fcedf915078bccf834d9068fcde3c73dae56 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 22 Feb 2021 15:42:03 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 42 ++++++++---------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index cf4a0da4..e196a0e5 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -444,9 +444,7 @@ namespace AyaNova.Biz { List l = new List(); - //l.Add(new FormField { TKey = "PartWarehouseName", FieldKey = "PartWarehouseName", Hideable = false }); - l.Add(new FormField { TKey = "PartWarehouseNotes", FieldKey = "PartWarehouseNotes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new FormField { TKey = "PartWarehouseNotes", FieldKey = "Notes" }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); @@ -472,20 +470,14 @@ namespace AyaNova.Biz } #endregion - #region PartAssembly { - List l = new List(); - // l.Add(new FormField { TKey = "PartAssemblyName", FieldKey = "Name", Hideable = false }); l.Add(new FormField { TKey = "PartAssemblyNotes", FieldKey = "Notes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); - // l.Add(new FormField { TKey = "PartList", FieldKey = "PartList", Hideable = false }); - l.Add(new FormField { TKey = "PartAssemblyCustom1", FieldKey = "PartAssemblyCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "PartAssemblyCustom2", FieldKey = "PartAssemblyCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "PartAssemblyCustom3", FieldKey = "PartAssemblyCustom3", IsCustomField = true }); @@ -509,20 +501,16 @@ namespace AyaNova.Biz #region Project { - List l = new List(); - //l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); + l.Add(new FormField { TKey = "ProjectAccountNumber", FieldKey = "AccountNumber" }); + l.Add(new FormField { TKey = "ProjectProjectOverseerID", FieldKey = "ProjectOverseerID" }); + l.Add(new FormField { TKey = "ProjectDateStarted", FieldKey = "DateStarted" }); + l.Add(new FormField { TKey = "ProjectDateCompleted", FieldKey = "DateCompleted" }); l.Add(new FormField { TKey = "ProjectNotes", FieldKey = "Notes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); - l.Add(new FormField { TKey = "ProjectAccountNumber", FieldKey = "ProjectAccountNumber" }); - l.Add(new FormField { TKey = "ProjectProjectOverseerID", FieldKey = "ProjectProjectOverseerID" }); - l.Add(new FormField { TKey = "ProjectDateStarted", FieldKey = "ProjectDateStarted" }); - l.Add(new FormField { TKey = "ProjectDateCompleted", FieldKey = "ProjectDateCompleted" }); - l.Add(new FormField { TKey = "ProjectCustom1", FieldKey = "ProjectCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "ProjectCustom2", FieldKey = "ProjectCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "ProjectCustom3", FieldKey = "ProjectCustom3", IsCustomField = true }); @@ -540,15 +528,12 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "ProjectCustom15", FieldKey = "ProjectCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "ProjectCustom16", FieldKey = "ProjectCustom16", IsCustomField = true }); _formFields.Add(AyaType.Project.ToString(), l); - } #endregion #region PurchaseOrder { List l = new List(); - //l.Add(new FormField { TKey = "PurchaseOrderPONumber", FieldKey = "Serial", Hideable = false }); - //l.Add(new FormField { TKey = "Vendor", FieldKey = "VendorId", Hideable = false }); l.Add(new FormField { TKey = "PurchaseOrderStatus", FieldKey = "Status" }); l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "OrderedDate" }); l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "ExpectedReceiveDate" }); @@ -562,6 +547,14 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); + + //Customizable child Items + l.Add(new FormField { TKey = "PurchaseOrderReceiptReceivedDate", FieldKey = "Items.ReceivedDate" }); + l.Add(new FormField { TKey = "PurchaseOrderItemPartRequestedByID", FieldKey = "Items.PartRequestedById" }); + l.Add(new FormField { TKey = "PurchaseOrderItemWorkOrderNumber", FieldKey = "Items.WorkorderItemPartRequestId" }); + l.Add(new FormField { TKey = "TaxCode", FieldKey = "Items.PurchaseTaxCodeId" }); + l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" }); + l.Add(new FormField { TKey = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom3", FieldKey = "PurchaseOrderCustom3", IsCustomField = true }); @@ -578,16 +571,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "PurchaseOrderCustom14", FieldKey = "PurchaseOrderCustom14", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom15", FieldKey = "PurchaseOrderCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom16", FieldKey = "PurchaseOrderCustom16", IsCustomField = true }); - - //Customizable child Items - l.Add(new FormField { TKey = "PurchaseOrderReceiptReceivedDate", FieldKey = "Items.ReceivedDate" }); - l.Add(new FormField { TKey = "PurchaseOrderItemPartRequestedByID", FieldKey = "Items.PartRequestedById" }); - l.Add(new FormField { TKey = "PurchaseOrderItemWorkOrderNumber", FieldKey = "Items.WorkorderItemPartRequestId" }); - l.Add(new FormField { TKey = "TaxCode", FieldKey = "Items.PurchaseTaxCodeId" }); - l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" }); - _formFields.Add(AyaType.PurchaseOrder.ToString(), l); - } #endregion