Merge branch 'edge' into 'develop'

fixed identation in director-view

See merge request !229
parents 353c5da4 4cd3dc2b
...@@ -298,9 +298,9 @@ import { ...@@ -298,9 +298,9 @@ import {
private showLoader: BehaviorSubject<boolean>; private showLoader: BehaviorSubject<boolean>;
private opened; private opened;
private applicationId = <number>0; private applicationId = <number>0;
private taxi= <number>0; private taxi = <number>0;
private sector = <number>0; private sector = <number>0;
private special= <number>0; private special = <number>0;
...@@ -452,8 +452,8 @@ import { ...@@ -452,8 +452,8 @@ import {
} }
deleteApplication(appId: number,taxi, sector, special ): void { deleteApplication(appId: number, taxi, sector, special): void {
this.applicationId = appId; this.applicationId = appId;
this.taxi = taxi; this.taxi = taxi;
this.sector = sector; this.sector = sector;
...@@ -465,41 +465,41 @@ import { ...@@ -465,41 +465,41 @@ import {
deleteApplicationDo(): void { deleteApplicationDo(): void {
this.hideConfirmModal(); this.hideConfirmModal();
this.showLoader.next(true); this.showLoader.next(true);
this._hds.deleteApplicationforDirector(this.applicationId).then(data => { this._hds.deleteApplicationforDirector(this.applicationId).then(data => {
this.StudentInfoSub.unsubscribe(); this.StudentInfoSub.unsubscribe();
this.CoursesPerSchoolSub.unsubscribe(); this.CoursesPerSchoolSub.unsubscribe();
this.showLoader.next(false);
this.StudentActive = -1;
//this.courseActive = -1;
this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => {
this.CoursesPerSchool$.next(x);
this.showLoader.next(false); this.showLoader.next(false);
this.StudentActive = -1;
//this.courseActive = -1;
}, this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => {
error => { this.CoursesPerSchool$.next(x);
this.CoursesPerSchool$.next([{}]);
console.log("Error Getting courses perSchool");
this.showLoader.next(false); this.showLoader.next(false);
});
this.StudentInfoSub = this._hds.getStudentPerSchool(this.taxi, this.sector, this.special)
.subscribe(data => {
this.StudentInfo$.next(data);
this.retrievedStudent.next(true);
this.showLoader.next(false);
}, },
error => { error => {
this.StudentInfo$.next([{}]); this.CoursesPerSchool$.next([{}]);
console.log("Error Getting Students"); console.log("Error Getting courses perSchool");
this.showLoader.next(false); this.showLoader.next(false);
this.showModal("#emptyselection"); });
});
this.StudentInfoSub = this._hds.getStudentPerSchool(this.taxi, this.sector, this.special)
.subscribe(data => {
this.StudentInfo$.next(data);
this.retrievedStudent.next(true);
this.showLoader.next(false);
},
error => {
this.StudentInfo$.next([{}]);
console.log("Error Getting Students");
this.showLoader.next(false);
this.showModal("#emptyselection");
});
}).catch(err => { }).catch(err => {
...@@ -507,4 +507,4 @@ deleteApplicationDo(): void { ...@@ -507,4 +507,4 @@ deleteApplicationDo(): void {
this.showLoader.next(false); this.showLoader.next(false);
}); });
} }
} }
\ No newline at end of file
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