diff --git a/dmp-frontend/src/app/app.constants.ts b/dmp-frontend/src/app/app.constants.ts index 83a2f6222..2cf927bf2 100644 --- a/dmp-frontend/src/app/app.constants.ts +++ b/dmp-frontend/src/app/app.constants.ts @@ -1,5 +1,5 @@ export const HostConfiguration = { - Server: 'http://192.168.32.171:8080/', + Server: 'http://192.168.32.96:8080/', //CASHost: 'https://login-devel.uoa.gr/login', //Service: 'http://elkefinman/login' } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html index b86a12bee..909f688d2 100644 --- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html +++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html @@ -1,7 +1,7 @@
-
{{compositeField.title}}
+
{{compositeField.title}}
{{compositeField.description}}
@@ -14,7 +14,7 @@
-
{{compositeField.title}}
+
{{compositeField.title}}
{{compositeField.description}}
diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html index c397fdd58..6db1d3053 100644 --- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html +++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html @@ -38,7 +38,7 @@ - {{path}} {{section.title}} + {{path}} {{section.title}}

{{section.description}}

diff --git a/dmp-frontend/src/app/form/dynamic-form.component.css b/dmp-frontend/src/app/form/dynamic-form.component.css index 886450342..c72073e18 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.css +++ b/dmp-frontend/src/app/form/dynamic-form.component.css @@ -28,4 +28,18 @@ ng-sidebar-container { .alignment-center{ text-align: center; -} \ No newline at end of file +} + + +.demo-progress-bar-container { + + width: 100%; + + + } + +.mat-progress-bar { + + margin: 20px 0; + + } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html index d19c51b9b..1b2a80ab0 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.html +++ b/dmp-frontend/src/app/form/dynamic-form.component.html @@ -1,24 +1,25 @@ 
- + - + - - + +
+
- +
- +
@@ -28,6 +29,6 @@
- +
\ No newline at end of file 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 f756f1966..772e29463 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,5 @@ - \ 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 89ae3437b..311353f17 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 @@ -11,7 +11,8 @@ import { FormGroup, FormControl, FormArray } from '@angular/forms' }) export class ProgressBarComponent implements OnInit { @Input() formGroup: FormGroup - @Input("progressValueAccuracy") public accuracy: number = 1 + @Input("progressValueAccuracy") public accuracy: number = 1; + determinateProgressValue:number; constructor(private visibilityRulesService: VisibilityRulesService) { } @@ -24,7 +25,7 @@ export class ProgressBarComponent implements OnInit { this.calculateValueForProgressbar(); }); } - + calculateValueForProgressbar(){ var progressSoFar = this.countFormControlsWithValue(this.formGroup); var total = this.getFormControlDepthLength(this.formGroup); @@ -52,7 +53,8 @@ export class ProgressBarComponent implements OnInit { let value = 0; Object.keys(form.controls).forEach(key => { let control = form.controls[key] - if (control instanceof FormGroup) value += this.getFormControlDepthLength(control); + if (control instanceof FormGroup) + { value += this.getFormControlDepthLength(control);} else if (control instanceof FormArray) { let formArray = (control); for (let i = 0; i < formArray.length; i++) {