|
@@ -65,17 +65,20 @@ class ItemMetaConverter {
|
|
|
}
|
|
|
|
|
|
static ItemMeta _convertChildItem(ChildItemMetaDTO c) {
|
|
|
- ChildItemMetaDTO dto = c;
|
|
|
+ List<ItemMeta> _kids = [];
|
|
|
if (c.childItems != null && c.childItems!.isNotEmpty) {
|
|
|
- final child = c.childItems!.firstWhere((e) => e.isWorking);
|
|
|
- dto = child;
|
|
|
+ for (var child in c.childItems!) {
|
|
|
+ if (child.isWorking) {
|
|
|
+ _kids.add(_convertChildItem(child));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return ItemMeta(
|
|
|
c.name!,
|
|
|
- measureType: dto.measureTypeName!,
|
|
|
+ measureType: c.measureTypeName!,
|
|
|
description: c.description ?? c.name!,
|
|
|
- outputs: _convetOutputsFromCalc(dto.calculator!),
|
|
|
- childItems: [],
|
|
|
+ outputs: _convetOutputsFromCalc(c.calculator!),
|
|
|
+ childItems: _kids,
|
|
|
);
|
|
|
}
|
|
|
|