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 22:52:10 +00:00
parent 829f225c21
commit d44361fc19
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -72,10 +72,10 @@ namespace AyaNova.DataList
//Iterate filter items building this WHERE segment
bool ThisIsTheFirstFilterItemForThisColumn = true;
//var ThereAreMultipleFilterItems = filterItems.Count > 1;
var ThereAreMultipleFilterItems = f.items.Count > 1;
var ThereAreMultipleFilterItems = f.Items.Count > 1;
// for (int y = 0; y < filterItems.Count; y++)
foreach (DataListColumnFilter filterItem in f.items)
foreach (DataListColumnFilter filterItem in f.Items)
{
//close or open another parenthetic group

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

@@ -120,8 +120,8 @@ namespace AyaNova.DataList
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 });
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;

2
server/AyaNova/DataList/MemoDataList.cs
View File

@@ -140,7 +140,7 @@ namespace AyaNova.DataList
List<DataListFilterOption> ret = new List<DataListFilterOption>();
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metamemoto" };
FilterOption.items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.Items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
return ret;

4
server/AyaNova/DataList/OutsideUserDataList.cs
View File

@@ -125,8 +125,8 @@ namespace AyaNova.DataList
List<DataListFilterOption> ret = new List<DataListFilterOption>();
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "usertype" };
FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
return ret;

2
server/AyaNova/DataList/ReminderDataList.cs
View File

@@ -121,7 +121,7 @@ namespace AyaNova.DataList
List<DataListFilterOption> ret = new List<DataListFilterOption>();
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metareminderuser" };
FilterOption.items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.Items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
return ret;

2
server/AyaNova/DataList/ReviewDataList.cs
View File

@@ -218,7 +218,7 @@ namespace AyaNova.DataList
if (!HasSupervisorRole)
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metareviewuser" };
FilterOption.items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
FilterOption.Items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}

5
server/AyaNova/models/DataListBase.cs
View File

@@ -31,11 +31,12 @@ namespace AyaNova.Models
public class DataListFilterOption
{
public string Column { get; set; }
public List<DataListColumnFilter> items { get; set; }
public List<DataListColumnFilter> Items { get; set; }
public bool Any { get; set; }//means "or" the filter conditions
public DataListFilterOption()
{
items = new List<DataListColumnFilter>();
Items = new List<DataListColumnFilter>();
Any = false;
}
}