Skip to content
Snippets Groups Projects
Commit 4a169662 authored by Baptiste Toulemonde's avatar Baptiste Toulemonde
Browse files

other fixes

parent 34399ed6
No related branches found
No related tags found
1 merge request!12Fix/mapping
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</nb-card> </nb-card>
<nb-card> <nb-card>
<nb-card-body> <nb-card-body>
<p class="success" *ngIf="data.postedMetadatas.length > 0">Athe following datasets have been published successfully: </p> <p class="success" *ngIf="data.postedMetadatas.length > 0">The following datasets have been published successfully: </p>
<ul *ngFor="let data of data.postedMetadatas"> <ul *ngFor="let data of data.postedMetadatas">
<li class="success" >{{ data }}</li> <li class="success" >{{ data }}</li>
</ul> </ul>
......
<form #form="ngForm"> <form #form="ngForm">
<div class="card-row"> <div class="card-row">
<div class="card-col"> <div class="card-col">
<nb-card size="giant" [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" <nb-card size="giant" >
nbSpinnerMessage="Loading...">
<nb-card-header>Dataset metadata</nb-card-header> <nb-card-header>Dataset metadata</nb-card-header>
<nb-card-body> <nb-card-body>
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
</form> </form>
<div class="card-row"> <div class="card-row">
<div class="card-col"> <div class="card-col">
<nb-card [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="loading"> <nb-card [nbSpinner]="loadingCr" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="loading">
<nb-card-header>Map</nb-card-header> <nb-card-header>Map</nb-card-header>
<nb-card-body> <nb-card-body>
<nb-list> <nb-list>
...@@ -108,7 +107,7 @@ ...@@ -108,7 +107,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="button-center" *ngIf="!first "> <div class="button-center" *ngIf="!first ">
<button nbButton status="primary" (click)=" publishDataset()">Publish</button> <button nbButton status="primary" (click)=" publishDataset()" [nbSpinner]="loading" nbSpinnerStatus="basic" >Publish</button>
</div> </div>
</div> </div>
......
...@@ -31,6 +31,7 @@ export class MappingComponent implements OnInit { ...@@ -31,6 +31,7 @@ export class MappingComponent implements OnInit {
index: number = 0 index: number = 0
first: boolean = true; first: boolean = true;
loading: boolean = false; loading: boolean = false;
loadingCr = false;
FDP_URL = environment.fdpUrl; FDP_URL = environment.fdpUrl;
ids: number []; ids: number [];
...@@ -71,6 +72,7 @@ export class MappingComponent implements OnInit { ...@@ -71,6 +72,7 @@ export class MappingComponent implements OnInit {
} }
createDataset(item: Object): Map<string, string> { createDataset(item: Object): Map<string, string> {
this.loadingCr = true;
let mappedMetadata: Map<string, string> = new Map() let mappedMetadata: Map<string, string> = new Map()
for (let i = 0; i < this.selectedPaths.length; i++) { for (let i = 0; i < this.selectedPaths.length; i++) {
if (this.selectedPaths[i]) { if (this.selectedPaths[i]) {
...@@ -78,6 +80,7 @@ export class MappingComponent implements OnInit { ...@@ -78,6 +80,7 @@ export class MappingComponent implements OnInit {
mappedMetadata.set(this.datasetModel[i].identifier, this.getValue(tab, item)); mappedMetadata.set(this.datasetModel[i].identifier, this.getValue(tab, item));
} }
} }
this.loadingCr = false
return mappedMetadata; return mappedMetadata;
} }
...@@ -242,6 +245,7 @@ export class MappingComponent implements OnInit { ...@@ -242,6 +245,7 @@ export class MappingComponent implements OnInit {
this.first = false; this.first = false;
} }
next() { next() {
this.loadingCr = true;
if (this.index < this.itemsdataset.length) { if (this.index < this.itemsdataset.length) {
this.index += 1; this.index += 1;
this.createDataset(this.itemsdataset[this.index]) this.createDataset(this.itemsdataset[this.index])
...@@ -249,6 +253,7 @@ export class MappingComponent implements OnInit { ...@@ -249,6 +253,7 @@ export class MappingComponent implements OnInit {
} }
} }
prev() { prev() {
this.loadingCr = true;
if (this.index > 0) { if (this.index > 0) {
this.index -= 1; this.index -= 1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment