admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-01-27 20:37:28 +00:00
parent d425a13267
commit f7563f4068
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/AyaNova/DataList/CustomerNoteDataList.cs
View File

@@ -88,12 +88,8 @@ namespace AyaNova.DataList
if (string.IsNullOrWhiteSpace(dataListBase.ClientCriteria))
throw new System.ArgumentNullException("CustomerNoteDataList - ClientCriteria is empty, should be Customer ID");
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" };
DataListColumnFilter ColumnFilter = new DataListColumnFilter();
ColumnFilter.value = dataListBase.ClientCriteria;
ColumnFilter.op = "=";
FilterOption.items.Add(ColumnFilter);
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" };
FilterOption.items.Add(new DataListColumnFilter() { value = dataListBase.ClientCriteria, op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
return ret;

14
server/AyaNova/DataList/InsideUserDataList.cs
View File

@@ -1,8 +1,10 @@
using System.Collections.Generic;
using AyaNova.Biz;
using AyaNova.Models;
namespace AyaNova.DataList
{
internal class InsideUserDataList : AyaDataList
internal class InsideUserDataList : AyaDataList, IAyaDataListServerCriteria
{
public InsideUserDataList()
@@ -111,8 +113,18 @@ namespace AyaNova.DataList
SqlIdColumnName = "avendor.id",
SqlValueColumnName = "avendor.name"
});
}
public List<DataListFilterOption> DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase)
{
List<DataListFilterOption> ret = new List<DataListFilterOption>();
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "usertype" };
FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.NotEqual });
FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.NotEqual });
ret.Add(FilterOption);
return ret;
}
}//eoc