This commit is contained in:
2021-01-28 18:24:27 +00:00
parent b16fc01b92
commit 0b631228b9
48 changed files with 1792 additions and 1766 deletions

View File

@@ -3,7 +3,7 @@ using AyaNova.Models;
using AyaNova.Biz;
namespace AyaNova.DataList
{
internal class OutsideUserDataList : AyaDataList, IAyaDataListServerCriteria
internal class OutsideUserDataList : DataListBase, IDataListInternalCriteria
{
public OutsideUserDataList()
@@ -43,8 +43,8 @@ namespace AyaNova.DataList
DefaultSortBy = new Dictionary<string, string>() { { "name", "+" } };
FieldDefinitions = new List<AyaDataListFieldDefinition>();
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions = new List<DataListFieldDefinition>();
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "User",
FieldKey = "name",
@@ -55,7 +55,7 @@ namespace AyaNova.DataList
IsRowId = true
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "UserEmployeeNumber",
FieldKey = "employeenumber",
@@ -64,7 +64,7 @@ namespace AyaNova.DataList
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Active",
FieldKey = "active",
@@ -72,7 +72,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "auser.active"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "UserType",
FieldKey = "usertype",
@@ -81,7 +81,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "auser.usertype"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "AuthorizationRoles",
FieldKey = "roles",
@@ -91,7 +91,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "auser.roles"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "LastLogin",
FieldKey = "lastlogin",
@@ -99,7 +99,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "auser.lastlogin"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "HeadOffice",
FieldKey = "userheadoffice",
@@ -109,7 +109,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "aheadoffice.name"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Customer",
FieldKey = "usercustomer",
@@ -120,7 +120,7 @@ namespace AyaNova.DataList
});
}
public List<DataListFilterOption> DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase)
public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, Models.DataListBase dataListBase)
{
List<DataListFilterOption> ret = new List<DataListFilterOption>();