From 05dab7f674170f61ecfd459f279d5bbbe35ce36f Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Wed, 10 Jan 2018 10:17:22 +0200
Subject: [PATCH] progress bar, change server url

---
 dmp-frontend/src/app/app.constants.ts         |  2 +-
 .../dynamic-form-composite-field.html         |  4 ++--
 .../dynamic-form-section.html                 |  2 +-
 .../src/app/form/dynamic-form.component.css   | 16 +++++++++++++++-
 .../src/app/form/dynamic-form.component.html  | 19 ++++++++++---------
 .../pprogress-bar/progress-bar.component.html |  6 +++++-
 .../pprogress-bar/progress-bar.component.ts   |  8 +++++---
 7 files changed, 39 insertions(+), 18 deletions(-)

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 @@
 <div [id]="compositeField.id" [formGroup]="form">
 
     <div *ngIf="compositeField.fields.length == 1" class="fieldset-component">
-        <h5 *ngIf="compositeField.title">{{compositeField.title}}</h5>
+        <h5 *ngIf="compositeField.title" style="font-weight:bold; color: #3a3737;">{{compositeField.title}}</h5>
         <div class="content-left-margin">
             <h5 *ngIf="compositeField.description">{{compositeField.description}}</h5>
             <h5 *ngIf="compositeField.extendedDescription" class="fieldset-extended-desc">
@@ -14,7 +14,7 @@
 
 
     <div *ngIf="compositeField.fields.length > 1" class="fieldset-component">
-        <h5 *ngIf="compositeField.title">{{compositeField.title}}</h5>
+        <h5 *ngIf="compositeField.title" style="font-weight:bold; color: #3a3737;">{{compositeField.title}}</h5>
         <div class="content-left-margin">
             <h5 *ngIf="compositeField.description">{{compositeField.description}}</h5>
             <h5 *ngIf="compositeField.extendedDescription" class="fieldset-extended-desc">
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 @@
         <mat-expansion-panel expanded=true>
             <mat-expansion-panel-header>
                 <mat-panel-title>
-                    <a data-toggle="collapse" href="#{{section.id}}" class="panel-title pull-left" style="padding-top: 7.5px;">{{path}} {{section.title}}</a>
+                  {{path}} {{section.title}}
                 </mat-panel-title>
                 <mat-panel-description>
                     <h3 *ngIf="section.description">{{section.description}}</h3>
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 @@
 <div class="ui-g dynamic-formc full-width full-height">
-	 <mat-sidenav-container contentClass="scrollableContent">
+	<mat-sidenav-container contentClass="scrollableContent">
 		<mat-sidenav mode="push" position="right" [(opened)]="visibleSidebar">
 			<table-of-content class="toc-container full-height" [model]="datasetProfileDefinitionModel"></table-of-content>
 		</mat-sidenav>
 
-		 <mat-sidenav-content class="ui-g">
+		<mat-sidenav-content class="ui-g">
 			<button mat-raised-button color="primary" style="margin: 15px;" (click)="toggleSidebar()" icon="fa-arrow-left">Table Of Contents</button>
-			<button  mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-			(click)="save();">Save</button>
-			<button  mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-			 (click)="submit();">Save and Finalize</button>
+			<button mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel.status != 1"
+			 style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;" (click)="save();">Save</button>
+			<button mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel?.status != 1"
+			 style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;" (click)="submit();">Save and Finalize</button>
 			<div class="ui-g-12">
 				<div class="alignment-center">
 					<!-- <ngb-pagination *ngIf="pages" [collectionSize]="pages.length*10" [page]="currentPageIndex" (pageChange)="changePageIndex($event)" aria-label="Default pagination"></ngb-pagination> -->
+					<progress-bar *ngIf="form" [formGroup]="form"></progress-bar>
 				</div>
 			</div>
 			<div class="ui-g-12">
-				<progress-bar *ngIf="form" [formGroup]="form"></progress-bar>
+				<!-- <progress-bar *ngIf="form" [formGroup]="form"></progress-bar> -->
 			</div>
-			
+
 			<div class="col-md-12 form-body-container" id="form-container">
 				<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
 					<div *ngFor="let section of datasetProfileDefinitionModel.sections; let i = index;">
@@ -28,6 +29,6 @@
 				</form>
 			</div>
 		</mat-sidenav-content>
-	 </mat-sidenav-container>
+	</mat-sidenav-container>
 </div>
 <!-- <p>Form value: {{ form.value | json }}</p> -->
\ 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 @@
-<!-- <p-progressBar [value]="value" [style]="{'height': '30px'}" [styleClass]="'alwaysVisible'"></p-progressBar> -->
\ No newline at end of file
+<!-- <p-progressBar [value]="value" [style]="{'height': '30px'}" [styleClass]="'alwaysVisible'"></p-progressBar> -->
+
+<div class="demo-progress-bar-container">
+    <mat-progress-bar mode="determinate" [value]="value" [color]="color"></mat-progress-bar>
+</div>
\ 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 = (<FormArray>control);
                 for (let i = 0; i < formArray.length; i++) {