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
1ea256ca
Commit
1ea256ca
authored
Jun 21, 2017
by
Open Source Developer
Browse files
Merge branch 'develop' of
https://git.minedu.gov.gr/itminedu/e-epal
into pde-dde-views
parents
c39fed2a
7c88b09a
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
drupal/modules/casost/src/Controller/CASLogin.php
View file @
1ea256ca
...
...
@@ -139,7 +139,7 @@ class CASLogin extends ControllerBase
phpCAS
::
trace
(
$umdobject
);
// phpCAS::trace($physicaldeliveryofficename);
// $gsnunitcodedn = $filterAttribute('edupersonorgunitdn:gsnunitcode:extended');
$gsnunitcode
=
substr
(
$gsnunitcodedn
,
strpos
(
$gsnunitcodedn
,
";"
)
+
1
);
//
$gsnunitcode = substr($gsnunitcodedn, strpos($gsnunitcodedn, ";") + 1);
$gsnunitcode
=
$filterAttribute
(
'edupersonorgunitdn:gsnunitcode'
);
/* check if myschool account */
if
(
!
$umdobject
||
$umdobject
!==
"ISaccount"
)
{
...
...
drupal/modules/epal/src/Controller/ApplicationSubmit.php
View file @
1ea256ca
...
...
@@ -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
]
}
"
;
...
...
drupal/modules/epal/src/Controller/Distribution.php
View file @
1ea256ca
This diff is collapsed.
Click to expand it.
drupal/modules/epal/src/Controller/ReportsCreator.php
View file @
1ea256ca
...
...
@@ -24,14 +24,14 @@ use Drupal\Core\TypedData\Plugin\DataType\TimeStamp;
use
Drupal\Core\Language\LanguageManagerInterface
;
define
(
"ERR_DB"
,
-
1
);
define
(
"NO_CLASS_LIM_DOWN"
,
-
2
);
define
(
"SMALL_CLS"
,
1
);
define
(
"NON_SMALL_CLS"
,
2
);
class
ReportsCreator
extends
ControllerBase
{
const
ERR_DB
=
-
1
;
const
NO_CLASS_LIM_DOWN
=
-
2
;
const
SMALL_CLS
=
1
;
const
NON_SMALL_CLS
=
2
;
protected
$entity_query
;
protected
$entityTypeManager
;
protected
$logger
;
...
...
@@ -673,7 +673,7 @@ class ReportsCreator extends ControllerBase
for
(
$j
=
0
;
$j
<
sizeof
(
$schoolNameColumn
);
$j
++
)
{
// αν έγινε αίτημα για εμφάνιση ολιγομελών και είναι το τρέχον τμήμα ολιγομελές
if
((
$finalized
===
"1"
)
||
(
$finalized
===
"0"
&&
$smallClass
[
$j
]
===
SMALL_CLS
(
$finalized
===
"0"
&&
$smallClass
[
$j
]
===
self
::
SMALL_CLS
&&
$schoolSectionColumn
[
$j
]
!==
"Β τάξη"
&&
$schoolSectionColumn
[
$j
]
!==
"Γ τάξη"
&&
$schoolSectionColumn
[
$j
]
!==
"Δ τάξη"
))
{
array_push
(
$list
,
(
object
)
array
(
...
...
@@ -704,17 +704,17 @@ class ReportsCreator extends ControllerBase
$limitDown
=
$this
->
retrieveLimitDown
(
$classId
,
$regionId
);
if
(
$limitDown
===
NO_CLASS_LIM_DOWN
)
{
return
NO_CLASS_LIM_DOWN
;
}
elseif
(
$limitDown
===
ERR_DB
)
{
return
ERR_DB
;
if
(
$limitDown
===
self
::
NO_CLASS_LIM_DOWN
)
{
return
self
::
NO_CLASS_LIM_DOWN
;
}
elseif
(
$limitDown
===
self
::
ERR_DB
)
{
return
self
::
ERR_DB
;
}
$numStudents
=
(
int
)
$numStud
;
if
((
$numStudents
<
$limitDown
)
/*&& ($numStudents > 0)*/
)
{
return
SMALL_CLS
;
return
self
::
SMALL_CLS
;
}
else
{
return
NON_SMALL_CLS
;
return
self
::
NON_SMALL_CLS
;
}
}
...
...
@@ -738,18 +738,18 @@ class ReportsCreator extends ControllerBase
$data
[
"
$limit->name
"
][
"
$limit->category
"
]
=
$limit
->
limit_down
;
}
}
else
{
return
NO_CLASS_LIM_DOWN
;
return
self
::
NO_CLASS_LIM_DOWN
;
}
}
catch
(
\
Exception
$e
)
{
$this
->
logger
->
warning
(
$e
->
getMessage
());
return
ERR_DB
;
return
self
::
ERR_DB
;
}
}
if
(
isset
(
$data
[
"
$classId
"
][
"
$regionId
"
]))
{
return
$data
[
"
$classId
"
][
"
$regionId
"
];
}
else
{
return
NO_CLASS_LIM_DOWN
;
return
self
::
NO_CLASS_LIM_DOWN
;
}
}
...
...
source/components/student-application-form/application.form.main.ts
View file @
1ea256ca
...
...
@@ -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 @
1ea256ca
...
...
@@ -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>
...
...
source/services/helper-data-service.ts
View file @
1ea256ca
...
...
@@ -593,7 +593,7 @@ export class HelperDataService implements OnInit, OnDestroy {
let
options
=
new
RequestOptions
({
headers
:
headers
});
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/distribution`
,
{
username
:
username
,
userpassword
:
userpassword
},
options
)
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/distribution`
,
{
},
options
)
.
map
(
response
=>
response
.
json
())
.
subscribe
(
data
=>
{
resolve
(
data
);
...
...
@@ -615,7 +615,7 @@ export class HelperDataService implements OnInit, OnDestroy {
let
options
=
new
RequestOptions
({
headers
:
headers
});
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/distribution-secondperiod`
,
{
username
:
username
,
userpassword
:
userpassword
},
options
)
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/distribution-secondperiod`
,
{
},
options
)
.
map
(
response
=>
response
.
json
())
.
subscribe
(
data
=>
{
resolve
(
data
);
...
...
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