From e1ff44ed3c010229caed029de513850d6c426c19 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:18:00 +0100 Subject: [PATCH 1/9] AW-784 Reapply from Farmmaps commits - 6f79b625: AW-738 changed selected-item-container to allow forSourceTask annotation. --- .../selected-item-container.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts index 7dd0d2d..5bece46 100644 --- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts @@ -19,12 +19,20 @@ export class SelectedItemContainerComponent { @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; loadComponent() { - var componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default - for (var i = 0; i < this.selectedItemComponents.length; i++) { - if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType) { + let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default + for (let i = 0; i < this.selectedItemComponents.length; i++) { + 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); } - } + } const viewContainerRef = this.widgetHost.viewContainerRef; viewContainerRef.clear(); From 2059b48abb259be3167db00e5e01db10ba221907 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:19:53 +0100 Subject: [PATCH 2/9] AW-784 Reapply from Farmmaps commits - a4bb051a: AW-738 fixed bug --- .../selected-item-container.component.ts | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts index 5bece46..716013f 100644 --- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts @@ -20,19 +20,21 @@ export class SelectedItemContainerComponent { loadComponent() { let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default - for (let i = 0; i < this.selectedItemComponents.length; i++) { - let hasSourceTask = this.selectedItemComponents[i]['forSourceTask'] != null && - this.selectedItemComponents[i]['forSourceTask'] != undefined; + let firstComponentWithTypeAndTask = this.selectedItemComponents + .find(value => value['forSourceTask'] == this.item.sourceTask && + value['forItemType'] == this.item.itemType + ); - if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType && - hasSourceTask && this.selectedItemComponents[i]['forSourceTask'] == this.item.sourceTask) { + if (firstComponentWithTypeAndTask) { + componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithTypeAndTask['constructor'] as any); + } else { + let firstComponentWithType = this.selectedItemComponents + .find(value => value['forItemType'] == this.item.itemType); - 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); + if (firstComponentWithType) { + componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithType['constructor'] as any); } - } + } const viewContainerRef = this.widgetHost.viewContainerRef; viewContainerRef.clear(); From 7cb129dbc4b6ce0edaf13df95e2dd6da8177fa0f Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:25:09 +0100 Subject: [PATCH 3/9] AW-784 Reapply from Farmmaps commits - cd035366: AW-718 Layout as requested by Thomas. --- .../selected-item-cropfield.component.scss | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss index 8c27211..642b42b 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss @@ -1,5 +1,7 @@ -@import "../../_theme.scss"; -@import "~bootstrap/scss/bootstrap.scss"; +@import "../../../app/theme.scss"; +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins"; .big-icon { width: 100%; @@ -13,6 +15,10 @@ font-size: 1rem; } +.card-body { + padding-bottom: unset; +} + .spacer { display: none; height: 4rem; @@ -23,3 +29,11 @@ display: block; } } + +.menu-card { + margin-left: -7px; + padding-left: 7px; + margin-right: -7px; + padding-right: 7px; + margin-bottom: 7px; +} From 15c224ff5d39443621efd35c4072a7bfedb93369 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:36:55 +0100 Subject: [PATCH 4/9] AW-784 Reapply from Farmmaps commits - 5d11bfe8: Enable histogram for shape --- .../selected-item-shape/selected-item-shape.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html index 098843c..f873f7d 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html @@ -10,7 +10,7 @@ - +
    From 9b03b490284f5b3594e9082c0c700e7dcd98a75e Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:39:29 +0100 Subject: [PATCH 5/9] AW-784 Reapply from Farmmaps commits - 47deb5f6: AW-772 Panels --- .../selected-item-shape.component.html | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html index f873f7d..b2aef5d 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html @@ -3,20 +3,26 @@
    Back
    -

    {{item.name}}

    -
    -
    - -
    - +
    +

    {{item.name}}

    - -
    +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    - + From ee925d07b44b5071f23209f10252e5e16ec92fff Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:41:06 +0100 Subject: [PATCH 6/9] AW-784 Reapply from Farmmaps commits - 47deb5f6: AW-772 Panels --- .../selected-item-shape.component.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss index 9b251a3..0697183 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss @@ -39,3 +39,11 @@ li { display: block; } } + +.menu-card { + margin-left: -7px; + padding-left: 7px; + margin-right: -7px; + padding-right: 7px; + margin-bottom: 7px; +} From f66428d04c2267fb09e0359ddb1ffff6eea3589d Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:47:33 +0100 Subject: [PATCH 7/9] AW-784 Reapply from Farmmaps commits - cd035366: AW-718 Layout as requested by Thomas. --- .../selected-item/selected-item.component.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html index cf9c138..572a610 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html @@ -4,13 +4,15 @@
    -
    -
    Back
    -

    {{item.name}}

    - View - Download - Edit - Add as overlay +
    +
    +
    Back
    +

    {{item.name}}

    + View + Download + Edit + Add as overlay +
    - + From 76a44a8f95307da8349698d7973bd7254348c6ee Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:50:21 +0100 Subject: [PATCH 8/9] AW-784 Reapply from Farmmaps commits - cd035366: AW-718 Layout as requested by Thomas. --- .../selected-item-cropfield.component.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html index 31b3b12..7d1b3bc 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html @@ -3,11 +3,15 @@
    -

    Cropfield

    -

    {{item.name}}

    -
    {{item.data.cropTypeName}}
    -
    {{item.data.startDate|date}} - {{item.data.endDate|date}}
    -
    Edit
    +
    +

    Cropfield

    +

    {{item.name}}

    +
    {{item.data.cropTypeName}}
    +
    {{item.data.startDate|date}} - {{item.data.endDate|date}}
    + +
    From 456628d0142dad82894c52a48c3636497940e637 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Dec 2019 09:53:22 +0100 Subject: [PATCH 9/9] AW-784 Reapply from Farmmaps commits - cd035366: AW-718 Layout as requested by Thomas. --- .../selected-item/selected-item.component.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html index 572a610..c92a831 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html @@ -4,15 +4,15 @@
    -
    -
    -
    Back
    -

    {{item.name}}

    - View - Download - Edit - Add as overlay -
    +
    +
    +
    +
    Back
    +

    {{item.name}}

    + View + Download + Edit + Add as overlay