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

AW-784 Reapply from Farmmaps commits

Browse Source 
- 6f79b625: AW-738 changed selected-item-container to allow forSourceTask annotation.
This commit is contained in:
Peter Bastiani 2019-12-20 09:18:00 +01:00
parent 709c76a851
commit e1ff44ed3c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,17 @@ export class SelectedItemContainerComponent {
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
loadComponent() { loadComponent() {
var componentFactory: ComponentFactory<AbstractSelectedItemComponent> = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default let componentFactory: ComponentFactory<AbstractSelectedItemComponent> = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default
for (var i = 0; i < this.selectedItemComponents.length; i++) { for (let i = 0; i < this.selectedItemComponents.length; i++) {
if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType) { let hasSourceTask = this.selectedItemComponents[i]['forSourceTask'] != null &&
this.selectedItemComponents[i]['forSourceTask'] != undefined;
if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType &&
hasSourceTask && this.selectedItemComponents[i]['forSourceTask'] == this.item.sourceTask) {
componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[i]['constructor'] as any);
break;
} else if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType) {
componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[i]['constructor'] as any); componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[i]['constructor'] as any);
} }
} }