Merge branch 'edge' into 'master'

Merge latest updates to master

See merge request !235
parents 8154359a dd1c6b97
......@@ -386,8 +386,6 @@ class ApplicationSubmit extends ControllerBase
$existing = $esQuery->execute()->fetchAll(\PDO::FETCH_OBJ);
/* $existing = $this->entityTypeManager->getStorage('epal_student')
->loadByProperties(['epaluser_id' => $epalUser->id->value]); */
if ($existing && sizeof($existing) > 0) {
$crypt = new Crypt();
foreach ($existing as $candidate) {
......
......@@ -50,7 +50,7 @@ class DirectorView extends ControllerBase
"error_code" => 3001
], Response::HTTP_FORBIDDEN);
}
if ($epalConfig->lock_students->value) {
if ($epalConfig->lock_school_students_view->value) {
return $this->respondWithStatus([
"error_code" => 3002
], Response::HTTP_FORBIDDEN);
......@@ -81,7 +81,6 @@ class DirectorView extends ControllerBase
'error_code' => 4003,
], Response::HTTP_FORBIDDEN);
} elseif ($userRole === 'epal') {
$selectIdNew = $selectId;
if ($classId == 1) {
$selectIdNew = -1;
} elseif ($classId == 2) {
......@@ -555,7 +554,7 @@ class DirectorView extends ControllerBase
$specialityid = $object->specialty_id->entity->id();
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')
->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $specialityid, 'currentclass' => 4));
$capacity_class_d = ($object -> capacity_class_specialty_d ->value) *25;
$capacity_class_d = ($object -> capacity_class_specialty_d ->value) *25;
$list[] = array(
'id' => $object->specialty_id->entity->id(),
'name' => 'Δ Λυκείου '.$object->specialty_id->entity->get('name')->value,
......
......@@ -259,9 +259,9 @@ class SubmitedApplications extends ControllerBase
'name' => $name_decoded,
'studentsurname' => $studentsurname_decoded,
'fatherfirstname' => $fatherfirstname_decoded,
'fathersurname' => $object->fathersurname->value,
'fathersurname' => '',
'motherfirstname' => $motherfirstname_decoded,
'mothersurname' => $object->mothersurname->value,
'mothersurname' => '',
'guardian_name' => $guardian_name_decoded,
'guardian_surname' => $guardian_surname_decoded,
'guardian_fathername' => $guardian_fathername_decoded,
......@@ -436,9 +436,9 @@ class SubmitedApplications extends ControllerBase
'name' => $name_decoded,
'studentsurname' => $studentsurname_decoded,
'fatherfirstname' => $fatherfirstname_decoded,
'fathersurname' => $epalStudent->fathersurname,
'fathersurname' => '',
'motherfirstname' => $motherfirstname_decoded,
'mothersurname' => $epalStudent->mothersurname,
'mothersurname' => '',
'guardian_name' => $guardian_name_decoded,
'guardian_surname' => $guardian_surname_decoded,
'guardian_fathername' => $guardian_fathername_decoded,
......@@ -720,7 +720,7 @@ class SubmitedApplications extends ControllerBase
}
$transaction = $this->connection->startTransaction();
try {
//ανάκτηση τιμής από ρυθμίσεις διαχειριστή για lock_school_students_view
......@@ -738,6 +738,11 @@ class SubmitedApplications extends ControllerBase
"error_code" => 3002
], Response::HTTP_FORBIDDEN);
}
else if ($epalConfig->lock_application->value) {
return $this->respondWithStatus([
"error_code" => 3002
], Response::HTTP_FORBIDDEN);
}
......@@ -749,7 +754,7 @@ class SubmitedApplications extends ControllerBase
if ($epalStudent) {
$epalStudentClasses = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('student_id' => $applicationId));
$epalStudentClass = reset($epalStudentClasses);
if ($epalStudentClass) {
if ($epalStudentClass->directorconfirm->value === "1") {
return $this->respondWithStatus([
......@@ -801,4 +806,4 @@ class SubmitedApplications extends ControllerBase
return $res;
}
}
\ No newline at end of file
}
......@@ -93,7 +93,7 @@ import {
</div>
<p style="text-align: left, font-size: 0.9em;">
<strong>Τηλ. Επικοινωνίας:</strong> 2103443014, 2103442231, 2103442034, 2103443309 (ώρες: 8:00 - 16:00)</p>
<strong>Τηλ. Επικοινωνίας:</strong> 2103443014, 2103443359, 2103442034, 2103443309 (ώρες: 8:00 - 16:00)</p>
<div id="mailsent" (onHidden)="onHidden('#mailsent')"
......
......@@ -90,14 +90,14 @@ import {Location} from '@angular/common';
<div *ngFor="let StudentDetails$ of SubmitedDetails$ | async" [hidden]="UserData$.id !== applicationIdActive" style="margin: 10px 10px 10px 10px;">
<div *ngIf = "StudentDetails$.applicantsResultsDisabled == '0'" >
<div *ngIf = "StudentDetails$.status == '1' && StudentDetails$.secondPeriod == '0'" >
<div *ngIf = "StudentDetails$.status == '1'" >
<div class="col-md-12" style="font-size: 1.0em; color: #143147; font-weight: bold;">
Η αίτησή σας ικανοποιήθηκε. Έχετε επιλεγεί για να εγγραφείτε στο {{StudentDetails$.schoolName}}.
Παρακαλώ να προσέλθετε ΑΜΕΣΑ στο σχολείο για να προχωρήσει η διαδικασία εγγραφής σας σε αυτό, προσκομίζοντας τα απαραίτητα δικαιολογητικά. Διεύθυνση σχολείου: {{StudentDetails$.schoolAddress}}, Τηλέφωνο σχολείου: {{StudentDetails$.schoolTel}}<br><br>
</div>
</div>
<div *ngIf = "StudentDetails$.status != '1' && StudentDetails$.secondPeriod == '0'" >
<div *ngIf = "StudentDetails$.status != '1'" >
<div class="col-md-12" style="font-size: 1.0em; color: #a52a2a; font-weight: bold;">
Η αίτησή σας είναι σε εκκρεμότητα. Για την τοποθέτησή σας και τις ενέργειες που πρέπει να κάνετε θα ενημερωθείτε με νέο μήνυμα, με τον ίδιο τρόπο, μετά τις 8-7-2017.<br><br>
</div>
......
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