diff --git a/User/UserCrud.cs b/User/UserCrud.cs index 928191b..bda800c 100644 --- a/User/UserCrud.cs +++ b/User/UserCrud.cs @@ -409,32 +409,38 @@ namespace raven_integration //CREATE FILTER //FILTER IN BY NAME FOR TESTING THIS RUN ONLY - dynamic dfilter = new JArray(); - //name starts with filter to constrict to widgets that this test block created only - dynamic DataFilterNameStart = new JObject(); - DataFilterNameStart.fld = "username"; - DataFilterNameStart.op = Util.OpStartsWith; - DataFilterNameStart.value = ObjectNameStart; - dfilter.Add(DataFilterNameStart); + // dynamic dfilter = new JArray(); + // //name starts with filter to constrict to widgets that this test block created only + // dynamic DataFilterNameStart = new JObject(); + // DataFilterNameStart.fld = "username"; + // DataFilterNameStart.op = Util.OpStartsWith; + // DataFilterNameStart.value = ObjectNameStart; + // dfilter.Add(DataFilterNameStart); - dynamic dsortarray = new JArray(); + // dynamic dsortarray = new JArray(); //SORT ORDER ################### //sort by active then by ID - dynamic dsort = new JObject(); - dsort.fld = "useractive"; - dsort.dir = "+"; - dsortarray.Add(dsort); + // dynamic dsort = new JObject(); + // dsort.fld = "useractive"; + // dsort.dir = "+"; + // dsortarray.Add(dsort); - dsort = new JObject(); - dsort.fld = "df"; - dsort.dir = "+"; - dsortarray.Add(dsort); + // dsort = new JObject(); + // dsort.fld = "df"; + // dsort.dir = "+"; + // dsortarray.Add(dsort); + + dynamic dListView = new JArray(); + //name starts with filter to constrict to widgets that this test block created only + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("username", Util.OpStartsWith, ObjectNameStart)); + dListView.Add(Util.BuildSimpleSortDataListViewColumn("useractive", "+")); + dListView.Add(Util.BuildSimpleSortDataListViewColumn("df", "+")); //NOW FETCH WIDGET LIST WITH FILTER UserDataList // a = await Util.GetAsync($"DataList/list?DataListKey=UserDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in")); - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray, 999, 0, false, "UserDataList")); + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView, 999, 0, "UserDataList")); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200);