Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot

dmp-frontend/src/app/datasets/dataset.component.ts

@@ -159,18 +159,7 @@ export class DatasetsComponent implements OnInit {
   getDatasetForDmpMethod(dmpid) {
     this.serverService.getDatasetForDmp({ "id": dmpid }).subscribe(
       response => {
-
-        console.log("response");
-        console.log(response);
-        this.datasets = [];
-        response.forEach(resp => {
-
-          let dt = new Dataset();
-          dt.id = resp.id;
-          dt.name = resp.label;
-          dt.uriDataset = resp.uri;
-          this.datasets.push(dt);
-        });
+        this.tableData = response;
       }
     );
   }

dmp-frontend/src/app/datasets/dataset.html

@@ -25,10 +25,7 @@
                 </th>
                 <th>
                     <mfDefaultSorter by="label">Label</mfDefaultSorter>
-                </th>
-                <th>
-                    <mfDefaultSorter by="status">Status</mfDefaultSorter>
-                </th>
+                </th>                
                 <th>
                     <mfDefaultSorter by="uri">Uri</mfDefaultSorter>
                 </th>
@@ -38,6 +35,9 @@
                 <th>
                     <mfDefaultSorter by="description">Description</mfDefaultSorter>
                 </th>
+                <th>
+                        <mfDefaultSorter by="status">Status</mfDefaultSorter>
+                    </th>
                 <th>
                     <mfDefaultSorter>Actions </mfDefaultSorter>
                 </th>

dmp-frontend/src/app/dmps/dmp.component.ts

@@ -55,6 +55,7 @@ export class DmpComponent implements OnInit{
   @Input() dmpCount = 0;
   @Input() projectsDropDown:DropdownField;
   @Input() dataSetVisibe:boolean;
+  @Input() statusDropDown: DropdownField;
   //@Input() projects: Project[];
   dmpIdforDatasets: string;
   dmpLabelforDatasets:string;
@@ -73,6 +74,9 @@ export class DmpComponent implements OnInit{
     private router: Router){
       this.projectsDropDown = new DropdownField();      
       this.projectsDropDown.options = [];
+      this.statusDropDown = new DropdownField();
+      this.statusDropDown.options =[];
+      this.statusDropDown.options= [{key:'0', value:"active"},{key:'1', value:"inactive"}]
       //this.projects = [];
       this.dmpTableVisible = false;
       this.dataSetVisibe = false;

dmp-frontend/src/app/dmps/dmps.html

@@ -1,6 +1,6 @@
 <meta name="google-signin-client_id" content="524432312250-vhgidft856v8qftsc81kls4c74v87d8o.apps.googleusercontent.com">
 
-<div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]">
+<!-- <div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]"> -->
     
 <table class="table table-striped" [mfData]="tableData | dmpTableFilter : filterQuery | dmpVersionFilter : versionFilter"
     #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
@@ -75,7 +75,7 @@
         </tr>
     </tfoot>
 </table>
-</div>
+<!-- </div> -->
 
 <!--Modal for new and edit DMP-->
 <div class="modal fade" id="newDmpModal" tabindex="-1" role="dialog" aria-labelledby="newDmpModalLabel" aria-hidden="true">
@@ -99,12 +99,12 @@
                                   <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
                                   </select>
                     </div>
-                    <!-- <div class="form-group">
-                        <label for="recipient-name" class="col-form-label">Status:</label>
-                        <select class="form-control" [id]="statusDropDownKey" [(ngModel)]="dmp.status" [name]="statusDropDown" #datasetfield>
-                                  <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
-                                  </select>
-                    </div> -->
+                    <div class="form-group">
+                        <label for="status-name" class="col-form-label">Status:</label>
+                        <select class="form-control" [id]="statusid" [(ngModel)]="dmp.status" [name]="statusDropDown" #datasetfield >
+                        <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
+                        </select>
+                    </div>
                     <div class="form-group">
                         <label for="label-name" class="form-control-label">Previous:</label>
                         <input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous" disabled>
@@ -115,7 +115,7 @@
                     </div>
                     <div class="form-group">
                         <label for="abbreviation-text" class="form-control-label">Description:</label>
-                        <textarea class="form-control" id="abbreviation-text" [(ngModel)]="dmp.description" name="version" ></textarea>
+                        <textarea class="form-control" id="abbreviation-text" [(ngModel)]="dmp.description" name="description" ></textarea>
                     </div>
                     <!-- <div class="form-group">
                         <label for="reference-text" class="form-control-label">Profile Data:</label>

dmp-frontend/src/app/form/dynamic-form.component.html

@@ -1,5 +1,5 @@
 <div class="panel-body">
-		<div class="col-md-8">
+		<div class="col-md-8 col-sm-9">
 				<form [formGroup]="form" (ngSubmit)="onSubmit()" novalidate>
 			
 					<div *ngFor = "let section of dataModel.sections">			
@@ -36,8 +36,8 @@
 				<p>Form value: {{ form.value | json }}</p>
 			</div>
 			
-			<div class="col-md-4">
-				<div ngDraggable style="position:fixed; top:60;">
+			<div class="col-md-4  col-sm-3">
+				<div ngDraggable style="top:60;"> <!--position:fixed; to ekana sxolio gia na ginetai responsive-->
 						<div class="panel panel-default" >
 							<div class="panel-heading" data-toggle="collapse" href="#collapse-panel">
 								<h4>Table of contents:</h4>