From efc5880fe8e343a80a0642f0152ab9c318acaead Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 4 Feb 2021 21:09:01 +0000 Subject: [PATCH] --- server/AyaNova/DataList/InsideUserDataList.cs | 6 ++-- .../AyaNova/DataList/OutsideUserDataList.cs | 12 ++++++- .../AyaNova/DataList/PartInventoryDataList.cs | 32 ++++++++++++++++--- .../PartInventoryTransactionsDataList.cs | 25 +++++++++++++-- 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/server/AyaNova/DataList/InsideUserDataList.cs b/server/AyaNova/DataList/InsideUserDataList.cs index b4781c08..aa9a5cff 100644 --- a/server/AyaNova/DataList/InsideUserDataList.cs +++ b/server/AyaNova/DataList/InsideUserDataList.cs @@ -115,9 +115,9 @@ namespace AyaNova.DataList }); //META COLUMNS - FieldDefinitions.Add(new DataListFieldDefinition + FieldDefinitions.Add(new DataListFieldDefinition { - + FieldKey = "metausertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()), @@ -125,7 +125,7 @@ namespace AyaNova.DataList IsMeta = true }); - + } public List DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) diff --git a/server/AyaNova/DataList/OutsideUserDataList.cs b/server/AyaNova/DataList/OutsideUserDataList.cs index 7bbfe4ab..7c1cd890 100644 --- a/server/AyaNova/DataList/OutsideUserDataList.cs +++ b/server/AyaNova/DataList/OutsideUserDataList.cs @@ -118,13 +118,23 @@ namespace AyaNova.DataList SqlIdColumnName = "acustomer.id", SqlValueColumnName = "acustomer.name" }); + + //META COLUMNS + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "metausertype", + UiFieldDataType = (int)UiFieldDataType.Enum, + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()), + SqlValueColumnName = "auser.usertype", + IsMeta = true + }); } public List DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles,string clientCriteria) { List ret = new List(); - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "usertype" }; + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metausertype" }; FilterOption.Any=true; FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.Equality }); FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.Equality }); diff --git a/server/AyaNova/DataList/PartInventoryDataList.cs b/server/AyaNova/DataList/PartInventoryDataList.cs index 5a0e95f0..db67ccb2 100644 --- a/server/AyaNova/DataList/PartInventoryDataList.cs +++ b/server/AyaNova/DataList/PartInventoryDataList.cs @@ -114,8 +114,30 @@ namespace AyaNova.DataList SqlValueColumnName = "vpartinventorynow.balance" }); + + //META + FieldDefinitions.Add(new DataListFieldDefinition + { + + FieldKey = "metapartnumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "apart.id", + SqlValueColumnName = "apart.partnumber", + IsMeta = true + + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "metawarehouse", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "apartwarehouse.id", + SqlValueColumnName = "apartwarehouse.name", + IsMeta = true + }); + } - + public List DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) { List ret = new List(); @@ -127,17 +149,17 @@ namespace AyaNova.DataList if (crit.Length > 1) { //Part criteria - if (crit[0]!="0") + if (crit[0] != "0") { - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartPartNumber" }; + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metapartnumber" }; FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality }); ret.Add(FilterOption); } - //Warehouse criteria + //Warehouse criteria if (!string.IsNullOrWhiteSpace(crit[1])) { - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartWarehouseName" }; + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metawarehouse" }; FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality }); ret.Add(FilterOption); } diff --git a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs index 443ad68f..912c44db 100644 --- a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs +++ b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs @@ -127,6 +127,27 @@ namespace AyaNova.DataList SqlValueColumnName = "apartinventory.balance" }); + //META + FieldDefinitions.Add(new DataListFieldDefinition + { + + FieldKey = "metapartnumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "apart.id", + SqlValueColumnName = "apart.partnumber", + IsMeta = true + + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "metawarehouse", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "apartwarehouse.id", + SqlValueColumnName = "apartwarehouse.name", + IsMeta = true + }); + } @@ -143,7 +164,7 @@ namespace AyaNova.DataList //Part criteria if (crit[0] != "0") { - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartPartNumber" }; + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metapartnumber" }; FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality }); ret.Add(FilterOption); } @@ -151,7 +172,7 @@ namespace AyaNova.DataList //Warehouse criteria if (!string.IsNullOrWhiteSpace(crit[1])) { - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartWarehouseName" }; + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metawarehouse" }; FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality }); ret.Add(FilterOption); }