sebastian/ConceptCreator
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

inventory-items-2 #44

Closed
sebastian wants to merge 32 commits from inventory-items-2 into inventory
pull from: inventory-items-2
merge into: sebastian:inventory
Conversation 0 Commits 32 Files Changed 58 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34c139eecf - Show all commits

2
src/app/editor/items/item-editor/inherited-item-characteristic-editor/inherited-item-characteristic-editor.component.html
View File

@ -1,4 +1,4 @@
<table mat-table [dataSource]="datasource" class="mat-elevation-z8"> <table mat-table [dataSource]="findCharacteristicValuesByItemgroup(inheritedItemgroup!)" class="mat-elevation-z8">
<ng-container matColumnDef="characteristic"> <ng-container matColumnDef="characteristic">
<th mat-header-cell *matHeaderCellDef>Characteristic</th> <th mat-header-cell *matHeaderCellDef>Characteristic</th>
<td mat-cell *matCellDef="let characteristicValue">{{characteristicValue.key.characteristicName}}</td> <td mat-cell *matCellDef="let characteristicValue">{{characteristicValue.key.characteristicName}}</td>

2
src/app/editor/items/item-editor/inherited-item-characteristic-editor/inherited-item-characteristic-editor.component.ts
View File

@ -24,7 +24,7 @@ export class InheritedItemCharacteristicEditorComponent implements OnInit{
} }
private findCharacteristicValuesByItemgroup(itemGroup: ItemGroup): ItemgroupCharacteristicValue[] { findCharacteristicValuesByItemgroup(itemGroup: ItemGroup): ItemgroupCharacteristicValue[] {
const result = this.item?.itemCharacteristicValues.filter(value => value.key.itemgroup.componentName === itemGroup.componentName); const result = this.item?.itemCharacteristicValues.filter(value => value.key.itemgroup.componentName === itemGroup.componentName);
if(result != undefined) { if(result != undefined) {
return result; return result;