MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

saved dataset opens in 3rd step

This commit is contained in:
annampak 2018-01-24 13:41:31 +02:00
parent f985d467d0
commit 4dd2acc44a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
View File

@ -1,7 +1,7 @@
<div class="dataset-wizard"> <div class="dataset-wizard">
<h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3> <h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3> <h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<mat-horizontal-stepper [linear]="isLinear"> <mat-horizontal-stepper [linear]="isLinear" #stepper>
<mat-step [stepControl]="formGroup"> <mat-step [stepControl]="formGroup">
<form *ngIf="formGroup" [formGroup]="formGroup"> <form *ngIf="formGroup" [formGroup]="formGroup">
<ng-template matStepLabel>{{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}</ng-template> <ng-template matStepLabel>{{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}</ng-template>

17
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
View File

@ -15,7 +15,7 @@ import { DataManagementPlanModel } from "../models/data-managemnt-plans/DataMana
import { JsonSerializer } from "../utilities/JsonSerializer"; import { JsonSerializer } from "../utilities/JsonSerializer";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import { RequestItem } from "../models/criteria/RequestItem"; import { RequestItem } from "../models/criteria/RequestItem";
import { MatPaginator, MatSort, MatSnackBar } from "@angular/material"; import { MatPaginator, MatSort, MatSnackBar, MatStepper } from "@angular/material";
import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component"; import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component";
import { DatasetProfileModel } from '../models/datasetprofile/DatasetProfileModel'; import { DatasetProfileModel } from '../models/datasetprofile/DatasetProfileModel';
import { ExternalSourcesItemModel } from '../models/external-sources/ExternalSourcesItemModel'; import { ExternalSourcesItemModel } from '../models/external-sources/ExternalSourcesItemModel';
@ -25,10 +25,11 @@ import { ExternalSourcesService } from '../services/external-sources/external-so
selector: 'app-dataset-wizard-component', selector: 'app-dataset-wizard-component',
templateUrl: 'dataset-wizard.component.html', templateUrl: 'dataset-wizard.component.html',
styleUrls: ['./dataset-wizard.component.scss'], styleUrls: ['./dataset-wizard.component.scss'],
providers: [DatasetWizardService, ExternalSourcesService, DataManagementPlanService], providers: [DatasetWizardService, ExternalSourcesService, DataManagementPlanService, MatStepper],
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class DatasetWizardComponent implements AfterViewInit { export class DatasetWizardComponent implements AfterViewInit {
@ViewChild('stepper') stepper: MatStepper;
//dmpAutoCompleteConfiguration: AutoCompleteConfiguration; //dmpAutoCompleteConfiguration: AutoCompleteConfiguration;
//datasetProfileAutoCompleteConfiguration: AutoCompleteConfiguration; //datasetProfileAutoCompleteConfiguration: AutoCompleteConfiguration;
@ -46,7 +47,7 @@ export class DatasetWizardComponent implements AfterViewInit {
filtereddataRepositories: ExternalSourcesItemModel[]; filtereddataRepositories: ExternalSourcesItemModel[];
filteredRegistries: ExternalSourcesItemModel[]; filteredRegistries: ExternalSourcesItemModel[];
filteredServices: ExternalSourcesItemModel[]; filteredServices: ExternalSourcesItemModel[];
filteredExternalDatasets: ExternalSourcesItemModel[]; filteredExternalDatasets: ExternalSourcesItemModel[];
constructor( constructor(
private datasetWizardService: DatasetWizardService, private datasetWizardService: DatasetWizardService,
@ -71,7 +72,6 @@ export class DatasetWizardComponent implements AfterViewInit {
dmpRequestItem.criteria = new DataManagementPlanCriteria(); dmpRequestItem.criteria = new DataManagementPlanCriteria();
//this.dmpAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.userDmps.bind(this.datasetWizardService), dmpRequestItem); //this.dmpAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.userDmps.bind(this.datasetWizardService), dmpRequestItem);
this.route.params.subscribe((params: Params) => { this.route.params.subscribe((params: Params) => {
const itemId = params['id']; const itemId = params['id'];
const dmpId = params['dmpId']; const dmpId = params['dmpId'];
@ -81,7 +81,7 @@ export class DatasetWizardComponent implements AfterViewInit {
.subscribe(data => { .subscribe(data => {
this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel); this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
this.formGroup = this.datasetWizardModel.buildForm(); this.formGroup = this.datasetWizardModel.buildForm();
this.loadDatasetProfiles(); this.loadDatasetProfiles();
}); });
} else if (dmpId != null) { } else if (dmpId != null) {
this.isNew = true; this.isNew = true;
@ -111,6 +111,12 @@ export class DatasetWizardComponent implements AfterViewInit {
}); });
} }
ngAfterViewInit() { ngAfterViewInit() {
this.route.params.subscribe((params: Params) => {
let itemId = params['id'];
if(itemId !=null) this.stepper.selectedIndex = 2;
})
}
// this.route.params.subscribe((params: Params) => { // this.route.params.subscribe((params: Params) => {
// const itemId = params['id']; // const itemId = params['id'];
@ -128,7 +134,6 @@ export class DatasetWizardComponent implements AfterViewInit {
// }); // });
// } // }
// }); // });
}
public cancel(): void { public cancel(): void {
//this.router.navigate(['/dataManagementPlans']); //this.router.navigate(['/dataManagementPlans']);