server/AyaNova/DataList/AttachmentDataList.cs

@@ -22,11 +22,7 @@ namespace AyaNova.DataList
             dlistView.Add(cm);
 
             cm = new JObject();
-            cm.fld = "ayatype";
+            cm.fld = "object";
-            dlistView.Add(cm);
-
-            cm = new JObject();
-            cm.fld = "ayatypeex";
             dlistView.Add(cm);
 
             cm = new JObject();
@@ -69,31 +65,16 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "afileattachment.exists"
             });
 
-
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "AyaType",
+                TKey = "Object",
-                FieldKey = "ayatype",
+                FieldKey = "object",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
-                SqlValueColumnName = "afileattachment.AttachToObjectType"
-            });
-
-
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "AyaType",
-                FieldKey = "ayatypeex",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                // EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
                 SqlIdColumnName = "afileattachment.AttachToObjectid",
                 SqlValueColumnName = "AYGETNAME(afileattachment.AttachToObjectid, afileattachment.attachtoobjecttype)",
                 SqlAyTypeColumnName = "afileattachment.attachtoobjecttype"
             });
 
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "FileSize",

server/AyaNova/DataList/EventDataList.cs

@@ -66,17 +66,6 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aevent.ayevent"
             });
 
-
-            // 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 = "Object",

server/AyaNova/DataList/ReviewDataList.cs

@@ -9,7 +9,7 @@ namespace AyaNova.DataList
         {
 
             DefaultListObjectType = AyaType.Review;
-            SQLFrom = "from areview left outer join auser on (areview.fromid=auser.id)";
+            SQLFrom = "from areview left outer join auser uassto on (areview.userid=uassto.id) left outer join auser uassby on (areview.assignedbyuserid=uassby.id)";
             var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
 
@@ -32,14 +32,13 @@ namespace AyaNova.DataList
             dlistView.Add(cm);
 
             cm = new JObject();
-            cm.fld = "ayatype";
+            cm.fld = "Object";
             dlistView.Add(cm);
 
             cm = new JObject();
             cm.fld = "ReviewNotes";
             dlistView.Add(cm);
 
-
             cm = new JObject();
             cm.fld = "ReviewUserId";
             dlistView.Add(cm);
@@ -51,27 +50,20 @@ namespace AyaNova.DataList
             FieldDefinitions = new List<AyaDataListFieldDefinition>();
 
 
-
-           // TODO: have to figure out how to include name and openable link to object in reminder
-            //or do I?... outstanding for sure
-            //The only efficient way to do this would be a Function that is outer joined to fetch the names
-            //maybe that's an option, look into a query that joins tables to Function
-            //https://dba.stackexchange.com/a/194912
-   
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "AyaType",
+                TKey = "Object",
-                FieldKey = "ayatype",
+                FieldKey = "Object",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
+                UiFieldDataType = (int)UiFieldDataType.Text,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
+                SqlIdColumnName = "aevent.ayid",
-                SqlValueColumnName = "afileattachment.AttachToObjectType"
+                SqlValueColumnName = "AYGETNAME(aevent.ayid, aevent.ayatype)",
+                SqlAyTypeColumnName = "aevent.ayatype"
             });
 
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "ReviewSubject",
+                TKey = "ReviewName",
-                FieldKey = "ReviewSubject",
+                FieldKey = "ReviewName",
                 AyaObjectType = (int)AyaType.Review,
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlIdColumnName = "areview.id",
@@ -81,48 +73,57 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "ReviewMessage",
+                TKey = "ReviewNotes",
-                FieldKey = "ReviewMessage",
+                FieldKey = "ReviewNotes",
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlValueColumnName = "areview.notes"
             });
 
+
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "ReviewFromID",
+                TKey = "ReviewDueDate",
-                FieldKey = "ReviewFromID",
+                FieldKey = "ReviewDueDate",
+                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                SqlValueColumnName = "areview.duedate"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "ReviewCompletedDate",
+                FieldKey = "ReviewCompletedDate",
+                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                SqlValueColumnName = "areview.completeddate"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "ReviewCompletionNotes",
+                FieldKey = "ReviewCompletionNotes",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "areview.completionnotes"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "ReviewUserId",
+                FieldKey = "ReviewUserId",
                 AyaObjectType = (int)AyaType.User,
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "auser.id",
+                SqlIdColumnName = "uassto.id",
-                SqlValueColumnName = "auser.name",
+                SqlValueColumnName = "uassto.name"
-                IsRowId = false
             });
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "ReviewSent",
+                TKey = "ReviewAssignedByUserId",
-                FieldKey = "ReviewSent",
+                FieldKey = "ReviewAssignedByUserId",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                AyaObjectType = (int)AyaType.User,
-                SqlValueColumnName = "areview.sent"
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlIdColumnName = "uassby.id",
+                SqlValueColumnName = "uassby.name"
             });
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReviewReplied",
-                FieldKey = "ReviewReplied",
-                UiFieldDataType = (int)UiFieldDataType.Bool,
-                SqlValueColumnName = "areview.replied"
-            });
-
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                TKey = "ReviewViewed",
-                FieldKey = "ReviewViewed",
-                UiFieldDataType = (int)UiFieldDataType.Bool,
-                SqlValueColumnName = "areview.viewed"
-            });
-
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "Tags",
@@ -134,9 +135,9 @@ namespace AyaNova.DataList
             //META column 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                FieldKey = "metareviewto",
+                FieldKey = "metareviewuser",
-                SqlIdColumnName = "areview.toid",
+                SqlIdColumnName = "areview.userid",
-                SqlValueColumnName = "areview.toid",
+                SqlValueColumnName = "areview.userid",
                 IsMeta = true
             });