FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix template selection
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma
2020-06-30 09:11:46 +02:00
parent 214dc3ffa1
commit 09fa8b4f1f
4 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts
View File

@@ -29,14 +29,21 @@ export class SelectedItemContainerComponent {
let showItem = true;
for (let i = 0; i < this.selectedItemComponents.length; i++) {
let matches=0;
if (this.selectedItemComponents[i]['forItemType'] && this.selectedItemComponents[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
matches++;
let criteria=0;
if (this.selectedItemComponents[i]['forItemType'] ) {
criteria++;
if(this.selectedItemComponents[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
matches++;
}
}
if (this.selectedItemComponents[i]['forSourceTask'] && this.selectedItemComponents[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
matches++;
if (this.selectedItemComponents[i]['forSourceTask']) {
criteria++;
if( this.selectedItemComponents[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
matches++;
}
}
if(matches > maxMatches) {
if(criteria==matches && matches > maxMatches) {
selected=i;
maxMatches = matches;
}