diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs index 2f424305..3be9cd54 100644 --- a/server/AyaNova/DataList/ReviewDataList.cs +++ b/server/AyaNova/DataList/ReviewDataList.cs @@ -35,6 +35,10 @@ namespace AyaNova.DataList cm.fld = "Object"; dlistView.Add(cm); + cm = new JObject(); + cm.fld = "AyaType"; + dlistView.Add(cm); + cm = new JObject(); cm.fld = "ReviewNotes"; dlistView.Add(cm); @@ -45,19 +49,26 @@ namespace AyaNova.DataList 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(); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "Object", FieldKey = "Object", UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "aevent.ayid", - SqlValueColumnName = "AYGETNAME(aevent.ayid, aevent.ayatype)", - SqlAyTypeColumnName = "aevent.ayatype" + SqlIdColumnName = "areview.ayid", + SqlValueColumnName = "AYGETNAME(areview.objectid, areview.objecttype)", + SqlAyTypeColumnName = "areview.ayatype" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "AyaType", + FieldKey = "AyaType", + UiFieldDataType = (int)UiFieldDataType.Enum, + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()), + SqlValueColumnName = "areview.ayatype" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -79,7 +90,6 @@ namespace AyaNova.DataList SqlValueColumnName = "areview.notes" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "ReviewDueDate",