diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index c128949dd..5f5c491d1 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -15,7 +15,7 @@ import { BreadcrumbService } from './services/breadcrumb.service';
const appRoutes: Routes = [
//{ path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
{ path: 'dynamic-form', component: DynamicFormComponent, canActivate: [AuthGuard] },
- //{ path: 'dataset', component: DatasetsComponent },
+ { path: 'dataset', component: DatasetsComponent },
{ path: 'login', component: MainSignInComponent},
{ path: 'projects', component: ProjectsComponent},
{ path: 'dmps', component: DmpComponent},
diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index d9b7e651f..4ee6d4ad0 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -61,8 +61,8 @@
-
-
+
+
diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts
index e6e2273b3..817af16be 100644
--- a/dmp-frontend/src/app/app.component.ts
+++ b/dmp-frontend/src/app/app.component.ts
@@ -3,11 +3,12 @@ import { ServerService } from './services/server.service';
import { FieldBase } from '../app/form/fields/field-base';
import { JsonObjest } from '../app/entities/JsonObject.class';
import { TokenService, TokenProvider } from './services/login/token.service';
-import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, ActivatedRoute, NavigationExtras } from '@angular/router';
import { MainSignInComponent } from './login/main-sign-in/main-sign-in.component';
import {BreadcrumbModule,MenuItem} from 'primeng/primeng';
import { BreadcrumbService } from './services/breadcrumb.service';
+import { BreadcrumbComponent } from './widgets/breadcrumb/breadcrumb.component';
import { AutocompleteRemoteComponent } from './form/fields/autocomplete-remote/autocomplete-remote.component';
@@ -31,7 +32,7 @@ export class AppComponent implements OnInit {
- constructor(private tokenService : TokenService, private router: Router, private breadcrumbService : BreadcrumbService) {
+ constructor(private tokenService : TokenService, private router: Router, private breadcrumbService : BreadcrumbService, private route: ActivatedRoute) {
}
@@ -44,6 +45,7 @@ export class AppComponent implements OnInit {
this.breadcrumbData = data;
}
);
+
this.breadcrumbService.breadcrumbHomeEmitter.subscribe(
(data) => {
this.breadcrumbHome = data;
diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index b7ee0bb57..389735956 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -70,6 +70,7 @@ import { UserWorkspaceComponent } from './user-workspace/user-workspace.componen
import { AutocompleteRemoteComponent } from './form/fields/autocomplete-remote/autocomplete-remote.component';
import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner';
+import { BreadcrumbComponent } from './widgets/breadcrumb/breadcrumb.component';
@@ -100,7 +101,8 @@ import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner';
DmpTableFilterPipe,
DatasetTableFilterPipe,
DatasetStatusFilterPipe,
- StatusToString
+ StatusToString,
+ BreadcrumbComponent
],
imports: [
BrowserModule,
diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index 57c66c9ae..05423a030 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -41,6 +41,8 @@ export class DatasetsComponent implements OnInit {
public sortBy = "label";
public sortOrder = "asc";
+ dmpIdforDatasets: string;
+
// for tableIds
showIDs : boolean = false;
@@ -50,25 +52,14 @@ export class DatasetsComponent implements OnInit {
@Input() datasets: Dataset[];
@Input() datasetProfileDropDown: DropdownField;
@Input() datasetCount = 0;
- @Input() dmpIdforDatasets: string;
+
@Input() dmpLabelforDatasets: string;
@Input() statusDropDown: DropdownField;
dataset: any;
saveAndDescribe:boolean;
-
- dataSetValue: boolean
- @Input()
- get dataSetVisibe() {
- return this.dataSetValue;
- }
- @Output()
- public dataSetValueChange = new EventEmitter();
-
- set dataSetVisibe(value: any) {
- this.dataSetValue = value
- this.dataSetValueChange.emit(this.dataSetValue)
- }
+ dataSetValue: boolean = true;
+
constructor(
@@ -77,21 +68,27 @@ export class DatasetsComponent implements OnInit {
private router: Router,
private ngZone: NgZone,
private spinnerService: Ng4LoadingSpinnerService) {
+
this.dataset = this.createEmptyDataset();
this.datasetProfileDropDown = new DropdownField();
this.datasetProfileDropDown.options = [];
this.saveAndDescribe = false;
this.statusDropDown = new DropdownField();
- this.statusDropDown.options= [{key:'', value:null},{key:'0', value:"Active"},{key:'1', value:"Inactive"}, {key:'2', value:"Submitted"}, {key:'3', value:"Cancel"}]
+ this.statusDropDown.options= [{key:'', value:null},{key:'0', value:"Active"},{key:'1', value:"Inactive"}]
}
ngOnInit() {
- //this.projects = this.serverService.getDummyProjects();
- this.datasets = [];
- console.log(this.dmpIdforDatasets);
- this.getDatasets();
+
+
+ this.route
+ .queryParams
+ .subscribe(params => {
+ this.dmpIdforDatasets = params['dmpid'];
+ this.getDatasets();
+ });
+
this.serverService.getAllDatsetsProfile().subscribe(
response => {
diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts
index f7f8395a2..bf7ef8414 100644
--- a/dmp-frontend/src/app/dmps/dmp.component.ts
+++ b/dmp-frontend/src/app/dmps/dmp.component.ts
@@ -217,24 +217,6 @@ export class DmpComponent implements OnInit{
}
- showDatasetsOfDmp(item){
- this.stateConfig.dmps.selectedID = item.id;
- this.stateConfig.dmps.selectedLabel = item.label;
- if(this.stateConfig.datasets.tableVisible == false){
- this.stateConfig.datasets.tableVisible = true;
- this.stateConfig.dmps.tableVisible = false;
-
- this.breadcrumbData.push({label:"Datasets of '"+this.stateConfig.dmps.selectedLabel+"'" /* , command:""*/})
- this.breadcrumbService.breadcrumbDataEmitter.emit(this.breadcrumbData);
- }
- else{
- this.datasetsComponent.getDatasetForDmpMethod(item.id);
-
- }
- }
-
-
-
editDmp(item){
this.dmp = item;
this.dmp.project = item.project.id;
@@ -311,5 +293,10 @@ export class DmpComponent implements OnInit{
}
+ showDatasetsOfDmp(item){
+ this.router.navigate(['/dataset'], { queryParams: { "dmpid":item.id }});
+ }
+
+
}
diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index 32869b670..882c2075c 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -227,10 +227,6 @@
-
-