server/AyaNova/DataList/DataListFetcher.cs

@@ -31,8 +31,20 @@ namespace AyaNova.DataList
                 throw new System.NotSupportedException("User roles insufficient for this datalist");
             }
 
-            //TODO: FETCH DATALISTTEMPLATE HERE OR USE DEFAULT IF FAULTY OR NOT FOUND
-            var JSONDataListTemplate = DataList.DefaultDataListDisplayTemplate;
+            //FETCH DATALISTTEMPLATE HERE OR USE DEFAULT IF FAULTY OR NOT FOUND
+
+            //start with default
+            string JSONDataListTemplate=DataList.DefaultDataListDisplayTemplate;
+
+            var CustomDataListTemplate = await ct.DataListTemplate.FirstOrDefaultAsync(x => x.DataListKey == listOptions.DataListKey);
+            //Null is expected unless user has created a new one
+            if(CustomDataListTemplate!=null){
+                //todo: validate the template first here need a new method to do that
+                //Assuming it's valid then use it
+                JSONDataListTemplate = CustomDataListTemplate.Template;
+            }
+           
+            
 
             //PARSE THE TEMPLATE INTO A STRING ARRAY
             //SO WE KNOW WHICH FIELDS TO RETURN FROM QUERY