From 3b91e5cbca27836bc9d7486c6098a617fe98af0c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 22 Feb 2021 15:47:18 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 44 ++++++------------------ 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index e196a0e5..5c959968 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -577,20 +577,14 @@ namespace AyaNova.Biz #region ServiceRate { - List l = new List(); - // l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); - l.Add(new FormField { TKey = "ServiceRateNotes", FieldKey = "ServiceRateNotes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "AccountNumber" }); + l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "Unit" }); + l.Add(new FormField { TKey = "ServiceRateNotes", 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" }); - l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "RateAccountNumber" }); - // l.Add(new FormField { TKey = "Cost", FieldKey = "Cost", Hideable = false }); - // l.Add(new FormField { TKey = "RateCharge", FieldKey = "RateCharge", Hideable = false }); - l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "RateUnitChargeDescriptionID" }); - l.Add(new FormField { TKey = "ServiceRateCustom1", FieldKey = "ServiceRateCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "ServiceRateCustom2", FieldKey = "ServiceRateCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "ServiceRateCustom3", FieldKey = "ServiceRateCustom3", IsCustomField = true }); @@ -608,26 +602,19 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "ServiceRateCustom15", FieldKey = "ServiceRateCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "ServiceRateCustom16", FieldKey = "ServiceRateCustom16", IsCustomField = true }); _formFields.Add(AyaType.ServiceRate.ToString(), l); - } #endregion #region TravelRate { - List l = new List(); - // l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); - l.Add(new FormField { TKey = "TravelRateNotes", FieldKey = "TravelRateNotes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "AccountNumber" }); + l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "Unit" }); + l.Add(new FormField { TKey = "TravelRateNotes", 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" }); - l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "RateAccountNumber" }); - // l.Add(new FormField { TKey = "Cost", FieldKey = "Cost", Hideable = false }); - // l.Add(new FormField { TKey = "RateCharge", FieldKey = "RateCharge", Hideable = false }); - l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "RateUnitChargeDescriptionID" }); - l.Add(new FormField { TKey = "TravelRateCustom1", FieldKey = "TravelRateCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "TravelRateCustom2", FieldKey = "TravelRateCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "TravelRateCustom3", FieldKey = "TravelRateCustom3", IsCustomField = true }); @@ -651,19 +638,12 @@ namespace AyaNova.Biz #region TaxCode { - List l = new List(); - //l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); - l.Add(new FormField { TKey = "TaxCodeNotes", FieldKey = "TaxCodeNotes" }); - // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new FormField { TKey = "TaxCodeNotes", 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" }); - //l.Add(new FormField { TKey = "TaxCodeTaxA", FieldKey = "TaxCodeTaxA", Hideable = false }); - //l.Add(new FormField { TKey = "TaxCodeTaxB", FieldKey = "TaxCodeTaxB", Hideable = false }); - // l.Add(new FormField { TKey = "TaxCodeTaxOnTax", FieldKey = "TaxCodeTaxOnTax", Hideable = false }); - l.Add(new FormField { TKey = "TaxCodeCustom1", FieldKey = "TaxCodeCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "TaxCodeCustom2", FieldKey = "TaxCodeCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "TaxCodeCustom3", FieldKey = "TaxCodeCustom3", IsCustomField = true }); @@ -681,20 +661,16 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "TaxCodeCustom15", FieldKey = "TaxCodeCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "TaxCodeCustom16", FieldKey = "TaxCodeCustom16", IsCustomField = true }); _formFields.Add(AyaType.TaxCode.ToString(), l); - } #endregion #region ServiceBank { - List l = new List(); - //l.Add(new FormField { TKey = "ServiceBankDescription", FieldKey = "ServiceBankDescription", Hideable = false }); - l.Add(new FormField { TKey = "ServiceBankCurrency", FieldKey = "ServiceBankCurrency" }); - l.Add(new FormField { TKey = "ServiceBankHours", FieldKey = "ServiceBankHours" }); - l.Add(new FormField { TKey = "ServiceBankIncidents", FieldKey = "ServiceBankIncidents" }); + l.Add(new FormField { TKey = "ServiceBankCurrency", FieldKey = "Currency" }); + l.Add(new FormField { TKey = "ServiceBankHours", FieldKey = "Hours" }); + l.Add(new FormField { TKey = "ServiceBankIncidents", FieldKey = "Incidents" }); _formFields.Add(AyaType.ServiceBank.ToString(), l); - } #endregion