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

case 4208

Browse Source
This commit is contained in:
John Cardinal
2022-11-02 19:51:31 +00:00
parent 210d8ab0ee
commit 12c0f9b1bf
3 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/AyaNova/DataList/PMItemUnitDataList.cs
View File

@@ -113,6 +113,15 @@ namespace AyaNova.DataList
IsMeta = true IsMeta = true
}); });
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metaunitmodel",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "aunit.unitmodelid",
SqlValueColumnName = "aunit.unitmodelid",
IsMeta = true
});
#endregion #endregion
@@ -509,7 +518,7 @@ namespace AyaNova.DataList
int nType = 0; int nType = 0;
if (!int.TryParse(crit[1], out nType)) return ret; if (!int.TryParse(crit[1], out nType)) return ret;
AyaType forType = (AyaType)nType; AyaType forType = (AyaType)nType;
if (forType != AyaType.Unit) return ret;//could be more later if (forType != AyaType.Unit && forType != AyaType.UnitModel) return ret;
long lId = 0; long lId = 0;
if (!long.TryParse(crit[0], out lId)) return ret; if (!long.TryParse(crit[0], out lId)) return ret;
@@ -525,6 +534,13 @@ namespace AyaNova.DataList
ret.Add(FilterOption); ret.Add(FilterOption);
} }
break; break;
case AyaType.UnitModel:
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaunitmodel" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}
break;
} }
} }

20
server/AyaNova/DataList/QuoteItemUnitDataList.cs
View File

@@ -114,6 +114,16 @@ namespace AyaNova.DataList
IsMeta = true IsMeta = true
}); });
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metaunitmodel",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "aunit.unitmodelid",
SqlValueColumnName = "aunit.unitmodelid",
IsMeta = true
});
#endregion #endregion
@@ -532,7 +542,7 @@ namespace AyaNova.DataList
int nType = 0; int nType = 0;
if (!int.TryParse(crit[1], out nType)) return ret; if (!int.TryParse(crit[1], out nType)) return ret;
AyaType forType = (AyaType)nType; AyaType forType = (AyaType)nType;
if (forType != AyaType.Unit) return ret;//could be more later if (forType != AyaType.Unit && forType != AyaType.UnitModel) return ret;
long lId = 0; long lId = 0;
if (!long.TryParse(crit[0], out lId)) return ret; if (!long.TryParse(crit[0], out lId)) return ret;
@@ -548,6 +558,14 @@ namespace AyaNova.DataList
ret.Add(FilterOption); ret.Add(FilterOption);
} }
break; break;
case AyaType.UnitModel:
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaunitmodel" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}
break;
} }
} }

18
server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
View File

@@ -118,6 +118,15 @@ namespace AyaNova.DataList
IsMeta = true IsMeta = true
}); });
FieldDefinitions.Add(new DataListFieldDefinition
{
FieldKey = "metaunitmodel",
UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "aunit.unitmodelid",
SqlValueColumnName = "aunit.unitmodelid",
IsMeta = true
});
#endregion #endregion
@@ -535,7 +544,7 @@ namespace AyaNova.DataList
int nType = 0; int nType = 0;
if (!int.TryParse(crit[1], out nType)) return ret; if (!int.TryParse(crit[1], out nType)) return ret;
AyaType forType = (AyaType)nType; AyaType forType = (AyaType)nType;
if (forType != AyaType.Unit) return ret;//could be more later if (forType != AyaType.Unit && forType != AyaType.UnitModel) return ret;//could be more later
long lId = 0; long lId = 0;
if (!long.TryParse(crit[0], out lId)) return ret; if (!long.TryParse(crit[0], out lId)) return ret;
@@ -551,6 +560,13 @@ namespace AyaNova.DataList
ret.Add(FilterOption); ret.Add(FilterOption);
} }
break; break;
case AyaType.UnitModel:
{
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaunitmodel" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption);
}
break;
} }
} }