diff --git a/docs/8.0/ayanova/docs/api-request-format.md b/docs/8.0/ayanova/docs/api-request-format.md
index d050950d..947d2f15 100644
--- a/docs/8.0/ayanova/docs/api-request-format.md
+++ b/docs/8.0/ayanova/docs/api-request-format.md
@@ -47,7 +47,7 @@ Notes:
CustomerNoteDataList - ClientCriteria MUST be provided with CustomerId value
PartInventoryDataList - ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
-
+PartInventoryTransactionsDataList - ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
TODO: Replace this section with updated sort / filter and column selection
diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs
index d49fbe89..454cd23a 100644
--- a/server/AyaNova/Controllers/DataListController.cs
+++ b/server/AyaNova/Controllers/DataListController.cs
@@ -74,7 +74,7 @@ namespace AyaNova.Api.Controllers
try
{
- ApiDataListResponse r = await DataListFetcher.GetResponseAsync(ct, listOptions, UserRoles, log, UserId);
+ DataListReturnData r = await DataListFetcher.GetResponseAsync(ct, listOptions, UserRoles, log, UserId);
return Ok(r);
}
catch (System.UnauthorizedAccessException)
diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs
index bc1e5dcb..3eff02fe 100644
--- a/server/AyaNova/Controllers/FormCustomController.cs
+++ b/server/AyaNova/Controllers/FormCustomController.cs
@@ -132,7 +132,7 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
- return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys));
+ return Ok(ApiOkResponse.Response(FormFieldReference.FormFieldKeys));
}
diff --git a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs
index 43c3a520..db25539e 100644
--- a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs
+++ b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs
@@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers
{
[ApiController]
[ApiVersion("8.0")]
- [Route("api/v{version:apiVersion}/form-field-definition")]
+ [Route("api/v{version:apiVersion}/form-field-reference")]
[Produces("application/json")]
[Authorize]
public class FormFieldsDefinitionsController : ControllerBase
@@ -38,7 +38,7 @@ namespace AyaNova.Api.Controllers
///
- /// Get available fields for Form specified
+ /// Get field reference list for Form specified
/// Used at UI for customizing forms
///
///
@@ -52,9 +52,9 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
- if (AyaFormFieldDefinitions.IsValidFormFieldDefinitionKey(key))
+ if (FormFieldReference.IsValidFormFieldKey(key))
{
- return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFields(key)));
+ return Ok(ApiOkResponse.Response(FormFieldReference.FormFieldReferenceList(key)));
}
else
{
diff --git a/server/AyaNova/DataList/AttachmentDataList.cs b/server/AyaNova/DataList/AttachmentDataList.cs
index f7609eca..2f3d1633 100644
--- a/server/AyaNova/DataList/AttachmentDataList.cs
+++ b/server/AyaNova/DataList/AttachmentDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using AyaNova.Biz;
namespace AyaNova.DataList
{
- internal class AttachmentDataList : AyaDataList
+ internal class AttachmentDataList : DataListBase
{
public AttachmentDataList()
@@ -44,9 +44,9 @@ namespace AyaNova.DataList
//NOTE: Due to the join, all the sql id and name fields that can conflict with the joined (in this case User) table need to be specified completely
- FieldDefinitions = new List();
+ FieldDefinitions = new List();
//DPRECATED FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "df", AyaObjectType = (int)AyaType.User, SqlIdColumnName = "auser.id" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "FileAttachment",
FieldKey = "displayfilename",
@@ -57,7 +57,7 @@ namespace AyaNova.DataList
IsRowId = true
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AttachmentExists",
FieldKey = "exists",
@@ -65,7 +65,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "afileattachment.exists"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Object",
FieldKey = "object",
@@ -75,7 +75,7 @@ namespace AyaNova.DataList
SqlAyTypeColumnName = "afileattachment.attachtoobjecttype"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "FileSize",
FieldKey = "size",
@@ -83,7 +83,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "afileattachment.size"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AttachmentNotes",
FieldKey = "notes",
diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs
index bb765fcc..6c455464 100644
--- a/server/AyaNova/DataList/CustomerDataList.cs
+++ b/server/AyaNova/DataList/CustomerDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using AyaNova.Biz;
namespace AyaNova.DataList
{
- internal class CustomerDataList : AyaDataList
+ internal class CustomerDataList : DataListBase
{
public CustomerDataList()
{
@@ -42,9 +42,9 @@ namespace AyaNova.DataList
//NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
- FieldDefinitions = new List();
+ FieldDefinitions = new List();
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerName",
FieldKey = "customername",
@@ -55,7 +55,7 @@ namespace AyaNova.DataList
IsRowId = true
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerNotes",
FieldKey = "customernotes",
@@ -63,7 +63,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.notes"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Active",
FieldKey = "customeractive",
@@ -71,7 +71,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.active"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Tags",
FieldKey = "customertags",
@@ -79,7 +79,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.tags"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "WebAddress",
FieldKey = "customerwebaddress",
@@ -87,7 +87,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.webaddress"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPopUpNotes",
FieldKey = "customerpopupnotes",
@@ -95,7 +95,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.popupnotes"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "HeadOffice",
FieldKey = "customerheadoffice",
@@ -105,7 +105,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "aheadoffice.name"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerBillHeadOffice",
FieldKey = "customerbillheadoffice",
@@ -113,7 +113,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.billheadoffice"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerTechNotes",
FieldKey = "customertechnotes",
@@ -121,7 +121,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.technotes"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerAccountNumber",
FieldKey = "customeraccountnumber",
@@ -129,7 +129,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.accountnumber"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "UsesBanking",
FieldKey = "customerusesbanking",
@@ -137,7 +137,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.usesbanking"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Contract",
FieldKey = "customercontract",
@@ -147,7 +147,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acontract.name"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "ContractExpires",
FieldKey = "customercontractexpires",
@@ -155,7 +155,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.contractexpires"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPhone1",
FieldKey = "customerphone1",
@@ -163,7 +163,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.phone1"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPhone2",
FieldKey = "customerphone2",
@@ -171,7 +171,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.phone2"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPhone3",
FieldKey = "customerphone3",
@@ -179,7 +179,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.phone3"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPhone4",
FieldKey = "customerphone4",
@@ -187,7 +187,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.phone4"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerPhone5",
FieldKey = "customerphone5",
@@ -195,7 +195,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.phone5"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerEmail",
FieldKey = "customeremail",
@@ -204,7 +204,7 @@ namespace AyaNova.DataList
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressPostalDeliveryAddress",
FieldKey = "customerpostaddress",
@@ -213,7 +213,7 @@ namespace AyaNova.DataList
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressPostalCity",
FieldKey = "customerpostcity",
@@ -221,7 +221,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.postcity"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressPostalStateProv",
FieldKey = "customerpostregion",
@@ -229,7 +229,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.postregion"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressPostalCountry",
FieldKey = "customerpostcountry",
@@ -237,7 +237,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.postcountry"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressPostalPostal",
FieldKey = "customerpostcode",
@@ -245,7 +245,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.postcode"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressDeliveryAddress",
FieldKey = "customeraddress",
@@ -253,7 +253,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.address"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressCity",
FieldKey = "customercity",
@@ -261,7 +261,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.city"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressStateProv",
FieldKey = "customerregion",
@@ -269,7 +269,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.region"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressCountry",
FieldKey = "customercountry",
@@ -277,7 +277,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.country"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressLatitude",
FieldKey = "customerlatitude",
@@ -285,7 +285,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.latitude"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AddressLongitude",
FieldKey = "customerlongitude",
@@ -295,22 +295,22 @@ namespace AyaNova.DataList
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom1", FieldKey = "customercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom2", FieldKey = "customercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom3", FieldKey = "customercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom4", FieldKey = "customercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom5", FieldKey = "customercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom6", FieldKey = "customercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom7", FieldKey = "customercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom8", FieldKey = "customercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom9", FieldKey = "customercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom10", FieldKey = "customercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom11", FieldKey = "customercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom12", FieldKey = "customercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom13", FieldKey = "customercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom14", FieldKey = "customercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom15", FieldKey = "customercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom16", FieldKey = "customercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom1", FieldKey = "customercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom2", FieldKey = "customercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom3", FieldKey = "customercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom4", FieldKey = "customercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom5", FieldKey = "customercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom6", FieldKey = "customercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom7", FieldKey = "customercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom8", FieldKey = "customercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom9", FieldKey = "customercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom10", FieldKey = "customercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom11", FieldKey = "customercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom12", FieldKey = "customercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom13", FieldKey = "customercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom14", FieldKey = "customercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom15", FieldKey = "customercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerCustom16", FieldKey = "customercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" });
}
diff --git a/server/AyaNova/DataList/CustomerNoteDataList.cs b/server/AyaNova/DataList/CustomerNoteDataList.cs
index c9eb62c8..edf98772 100644
--- a/server/AyaNova/DataList/CustomerNoteDataList.cs
+++ b/server/AyaNova/DataList/CustomerNoteDataList.cs
@@ -4,7 +4,7 @@ using AyaNova.Models;
namespace AyaNova.DataList
{
- internal class CustomerNoteDataList : AyaDataList, IAyaDataListServerCriteria
+ internal class CustomerNoteDataList : DataListBase, IDataListInternalCriteria
{
public CustomerNoteDataList()
{
@@ -37,9 +37,9 @@ namespace AyaNova.DataList
//NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
- FieldDefinitions = new List();
+ FieldDefinitions = new List();
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "User",
FieldKey = "username",
@@ -51,7 +51,7 @@ namespace AyaNova.DataList
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerNoteNotes",
FieldKey = "notes",
@@ -62,7 +62,7 @@ namespace AyaNova.DataList
IsRowId = true
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerNoteNoteDate",
FieldKey = "notedate",
@@ -71,7 +71,7 @@ namespace AyaNova.DataList
});
//META column
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metacustomer",
UiFieldDataType = (int)UiFieldDataType.InternalId,
@@ -82,7 +82,7 @@ namespace AyaNova.DataList
}
- public List DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase)
+ public List DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, Models.DataListBase dataListBase)
{
List ret = new List();
//ClientCriteria MUST be CustomerId
diff --git a/server/AyaNova/DataList/CustomerServiceRequestDataList.cs b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
index b9bda3b2..fe3c1865 100644
--- a/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
+++ b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using AyaNova.Biz;
namespace AyaNova.DataList
{
- internal class CustomerServiceRequestDataList : AyaDataList
+ internal class CustomerServiceRequestDataList : DataListBase
{
public CustomerServiceRequestDataList()
{
@@ -48,9 +48,9 @@ namespace AyaNova.DataList
DefaultSortBy = new Dictionary() { { "Created", "-" } };
//NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
- FieldDefinitions = new List();
+ FieldDefinitions = new List();
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerServiceRequestTitle",
FieldKey = "CustomerServiceRequestTitle",
@@ -61,7 +61,7 @@ namespace AyaNova.DataList
IsRowId = true
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerServiceRequestDetails",
FieldKey = "CustomerServiceRequestDetails",
@@ -69,7 +69,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomerservicerequest.notes"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Tags",
FieldKey = "customerservicerequesttags",
@@ -77,7 +77,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomerservicerequest.tags"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Created",
FieldKey = "Created",
@@ -85,7 +85,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomerservicerequest.daterequested"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "Customer",
TKey = "Customer",
@@ -95,7 +95,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.name"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "CustomerServiceRequestItemUnitID",
TKey = "CustomerServiceRequestItemUnitID",
@@ -105,7 +105,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "aunit.serial"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "WorkOrder",
TKey = "WorkOrder",
@@ -115,7 +115,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "w.serial"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "CustomerServiceRequestRequestedBy",
TKey = "CustomerServiceRequestRequestedBy",
@@ -125,7 +125,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "auser.name"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerServiceRequestCustomerReferenceNumber",
FieldKey = "CustomerServiceRequestCustomerReferenceNumber",
@@ -133,7 +133,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomerservicerequest.customerreferencenumber"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerServiceRequestStatus",
FieldKey = "CustomerServiceRequestStatus",
@@ -142,7 +142,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomerservicerequest.status"
});
- FieldDefinitions.Add(new AyaDataListFieldDefinition
+ FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "CustomerServiceRequestPriority",
FieldKey = "CustomerServiceRequestPriority",
@@ -154,22 +154,22 @@ namespace AyaNova.DataList
//-----------
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom1", FieldKey = "customerservicerequestcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom2", FieldKey = "customerservicerequestcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom3", FieldKey = "customerservicerequestcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom4", FieldKey = "customerservicerequestcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom5", FieldKey = "customerservicerequestcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom6", FieldKey = "customerservicerequestcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom7", FieldKey = "customerservicerequestcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom8", FieldKey = "customerservicerequestcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom9", FieldKey = "customerservicerequestcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom10", FieldKey = "customerservicerequestcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom11", FieldKey = "customerservicerequestcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom12", FieldKey = "customerservicerequestcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom13", FieldKey = "customerservicerequestcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom14", FieldKey = "customerservicerequestcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom15", FieldKey = "customerservicerequestcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerServiceRequestCustom16", FieldKey = "customerservicerequestcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom1", FieldKey = "customerservicerequestcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom2", FieldKey = "customerservicerequestcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom3", FieldKey = "customerservicerequestcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom4", FieldKey = "customerservicerequestcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom5", FieldKey = "customerservicerequestcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom6", FieldKey = "customerservicerequestcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom7", FieldKey = "customerservicerequestcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom8", FieldKey = "customerservicerequestcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom9", FieldKey = "customerservicerequestcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom10", FieldKey = "customerservicerequestcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom11", FieldKey = "customerservicerequestcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom12", FieldKey = "customerservicerequestcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom13", FieldKey = "customerservicerequestcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom14", FieldKey = "customerservicerequestcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom15", FieldKey = "customerservicerequestcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
+ FieldDefinitions.Add(new DataListFieldDefinition { TKey = "CustomerServiceRequestCustom16", FieldKey = "customerservicerequestcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomerservicerequest.customfields" });
}
}//eoc
diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/DataListBase.cs
similarity index 93%
rename from server/AyaNova/DataList/AyaDataList.cs
rename to server/AyaNova/DataList/DataListBase.cs
index c057be56..57fa8ccc 100644
--- a/server/AyaNova/DataList/AyaDataList.cs
+++ b/server/AyaNova/DataList/DataListBase.cs
@@ -12,11 +12,11 @@ namespace AyaNova.DataList
///
/// DataList object base class
///
- internal abstract class AyaDataList : IAyaDataList
+ internal abstract class DataListBase : IDataList
{
//CoreBizObject add here
//well, not here exactly but add a new DATALIST class if it will be displayed as a list anywhere in the UI or reported on
- public AyaDataList()
+ public DataListBase()
{
/*
@@ -28,7 +28,7 @@ namespace AyaNova.DataList
}
public string SQLFrom { get; set; }
- public List FieldDefinitions { get; set; }
+ public List FieldDefinitions { get; set; }
public AuthorizationRoles AllowedRoles { get; set; }
public AyaType DefaultListObjectType { get; set; }
@@ -40,7 +40,7 @@ namespace AyaNova.DataList
public Dictionary DefaultSortBy { get; set; }
//set defaults if not provided in listOptions
- public void SetListOptionDefaultsIfNecessary(DataListBase listOptions)
+ public void SetListOptionDefaultsIfNecessary(Models.DataListBase listOptions)
{
//columns, filter and sortby could all be null
if (listOptions.Filter == null)
@@ -102,7 +102,7 @@ namespace AyaNova.DataList
foreach (string s in columns)
{
- AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s);
+ DataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s);
#if (DEBUG)
//Developers little helper
if (o == null)
@@ -170,7 +170,7 @@ namespace AyaNova.DataList
Dictionary ret = new Dictionary();
List typesProcessed = new List();
//custom fields handling
- foreach (AyaDataListFieldDefinition d in this.FieldDefinitions)
+ foreach (DataListFieldDefinition d in this.FieldDefinitions)
{
if (d.IsCustomField)
{
diff --git a/server/AyaNova/DataList/DataListFactory.cs b/server/AyaNova/DataList/DataListFactory.cs
index f926765f..d8f9d0d3 100644
--- a/server/AyaNova/DataList/DataListFactory.cs
+++ b/server/AyaNova/DataList/DataListFactory.cs
@@ -11,10 +11,10 @@ namespace AyaNova.DataList
//Instantiate list object specified
//this is safe as it's only attempting to load assemblies in the AyaNova.DataList namespace so can't attempt to instantiate some random object or nefarious object
//returns null if doesn't exist
- internal static IAyaDataList GetAyaDataList(string ListKey)
+ internal static IDataList GetAyaDataList(string ListKey)
{
System.Reflection.Assembly ass = System.Reflection.Assembly.GetEntryAssembly();
- return ass.CreateInstance($"AyaNova.DataList.{ListKey}") as IAyaDataList;
+ return ass.CreateInstance($"AyaNova.DataList.{ListKey}") as IDataList;
}
//List all the datalist types available
@@ -27,7 +27,7 @@ namespace AyaNova.DataList
foreach (System.Reflection.TypeInfo ti in ass.DefinedTypes)
{
- if (!ti.IsAbstract && ti.ImplementedInterfaces.Contains(typeof(IAyaDataList)))
+ if (!ti.IsAbstract && ti.ImplementedInterfaces.Contains(typeof(IDataList)))
{
ret.Add(ti.Name);
}
diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index 97ed9b8f..c3d92f50 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -18,7 +18,7 @@ namespace AyaNova.DataList
// Get the data list data requested
//
//
- internal static async Task GetResponseAsync(AyContext ct, DataListTableOptions dataListTableOptions, AuthorizationRoles userRoles, ILogger log, long userId)
+ internal static async Task GetResponseAsync(AyContext ct, DataListTableOptions dataListTableOptions, AuthorizationRoles userRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(dataListTableOptions.DataListKey);
@@ -37,8 +37,8 @@ namespace AyaNova.DataList
//STATIC filter options from server
List StaticServerFilterOptions = new List();
- if (DataList is IAyaDataListServerCriteria)
- StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, dataListTableOptions);
+ if (DataList is IDataListInternalCriteria)
+ StaticServerFilterOptions = ((IDataListInternalCriteria)DataList).DataListInternalCriteria(userId, userRoles, dataListTableOptions);
// //Get the public field key names in a list from the listview
@@ -85,7 +85,7 @@ namespace AyaNova.DataList
//RETURN OBJECTS
int returnRowColumnCount = dataListTableOptions.Columns.Count();
- List> rows = new List>();
+ List> rows = new List>();
long totalRecordCount = 0;
//QUERY THE DB
@@ -101,7 +101,7 @@ namespace AyaNova.DataList
{
while (dr.Read())
{
- List row = new List(returnRowColumnCount);
+ List row = new List(returnRowColumnCount);
//INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST
@@ -109,17 +109,17 @@ namespace AyaNova.DataList
{
//get the AyaObjectFieldDefinition
- AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
+ DataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
if (f.IsCustomField)
{
- AyaFieldData AyaField = new AyaFieldData();
+ DataListField AyaField = new DataListField();
var cust = dr.GetString(qSelect.map[f.GetSqlValueColumnName()]);
if (!string.IsNullOrWhiteSpace(cust))
{
JObject j = JObject.Parse(cust);
//convert field name to cust name then get value
- var InternalCustomFieldName = AyaFormFieldDefinitions.TranslateLTCustomFieldToInternalCustomFieldName(TemplateField);
+ var InternalCustomFieldName = FormFieldReference.TranslateLTCustomFieldToInternalCustomFieldName(TemplateField);
//Sometimes a custom field is specified but doesn't exist in the collection so don't assume it's there
// AyaField.v = j[InternalCustomFieldName].Value