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-02-08 15:00:09 +00:00
parent a4f6ae4356
commit fd1b3fc18c
2 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
server/AyaNova/DataList/ReviewDataList.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using AyaNova.Models; using AyaNova.Models;
using AyaNova.Biz; using AyaNova.Biz;
using System.Linq;
namespace AyaNova.DataList namespace AyaNova.DataList
{ {
internal class ReviewDataList : DataListProcessingBase, IDataListInternalCriteria internal class ReviewDataList : DataListProcessingBase, IDataListInternalCriteria
@@ -149,25 +150,7 @@ namespace AyaNova.DataList
SqlValueColumnName = "areview.tags" SqlValueColumnName = "areview.tags"
}); });
//META userid column
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metareviewuser",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "areview.userid",
SqlValueColumnName = "areview.userid",
IsMeta = true
});
//META object id column
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metareviewobjectid",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "areview.objectid",
SqlValueColumnName = "areview.objectid",
IsMeta = true
});
FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom1", FieldKey = "ReviewCustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom1", FieldKey = "ReviewCustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" });
FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom2", FieldKey = "ReviewCustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom2", FieldKey = "ReviewCustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" });
@@ -186,6 +169,36 @@ namespace AyaNova.DataList
FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom15", FieldKey = "ReviewCustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom15", FieldKey = "ReviewCustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" });
FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom16", FieldKey = "ReviewCustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "ReviewCustom16", FieldKey = "ReviewCustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "areview.customfields" });
//META COLUMNS
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metareviewuser",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "areview.userid",
SqlValueColumnName = "areview.userid",
IsMeta = true
});
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metareviewobjectid",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "areview.objectid",
SqlValueColumnName = "areview.objectid",
IsMeta = true
});
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metaobjecttype",
UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
SqlValueColumnName = "areview.objecttype",
IsMeta = true
});
} }
@@ -210,30 +223,30 @@ namespace AyaNova.DataList
public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
{ {
//TODO: support this clientcriteria //TODO: support this clientcriteria
// if (vm.objectId && vm.objectId != 0 && vm.objectType) { // if (vm.objectId && vm.objectId != 0 && vm.objectType) {
// //REMOVE COMMENT BLOCK AFTER TESTING // //REMOVE COMMENT BLOCK AFTER TESTING
// // //pre-filter // // //pre-filter
// // vm.metaView = JSON.stringify([ // // vm.metaView = JSON.stringify([
// // { // // {
// // fld: "metareviewobjectid", // // fld: "metareviewobjectid",
// // filter: { // // filter: {
// // items: [{ op: "=", value: vm.objectId }] // // items: [{ op: "=", value: vm.objectId }]
// // } // // }
// // }, // // },
// // { // // {
// // fld: "AyaType", // // fld: "AyaType",
// // filter: { // // filter: {
// // items: [{ op: "=", value: vm.objectType }] // // items: [{ op: "=", value: vm.objectType }]
// // } // // }
// // } // // }
// // ]); // // ]);
// // vm.name = await window.$gz.api.fetchBizObjectName( // // vm.name = await window.$gz.api.fetchBizObjectName(
// // vm.objectType, // // vm.objectType,
// // vm.objectId // // vm.objectId
// // ); // // );
// //OBJECTID,AYATYPE // //OBJECTID,AYATYPE
// vm.clientCriteria = `${vm.objectId},${vm.objectType}`; // vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
// } // }
List<DataListFilterOption> ret = new List<DataListFilterOption>(); List<DataListFilterOption> ret = new List<DataListFilterOption>();
bool HasSupervisorRole = bool HasSupervisorRole =
userRoles.HasFlag(AuthorizationRoles.BizAdminFull) userRoles.HasFlag(AuthorizationRoles.BizAdminFull)
@@ -250,6 +263,28 @@ namespace AyaNova.DataList
ret.Add(FilterOption); ret.Add(FilterOption);
} }
//ClientCriteria format for this list is "OBJECTID,AYATYPE"
var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
if (crit.Length > 1)
{
//OBJECTID criteria
if (crit[0] != "0")
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjectid" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}
//AYATYPE criteria
if (!string.IsNullOrWhiteSpace(crit[1]))
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjecttype" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}
}
return ret; return ret;
} }

6
server/AyaNova/DataList/ServiceBankDataList.cs
View File

@@ -191,10 +191,8 @@ namespace AyaNova.DataList
public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
{ {
List<DataListFilterOption> ret = new List<DataListFilterOption>(); List<DataListFilterOption> ret = new List<DataListFilterOption>();
//ClientCriteria is optional for this list //ClientCriteria format for this list is "OBJECTID,AYATYPE"
//Format for this list is "PARTID,WAREHOUSENAME" where the id is 0 if not filtered or the id to filter
//and bizarrely the warehousename is text or empty if not filtered
var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray(); var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
if (crit.Length > 1) if (crit.Length > 1)
{ {