Merge branch 'front_end_review' into 'develop'

front-end UI fixes - enhancements etc(WIP)

See merge request !91
parents 43b77c51 653c9b4d
import {Router} from '@angular/router';
import {OnInit, OnDestroy, Component, Injectable} from '@angular/core';
import { HelperDataService } from '../../services/helper-data-service';
import { BehaviorSubject } from 'rxjs/Rx';
import { NgRedux, select } from 'ng2-redux';
import { IAppState } from '../../store/store';
import { ILoginInfo, ILoginInfoToken } from '../../store/logininfo/logininfo.types';
import { LoginInfoActions } from '../../actions/logininfo.actions';
import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
import { SCHOOL_ROLE, STUDENT_ROLE, PDE_ROLE, DIDE_ROLE, MINISTRY_ROLE } from '../../constants';
import { EpalClassesActions } from '../../actions/epalclass.actions';
import { SectorFieldsActions } from '../../actions/sectorfields.actions';
import { RegionSchoolsActions } from '../../actions/regionschools.actions';
import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
import { CriteriaActions } from '../../actions/criteria.actions';
import { StudentDataFieldsActions } from '../../actions/studentdatafields.actions';
@Component({
selector: 'post-submit',
template: `
<div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
<div class="row" style="margin-top: 130px; margin-bottom: 200px;">
<div class="col-md-3 offset-md-3">
<button type="submit" class="btn-primary btn-lg btn-block isclickable" style="margin: 0px; font-size: 1em; padding: 5px; height: 6em;" (click)="submittedView()">
Εμφάνιση<br />Εκτύπωση<br />Αίτησης
</button>
</div>
<div class="col-md-6">
<button type="submit" class="btn-primary btn-lg btn-block isclickable" style="margin: 0px; font-size: 1em; padding: 5px; height: 6em;" (click)="signOut()">
Αποσύνδεση
</button>
</div>
</div>
`
})
@Injectable() export default class AfterSubmit implements OnInit, OnDestroy {
private authToken: string;
private authRole: string;
private cuName: string;
private loginInfo$: BehaviorSubject<ILoginInfo>;
public cuser: any;
private showLoader$: BehaviorSubject<boolean>;
constructor(
private _ata: LoginInfoActions,
private _hds: HelperDataService,
private _csa: SectorCoursesActions,
private _sfa: SectorFieldsActions,
private _rsa: RegionSchoolsActions,
private _eca: EpalClassesActions,
private _sdfa: StudentDataFieldsActions,
private _cria: CriteriaActions,
private _ngRedux: NgRedux<IAppState>,
private router: Router
) {
this.showLoader$ = new BehaviorSubject(false);
};
ngOnInit() {
this._ngRedux.select(state => {
if (state.loginInfo.size > 0) {
state.loginInfo.reduce(({}, loginInfoToken) => {
this.authToken = loginInfoToken.auth_token;
this.authRole = loginInfoToken.auth_role;
this.cuName = loginInfoToken.cu_name;
return loginInfoToken;
}, {})
}
return state.loginInfo;
}).subscribe(this.loginInfo$);
}
ngOnDestroy() {
if (this.loginInfo$)
this.loginInfo$.unsubscribe();
}
signOut() {
this.showLoader$.next(true);
this._hds.signOut().then(data => {
this._ata.initLoginInfo();
this._eca.initEpalClasses();
this._sfa.initSectorFields();
this._rsa.initRegionSchools();
this._csa.initSectorCourses();
this._sdfa.initStudentDataFields();
this._cria.initCriteria();
this.router.navigate(['']);
this.authToken = '';
this.authRole = '';
this.showLoader$.next(false);
}).catch(err => {
this.showLoader$.next(false);
console.log(err)
});
}
submittedView() {
this.router.navigate(['/submited-preview']);
}
}
......@@ -170,13 +170,13 @@
</div>
<div class="form-group">
<label for="telnum">Τηλέφωνο επικοινωνίας</label><input class="form-control" type="text" formControlName="telnum">
<label for="telnum">Κινητό Τηλέφωνο</label><input class="form-control" type="text" formControlName="telnum">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('telnum').touched && studentDataGroup.get('telnum').hasError('required')">
Το πεδίο δεν μπορεί να αφεθεί κενό!
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('telnum').dirty && studentDataGroup.get('telnum').hasError('pattern')">
Επιτρέπονται μόνο ψηφία σε αυτό το πεδίο!
Επιτρέπονται μόνο ψηφία σε αυτό το πεδίο και πρέπει να αντιστοιχούν σε κινητό τηλέφωνο!
</div>
......@@ -254,15 +254,15 @@
</form>
<div class="row" style="margin-top: 20px;" *ngIf="(criteria$ | async).size > 0">
<div class="row" style="margin-top: 20px; margin-bottom: 20px;" *ngIf="(criteria$ | async).size > 0">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="navigateBack()">
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-right" (click)="submitSelected()" [disabled]="studentDataGroup.invalid || studentCriteriaGroup.invalid " >
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="submitSelected()" [disabled]="studentDataGroup.invalid || studentCriteriaGroup.invalid ">
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
......
......@@ -66,7 +66,7 @@ import {
regionarea: ['ΠΑΤΡΑ', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
certificatetype: ['Απολυτήριο Λυκείου', this.checkChoice],
relationtostudent: ['Μαθητής', this.checkChoice],
telnum: ['2610789789', [Validators.pattern(VALID_DIGITS_PATTERN),Validators.required]],
telnum: ['6978333235', [Validators.pattern(VALID_DIGITS_PATTERN),Validators.required]],
});
this.applicantDataGroup = this.fb.group({
......
......@@ -7,18 +7,17 @@ import { IAppState } from '../../store/store';
import { SectorFieldsActions } from '../../actions/sectorfields.actions';
import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
import { RegionSchoolsActions } from '../../actions/regionschools.actions';
import { StudentDataFieldsActions } from '../../actions/studentdatafields.actions';
import { EpalClassesActions } from '../../actions/epalclass.actions';
import { ISectorFields } from '../../store/sectorfields/sectorfields.types';
import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
import { IRegions, IRegionSchool } from '../../store/regionschools/regionschools.types';
import { IStudentDataFields } from '../../store/studentdatafields/studentdatafields.types';
import { IEpalClasses } from '../../store/epalclasses/epalclasses.types';
import {AppSettings} from '../../app.settings';
import { REGION_SCHOOLS_INITIAL_STATE } from '../../store/regionschools/regionschools.initial-state';
import { EPALCLASSES_INITIAL_STATE } from '../../store/epalclasses/epalclasses.initial-state';
import { SECTOR_COURSES_INITIAL_STATE } from '../../store/sectorcourses/sectorcourses.initial-state';
import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfields.initial-state';
import { IStudentDataFields } from '../../store/studentdatafields/studentdatafields.types';
import { STUDENT_DATA_FIELDS_INITIAL_STATE } from '../../store/studentdatafields/studentdatafields.initial-state';
import { ICriteria, ICriter } from '../../store/criteria/criteria.types';
import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-state';
......@@ -34,13 +33,13 @@ import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-st
Τάξη εισαγωγής
</li>
<li class="list-group-item" *ngIf="epalclass$.name === '1'">
Α’ Λυκείου
Α’ Λυκείου
</li>
<li class="list-group-item" *ngIf="epalclass$.name === '2'">
Β’ Λυκείου
Β’ Λυκείου
</li>
<li class="list-group-item" *ngIf="epalclass$.name === '3'">
Γ’ Λυκείου
Γ’ Λυκείου
</li>
</ul>
......@@ -80,6 +79,7 @@ import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-st
</li>
</div>
</ul>
<div *ngIf="currentUrl === '/submited-preview'">
<div *ngFor="let studentDataField$ of studentDataFields$ | async;">
<ul class="list-group left-side-view" style="margin-bottom: 20px;">
......@@ -124,13 +124,13 @@ import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-st
</div>
</li>
</ul>
</div>
</div>
</div>
<div *ngIf="currentUrl === '/submited-preview'">
<div *ngFor="let criteriaField$ of criteriaFields$ | async;">
<div *ngIf="criteriaField$.selected === true">
{{criteriaField$.name}}
{{criteriaField$.name}}
</div>
</div>
</div>
......@@ -262,13 +262,10 @@ import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-st
this.sectorsSub.unsubscribe();
if (this.sectorFieldsSub)
this.sectorFieldsSub.unsubscribe();
if (this.studentDataFieldsSub)
this.studentDataFieldsSub.unsubscribe();
this.regions$.unsubscribe();
this.epalclasses$.unsubscribe();
this.sectors$.unsubscribe();
this.sectorFields$.unsubscribe();
this.studentDataFields$.unsubscribe();
}
}
......@@ -11,22 +11,29 @@ import { ICriter } from '../../store/criteria/criteria.types';
import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
import { ISectorFields } from '../../store/sectorfields/sectorfields.types';
import { IEpalClasses } from '../../store/epalclasses/epalclasses.types';
import { ILoginInfo } from '../../store/logininfo/logininfo.types';
import { STUDENT_DATA_FIELDS_INITIAL_STATE } from '../../store/studentdatafields/studentdatafields.initial-state';
import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-state';
import { REGION_SCHOOLS_INITIAL_STATE } from '../../store/regionschools/regionschools.initial-state';
import { EPALCLASSES_INITIAL_STATE } from '../../store/epalclasses/epalclasses.initial-state';
import { SECTOR_COURSES_INITIAL_STATE } from '../../store/sectorcourses/sectorcourses.initial-state';
import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfields.initial-state';
import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
import { Student, StudentEpalChosen, StudentCourseChosen, StudentSectorChosen, StudentCriteriaChosen } from '../students/student';
import {AppSettings} from '../../app.settings';
import { ILoginInfo, ILoginInfoToken } from '../../store/logininfo/logininfo.types';
import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
import { EpalClassesActions } from '../../actions/epalclass.actions';
import { SectorFieldsActions } from '../../actions/sectorfields.actions';
import { RegionSchoolsActions } from '../../actions/regionschools.actions';
import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
import { CriteriaActions } from '../../actions/criteria.actions';
import { StudentDataFieldsActions } from '../../actions/studentdatafields.actions';
import { HelperDataService } from '../../services/helper-data-service';
@Component({
selector: 'application-submit',
template: `
<div class = "loading" *ngIf="(studentDataFields$ | async).size === 0 || (criteria$ | async).size === 0 || (regions$ | async).size === 0 || (epalclasses$ | async).size === 0 || (loginInfo$ | async).size === 0 || (showLoader | async) === true"></div>
<div id="studentFormSentNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div id="studentFormSentNotice" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header modal-header-success">
......@@ -39,7 +46,7 @@ import {AppSettings} from '../../app.settings';
<p>{{ modalText | async }}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">Κλείσιμο</button>
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" (click)="hideModal()">Κλείσιμο</button>
</div>
</div>
</div>
......@@ -84,7 +91,15 @@ import {AppSettings} from '../../app.settings';
private showLoader: BehaviorSubject<boolean>;
public currentUrl: string;
constructor(private _ngRedux: NgRedux<IAppState>,
constructor(
private _hds: HelperDataService,
private _csa: SectorCoursesActions,
private _sfa: SectorFieldsActions,
private _rsa: RegionSchoolsActions,
private _eca: EpalClassesActions,
private _sdfa: StudentDataFieldsActions,
private _cria: CriteriaActions,
private _ngRedux: NgRedux<IAppState>,
private router: Router,
private http: Http
) {
......@@ -265,17 +280,30 @@ import {AppSettings} from '../../app.settings';
.map((res: Response) => res.json())
.subscribe(
success => {
(<any>$('.loading')).remove();
this.showLoader.next(false);
this.modalTitle.next("Υποβολή Αίτησης Εγγραφής");
this.modalText.next("Η υποβολή της αίτησής σας πραγματοποιήθηκε. Μπορείτε να την εκτυπώσετε από την επιλογή 'Εξαγωγή σε PDF'. Θα ειδοποιηθείτε στο e-mail που δηλώσατε για την εξέλιξη της αίτησής σας");
this.modalText.next("Η υποβολή της αίτησής σας πραγματοποιήθηκε. Μπορείτε να την εκτυπώσετε από την επιλογή 'Εμφάνιση - Εκτύπωση Αίτησης'. Θα ειδοποιηθείτε στο e-mail που δηλώσατε για την εξέλιξη της αίτησής σας");
this._eca.initEpalClasses();
this._sfa.initSectorFields();
this._rsa.initRegionSchools();
this._csa.initSectorCourses();
this._sdfa.initStudentDataFields();
this._cria.initCriteria();
console.log("success post");
this.showModal();
console.log("success post"); },
},
error => {
(<any>$('.loading')).remove();
this.showLoader.next(false);
this.modalTitle.next("Υποβολή Αίτησης Εγγραφής");
this.modalText.next("Η υποβολή της αίτησής σας απέτυχε. Παρακαλούμε προσπαθήστε πάλι και αν το πρόβλημα συνεχίσει να υφίσταται, επικοινωνήστε με την ομάδα υποστήριξης");
this.showLoader.next(false);
this.showModal();
console.log("Error HTTP POST Service")},
() => {
console.log("write this message anyway");
(<any>$('.loading')).remove();
this.showLoader.next(false);
},
......@@ -288,11 +316,16 @@ import {AppSettings} from '../../app.settings';
}
public hideModal():void {
console.log("going to post-submit from hide()");
(<any>$('#studentFormSentNotice')).modal('hide');
//(<any>$('.modal-backdrop')).remove();
this.router.navigate(['/post-submit']);
}
public onHidden():void {
this.isModalShown.next(false);
console.log("going to post-submit");
this.router.navigate(['/post-submit']);
}
}
......@@ -34,10 +34,10 @@ import {AppSettings} from '../../app.settings';
</div>
</div>
</div>
<div class="row">
<div class="row" style="margin-bottom: 20px;">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveSelected()">
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -34,14 +34,14 @@ import {AppSettings} from '../../app.settings';
<option value=1>Α’ Λυκείου</option>
<option value=2>Β’ Λυκείου</option>
<option value=3>Γ' Λυκείου / Δ' Λυκείου</option>
</select>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveSelected()">
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -118,9 +118,9 @@
<div class="row" *ngIf="!(userEmailEnabled | async) && (verificationCodeVerified | async)">
<div class="col-md-12">
<button type="button" class="btn-primary btn-sm pull-right" (click)="saveProfileAndContinue()" [disabled]="((userEmailEnabled | async) && !(verificationCodeVerified | async))">
Συνέχεια
<i class="fa fa-forward"></i> </button>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveProfileAndContinue()" [disabled]="((userEmailEnabled | async) && !(verificationCodeVerified | async))" >
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
</form>
......
......@@ -66,15 +66,15 @@ import {AppSettings} from '../../app.settings';
</div>
</ul>
</div>
<div class="row" style="margin-top: 20px;" *ngIf="(regions$ | async).size > 0">
<div class="row" style="margin-top: 20px; margin-bottom: 20px;" *ngIf="(regions$ | async).size > 0">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="navigateBack()" >
<button type="button" class="btn-primary btn-lg pull-left isclickable" (click)="navigateBack()" >
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToApplication()" [disabled] = "(selectionLimitOptional | async) === false && (numSelected | async) < (selectionLimit | async)" >
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="navigateToApplication()" [disabled] = "(selectionLimitOptional | async) === false && (numSelected | async) < (selectionLimit | async)">
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -32,16 +32,16 @@ import {AppSettings} from '../../app.settings';
</li>
</div>
</ul>
<div class="row" style="margin-top: 20px;">
<div class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="navigateBack();" >
<button type="button" class="btn-primary btn-lg pull-left isclickable" (click)="navigateBack();" >
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToStudentForm()" [disabled] = "numSelected === 0" >
<i class="fa fa-forward"></i>
</button>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="navigateToStudentForm()" [disabled] = "numSelected === 0">
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -53,15 +53,15 @@ import {AppSettings} from '../../app.settings';
</ul>
</div>
<div class="row" style="margin-top: 20px;" *ngIf="(sectors$ | async).size > 0">
<div class="row" style="margin-top: 20px; margin-bottom: 20px;" *ngIf="(sectors$ | async).size > 0">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="router.navigate(['/epal-class-select']);" >
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToSchools()" [disabled]="idx === -1">
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="navigateToSchools()" (click)="navigateToSchools()" [disabled]="idx === -1" >
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -40,15 +40,15 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="row" style="margin-top: 20px;" *ngIf="(sectorFields$ | async).size > 0">
<div class="row" style="margin-top: 20px; margin-bottom: 20px;" *ngIf="(sectorFields$ | async).size > 0">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="router.navigate(['/epal-class-select']);" >
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToSchools()" [disabled]="sectorActive === -1" >
<i class="fa fa-forward"></i>
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="navigateToSchools()" [disabled]="sectorActive === -1" >
<span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -17,6 +17,7 @@ import * as html2canvas from "html2canvas"
@Component({
selector: 'submited-preview',
template: `
<div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
<div class="row">
<breadcrumbs></breadcrumbs>
</div>
......@@ -116,6 +117,7 @@ import * as html2canvas from "html2canvas"
private incomeChosenSub: Subscription;
private CritirioChosen$: BehaviorSubject<any>;
private CritirioChosenSub: Subscription;
private showLoader$: BehaviorSubject<boolean>;
public StudentId;
......@@ -133,6 +135,7 @@ import * as html2canvas from "html2canvas"
this.EpalChosen$ = new BehaviorSubject([{}]);
this.CritirioChosen$ = new BehaviorSubject([{}]);
this.incomeChosen$ = new BehaviorSubject([{}]);
this.showLoader$ = new BehaviorSubject(false);
}
ngOnDestroy()
......@@ -156,15 +159,22 @@ import * as html2canvas from "html2canvas"
ngOnInit() {
this.showLoader$.next(true);
this.SubmitedUsersSub = this._hds.getSubmittedPreviw().subscribe(data => {
this.SubmitedApplic$.next(data)},
this.SubmitedUsersSub = this._hds.getSubmittedPreviw().subscribe(
data => {
this.SubmitedApplic$.next(data);
this.showLoader$.next(false);
},
error => {
this.SubmitedApplic$.next([{}]);
this.showLoader$.next(false);
console.log("Error Getting Schools");
},
() => console.log("Getting Schools"));
console.log(this.SubmitedApplic$);
() => {
console.log("Getting Schools")
this.showLoader$.next(false);
});
}
......@@ -180,13 +190,20 @@ import * as html2canvas from "html2canvas"
}
ind--;
this.userActive = ind+1 ;
this.showLoader$.next(true);
this.SubmitedDetailsSub = this._hds.getStudentDetails(this.userActive+1).subscribe(data => {
this.SubmitedDetails$.next(data)},
this.SubmitedDetails$.next(data);
this.showLoader$.next(false);
},
error => {
this.SubmitedDetails$.next([{}]);
console.log("Error Getting Schools");
this.showLoader$.next(false);
},
() => console.log("Getting Schools"));
() => {
console.log("Getting Schools");
this.showLoader$.next(false);
});
this.EpalChosenSub = this._hds.getEpalchosen(this.userActive+1).subscribe(data => {
this.EpalChosen$.next(data)},
error => {
......
......@@ -37,7 +37,7 @@ export const CRITERIA_INIT = 'CRITERIA_INIT';
export const VALID_NAMES_PATTERN = '[A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$';
export const VALID_ADDRESS_PATTERN = '[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$';
export const VALID_ADDRESSTK_PATTERN = '[0-9 ]*$';
export const VALID_DIGITS_PATTERN = '[0-9]*$';
export const VALID_DIGITS_PATTERN = '69[0-9]*$';
export const VALID_EMAIL_PATTERN = '[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}';
......
......@@ -21,6 +21,7 @@ import SchoolsOrderSelect from '../components/student-application-form/schools-o
import ApplicationSubmit from '../components/student-application-form/application.submit';
import SubmitedPreview from '../components/student-application-form/submited.aplication.preview';
import SubmitedPerson from '../components/student-application-form/submitedstudent.preview';
import AfterSubmit from '../components/student-application-form/after.submit';
import DirectorView from '../components/director/director-view';
import DirectorButtons from '../components/director/director.buttons';
import PerfectureView from '../components/infoviews/perfecture-view';
......@@ -53,6 +54,7 @@ export const MainRoutes: Routes = [
{ path: 'application-submit', component: ApplicationSubmit, canActivate: [StudentAuthGuard] },
{ path: 'submited-preview', component: SubmitedPreview, canActivate: [StudentAuthGuard] },
{ path: 'submited-person', component: SubmitedPerson, canActivate: [StudentAuthGuard] },
{ path: 'post-submit', component: AfterSubmit, canActivate: [StudentAuthGuard] },
{ path: 'school/director-view', component: DirectorView, canActivate: [SchoolAuthGuard] },
{ path: 'school/director-buttons', component: DirectorButtons },
{ path: 'school/director-classcapacity', component: DirectorClassCapacity, canActivate: [SchoolAuthGuard] },
......@@ -83,6 +85,7 @@ export const MainDeclarations = [
ApplicationSubmit,
SubmitedPreview,
SubmitedPerson,
AfterSubmit,
DirectorView,
DirectorClassCapacity,
MinisterView,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment