From 61071d582779280846d16da322c312cb7beee799 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 22 Feb 2021 18:08:56 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 94 ++++++++++-------------- 1 file changed, 38 insertions(+), 56 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index f6a8e42f..5d92f154 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -681,12 +681,12 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "UnitModel", FieldKey = "UnitModelId" }); l.Add(new FormField { TKey = "UnitReplacedByUnitID", FieldKey = "ReplacedByUnitId" }); l.Add(new FormField { TKey = "UnitParentUnitID", FieldKey = "ParentUnitId" }); - l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" }); + l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" }); l.Add(new FormField { TKey = "UnitMetered", FieldKey = "Metered" }); l.Add(new FormField { TKey = "UnitBoughtHere", FieldKey = "BoughtHere" }); l.Add(new FormField { TKey = "UnitPurchaseFromID", FieldKey = "PurchasedFromVendorId" }); - l.Add(new FormField { TKey = "UnitPurchasedDate", FieldKey = "PurchasedDate" }); - l.Add(new FormField { TKey = "UnitReceipt", FieldKey = "Receipt" }); + l.Add(new FormField { TKey = "UnitPurchasedDate", FieldKey = "PurchasedDate" }); + l.Add(new FormField { TKey = "UnitReceipt", FieldKey = "Receipt" }); l.Add(new FormField { TKey = "UnitText1", FieldKey = "Text1" }); l.Add(new FormField { TKey = "UnitText2", FieldKey = "Text2" }); l.Add(new FormField { TKey = "UnitText3", FieldKey = "Text3" }); @@ -696,12 +696,15 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); - //TODO: ALL ADDRESS FIELDS AND UNIT HAS OWN ADDRESS - //also hide that section in UI note if it's all disabled + l.Add(new FormField { TKey = "AddressDeliveryAddress", FieldKey = "Address" }); + l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" }); + l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" }); + l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" }); + l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" }); + l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" }); - l.Add(new FormField { TKey = "UnitOverrideLength", FieldKey = "WarrantyLength" }); + l.Add(new FormField { TKey = "UnitOverrideLength", FieldKey = "WarrantyLength" }); l.Add(new FormField { TKey = "UnitOverrideWarrantyTerms", FieldKey = "WarrantyTerms" }); - l.Add(new FormField { TKey = "UnitOverrideLifeTime", FieldKey = "LifeTimeWarranty" }); l.Add(new FormField { TKey = "UnitCustom1", FieldKey = "UnitCustom1", IsCustomField = true }); @@ -729,22 +732,19 @@ namespace AyaNova.Biz { List l = new List(); l.Add(new FormField { TKey = "Name", FieldKey = "Name" }); + l.Add(new FormField { TKey = "UnitModelVendorID", FieldKey = "VendorID" }); + l.Add(new FormField { TKey = "UnitModelUPC", FieldKey = "UPC" }); + l.Add(new FormField { TKey = "UnitModelIntroducedDate", FieldKey = "IntroducedDate" }); + l.Add(new FormField { TKey = "UnitModelDiscontinued", FieldKey = "Discontinued" }); + l.Add(new FormField { TKey = "UnitModelDiscontinuedDate", FieldKey = "DiscontinuedDate" }); + l.Add(new FormField { TKey = "UnitModelLifeTimeWarranty", FieldKey = "LifeTimeWarranty" }); + l.Add(new FormField { TKey = "UnitModelWarrantyLength", FieldKey = "WarrantyLength" }); + l.Add(new FormField { TKey = "UnitModelWarrantyTerms", FieldKey = "WarrantyTerms" }); l.Add(new FormField { TKey = "UnitModelNotes", 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 = "UnitModelModelNumber", FieldKey = "UnitModelModelNumber", Hideable = false }); - l.Add(new FormField { TKey = "UnitModelVendorID", FieldKey = "UnitModelVendorID" }); - l.Add(new FormField { TKey = "UnitModelUPC", FieldKey = "UnitModelUPC" }); - l.Add(new FormField { TKey = "UnitModelLifeTimeWarranty", FieldKey = "UnitModelLifeTimeWarranty" }); - l.Add(new FormField { TKey = "UnitModelIntroducedDate", FieldKey = "UnitModelIntroducedDate" }); - l.Add(new FormField { TKey = "UnitModelDiscontinued", FieldKey = "UnitModelDiscontinued" }); - l.Add(new FormField { TKey = "UnitModelDiscontinuedDate", FieldKey = "UnitModelDiscontinuedDate" }); - l.Add(new FormField { TKey = "UnitModelWarrantyLength", FieldKey = "UnitModelWarrantyLength" }); - l.Add(new FormField { TKey = "UnitModelWarrantyTerms", FieldKey = "UnitModelWarrantyTerms" }); - l.Add(new FormField { TKey = "UnitModelCustom1", FieldKey = "UnitModelCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "UnitModelCustom2", FieldKey = "UnitModelCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "UnitModelCustom3", FieldKey = "UnitModelCustom3", IsCustomField = true }); @@ -762,45 +762,38 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "UnitModelCustom15", FieldKey = "UnitModelCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "UnitModelCustom16", FieldKey = "UnitModelCustom16", IsCustomField = true }); _formFields.Add(AyaType.UnitModel.ToString(), l); - } #endregion #region Vendor { - List l = new List(); - //l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); - l.Add(new FormField { TKey = "VendorNotes", 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" }); - - //VENDOR FIELDS + l.Add(new FormField { TKey = "VendorAccountNumber", FieldKey = "AccountNumber" }); l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" }); - l.Add(new FormField { TKey = "HeadOfficeAccountNumber", FieldKey = "AccountNumber" }); - l.Add(new FormField { TKey = "VendorContact", FieldKey = "Contact" }); - l.Add(new FormField { TKey = "VendorContactNotes", FieldKey = "ContactNotes" }); + l.Add(new FormField { TKey = "HeadOfficeEmail", FieldKey = "EmailAddress" }); l.Add(new FormField { TKey = "HeadOfficePhone1", FieldKey = "Phone1" }); l.Add(new FormField { TKey = "HeadOfficePhone2", FieldKey = "Phone2" }); l.Add(new FormField { TKey = "HeadOfficePhone3", FieldKey = "Phone3" }); l.Add(new FormField { TKey = "HeadOfficePhone4", FieldKey = "Phone4" }); l.Add(new FormField { TKey = "HeadOfficePhone5", FieldKey = "Phone5" }); - l.Add(new FormField { TKey = "HeadOfficeEmail", FieldKey = "EmailAddress" }); - - //ADDRESS FIELDS - l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" }); - l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" }); - l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" }); - l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" }); - l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" }); + l.Add(new FormField { TKey = "VendorContact", FieldKey = "Contact" }); + l.Add(new FormField { TKey = "VendorNotes", FieldKey = "Notes" }); + l.Add(new FormField { TKey = "VendorContactNotes", FieldKey = "ContactNotes" }); + l.Add(new FormField { TKey = "VendorPopUpNotes", FieldKey = "PopUpNotes" }); + 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 = "AddressDeliveryAddress", FieldKey = "Address" }); l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" }); l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" }); l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" }); l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" }); l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" }); + l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" }); + l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" }); + l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" }); + l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" }); + l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" }); l.Add(new FormField { TKey = "VendorCustom1", FieldKey = "VendorCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "VendorCustom2", FieldKey = "VendorCustom2", IsCustomField = true }); @@ -819,7 +812,6 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "VendorCustom15", FieldKey = "VendorCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "VendorCustom16", FieldKey = "VendorCustom16", IsCustomField = true }); _formFields.Add(AyaType.Vendor.ToString(), l); - } #endregion @@ -881,31 +873,22 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderItemCustom15", FieldKey = "WorkOrderItemCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "WorkOrderItemCustom16", FieldKey = "WorkOrderItemCustom16", IsCustomField = true }); _formFields.Add(AyaType.WorkOrderItem.ToString(), l); - } #endregion - #region CustomerServiceRequest { - List l = new List(); - //l.Add(new FormField { TKey = "CustomerServiceRequestTitle", FieldKey = "CustomerServiceRequestTitle", Hideable = false }); - l.Add(new FormField { TKey = "CustomerServiceRequestDetails", FieldKey = "CustomerServiceRequestDetails" }); + l.Add(new FormField { TKey = "CustomerServiceRequestPriority", FieldKey = "Priority" }); + l.Add(new FormField { TKey = "CustomerServiceRequestStatus", FieldKey = "Status" }); + l.Add(new FormField { TKey = "CustomerServiceRequestDetails", FieldKey = "Notes" }); + l.Add(new FormField { TKey = "CustomerServiceRequestCustomerReferenceNumber", FieldKey = "CustomerReferenceNumber" }); + l.Add(new FormField { TKey = "CustomerServiceRequestRequestedBy", FieldKey = "RequestedByUserId" }); + l.Add(new FormField { TKey = "CustomerServiceRequestItemUnitID", FieldKey = "UnitId" }); 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 = "Created", FieldKey = "Created" }); - l.Add(new FormField { TKey = "Customer", FieldKey = "Customer" }); - l.Add(new FormField { TKey = "CustomerServiceRequestItemUnitID", FieldKey = "CustomerServiceRequestItemUnitID" }); - l.Add(new FormField { TKey = "WorkOrder", FieldKey = "WorkOrder" }); - l.Add(new FormField { TKey = "CustomerServiceRequestRequestedBy", FieldKey = "CustomerServiceRequestRequestedBy" }); - l.Add(new FormField { TKey = "CustomerServiceRequestCustomerReferenceNumber", FieldKey = "CustomerServiceRequestCustomerReferenceNumber" }); - l.Add(new FormField { TKey = "CustomerServiceRequestStatus", FieldKey = "CustomerServiceRequestStatus" }); - l.Add(new FormField { TKey = "CustomerServiceRequestPriority", FieldKey = "CustomerServiceRequestPriority" }); - - l.Add(new FormField { TKey = "CustomerServiceRequestCustom1", FieldKey = "CustomerServiceRequestCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "CustomerServiceRequestCustom2", FieldKey = "CustomerServiceRequestCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "CustomerServiceRequestCustom3", FieldKey = "CustomerServiceRequestCustom3", IsCustomField = true }); @@ -923,7 +906,6 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "CustomerServiceRequestCustom15", FieldKey = "CustomerServiceRequestCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "CustomerServiceRequestCustom16", FieldKey = "CustomerServiceRequestCustom16", IsCustomField = true }); _formFields.Add(AyaType.CustomerServiceRequest.ToString(), l); - } #endregion