From d5c7c4d7c6dc6d651ab40c9e784181fb76136e70 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 26 Feb 2020 19:24:44 +0000 Subject: [PATCH] --- DataList/DataListFiltering.cs | 6 +----- DataList/DataListReturnFormat.cs | 2 +- User/UserCrud.cs | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index acefcca..fe5f1f4 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -675,11 +675,7 @@ same as the server does but in a central location here for all tests to use. d.filter = filter; dListView.Add(d); - /* - "SELECT awidget.id AS df, awidget.name, awidget.id, awidget.startdate from awidget left outer join auser on (awidget.userid=auser.id) where (awidget.name Like 'DateOpBetweenFilterWorks%') AND ((awidget.startdate >='2019-03-12T18:00:00.0000000') AND awidget.startdate Is Null OR awidget.startdate <='2019-03-12T19:00:00.9990000Z')) ORDER BY awidget.id DESC LIMIT 999 OFFSET 0" - " where (awidget.name Like 'DateOpBetweenFilterWorks%') AND ((awidget.startdate >='2019-03-12T18:00:00.0000000') AND awidget.startdate Is Null OR awidget.startdate <='2019-03-12T19:00:00.9990000Z'))" - */ - + //FETCH DATALIST a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); diff --git a/DataList/DataListReturnFormat.cs b/DataList/DataListReturnFormat.cs index fbea850..8e81231 100644 --- a/DataList/DataListReturnFormat.cs +++ b/DataList/DataListReturnFormat.cs @@ -97,7 +97,7 @@ namespace raven_integration ((JArray)a.ObjectResponse["data"]).Count.Should().BeGreaterThan(0); //ensure first row contains all columns requested in listview - ((JArray)a.ObjectResponse["data"][0]).Count.Should().Be(10);//df column is also added by server always so it's one more than requested + ((JArray)a.ObjectResponse["data"][0]).Count.Should().Be(9); //sb a total record count greater than 3 ((JValue)a.ObjectResponse["totalRecordCount"]).Value().Should().BeGreaterThan(3); diff --git a/User/UserCrud.cs b/User/UserCrud.cs index 84f951f..1c13a0d 100644 --- a/User/UserCrud.cs +++ b/User/UserCrud.cs @@ -436,9 +436,7 @@ namespace raven_integration //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", "+")); - -//"SELECT auser.id AS df, auser.name, auser.id, auser.active, df, auser.id from auser where (auser.name Like 'UserListFilterAndSortWorks 1581707790170%') ORDER BY auser.active ASC, df ASC LIMIT 999 OFFSET 0" + //DEPRECATED NO DF ANYMORE 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"));