Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
e-epal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Σταύρος Παπαδάκης
e-epal
Commits
92b6c15c
Commit
92b6c15c
authored
May 20, 2017
by
Open Source Developer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://git.minedu.gov.gr/itminedu/e-epal
into stylesandmenus
parents
52ce48d9
be84e99d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
source/components/infoviews/perfecture-view.ts
source/components/infoviews/perfecture-view.ts
+10
-10
source/components/student-application-form/parent.form.html
source/components/student-application-form/parent.form.html
+1
-1
source/components/student-application-form/parent.form.ts
source/components/student-application-form/parent.form.ts
+2
-1
No files found.
source/components/infoviews/perfecture-view.ts
View file @
92b6c15c
...
...
@@ -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
View file @
92b6c15c
<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
View file @
92b6c15c
...
...
@@ -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
);
...
...
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