From b4191a2d7843a46d68bd3de81686ba495cd4bb97 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 21 Dec 2020 17:36:03 +0000
Subject: [PATCH]

---
 server/AyaNova/DataList/ReminderDataList.cs | 88 ++-------------------
 1 file changed, 8 insertions(+), 80 deletions(-)

diff --git a/server/AyaNova/DataList/ReminderDataList.cs b/server/AyaNova/DataList/ReminderDataList.cs
index 6939738c..2fb3a90c 100644
--- a/server/AyaNova/DataList/ReminderDataList.cs
+++ b/server/AyaNova/DataList/ReminderDataList.cs
@@ -15,14 +15,17 @@ namespace AyaNova.DataList
 
 
             //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############
-            //Default ListView
+
             dynamic dlistView = new JArray();
-
-
+            
             dynamic cm = new JObject();
             cm.fld = "ReminderName";
             dlistView.Add(cm);
 
+            cm = new JObject();
+            cm.fld = "ReminderNotes";
+            dlistView.Add(cm);
+
             cm = new JObject();
             cm.fld = "ReminderStopDate";
             dlistView.Add(cm);
@@ -31,46 +34,11 @@ namespace AyaNova.DataList
             cm.fld = "ReminderStartDate";
             dlistView.Add(cm);
 
-            cm = new JObject();
-            cm.fld = "Object";
-            dlistView.Add(cm);
-
-            cm = new JObject();
-            cm.fld = "AyaType";
-            dlistView.Add(cm);
-
-            cm = new JObject();
-            cm.fld = "ReminderNotes";
-            dlistView.Add(cm);
-
-            cm = new JObject();
-            cm.fld = "ReminderUserId";
-            dlistView.Add(cm);
-
             DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
 
             //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
             FieldDefinitions = new List<AyaDataListFieldDefinition>();
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "Object",
-                FieldKey = "Object",
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "areminder.ayid",
-                SqlValueColumnName = "AYGETNAME(areminder.objectid, areminder.objecttype)",
-                SqlAyTypeColumnName = "areminder.ayatype"
-            });
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "AyaType",
-                FieldKey = "AyaType",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
-                SqlValueColumnName = "areminder.ayatype"
-            });
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "ReminderName",
@@ -108,42 +76,6 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "areminder.stopdate"
             });
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReminderColor",
-                FieldKey = "ReminderColor",
-                UiFieldDataType = (int)UiFieldDataType.Color,
-                SqlValueColumnName = "areminder.color"
-            });
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReminderCompletionNotes",
-                FieldKey = "ReminderCompletionNotes",
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "areminder.completionnotes"
-            });
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReminderUserId",
-                FieldKey = "ReminderUserId",
-                AyaObjectType = (int)AyaType.User,
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "uassto.id",
-                SqlValueColumnName = "uassto.name"
-            });
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReminderAssignedByUserId",
-                FieldKey = "ReminderAssignedByUserId",
-                AyaObjectType = (int)AyaType.User,
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "uassby.id",
-                SqlValueColumnName = "uassby.name"
-            });
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "Tags",
@@ -180,14 +112,10 @@ namespace AyaNova.DataList
 
         }
 
-
-
-
-
-
+        //Ensure only current user can fetch their reminders
         string IAyaDataListViewServerCriteria.ListViewServerCriteria(long userId)
         {
-            return "[{\"fld\":\"metareminderto\",\"filter\":{\"items\":[{\"op\":\"=\",\"value\":" + userId.ToString() + "}]}}]";
+            return "[{\"fld\":\"metareminderuser\",\"filter\":{\"items\":[{\"op\":\"=\",\"value\":" + userId.ToString() + "}]}}]";
         }
 
     }//eoc