no message
This commit is contained in:
parent
730db6655d
commit
05cbadb17b
|
@ -31,6 +31,7 @@ const appRoutes: Routes = [
|
||||||
{ path: 'dataset/new/:dmpId', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
{ path: 'dataset/new/:dmpId', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'dataset/:id', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
{ path: 'dataset/:id', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'datasets/new', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
{ path: 'datasets/new', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'datasets/:dmpId', component: DatasetListingComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'invitation/:id', component: InvitationAcceptedComponent},
|
{ path: 'invitation/:id', component: InvitationAcceptedComponent},
|
||||||
{ path: 'login', loadChildren: './user-management/login.module#LoginModule' },
|
{ path: 'login', loadChildren: './user-management/login.module#LoginModule' },
|
||||||
{ path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
|
{ path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { Component, ViewChild, OnInit, AfterViewInit } from "@angular/core";
|
import { Component, ViewChild, OnInit, AfterViewInit } from "@angular/core";
|
||||||
import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
|
import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
|
||||||
import { Router } from "@angular/router";
|
import { Router, Params, ActivatedRoute } from "@angular/router";
|
||||||
import { TranslateService } from "@ngx-translate/core";
|
import { TranslateService } from "@ngx-translate/core";
|
||||||
import { DataSource } from "@angular/cdk/table";
|
import { DataSource } from "@angular/cdk/table";
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ import { DataTableRequest } from "../models/data-table/DataTableRequest";
|
||||||
import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component";
|
import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component";
|
||||||
import { DatasetService } from "../services/dataset/dataset.service";
|
import { DatasetService } from "../services/dataset/dataset.service";
|
||||||
import { DatasetListingModel } from "../models/datasets/DatasetListingModel";
|
import { DatasetListingModel } from "../models/datasets/DatasetListingModel";
|
||||||
import {PageEvent} from '@angular/material';
|
import { PageEvent } from '@angular/material';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -27,28 +27,32 @@ export class DatasetListingComponent implements OnInit {
|
||||||
@ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
|
@ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
|
||||||
|
|
||||||
dataSource: DatasetDataSource | null;
|
dataSource: DatasetDataSource | null;
|
||||||
displayedColumns: String[] = ['label','dmp' ,'profile' , 'dataRepositories', 'registries','services', 'status', 'description', 'created', 'actions'];
|
displayedColumns: String[] = ['label', 'dmp', 'profile', 'dataRepositories', 'registries', 'services', 'status', 'description', 'created', 'actions'];
|
||||||
pageEvent: PageEvent;
|
pageEvent: PageEvent;
|
||||||
|
|
||||||
statuses = [
|
statuses = [
|
||||||
{value: '0', viewValue: 'Active'},
|
{ value: '0', viewValue: 'Active' },
|
||||||
{value: '1', viewValue: 'Inactive'}
|
{ value: '1', viewValue: 'Inactive' }
|
||||||
];
|
];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private datasetService: DatasetService,
|
private datasetService: DatasetService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private languageService: TranslateService,
|
private languageService: TranslateService,
|
||||||
public snackBar: MatSnackBar,
|
public snackBar: MatSnackBar,
|
||||||
|
public route: ActivatedRoute
|
||||||
) {
|
) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria());
|
this.route.params.subscribe((params: Params) => {
|
||||||
this.refresh();
|
const dmpId = params['dmpId'];
|
||||||
this.criteria.setRefreshCallback(() => this.refresh());
|
this.criteria.setCriteria(this.getDefaultCriteria(dmpId));
|
||||||
|
this.refresh();
|
||||||
|
this.criteria.setRefreshCallback(() => this.refresh());
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh() {
|
refresh() {
|
||||||
|
@ -59,8 +63,11 @@ export class DatasetListingComponent implements OnInit {
|
||||||
this.router.navigate(['/dataset/' + rowId]);
|
this.router.navigate(['/dataset/' + rowId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefaultCriteria(): DatasetCriteria {
|
getDefaultCriteria(dmpId: string): DatasetCriteria {
|
||||||
const defaultCriteria = new DatasetCriteria();
|
const defaultCriteria = new DatasetCriteria();
|
||||||
|
if (dmpId != null) {
|
||||||
|
defaultCriteria.dmpIds.push(dmpId);
|
||||||
|
}
|
||||||
return defaultCriteria;
|
return defaultCriteria;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ export class DataManagementPlanListingComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
showDatasets(rowId: String) {
|
showDatasets(rowId: String) {
|
||||||
this.router.navigate(['/dataset/new/' + rowId]);
|
this.router.navigate(['/datasets/' + rowId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefaultCriteria(): DataManagementPlanCriteria {
|
getDefaultCriteria(): DataManagementPlanCriteria {
|
||||||
|
|
|
@ -2,4 +2,5 @@ import { BaseCriteria } from "../BaseCriteria";
|
||||||
|
|
||||||
export class DatasetCriteria extends BaseCriteria {
|
export class DatasetCriteria extends BaseCriteria {
|
||||||
public status: Number;
|
public status: Number;
|
||||||
|
public dmpIds: string[] = [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
<!-- Column Definition: Start -->
|
<!-- Column Definition: Start -->
|
||||||
<ng-container cdkColumnDef="start">
|
<ng-container cdkColumnDef="start">
|
||||||
<mat-header-cell *matHeaderCellDef>{{'PROJECT-LISTING.COLUMNS.START' | translate}}</mat-header-cell>
|
<mat-header-cell *matHeaderCellDef>{{'PROJECT-LISTING.COLUMNS.START' | translate}}</mat-header-cell>
|
||||||
<mat-cell *matCellDef="let row"> {{row.startDate}} </mat-cell>
|
<mat-cell *matCellDef="let row"> {{row.startDate | date:'shortDate'}} </mat-cell>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<!-- Column Definition: End -->
|
<!-- Column Definition: End -->
|
||||||
<ng-container cdkColumnDef="end">
|
<ng-container cdkColumnDef="end">
|
||||||
<mat-header-cell *matHeaderCellDef>{{'PROJECT-LISTING.COLUMNS.END' | translate}}</mat-header-cell>
|
<mat-header-cell *matHeaderCellDef>{{'PROJECT-LISTING.COLUMNS.END' | translate}}</mat-header-cell>
|
||||||
<mat-cell *matCellDef="let row"> {{row.endDate}} </mat-cell>
|
<mat-cell *matCellDef="let row"> {{row.endDate | date:'shortDate'}} </mat-cell>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<!-- Column Definition: Submission Time -->
|
<!-- Column Definition: Submission Time -->
|
||||||
|
|
|
@ -42,13 +42,13 @@
|
||||||
"RESEARCHERS": "Researchers",
|
"RESEARCHERS": "Researchers",
|
||||||
"ORGANISATIONS": "Organisations",
|
"ORGANISATIONS": "Organisations",
|
||||||
"VERSION": "Version",
|
"VERSION": "Version",
|
||||||
"ACTIONS":"Actions"
|
"ACTIONS": "Actions"
|
||||||
},
|
},
|
||||||
"ACTIONS":{
|
"ACTIONS": {
|
||||||
"EDIT":"Edit",
|
"EDIT": "Edit",
|
||||||
"INVITE":"Invite",
|
"INVITE": "Invite",
|
||||||
"ADD-DATASET":"Add Dataset",
|
"ADD-DATASET": "Add Dataset",
|
||||||
"DATASETS":"Datasets"
|
"DATASETS": "Datasets"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"DATASET-WIZARD": {
|
"DATASET-WIZARD": {
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
"FIELDS": {
|
"FIELDS": {
|
||||||
"NAME": "Name",
|
"NAME": "Name",
|
||||||
"ABBREVIATION": "Abbreviation",
|
"ABBREVIATION": "Abbreviation",
|
||||||
"URI": "URI",
|
"URI": "URL",
|
||||||
"START": "Start",
|
"START": "Start",
|
||||||
"END": "End",
|
"END": "End",
|
||||||
"DESCRIPTION": "Description"
|
"DESCRIPTION": "Description"
|
||||||
|
|
Loading…
Reference in New Issue