diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts index ee7086f98..4ee7def0c 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.ts +++ b/dmp-frontend/src/app/form/dynamic-form.component.ts @@ -95,9 +95,9 @@ export class DynamicFormComponent implements OnInit { this.visibilityRulesService.buildVisibilityRules(rules) this.progressbar = true; - this.route.fragment.subscribe((fragment: string) => { - //if (fragment) - this.scrollTo(fragment); + this.route.fragment.subscribe((fragment: string) => { + var self = this; + setTimeout(function () { self.scrollTo(fragment) }); }); this.route.queryParams.subscribe((params) => { diff --git a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html index 4a2877387..c0bdcc75d 100644 --- a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html +++ b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts index 1b909a732..24de771ae 100644 --- a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts +++ b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts @@ -1,10 +1,13 @@ import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service'; +import { ViewEncapsulation } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormControl, FormArray } from '@angular/forms' @Component({ selector: 'progress-bar', - templateUrl: './progress-bar.component.html', + templateUrl: './progress-bar.component.html', + styles: ['.alwaysVisible .ui-progressbar-label { display:block!important; }'], + encapsulation: ViewEncapsulation.None }) export class ProgressBarComponent implements OnInit { @Input() formGroup: FormGroup @@ -12,7 +15,7 @@ export class ProgressBarComponent implements OnInit { constructor(private visibilityRulesService: VisibilityRulesService) { } - private value: number; + private value: number = 0; ngOnInit() { this.formGroup .valueChanges