From 5cb9e4fb228672a2acafd7fc6773e1288cf6483b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 13 Feb 2020 23:39:03 +0000 Subject: [PATCH] --- server/AyaNova/DataList/AyaDataList.cs | 17 ++++++++++++++--- server/AyaNova/DataList/DataListFetcher.cs | 2 +- .../DataList/DataListSqlSelectBuilder.cs | 1 + server/AyaNova/DataList/IAyaDataList.cs | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index 076f3172..62171ace 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -26,13 +26,24 @@ namespace AyaNova.DataList public string DefaultListView { get; set; } - public string[] GetFieldListFromListView(string listView) + //return array of field keys in list view + public List GetFieldListFromListView(JArray listViewArray) { - throw new System.NotImplementedException("AyaDataList:GetFieldListFromListView not coded yet "); + // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] + List ret = new List(); + for (int i = 0; i < listViewArray.Count; i++) + { + + var cm = listViewArray[i]; + + //Get some info about this column / field + ret.Append(cm["fld"].Value()); + } + return ret; } - public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(string listView) + public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray) { throw new System.NotImplementedException("AyaDataList:GenerateListColumnsJSONFromListView not coded yet "); // //parse the template diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs index c72aec67..a0cc3269 100644 --- a/server/AyaNova/DataList/DataListFetcher.cs +++ b/server/AyaNova/DataList/DataListFetcher.cs @@ -36,7 +36,7 @@ namespace AyaNova.DataList - string[] templateFieldList = DataList.GetFieldListFromListView(ListViewArray); + List templateFieldList = DataList.GetFieldListFromListView(ListViewArray); //BUILD THE QUERY //SELECT FRAGMENT COLUMNS FROM TEMPLATE diff --git a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs index 4e3bbb5d..bbd5335f 100644 --- a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs @@ -19,6 +19,7 @@ namespace AyaNova.DataList //convert to strings array (https://stackoverflow.com/a/33836599/8939) + // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] string[] templateFieldList; if (mini!=null && mini==true) { diff --git a/server/AyaNova/DataList/IAyaDataList.cs b/server/AyaNova/DataList/IAyaDataList.cs index 0c00ffb7..4c715eee 100644 --- a/server/AyaNova/DataList/IAyaDataList.cs +++ b/server/AyaNova/DataList/IAyaDataList.cs @@ -22,7 +22,7 @@ namespace AyaNova.DataList string DefaultListView { get; set; } Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray); - string[] GetFieldListFromListView(JArray listViewArray); + List GetFieldListFromListView(JArray listViewArray); // bool ValidateTemplate(string template);