From 071339d2513927750e2c4a1854638a530c9e9d19 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 27 Jan 2021 20:47:26 +0000 Subject: [PATCH] --- server/AyaNova/DataList/MemoDataList.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/DataList/MemoDataList.cs b/server/AyaNova/DataList/MemoDataList.cs index d70a67b9..b42a8d71 100644 --- a/server/AyaNova/DataList/MemoDataList.cs +++ b/server/AyaNova/DataList/MemoDataList.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Newtonsoft.Json.Linq; using AyaNova.Models; using AyaNova.Biz; namespace AyaNova.DataList @@ -38,7 +37,7 @@ namespace AyaNova.DataList // DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); - DefaultColumns = new List() { "MemoSubject", "MemoFromID", "MemoSent", "MemoViewed" }; + DefaultColumns = new List() { "MemoSubject", "MemoFromID", "MemoSent", "MemoViewed" }; DefaultSortBy = new Dictionary() { { "MemoSent", "-" } };//added but wasnt' in original @@ -136,13 +135,18 @@ namespace AyaNova.DataList } + public List DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase) + { + List ret = new List(); + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metamemoto" }; + FilterOption.items.Add(new DataListColumnFilter() { value = currentUserId.ToString(), op = DataListFilterComparisonOperator.Equality }); - DataListFilterOption DataListServerCriteria(long currentUserId, AyaNova.Biz.AuthorizationRoles userRoles, DataListBase dataListBase) - { - //return "[{\"fld\":\"metamemoto\",\"filter\":{\"items\":[{\"op\":\"=\",\"value\":" + currentUserId.ToString() + "}]}}]"; - return null; + ret.Add(FilterOption); + return ret; } + + }//eoc }//eons \ No newline at end of file