diff --git a/server/AyaNova/DataList/ServiceRateDataList.cs b/server/AyaNova/DataList/ServiceRateDataList.cs index 6287a6df..5ccc6383 100644 --- a/server/AyaNova/DataList/ServiceRateDataList.cs +++ b/server/AyaNova/DataList/ServiceRateDataList.cs @@ -81,6 +81,14 @@ namespace AyaNova.DataList SqlValueColumnName = "aservicerate.unit" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "RateContractRate", + FieldKey = "ContractOnly", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "aservicerate.contractonly" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ServiceRateCustom1", FieldKey = "ServiceRatecustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aservicerate.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ServiceRateCustom2", FieldKey = "ServiceRatecustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aservicerate.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ServiceRateCustom3", FieldKey = "ServiceRatecustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aservicerate.customfields" }); diff --git a/server/AyaNova/DataList/TravelRateDataList.cs b/server/AyaNova/DataList/TravelRateDataList.cs index a99492ce..10ba77db 100644 --- a/server/AyaNova/DataList/TravelRateDataList.cs +++ b/server/AyaNova/DataList/TravelRateDataList.cs @@ -81,6 +81,14 @@ namespace AyaNova.DataList SqlValueColumnName = "atravelrate.unit" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "RateContractRate", + FieldKey = "ContractOnly", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "aservicerate.contractonly" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "TravelRateCustom1", FieldKey = "TravelRatecustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "atravelrate.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "TravelRateCustom2", FieldKey = "TravelRatecustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "atravelrate.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "TravelRateCustom3", FieldKey = "TravelRatecustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "atravelrate.customfields" }); diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index e632d81d..6af8845d 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -582,7 +582,10 @@ namespace AyaNova.Biz List l = new List(); l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "AccountNumber" }); l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "Unit" }); + l.Add(new FormField { TKey = "RateContractRate", FieldKey = "ContractOnly" }); 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" }); @@ -612,6 +615,7 @@ namespace AyaNova.Biz List l = new List(); l.Add(new FormField { TKey = "RateAccountNumber", FieldKey = "AccountNumber" }); l.Add(new FormField { TKey = "RateUnitChargeDescriptionID", FieldKey = "Unit" }); + l.Add(new FormField { TKey = "RateContractRate", FieldKey = "ContractOnly" }); l.Add(new FormField { TKey = "TravelRateNotes", FieldKey = "Notes" }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });