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-04 21:09:01 +00:00
parent a95cabdb28
commit efc5880fe8
4 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)

12
server/AyaNova/DataList/OutsideUserDataList.cs
View File

@@ -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<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles,string clientCriteria)
{
List<DataListFilterOption> ret = new List<DataListFilterOption>();
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 });

32
server/AyaNova/DataList/PartInventoryDataList.cs
View File

@@ -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<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
{
List<DataListFilterOption> ret = new List<DataListFilterOption>();
@@ -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);
}

25
server/AyaNova/DataList/PartInventoryTransactionsDataList.cs
View File

@@ -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);
}