Add device service migrate, use back-button
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit

This commit is contained in:
Willem Dantuma
2021-01-27 08:11:37 +01:00
parent 3e14157e87
commit dda82c8b09
15 changed files with 43 additions and 25 deletions

View File

@@ -14,8 +14,8 @@
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"tassign": "^1.0.0",
"@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
"ngx-openlayers": "1.0.0-next.16",
"@farmmaps/common": ">=0.0.1-prerelease.502 <0.0.1",
"ngx-openlayers": "1.0.0-next.17",
"ol": "6.1.1"
}
}

View File

@@ -1,6 +1,6 @@
<div class="card border-0">
<div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
<div><a href="#" (click)="handleBackClick($event)" i18n>back</a></div>
<fm-back-button></fm-back-button>
<h4 i18n>Farm</h4>
<h3>{{schemeItem.name}}</h3>
<div *ngIf="features;let features">

View File

@@ -1,6 +1,6 @@
<div class="card border-0">
<div class="card-body">
<div><a href="#" (click)="handleBackClick($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3>
<div *ngIf="features;let features">
<div class="farms">

View File

@@ -1,5 +1,5 @@
<div *ngIf="features;let features">
<a href="#" (click)="handleBackClick($event)">Go back</a>
<fm-back-button></fm-back-button>>
<div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
</div>

View File

@@ -2,7 +2,7 @@
<div *ngIf="item;let item">
<div class="card border-0">
<div class="card-body">
<div><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<div class="card menu-card">
<h1>Cropfield</h1>
<h4>{{item.name}}</h4>

View File

@@ -2,7 +2,7 @@
<div *ngIf="item;let item">
<div class="card border-0">
<div class="card-body">
<div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<div class="card menu-card">
<h2 *ngIf="parentItem">{{parentItem.name}}</h2>
<h1>{{item.name}}</h1>

View File

@@ -2,7 +2,7 @@
<div *ngIf="item;let item">
<div class="card border-0">
<div class="card-body">
<div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<div class="card menu-card">
<h2 *ngIf="parentItem">{{parentItem.name}}</h2>
<h1>{{item.name}}</h1>

View File

@@ -2,7 +2,7 @@
<div *ngIf="selectedItem();let item">
<div class="card border-0">
<div class="card-body">
<div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<div class="card menu-card">
<h2 *ngIf="parentItem">{{parentItem.name}}</h2>
<h1>{{item.name}}</h1>

View File

@@ -7,7 +7,7 @@
</div>
<div class="card">
<div class="card-body">
<div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
<fm-back-button></fm-back-button>
<h1 class="card-title">{{item.name}}</h1>
<div class="card menu-card">
<ul class="p-0 mt-2">