Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
887da2d0
Commit
887da2d0
authored
Jun 29, 2017
by
Χάρης Παπαδόπουλος
Browse files
Merge branch 'edge' into 'develop'
fixed identation in director-view See merge request !229
parents
353c5da4
4cd3dc2b
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/components/director/director-view.ts
View file @
887da2d0
...
...
@@ -298,9 +298,9 @@ import {
private
showLoader
:
BehaviorSubject
<
boolean
>
;
private
opened
;
private
applicationId
=
<
number
>
0
;
private
taxi
=
<
number
>
0
;
private
taxi
=
<
number
>
0
;
private
sector
=
<
number
>
0
;
private
special
=
<
number
>
0
;
private
special
=
<
number
>
0
;
...
...
@@ -452,8 +452,8 @@ import {
}
deleteApplication
(
appId
:
number
,
taxi
,
sector
,
special
):
void
{
deleteApplication
(
appId
:
number
,
taxi
,
sector
,
special
):
void
{
this
.
applicationId
=
appId
;
this
.
taxi
=
taxi
;
this
.
sector
=
sector
;
...
...
@@ -465,41 +465,41 @@ import {
deleteApplicationDo
():
void
{
deleteApplicationDo
():
void
{
this
.
hideConfirmModal
();
this
.
showLoader
.
next
(
true
);
this
.
_hds
.
deleteApplicationforDirector
(
this
.
applicationId
).
then
(
data
=>
{
this
.
StudentInfoSub
.
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
.
StudentInfoSub
.
unsubscribe
();
this
.
CoursesPerSchoolSub
.
unsubscribe
();
this
.
showLoader
.
next
(
false
);
this
.
StudentActive
=
-
1
;
//this.courseActive = -1;
},
error
=>
{
this
.
CoursesPerSchool$
.
next
([{}]);
console
.
log
(
"
Error Getting courses perSchool
"
);
this
.
CoursesPerSchoolSub
=
this
.
_hds
.
FindCoursesPerSchool
().
subscribe
(
x
=>
{
this
.
CoursesPerSchool$
.
next
(
x
);
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
=>
{
this
.
StudentInfo$
.
next
([{}]);
console
.
log
(
"
Error Getting Students
"
);
this
.
showLoader
.
next
(
false
);
this
.
showModal
(
"
#emptyselection
"
);
});
error
=>
{
this
.
CoursesPerSchool$
.
next
([{}]);
console
.
log
(
"
Error Getting courses perSchool
"
);
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
=>
{
this
.
StudentInfo$
.
next
([{}]);
console
.
log
(
"
Error Getting Students
"
);
this
.
showLoader
.
next
(
false
);
this
.
showModal
(
"
#emptyselection
"
);
});
}).
catch
(
err
=>
{
...
...
@@ -507,4 +507,4 @@ deleteApplicationDo(): void {
this
.
showLoader
.
next
(
false
);
});
}
}
\ No newline at end of file
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment