diff --git a/server/AyaNova/DataList/ProjectDataList.cs b/server/AyaNova/DataList/ProjectDataList.cs index f95a8ccf..3351e167 100644 --- a/server/AyaNova/DataList/ProjectDataList.cs +++ b/server/AyaNova/DataList/ProjectDataList.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Newtonsoft.Json.Linq; using AyaNova.Biz; namespace AyaNova.DataList { @@ -12,44 +11,47 @@ namespace AyaNova.DataList var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############ - //Default ListView - dynamic dlistView = new JArray(); - dynamic cm = null; + // //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############ + // //Default ListView + // dynamic dlistView = new JArray(); + // dynamic cm = null; - cm = new JObject(); - cm.fld = "projectname"; - cm.sort = "+"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "projectname"; + // cm.sort = "+"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ProjectProjectOverseerID"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ProjectProjectOverseerID"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ProjectDateStarted"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ProjectDateStarted"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ProjectDateCompleted"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ProjectDateCompleted"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ProjectAccountNumber"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ProjectAccountNumber"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "projectactive"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "projectactive"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "projecttags"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "projecttags"; + // dlistView.Add(cm); - DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); + // 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 + DefaultColumns = new List() { "projectname", "ProjectProjectOverseerID", "ProjectDateStarted", "ProjectDateCompleted", + "ProjectAccountNumber", "projectactive", "projecttags" }; + DefaultSortBy = new Dictionary() { { "projectname", "+" } }; + FieldDefinitions = new List(); FieldDefinitions.Add(new AyaDataListFieldDefinition diff --git a/server/AyaNova/DataList/ReminderDataList.cs b/server/AyaNova/DataList/ReminderDataList.cs index af7d2db2..0b841020 100644 --- a/server/AyaNova/DataList/ReminderDataList.cs +++ b/server/AyaNova/DataList/ReminderDataList.cs @@ -15,27 +15,30 @@ namespace AyaNova.DataList AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############ + // //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############ - dynamic dlistView = new JArray(); + // dynamic dlistView = new JArray(); - dynamic cm = new JObject(); - cm.fld = "ReminderName"; - dlistView.Add(cm); + // dynamic cm = new JObject(); + // cm.fld = "ReminderName"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ReminderNotes"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ReminderNotes"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ReminderStopDate"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ReminderStopDate"; + // dlistView.Add(cm); - cm = new JObject(); - cm.fld = "ReminderStartDate"; - dlistView.Add(cm); + // cm = new JObject(); + // cm.fld = "ReminderStartDate"; + // dlistView.Add(cm); - DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); + // DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); + + DefaultColumns = new List() { "ReminderName", "ReminderNotes", "ReminderStopDate", "ReminderStartDate" }; + DefaultSortBy = new Dictionary() { { "ReminderStopDate", "-" } }; //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();