diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
index 0da875d67..3ec275bbe 100644
--- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
@@ -65,7 +65,7 @@
{{option.name}}
-
+
-
+
diff --git a/dmp-frontend/src/app/datasets/dataset-listing.component.html b/dmp-frontend/src/app/datasets/dataset-listing.component.html
index c18cb9955..32648970a 100644
--- a/dmp-frontend/src/app/datasets/dataset-listing.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-listing.component.html
@@ -1,5 +1,6 @@
-
{{'DATASET-LISTING.TITLE' | translate}}
+
{{titlePrefix}} {{'DATASET-LISTING.TITLE' | translate}}
+
@@ -45,11 +46,11 @@
-
+
@@ -77,7 +78,7 @@
-
\ No newline at end of file
diff --git a/dmp-frontend/src/app/datasets/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/dataset-listing.component.ts
index f7e6412b5..5ae82eabf 100644
--- a/dmp-frontend/src/app/datasets/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset-listing.component.ts
@@ -12,13 +12,15 @@ import { SnackBarNotificationComponent } from "../shared/components/notificaiton
import { DatasetService } from "../services/dataset/dataset.service";
import { DatasetListingModel } from "../models/datasets/DatasetListingModel";
import { PageEvent } from '@angular/material';
+import { DataManagementPlanService } from "@app/services/data-management-plan/data-management-plan.service";
+import { DataManagementPlanModel } from "@app/models/data-managemnt-plans/DataManagementPlanModel";
@Component({
selector: 'app-dataset-listing-component',
templateUrl: 'dataset-listing.component.html',
styleUrls: ['./dataset-listing.component.scss'],
- providers: [DatasetService]
+ providers: [DatasetService, DataManagementPlanService]
})
export class DatasetListingComponent implements OnInit {
@@ -26,9 +28,12 @@ export class DatasetListingComponent implements OnInit {
@ViewChild(MatSort) sort: MatSort;
@ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
+
dataSource: DatasetDataSource | null;
- displayedColumns: String[] = ['label', 'dmp', 'profile', 'dataRepositories', 'registries', 'services', 'status', 'description', 'created', 'actions'];
+ displayedColumns: String[] = ['label', 'dmp', 'profile', 'dataRepositories', 'registries', 'services', 'description', 'created', 'actions'];
pageEvent: PageEvent;
+ titlePrefix: String;
+ dmpId: String;
statuses = [
{ value: '0', viewValue: 'Active' },
@@ -40,7 +45,8 @@ export class DatasetListingComponent implements OnInit {
private router: Router,
private languageService: TranslateService,
public snackBar: MatSnackBar,
- public route: ActivatedRoute
+ public route: ActivatedRoute,
+ public dataManagementPlanService: DataManagementPlanService
) {
}
@@ -48,12 +54,20 @@ export class DatasetListingComponent implements OnInit {
ngOnInit() {
this.route.params.subscribe((params: Params) => {
- const dmpId = params['dmpId'];
- this.criteria.setCriteria(this.getDefaultCriteria(dmpId));
+ this.dmpId = params['dmpId'];
+ if(this.dmpId != null) this.setDmpTitle(this.dmpId);
+ this.criteria.setCriteria(this.getDefaultCriteria(this.dmpId));
this.refresh();
this.criteria.setRefreshCallback(() => this.refresh());
});
- }
+ }
+
+ setDmpTitle(dmpId: String) {
+ this.dataManagementPlanService.getSingle(dmpId).map(data => data as DataManagementPlanModel)
+ .subscribe(data => {
+ this.titlePrefix = data.label;
+ });
+ }
refresh() {
this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.languageService, this.snackBar, this.criteria);
@@ -63,7 +77,7 @@ export class DatasetListingComponent implements OnInit {
this.router.navigate(['/dataset/' + rowId]);
}
- getDefaultCriteria(dmpId: string): DatasetCriteria {
+ getDefaultCriteria(dmpId: String): DatasetCriteria {
const defaultCriteria = new DatasetCriteria();
if (dmpId != null) {
defaultCriteria.dmpIds.push(dmpId);
diff --git a/dmp-frontend/src/app/dmps/dmp-listing.component.html b/dmp-frontend/src/app/dmps/dmp-listing.component.html
index a912f8660..ef6b81d5a 100644
--- a/dmp-frontend/src/app/dmps/dmp-listing.component.html
+++ b/dmp-frontend/src/app/dmps/dmp-listing.component.html
@@ -22,10 +22,10 @@
-
+
@@ -50,9 +50,9 @@
mode_edit{{'DMP-LISTING.ACTIONS.EDIT' | translate}}
- insert_invitation{{'DMP-LISTING.ACTIONS.INVITE' | translate}}
- insert_invitation{{'DMP-LISTING.ACTIONS.ADD-DATASET' | translate}}
- insert_invitation{{'DMP-LISTING.ACTIONS.DATASETS' | translate}}
+ share{{'DMP-LISTING.ACTIONS.INVITE' | translate}}
+ add{{'DMP-LISTING.ACTIONS.ADD-DATASET' | translate}}
+ list{{'DMP-LISTING.ACTIONS.DATASETS' | translate}}
more_vert
diff --git a/dmp-frontend/src/app/dmps/dmp-listing.component.ts b/dmp-frontend/src/app/dmps/dmp-listing.component.ts
index 11a144d08..6bf67c7fd 100644
--- a/dmp-frontend/src/app/dmps/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/dmps/dmp-listing.component.ts
@@ -27,7 +27,7 @@ export class DataManagementPlanListingComponent implements OnInit {
@ViewChild(DataManagementPlanCriteriaComponent) criteria: DataManagementPlanCriteriaComponent;
dataSource: DataManagementPlanDataSource | null;
- displayedColumns: String[] = ['name', 'project', 'profile', 'researchers', 'organisations', 'version', 'actions'];
+ displayedColumns: String[] = ['name', 'project', 'researchers', 'organisations', 'version', 'actions'];
constructor(
private dataManagementPlanService: DataManagementPlanService,
diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html
index f9248eb06..43c2a1e24 100644
--- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html
@@ -69,7 +69,7 @@
{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
- {{'DMP-EDITOR.ACTIONS.INVITE' | translate}}
+
{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
{{'DMP-EDITOR.ACTIONS.DELETE' | translate}}
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts
index 10b451e1c..294f4a41b 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts
@@ -64,7 +64,6 @@ export class AutocompleteRemoteComponent implements OnInit/* , ControlValueAcces
// }); */
// },
// error => {
- // console.log(error);
// }
// );
}
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts
index a5742847d..d1472b899 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts
@@ -33,7 +33,6 @@ export class DynamicFormFieldComponent {
}
clearInput(){
-debugger;
}
get isValid() {
diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts
index e338d8880..f90ca0daf 100644
--- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts
+++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts
@@ -22,7 +22,6 @@ export class DynamicFormCompositeFieldComponent implements OnInit {
constructor(private visibilityRulesService: VisibilityRulesService) { }
ngOnInit() {
- console.log(this.form);
}
addMultipleField(fieldIndex: number) {
diff --git a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts
index 356918176..e7e0b1331 100644
--- a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts
@@ -26,7 +26,6 @@ export class DynamicFormGroupComponent implements OnInit {
}
ngOnInit() {
- console.log(this.group);
//let st = this.group.style == "any" ? "" : this.group.style;
//this.classFromJson = this.group.class == "" ? "" : this.group.class;
diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
index 9f5668b7e..7a6901833 100644
--- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
+++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
@@ -22,7 +22,6 @@ export class DynamicFormSectionComponent implements OnInit {
constructor(private visibilityRulesService: VisibilityRulesService) { }
ngOnInit() {
- console.log(this.section);
}
addMultipleField(fieldsetIndex: number) {
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.css b/dmp-frontend/src/app/form/dynamic-form.component.css
index fc9ad2d56..6cc1d4664 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.css
+++ b/dmp-frontend/src/app/form/dynamic-form.component.css
@@ -39,7 +39,7 @@
}
-.mat-progress-bar {
+.form-progress-bar {
margin: 20px 0;
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index f19765878..499570846 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -6,31 +6,31 @@
- Save
- Save and Finalize
-