admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-01-27 20:45:35 +00:00
parent f7563f4068
commit a6a2e0917c
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/AyaNova/DataList/LoanUnitDataList.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using Newtonsoft.Json.Linq;
using AyaNova.Biz;
namespace AyaNova.DataList
{
@@ -18,30 +17,31 @@ 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 = "LoanUnitName";
cm.sort = "+";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "LoanUnitName";
// cm.sort = "+";
// dlistView.Add(cm);
cm = new JObject();
cm.fld = "LoanUnitSerial";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "LoanUnitSerial";
// dlistView.Add(cm);
cm = new JObject();
cm.fld = "Tags";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "Tags";
// dlistView.Add(cm);
DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
// DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
DefaultColumns = new List<string>() { "LoanUnitName", "LoanUnitSerial", "Tags" };
DefaultSortBy = new Dictionary<string, string>() { { "LoanUnitName", "+" } };
//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 = "LoanUnitName",
@@ -182,6 +182,6 @@ namespace AyaNova.DataList
FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "LoanUnitCustom16", FieldKey = "loanunitcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aloanunit.customfields" });
}
}//eoc
}//eons

35
server/AyaNova/DataList/MemoDataList.cs
View File

@@ -15,28 +15,31 @@ namespace AyaNova.DataList
AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
//######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############
//Default ListView
dynamic dlistView = new JArray();
// //######## DEFAULT VIEW WHEN NO VIEW CHOSEN ############
// //Default ListView
// dynamic dlistView = new JArray();
dynamic cm = new JObject();
cm.fld = "MemoSubject";
dlistView.Add(cm);
// dynamic cm = new JObject();
// cm.fld = "MemoSubject";
// dlistView.Add(cm);
cm = new JObject();
cm.fld = "MemoFromID";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "MemoFromID";
// dlistView.Add(cm);
cm = new JObject();
cm.fld = "MemoSent";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "MemoSent";
// dlistView.Add(cm);
cm = new JObject();
cm.fld = "MemoViewed";
dlistView.Add(cm);
// cm = new JObject();
// cm.fld = "MemoViewed";
// dlistView.Add(cm);
DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
// DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
DefaultColumns = new List<string>() { "MemoSubject", "MemoFromID", "MemoSent", "MemoViewed" };
DefaultSortBy = new Dictionary<string, string>() { { "MemoSent", "-" } };//added but wasnt' in original
//NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely