From 84b3c41ab67aae9d90ceca842d43879831e161f3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 18 Dec 2020 19:59:06 +0000
Subject: [PATCH]

---
 server/AyaNova/DataList/EventDataList.cs | 26 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/server/AyaNova/DataList/EventDataList.cs b/server/AyaNova/DataList/EventDataList.cs
index abce5fe5..49d91069 100644
--- a/server/AyaNova/DataList/EventDataList.cs
+++ b/server/AyaNova/DataList/EventDataList.cs
@@ -25,7 +25,7 @@ namespace AyaNova.DataList
 
             dynamic cm = new JObject();
             cm.fld = "eventcreated";
-            cm.sort="-";
+            cm.sort = "-";
             dlistView.Add(cm);
 
             cm = new JObject();
@@ -33,7 +33,7 @@ namespace AyaNova.DataList
             dlistView.Add(cm);
 
             cm = new JObject();
-            cm.fld = "ayatype";
+            cm.fld = "object";
             dlistView.Add(cm);
 
             cm = new JObject();
@@ -67,14 +67,24 @@ namespace AyaNova.DataList
             });
 
 
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition
+            // {
+            //     TKey = "AyaType",
+            //     FieldKey = "ayatype",
+            //     UiFieldDataType = (int)UiFieldDataType.Enum,
+            //     EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
+            //     SqlValueColumnName = "aevent.ayatype",
+            //     SqlIdColumnName = "aevent.ayid"
+            // });
+
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "AyaType",
-                FieldKey = "ayatype",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
-                SqlValueColumnName = "aevent.ayatype",
-                SqlIdColumnName = "aevent.ayid"
+                TKey = "Object",
+                FieldKey = "object",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlIdColumnName = "aevent.ayid",
+                SqlValueColumnName = "AYGETNAME(aevent.ayid, aevent.ayatype)",
+                SqlAyTypeColumnName = "aevent.ayatype"
             });
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition