From d44361fc19ac8ce4c683397cb0328179d5b90615 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 27 Jan 2021 22:52:10 +0000 Subject: [PATCH] --- server/AyaNova/DataList/CustomerNoteDataList.cs | 2 +- server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs | 4 ++-- server/AyaNova/DataList/InsideUserDataList.cs | 4 ++-- server/AyaNova/DataList/MemoDataList.cs | 2 +- server/AyaNova/DataList/OutsideUserDataList.cs | 4 ++-- server/AyaNova/DataList/ReminderDataList.cs | 2 +- server/AyaNova/DataList/ReviewDataList.cs | 2 +- server/AyaNova/models/DataListBase.cs | 5 +++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/server/AyaNova/DataList/CustomerNoteDataList.cs b/server/AyaNova/DataList/CustomerNoteDataList.cs index 07f7a165..e7fb98e8 100644 --- a/server/AyaNova/DataList/CustomerNoteDataList.cs +++ b/server/AyaNova/DataList/CustomerNoteDataList.cs @@ -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; diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index 93d3ac84..af153374 100644 --- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -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 diff --git a/server/AyaNova/DataList/InsideUserDataList.cs b/server/AyaNova/DataList/InsideUserDataList.cs index 1ce5fd41..4ff49a9b 100644 --- a/server/AyaNova/DataList/InsideUserDataList.cs +++ b/server/AyaNova/DataList/InsideUserDataList.cs @@ -120,8 +120,8 @@ namespace AyaNova.DataList List ret = new List(); 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; diff --git a/server/AyaNova/DataList/MemoDataList.cs b/server/AyaNova/DataList/MemoDataList.cs index b42a8d71..6d9b0b15 100644 --- a/server/AyaNova/DataList/MemoDataList.cs +++ b/server/AyaNova/DataList/MemoDataList.cs @@ -140,7 +140,7 @@ namespace AyaNova.DataList List ret = new List(); 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; diff --git a/server/AyaNova/DataList/OutsideUserDataList.cs b/server/AyaNova/DataList/OutsideUserDataList.cs index f36bd4b8..f6a37bd9 100644 --- a/server/AyaNova/DataList/OutsideUserDataList.cs +++ b/server/AyaNova/DataList/OutsideUserDataList.cs @@ -125,8 +125,8 @@ namespace AyaNova.DataList List ret = new List(); 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; diff --git a/server/AyaNova/DataList/ReminderDataList.cs b/server/AyaNova/DataList/ReminderDataList.cs index 8a4f6268..ab2734be 100644 --- a/server/AyaNova/DataList/ReminderDataList.cs +++ b/server/AyaNova/DataList/ReminderDataList.cs @@ -121,7 +121,7 @@ namespace AyaNova.DataList List ret = new List(); 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; diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs index 0c3306cd..91a52305 100644 --- a/server/AyaNova/DataList/ReviewDataList.cs +++ b/server/AyaNova/DataList/ReviewDataList.cs @@ -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); } diff --git a/server/AyaNova/models/DataListBase.cs b/server/AyaNova/models/DataListBase.cs index 3b34a28e..b2429547 100644 --- a/server/AyaNova/models/DataListBase.cs +++ b/server/AyaNova/models/DataListBase.cs @@ -31,11 +31,12 @@ namespace AyaNova.Models public class DataListFilterOption { public string Column { get; set; } - public List items { get; set; } + public List Items { get; set; } public bool Any { get; set; }//means "or" the filter conditions public DataListFilterOption() { - items = new List(); + Items = new List(); + Any = false; } }