Merge branch 'develop' of https://git.minedu.gov.gr/itminedu/e-epal into stylesandmenus

source/components/infoviews/perfecture-view.ts

@@ -82,10 +82,17 @@ import {
     ngOnInit() {
 
       this.SchoolSub = this._hds.getSchoolId().subscribe(x => {
-                  this.School$.next(x);                 
+                  this.School$.next(x);
                   console.log(x[0].id, "perfectureID");
                    this.perfecture = x[0].id;
-                   
+                   this.SchoolPerPerfSub = this._hds.getSchoolPerPerfecture(this.perfecture).subscribe(data => {
+                       this.SchoolsPerPerf$.next(data);
+                   },
+                       error => {
+                           this.SchoolsPerPerf$.next([{}]);
+                           console.log("Error Getting Schools");
+                       },
+                       () => console.log("Getting Schools"));
 
                   },
                   error => {
@@ -95,14 +102,7 @@ import {
                   () => console.log("Getting School "));
 
 
-        this.SchoolPerPerfSub = this._hds.getSchoolPerPerfecture(this.perfecture).subscribe(data => {
-            this.SchoolsPerPerf$.next(data);
-        },
-            error => {
-                this.SchoolsPerPerf$.next([{}]);
-                console.log("Error Getting Schools");
-            },
-            () => console.log("Getting Schools"));
+
 
 
 

source/components/student-application-form/parent.form.html

-<div class = "loading" *ngIf="(epalUserData$ | async).userEmail === '' || (showLoader | async) === true"></div>
+<div class = "loading" *ngIf="(showLoader | async) === true"></div>
 
 <div id="emailSentNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-lg">

source/components/student-application-form/parent.form.ts

@@ -71,8 +71,9 @@ import {AppSettings} from '../../app.settings';
 
     ngOnInit() {
         (<any>$('#emailSentNotice')).appendTo("body");
-
+        this.showLoader.next(true);
         this.epalUserDataSub = this.hds.getEpalUserData().subscribe(x => {
+            this.showLoader.next(false);
             this.epalUserData$.next(x);
             this.formGroup.get('userEmail').setValue(x.userEmail);
             this.formGroup.get('userName').setValue(x.userName);