diff --git a/dmp-frontend/angular.json b/dmp-frontend/angular.json
index 4a86379e3..f389f1fa4 100644
--- a/dmp-frontend/angular.json
+++ b/dmp-frontend/angular.json
@@ -21,7 +21,9 @@
"src/favicon.ico"
],
"styles": [
- "src/styles.scss"
+ "src/styles.scss",
+ "src/assets/scss/material-dashboard.scss",
+ "src/assets/css/demo.css"
],
"scripts": []
},
@@ -88,7 +90,9 @@
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
- "src/styles.scss"
+ "src/styles.scss",
+ "src/assets/scss/material-dashboard.scss",
+ "src/assets/css/demo.css"
],
"assets": [
"src/assets",
diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index 1fbd999b4..15a1c59fd 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -1,4 +1,16 @@
-
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
index 1553b0ddf..d42ff27ca 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
@@ -3,7 +3,6 @@ import { FormControl } from '@angular/forms';
import { Router } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { takeUntil } from 'rxjs/operators';
-import { JsonSerializer } from '../../common/types/json/json-serializer';
import { BaseComponent } from '../../core/common/base/base.component';
import { RecentActivityType } from '../../core/common/enum/recent-activity-type';
import { DashboardStatisticsModel } from '../../core/model/dashboard/dashboard-statistics-model';
@@ -28,6 +27,7 @@ export class DashboardComponent extends BaseComponent implements OnInit {
datasetActivities: any[];
projectActivities: any[];
dmpActivities: any[];
+ organisationActivities: any[];
public dashboardStatisticsData: DashboardStatisticsModel;
public formControl = new FormControl();
projectAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
@@ -61,6 +61,7 @@ export class DashboardComponent extends BaseComponent implements OnInit {
this.datasetActivities = response['recentDatasetActivities'];
this.dmpActivities = response['recentDmpActivities'];
this.projectActivities = response['recentProjectActivities'];
+ this.organisationActivities = response['totalOrganisationCount'];
});
}
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
index 4fa99d50c..3eeeafdd0 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
@@ -5,6 +5,12 @@ import { DashboardComponent } from './dashboard.component';
import { DashboardRoutingModule } from './dashboard.routing';
import { QuickWizardCreateAdd } from './quick-wizard-create-add/quick-wizard-create-add.component';
import { RecentActivityComponent } from './recent-activity/recent-activity.component';
+import { WizardComponent } from './wizard/wizard.component';
+import { InfoCounterComponent } from './info-counter/info-counter.component';
+import { RecentVisitedActivityComponent } from './recent-visited-activity/recent-visited-activity.component';
+import { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component';
+import { DraftsComponent } from './drafts/drafts.component';
+
@NgModule({
imports: [
@@ -15,7 +21,12 @@ import { RecentActivityComponent } from './recent-activity/recent-activity.compo
DashboardComponent,
RecentActivityComponent,
CardComponent,
- QuickWizardCreateAdd
+ QuickWizardCreateAdd,
+ WizardComponent,
+ InfoCounterComponent,
+ RecentVisitedActivityComponent,
+ RecentEditedActivityComponent,
+ DraftsComponent
],
entryComponents: [
QuickWizardCreateAdd
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css
new file mode 100644
index 000000000..9c881118a
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css
@@ -0,0 +1,26 @@
+.grey {
+ color: rgb(162, 162, 162);
+}
+
+.card-draft {
+ height: calc(100% - 60px);
+}
+
+.draft-desc {
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
+
+.draft-subtitle {
+ font-weight: 400;
+ color: rgb(162, 162, 162);
+}
+
+.draft-title {
+ font-weight: 500;
+ color: black;
+}
+
+.drafts-more-btn {
+ text-align: right;
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
new file mode 100644
index 000000000..3690b3eef
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+ view_agenda
+
+
+
+ more_horiz
+
+
+ Dataset: Clarin-D For Dmp: Dmp for Project: Real time
+ application
+
+
03.08.2019
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
+ do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco
+ laboris nisi ut aliquip ex ea commodo consequat. Duis aute
+ irure dolor in reprehenderit in voluptate velit esse cillum
+ dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+ cupidatat non proident, sunt in culpa qui officia deserunt
+ mollit anim id est laborum.
+
+
+
+
+
+
+
+
+
+
+ library_books
+
+
+
+ more_horiz
+
+
Title unavailable
+
03.08.2019
+
+ Description unavailable
+
+
+
+
+
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.spec.ts
new file mode 100644
index 000000000..cf1ef647c
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DraftsComponent } from './drafts.component';
+
+describe('DraftsComponent', () => {
+ let component: DraftsComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DraftsComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DraftsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
new file mode 100644
index 000000000..432ca07a8
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-drafts',
+ templateUrl: './drafts.component.html',
+ styleUrls: ['./drafts.component.css']
+})
+export class DraftsComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.css
new file mode 100644
index 000000000..493c8b7b1
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.css
@@ -0,0 +1,9 @@
+.view-all {
+ cursor: pointer;
+ color: rgb(106, 164, 217);
+ font-weight: 500;
+}
+
+.view-all:hover {
+ color: rgb(46, 117, 182);
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html
new file mode 100644
index 000000000..f884a86a1
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.spec.ts
new file mode 100644
index 000000000..323ef79b5
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { InfoCounterComponent } from './info-counter.component';
+
+describe('InfoCounterComponent', () => {
+ let component: InfoCounterComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ InfoCounterComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(InfoCounterComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.ts b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.ts
new file mode 100644
index 000000000..c0f84ae45
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.ts
@@ -0,0 +1,55 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { Router } from "@angular/router";
+import { AuthService } from "../../../core/services/auth/auth.service";
+
+// declare interface RouteInfo {
+// path: string;
+// title: string;
+// subtitle: string;
+// icon: string;
+// }
+// export const INFO_COUNTER_ROUTES: RouteInfo[] = [
+// { path: '', title: 'DATA MANAGEMENT PLANS', subtitle: '4', icon: 'view_agenda' },
+// { path: '', title: 'RELATED DATA DESCRIPTIONS', subtitle: '20', icon: 'library_books' },
+// { path: '', title: 'RELATED PROJECTS', subtitle: '4', icon: 'work_outline' },
+// { path: '', title: 'ORGANIZATIONS', subtitle: '20', icon: 'scatter_plot' }
+// ];
+
+@Component({
+ selector: "app-info-counter",
+ templateUrl: "./info-counter.component.html",
+ styleUrls: ["./info-counter.component.css"]
+})
+export class InfoCounterComponent implements OnInit {
+ @Input() title: string;
+ @Input() subtitle: string;
+ @Input() icon: string;
+ @Input() routerLink: string;
+ @Input() buttonRedirectLink: string;
+ @Output() onClick: EventEmitter = new EventEmitter();
+
+ infoCounterItems: any[];
+
+ constructor(private router: Router, private authService: AuthService) {}
+
+ ngOnInit() {
+ // this.infoCounterItems = INFO_COUNTER_ROUTES.filter(infoCounterItem => infoCounterItem);
+ }
+
+ navigateToUrl() {
+ if (!this.isAuthenticated()) { return; }
+ this.router.navigate([this.routerLink]);
+ }
+
+ createNew() {
+ this.router.navigate([this.buttonRedirectLink]);
+ }
+
+ isAuthenticated() {
+ return this.authService.current() != null;
+ }
+
+ viewAllClicked() {
+ this.onClick.emit();
+ }
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-activity/recent-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-activity/recent-activity.component.html
index 778456c42..489f31cbb 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-activity/recent-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-activity/recent-activity.component.html
@@ -8,7 +8,7 @@
-
+
{{activity.label}}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
new file mode 100644
index 000000000..560b9df4a
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -0,0 +1,115 @@
+
+
+
+
+
+ NAME
+ TEMPLATE
+ PROJECT
+ ROLE
+ ORGANIZATION
+ STATUS
+ VISITED
+
+
+
+
+ DMP Name
+
+
+
+ Project Name
+ Role Name
+ Organization Name
+ PRIVATE
+ 01.01.2019
+ more_horiz
+
+
+ DMP Name
+
+
+
+ Project Name
+ Role Name
+ Organization Name
+
+
+
+ 01.01.2019
+ more_horiz
+
+
+ DMP Name
+
+
+
+ Project Name
+ Role Name
+ Organization Name
+ PRIVATE
+ 01.01.2019
+ more_horiz
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.spec.ts
new file mode 100644
index 000000000..d0c08de30
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RecentEditedActivityComponent } from './recent-edited-activity.component';
+
+describe('RecentEditedActivityComponent', () => {
+ let component: RecentEditedActivityComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RecentEditedActivityComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(RecentEditedActivityComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
new file mode 100644
index 000000000..96139dc0c
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-recent-edited-activity',
+ templateUrl: './recent-edited-activity.component.html',
+ styleUrls: ['./recent-edited-activity.component.css']
+})
+export class RecentEditedActivityComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.html
new file mode 100644
index 000000000..759d80d86
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+ NAME
+ TEMPLATE
+ PROJECT
+ ROLE
+ ORGANIZATION
+ STATUS
+ VISITED
+
+
+
+
+ {{activity.label}}
+
+
+
+ Project Name
+ Role Name
+ Organization Name
+
+
+
+ PRIVATE
+ {{activity.timestamp | date:'shortDate'}}
+ more_horiz
+
+
+
+
+ --
+
+
+
+ --
+ --
+ --
+ --
+ --
+ more_horiz
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.spec.ts
new file mode 100644
index 000000000..965e32b34
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RecentVisitedActivityComponent } from './recent-visited-activity.component';
+
+describe('RecentActivityComponent', () => {
+ let component: RecentVisitedActivityComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RecentVisitedActivityComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(RecentVisitedActivityComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.ts
new file mode 100644
index 000000000..1112bf205
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.ts
@@ -0,0 +1,62 @@
+import { Component, OnInit } from "@angular/core";
+import { RecentActivityType } from "../../../core/common/enum/recent-activity-type";
+import { BaseComponent } from '../../../core/common/base/base.component';
+import { Router } from "@angular/router";
+import { AuthService } from "../../../core/services/auth/auth.service";
+import { UserService } from "../../../core/services/user/user.service";
+import { takeUntil } from "rxjs/operators";
+
+@Component({
+ selector: "app-recent-visited-activity",
+ templateUrl: "./recent-visited-activity.component.html",
+ styleUrls: ["./recent-visited-activity.component.css"]
+})
+export class RecentVisitedActivityComponent extends BaseComponent implements OnInit {
+ dmpActivities: any[];
+ recentActivityItems: any[];
+ datasetActivities: any[];
+ projectActivities: any[];
+ organisationActivities: any[];
+ recentActivityTypeEnum = RecentActivityType;
+ public: boolean = false;
+
+ constructor(private router: Router, private authentication: AuthService, private userService: UserService) {
+ super();
+ }
+
+ ngOnInit() {
+ if (this.isAuthenticated()) {
+ this.userService.getRecentActivity()
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(response => {
+ this.datasetActivities = response['recentDatasetActivities'];
+ this.dmpActivities = response['recentDmpActivities'];
+ this.projectActivities = response['recentProjectActivities'];
+ this.organisationActivities = response['totalOrganisationCount'];
+ });
+ }
+ }
+
+ redirect(id: string, type: RecentActivityType) {
+ switch (type) {
+ case RecentActivityType.Project: {
+ this.router.navigate(["projects/edit/" + id]);
+ return;
+ }
+ case RecentActivityType.Dataset: {
+ this.router.navigate(["datasets/edit/" + id]);
+ return;
+ }
+ case RecentActivityType.Dmp: {
+ this.router.navigate(["plans/edit/" + id]);
+ return;
+ }
+ default:
+ throw new Error("Unsupported Activity Type ");
+ }
+ }
+
+ public isAuthenticated(): boolean {
+ return !(!this.authentication.current());
+ }
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.css b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.css
new file mode 100644
index 000000000..87ca6e700
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.css
@@ -0,0 +1,10 @@
+.clickable {
+ cursor: pointer;
+}
+
+.play_circle {
+ display: inline-block;
+ float: right;
+ margin: 0px 10px 0px 0px;
+ font-size: 40px;
+}
diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html
new file mode 100644
index 000000000..4de8ffdfe
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html
@@ -0,0 +1,10 @@
+
diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts
new file mode 100644
index 000000000..b5ec8b2c9
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WizardComponent } from './wizard.component';
+
+describe('WizardComponent', () => {
+ let component: WizardComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ WizardComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(WizardComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.ts b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.ts
new file mode 100644
index 000000000..b38486534
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { Router } from "@angular/router";
+
+@Component({
+ selector: "app-wizard",
+ templateUrl: "./wizard.component.html",
+ styleUrls: ["./wizard.component.css"]
+})
+export class WizardComponent {
+ @Input() title: string;
+ @Input() subtitle: string;
+ @Input() icon: string;
+ @Input() routerLink: string;
+ @Output() onClick: EventEmitter = new EventEmitter();
+
+ wizardItems: any[];
+
+ constructor(private router: Router) {}
+
+ cardClicked() {
+ this.onClick.emit();
+ }
+ navigateToCreate() {
+ this.router.navigate(["/quick-wizard"]);
+ }
+
+ navigateToAdd() {
+ this.router.navigate(["/datasetcreatewizard"]);
+ }
+}
diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
index b1a4c9f2a..e81e41e80 100644
--- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
@@ -1,39 +1,43 @@
-
-
-
- {{'DATASET-CREATE-WIZARD.FIRST-STEP.TITLE'| translate}}
-
-
-
-
-
-
{{'DATASET-CREATE-WIZARD.ACTIONS.NEXT'| translate}}
+
+
+
+
+
+ {{'DATASET-CREATE-WIZARD.FIRST-STEP.TITLE'| translate}}
+
+
+
+
+
+ {{'DATASET-CREATE-WIZARD.ACTIONS.NEXT'| translate}}
+
+
-
-
-
-
-
- {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.THIRD-STEP.TITLE' | translate}}
-
-
-
- {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}
- {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE-AND-FINALIZE' | translate}}
- {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE' | translate}}
-
-
-
+
+
+
+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.THIRD-STEP.TITLE' | translate}}
+
+
+
+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}
+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE-AND-FINALIZE' | translate}}
+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE' | translate}}
+
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
index d131f7818..3d1387380 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
@@ -1,123 +1,127 @@
-
-
{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}
-
-
-
{{datasetWizardModel?.label}} {{ 'GENERAL.NAMES.DATASET' | translate }}
-
- - {{ 'GENERAL.STATUSES.EDIT' | translate }}
-
-
{{'GENERAL.STATUSES.FINALISED' | translate }}
+
+
+
+
{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}
+
+
+
{{datasetWizardModel?.label}} {{ 'GENERAL.NAMES.DATASET' | translate }}
+
+ - {{ 'GENERAL.STATUSES.EDIT' | translate }}
+
+ {{'GENERAL.STATUSES.FINALISED' | translate }}
+
+
+
+
+ file_copy {{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
+
+
+
+ more_vert
+
+
+
+
+
+
{{ 'DATASET-WIZARD.ACTIONS.DELETE' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-PDF' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-DOCX' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-XML' | translate }}
+
{{ 'DATASET-WIZARD.ACTIONS.UPDATE-DATASET-PROFILE' | translate }}
+
+
+
+
+
+
+ {{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}
+
+
+
+ {{'DATASET-WIZARD.SECOND-STEP.TITLE' | translate}}
+
+
+
+ {{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}
+
+
+
+
+
+ {{'DATASET-WIZARD.ACTIONS.BACK' | translate}}
+
+
+
+
+
+
+
+
-
-
-
- file_copy {{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
-
-
-
- more_vert
-
-
-
-
-
-
{{ 'DATASET-WIZARD.ACTIONS.DELETE' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-PDF' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-DOCX' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-XML' | translate }}
-
{{ 'DATASET-WIZARD.ACTIONS.UPDATE-DATASET-PROFILE' | translate }}
-
-
-
-
-
-
- {{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}
-
-
-
- {{'DATASET-WIZARD.SECOND-STEP.TITLE' | translate}}
-
-
-
- {{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}
-
-
-
-
-
- {{'DATASET-WIZARD.ACTIONS.BACK' | translate}}
-
-
-
-
-
-
-
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index f69c23264..65093361f 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -1,93 +1,97 @@
-
-
{{'DATASET-LISTING.TITLE' | translate}} {{titlePrefix}}
+
+
+
+
{{'DATASET-LISTING.TITLE' | translate}} {{titlePrefix}}
-
-
-
+
+
+
-
-
- {{'DATASET-LISTING.COLUMNS.NAME' | translate}}
- {{row.label}}
-
+
+
+ {{'DATASET-LISTING.COLUMNS.NAME' | translate}}
+ {{row.label}}
+
-
-
- {{'DATASET-LISTING.COLUMNS.PROJECT' |
- translate}}
- {{row.project}}
-
+
+
+ {{'DATASET-LISTING.COLUMNS.PROJECT' |
+ translate}}
+ {{row.project}}
+
-
-
- {{'DATASET-LISTING.COLUMNS.DMP' |
- translate}}
- {{row.dmp}}
-
+
+
+ {{'DATASET-LISTING.COLUMNS.DMP' |
+ translate}}
+ {{row.dmp}}
+
-
-
- {{'DATASET-LISTING.COLUMNS.PROFILE' |
- translate}}
- {{row.profile}}
-
+
+
+ {{'DATASET-LISTING.COLUMNS.PROFILE' |
+ translate}}
+ {{row.profile}}
+
-
-
- {{'DATASET-LISTING.COLUMNS.STATUS' | translate}}
- {{enumUtils.toDatasetStatusString(row.status)}}
-
+
+
+ {{'DATASET-LISTING.COLUMNS.STATUS' | translate}}
+ {{enumUtils.toDatasetStatusString(row.status)}}
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- {{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}
- {{row.description}}
-
+
+
-
-
- {{'DATASET-LISTING.COLUMNS.CREATED' | translate}}
- {{row.created | date:'shortDate'}}
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+ {{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}
+ {{row.description}}
+
-
- add
-
-
- add
-
+
+
+ {{'DATASET-LISTING.COLUMNS.CREATED' | translate}}
+ {{row.created | date:'shortDate'}}
+
+
+
+
+
+
+
+
+
+
+
+
+ add
+
+
+ add
+
+
+
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss
index 37b0e8c6a..9f62fd785 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss
@@ -3,11 +3,12 @@
}
.mat-fab-bottom-right {
- top: auto !important;
- right: 20px !important;
- bottom: 10px !important;
- left: auto !important;
- position: fixed !important;
+ // top: auto !important;
+ // right: 20px !important;
+ // bottom: 10px !important;
+ // left: auto !important;
+ // position: fixed !important;
+ float: right;
z-index: 5;
}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index 2c0c41de9..dcd5272c3 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -1,183 +1,187 @@
-
-
- {{'DMP-EDITOR.TITLE.NEW' | translate}}
-
- {{formGroup?.get('label')?.value}}
-
-
-