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

dmp-db-scema/DataManagementPlanDB.sql

@@ -53,6 +53,7 @@ CREATE TABLE "DMP" (
     "Status" smallint not null default 0,
     "Created" timestamp not null default NOW(),
     "Modified" timestamp not null default NOW(),
+    "Description" text,
     "Profile" uuid
 );
 
@@ -118,6 +119,7 @@ CREATE TABLE "Dataset" (
     "Status" smallint not null default 0,
     "Created" timestamp not null default NOW(),
     "Modified" timestamp not null default NOW(),
+    "Description" text,
     "Profile" uuid
 );
 
@@ -139,6 +141,7 @@ CREATE TABLE "DatasetProfile" (
 	"Status" smallint not null default 0,
     "Created" timestamp not null default NOW(),
     "Modified" timestamp not null default NOW(),
+    "Description" text,
     "Definition" xml NOT NULL
 );
 
@@ -216,6 +219,7 @@ CREATE TABLE "Project" (
     "Modified" timestamp not null default NOW(),
     "StartDate" timestamp,
     "EndDate" timestamp,
+    "Description" text,
     "Definition" xml
 );
 

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

@@ -73,15 +73,7 @@ export class DatasetsComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private ngZone: NgZone) {
-    this.dataset = {
+    this.dataset = this.createEmptyDataset();
-      id: null,
-      label: '',
-      reference: '',
-      uri: '',
-      properties: '',
-      profile: { "id": '' },
-      dmp: { "id": '' }
-    }
 
     this.datasetProfileDropDown = new DropdownField();
     this.datasetProfileDropDown.options = [];
@@ -114,6 +106,17 @@ export class DatasetsComponent implements OnInit {
     )
   }
 
+  createEmptyDataset(){
+    return {
+      id: null,
+      label: '',
+      reference: '',
+      uri: '',
+      properties: '',
+      profile: { "id": '' },
+      dmp: { "id": '' }
+    }
+  }
 
   SaveDataset(){
     if(this.dataset.id ==null){
@@ -180,10 +183,9 @@ export class DatasetsComponent implements OnInit {
   }
 
   newDataset() {
-    this.dataset.label = "";
+    this.dataset = this.createEmptyDataset();
-    this.dataset.uri = "";
     this.dataset.dmp =this.dmpLabelforDatasets;
-    this.dataset.profile = "";
+    this.dataset.status = 0;
     $("#newDatasetModal").modal("show");
   }
 

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

@@ -1,32 +0,0 @@
-/*
-import { NgModule }       from '@angular/core';
-import { CommonModule }   from '@angular/common';
-import { FormsModule }    from '@angular/forms';
-//import {DataTableModule } from 'angular-4-data-table-bootstrap-4';
-import {DataTableModule} from 'angular2-datatable';
-import { DmpComponent }  from './dmp.component';
-
-import { DmpTableFilterPipe } from '../pipes/dmp-table-filter.pipe';
-import { DmpVersionFilterPipe } from '../pipes/dmp-version-filter.pipe';
-
-import { DmpRoutingModule } from './dmp-routing.module';
-import { DatasetsModule } from '../datasets/dataset.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    DmpRoutingModule,
-    DataTableModule,
-    DatasetsModule
-  ],
-  declarations: [
-  DmpTableFilterPipe,
-  DmpVersionFilterPipe,
-    DmpComponent
-  ],
-  providers: [  ]
-})
-export class DmpModule {}
-
-*/