diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index ff0a98692..7e3ae23a6 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -11,6 +11,7 @@ import { AppComponent } from './app.component'; import { UserWorkspaceComponent } from './user-workspace/user-workspace.component'; import { MainSignInComponent } from './login/main-sign-in/main-sign-in.component'; import { DmpDetailedComponent } from './viewers/dmp-detailed/dmp-detailed.component'; +import { ProjectDetailedComponent } from './viewers/project-detailed/project-detailed.component'; const appRoutes: Routes = [ @@ -19,6 +20,7 @@ const appRoutes: Routes = [ { path: 'dataset', component: DatasetsComponent }, { path: 'login', component: MainSignInComponent}, { path: 'projects', component: ProjectsComponent}, + { path: 'project', component: ProjectDetailedComponent}, { path: 'dmps', component: DmpComponent}, { path: 'dmp', component: DmpDetailedComponent }, { path: 'workspace', component: UserWorkspaceComponent}, diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 5305ecb6f..78d3a99c5 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -71,6 +71,7 @@ import { AutocompleteRemoteComponent } from './form/fields/autocomplete-remote/a import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner'; import { BreadcrumbComponent } from './widgets/breadcrumb/breadcrumb.component'; import { DmpDetailedComponent } from './viewers/dmp-detailed/dmp-detailed.component'; +import { ProjectDetailedComponent } from './viewers/project-detailed/project-detailed.component'; @@ -102,7 +103,7 @@ import { DmpDetailedComponent } from './viewers/dmp-detailed/dmp-detailed.compon DatasetTableFilterPipe, DatasetStatusFilterPipe, StatusToString, - BreadcrumbComponent, DmpDetailedComponent + BreadcrumbComponent, DmpDetailedComponent, ProjectDetailedComponent ], imports: [ BrowserModule, diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts index 943e27dbb..c26303cb6 100644 --- a/dmp-frontend/src/app/dmps/dmp.component.ts +++ b/dmp-frontend/src/app/dmps/dmp.component.ts @@ -268,6 +268,10 @@ export class DmpComponent implements OnInit{ this.router.navigate(['/dmp'], { queryParams: { "dmpid":dmp.id, "label":dmp.label }}); } + viewDetailedProject(dmp){ + console.log(dmp) + this.router.navigate(['/project'], { queryParams: { "projectid":dmp.project.id, "label":dmp.project.label }}); + } } diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html index e44badffb..6ffb2966c 100644 --- a/dmp-frontend/src/app/dmps/dmps.html +++ b/dmp-frontend/src/app/dmps/dmps.html @@ -68,7 +68,7 @@
+ Details of project -- Under construction +
diff --git a/dmp-frontend/src/app/viewers/project-detailed/project-detailed.component.ts b/dmp-frontend/src/app/viewers/project-detailed/project-detailed.component.ts new file mode 100644 index 000000000..ddf168bfa --- /dev/null +++ b/dmp-frontend/src/app/viewers/project-detailed/project-detailed.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'project-detailed', + templateUrl: './project-detailed.component.html', + styleUrls: ['./project-detailed.component.css'] +}) +export class ProjectDetailedComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts index d5edd8186..ca05e3d89 100644 --- a/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts +++ b/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts @@ -20,17 +20,11 @@ export class BreadcrumbComponent implements OnInit { constructor(private router: Router, private route: ActivatedRoute) { router.events.subscribe( event =>{ - console.log("Router event captured") - console.log(event) - - + //console.log("Router event captured") + //console.log(event) if(event instanceof NavigationEnd){ - //this.breadcrumbData.push("") - console.log(event.urlAfterRedirects); - console.log(this.route); - - - //this.breadcrumbData.length = 0; + //console.log(event.urlAfterRedirects); + //console.log(this.route); this.route.children.forEach( child => { let guessed = this.guessMenuItemFromActivatedRoute(child, event); this.adaptBreadcrumbByMenuItem(guessed.menuItem, guessed.isBaseComponent); @@ -77,6 +71,11 @@ export class BreadcrumbComponent implements OnInit { isBaseComponent = false; } + if(componentName == "ProjectDetailedComponent"){ + label = "Details of Project '"+params["label"]+"'"; + isBaseComponent = false; + } + if(label != null) menuItem = {"label": label, "routerLink": url, "queryParams" : params }; diff --git a/dmp-frontend/src/assets/custom.js b/dmp-frontend/src/assets/custom.js index eb5dc8256..c6deb2c16 100644 --- a/dmp-frontend/src/assets/custom.js +++ b/dmp-frontend/src/assets/custom.js @@ -8,6 +8,11 @@ var sign_out_google = (function() { var simple_notifier = (function(type, title, message) { + + setTimeout(function() { + $(".alert").remove(); + }, 11000); + return notify(type, title, message, null, null, null, null, null, null, null, null, null, null); });