MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

bug fixes in datasets and dmps dropdown fields

This commit is contained in:
annampak 2017-11-07 11:19:31 +02:00
parent 8874177986
commit 08310568a5
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/datasets/dataset.html
View File

@ -92,7 +92,7 @@
<form #newProjectForm="ngForm" (ngSubmit)="SaveDataset()"> <form #newProjectForm="ngForm" (ngSubmit)="SaveDataset()">
<div class="form-group"> <div class="form-group">
<label for="recipient-name" class="col-form-label">Dataset Profile:</label> <label for="recipient-name" class="col-form-label">Dataset Profile:</label>
<select class="form-control" [id]="datasetProfileDropDownKey" [(ngModel)]="dataset.profile" [name]="datasetProfileDropDown" <select class="form-control" id="datasetProfileDropDownKey" [(ngModel)]="dataset.profile" name="datasetProfileDropDown"
#datasetfield> #datasetfield>
<option *ngFor="let opt of datasetProfileDropDown.options" [value]="opt.key">{{opt.value}}</option> <option *ngFor="let opt of datasetProfileDropDown.options" [value]="opt.key">{{opt.value}}</option>
</select> </select>
@ -109,6 +109,12 @@
<label for="uri-text" class="form-control-label">Uri:</label> <label for="uri-text" class="form-control-label">Uri:</label>
<input class="form-control" id="uri-text" [(ngModel)]="dataset.uri" name="uri"> <input class="form-control" id="uri-text" [(ngModel)]="dataset.uri" name="uri">
</div> </div>
<div class="form-group">
<label for="status-name" class="col-form-label">Status:</label>
<select class="form-control" id="statusid" [(ngModel)]="dataset.status" name="statusDropDown" #datasetfield>
<option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
</select>
</div>
<!-- <div class="form-group"> <!-- <div class="form-group">
<label for="start-date" class="form-control-label">Properties:</label> <label for="start-date" class="form-control-label">Properties:</label>
<input class="form-control" id="startDate-date" [(ngModel)]= "dataset.properties" name = "properties"> <input class="form-control" id="startDate-date" [(ngModel)]= "dataset.properties" name = "properties">

7
dmp-frontend/src/app/dmps/dmp.component.ts
View File

@ -82,7 +82,6 @@ export class DmpComponent implements OnInit{
previous:'', previous:'',
version:'', version:'',
profileData:'' profileData:''
//,
//profile:{} //profile:{}
} }
} }
@ -185,7 +184,12 @@ editRow(item, event){
this.dmp.profileData = item.profileData; this.dmp.profileData = item.profileData;
this.dmp.id = item.id; this.dmp.id = item.id;
this.dmp.project = item.project.id; this.dmp.project = item.project.id;
this.dmp.description = item.description;
this.dmp.status = item.status;
setTimeout(function() {
$("#newDmpModal").modal("show"); $("#newDmpModal").modal("show");
},0);
} }
if(event.toElement.id == "changeVersionDMP"){ if(event.toElement.id == "changeVersionDMP"){
this.dmp.label = item.label; this.dmp.label = item.label;
@ -195,6 +199,7 @@ editRow(item, event){
this.dmp.profileData = item.profileData; this.dmp.profileData = item.profileData;
this.dmp.id = item.id; this.dmp.id = item.id;
this.dmp.project = item.project.id; this.dmp.project = item.project.id;
this.dmp.description = item.description;
$("#newVersionDmpModal").modal("show"); $("#newVersionDmpModal").modal("show");
} }

4
dmp-frontend/src/app/dmps/dmps.html
View File

@ -103,13 +103,13 @@
<input type="text" class="form-control" id="label-name" [(ngModel)]="dmp.label" name="label"> <input type="text" class="form-control" id="label-name" [(ngModel)]="dmp.label" name="label">
</div> </div>
<label for="recipient-name" class="col-form-label">Project:</label> <label for="recipient-name" class="col-form-label">Project:</label>
<select class="form-control" [id]="projectsDropDownKey" [(ngModel)]="dmp.project" [name]="projectsDropDown" #datasetfield> <select class="form-control" id="projectsDropDownKey" [(ngModel)]="dmp.project" name="projectsDropDown">
<option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option> <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="status-name" class="col-form-label">Status:</label> <label for="status-name" class="col-form-label">Status:</label>
<select class="form-control" [id]="statusid" [(ngModel)]="dmp.status" [name]="statusDropDown" #datasetfield> <select class="form-control" id="statusid" [(ngModel)]="dmp.status" name="statusDropDown">
<option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option> <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
</select> </select>
</div> </div>