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
5f317539
Commit
5f317539
authored
Jun 21, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed birth year validation. UI enhancements in submited.aplication.preview
parent
f6170ef9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drupal/modules/epal/src/Controller/ApplicationSubmit.php
drupal/modules/epal/src/Controller/ApplicationSubmit.php
+1
-1
source/components/student-application-form/application.form.main.ts
...ponents/student-application-form/application.form.main.ts
+1
-1
source/components/student-application-form/submited.aplication.preview.ts
...s/student-application-form/submited.aplication.preview.ts
+2
-2
No files found.
drupal/modules/epal/src/Controller/ApplicationSubmit.php
View file @
5f317539
...
...
@@ -315,7 +315,7 @@ class ApplicationSubmit extends ControllerBase
(
checkdate
(
$date_parts
[
1
],
$date_parts
[
2
],
$date_parts
[
0
])
!==
true
))
{
return
1003
;
}
if
(
intval
(
$date_parts
[
0
])
>=
2003
)
{
if
(
intval
(
$date_parts
[
0
])
>=
((
int
)
date
(
"Y"
)
-
13
)
)
{
return
1003
;
}
$birthdate
=
"
{
$date_parts
[
2
]
}
-
{
$date_parts
[
1
]
}
-
{
$date_parts
[
0
]
}
"
;
...
...
source/components/student-application-form/application.form.main.ts
View file @
5f317539
...
...
@@ -183,7 +183,7 @@ import {
let
d
=
this
.
studentDataGroup
.
controls
[
"
studentbirthdate
"
].
value
;
if
(
!
d
||
!
d
.
date
||
!
d
.
date
.
year
)
return
1
;
else
if
((
new
Date
().
getFullYear
())
-
d
.
date
.
year
<
1
5
)
else
if
((
new
Date
().
getFullYear
())
-
d
.
date
.
year
<
1
4
)
return
2
;
if
(
!
this
.
studentDataGroup
.
controls
[
"
lastschool_schoolname
"
].
value
.
registry_no
&&
this
.
studentDataGroup
.
controls
[
"
lastschool_schoolname
"
].
value
.
unit_type_id
!==
38
)
...
...
source/components/student-application-form/submited.aplication.preview.ts
View file @
5f317539
...
...
@@ -92,7 +92,7 @@ import {Location} from '@angular/common';
<div *ngFor="let StudentResult$ of StudentResults$ | async">
<div *ngIf = "StudentResult$.applicantsResultsDisabled == '0'" >
<div *ngIf = "StudentResult$.status == '1'" >
<div class="col-md-12" style="font-size: 1.0em; color: #
a52a2a
;">
<div class="col-md-12" style="font-size: 1.0em; color: #
ffffff; font-weight: bold
;">
Η αίτησή σας ικανοποιήθηκε. Έχετε επιλεγεί για να εγγραφείτε στο {{StudentResult$.schoolName}}.
Παρακαλώ να προσέλθετε ΑΜΕΣΑ στο σχολείο για να προχωρήσει η διαδικασία εγγραφής σας σε αυτό, επισυνάπτοντας τα απαραίτητα δικαιολογητικά.
Διεύθυνση σχολείου: {{StudentResult$.schoolAddress}}, Τηλέφωνο σχολείου: {{StudentResult$.schoolTel}}<br><br>
...
...
@@ -100,7 +100,7 @@ import {Location} from '@angular/common';
</div>
<div *ngIf = "StudentResult$.status != '1'" >
<div class="col-md-12" style="font-size: 1.0em; color: #a52a2a;">
<div class="col-md-12" style="font-size: 1.0em; color: #a52a2a;
font-weight: bold;
">
Η αίτησή σας δεν ήταν δυνατό να ικανοποιηθεί. Παρακαλώ επικοινωνήστε άμεσα τηλεφωνικά με τη Διεύθυνση Δευτεροβάθμιας Εκπαίδευσης στην οποία ανήκετε,
προκειμένου να διερευνηθεί εκ νέου η δυνατότητα εγγραφής σας.<br><br>
</div>
...
...
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