Merge branch 'component_updates' into 'develop'

minor changes

See merge request !222
parents a0502dc6 028dbff0
......@@ -313,6 +313,7 @@ class SubmitedApplications extends ControllerBase
}
else {
$applicantsResultsDisabled = $epalConfig->lock_results->value;
//$secondPeriodEnabled = $epalConfig->activate_second_period->value;
}
$status = "0";
......@@ -342,6 +343,8 @@ class SubmitedApplications extends ControllerBase
'currentclass',
'birthdate',
'created',
'second_period',
))
->fields('esec',
array('choice_no'
......@@ -455,6 +458,8 @@ class SubmitedApplications extends ControllerBase
'schoolName' => $epalStudent->eeschfin_name,
'schoolAddress' => $epalStudent->street_address,
'schoolTel' => $epalStudent->phone_number,
'secondPeriod' => $epalStudent->second_period,
//'secondPeriodSettingEnabled' => $secondPeriodEnabled,
);
return $this->respondWithStatus(
......@@ -589,12 +594,14 @@ class SubmitedApplications extends ControllerBase
}
else {
$applicantsResultsDisabled = $epalConfig->lock_results->getString();
//$secondPeriodEnabled = $epalConfig->activate_second_period->getString();
}
$status = "0";
$schoolName = '';
$schoolAddress = '';
$schoolTel = '';
$secondPeriod = "0";
//ανάκτηση αποτελέσματος
// εύρεση τοποθέτησης (περίπτωση μαθητή που τοποθετήθηκε "οριστικά")
......@@ -606,7 +613,8 @@ class SubmitedApplications extends ControllerBase
->fields('esch', array('id', 'name', 'street_address','phone_number'));
$escQuery->addJoin('inner', 'eepal_school_field_data', 'esch', 'esc.epal_id=esch.id');
$escQuery->condition('esc.student_id', intval($studentId), '=');
//->condition('eStudent.finalized', "1" , '=');
//$escQuery->condition('esc.second_period', intval($secondPeriodEnabled), '=');
$epalStudentClasses = $escQuery->execute()->fetchAll(\PDO::FETCH_OBJ);
if (sizeof($epalStudentClasses) === 1) {
$epalStudentClass = reset($epalStudentClasses);
......@@ -616,13 +624,19 @@ class SubmitedApplications extends ControllerBase
$schoolName = $epalStudentClass->name;
$schoolAddress = $epalStudentClass->street_address;
$schoolTel = $epalStudentClass->phone_number;
//$secondPeriod = $epalStudentClass->second_period;
//$secondPeriodEnabled = $secondPeriodEnabled;
}
else {
$status = "2";
//$secondPeriod = $epalStudentClass->second_period;
//$secondPeriodEnabled = $secondPeriodEnabled;
}
}
else {
$status = "0";
//$secondPeriod = $epalStudentClass->second_period;
//$secondPeriodEnabled = $secondPeriodEnabled;
}
} //endif $applicantsResultsDisabled === "0"
......@@ -633,6 +647,8 @@ class SubmitedApplications extends ControllerBase
'schoolName' => $schoolName,
'schoolAddress' => $schoolAddress,
'schoolTel' => $schoolTel,
//'secondPeriod' => $secondPeriod,
//'secondPeriodSettingEnabled' => $secondPeriodEnabled,
);
return $this->respondWithStatus(
......
......@@ -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'" >
<div *ngIf = "StudentDetails$.status == '1' && StudentDetails$.secondPeriod == '0'" >
<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'" >
<div *ngIf = "StudentDetails$.status != '1' && StudentDetails$.secondPeriod == '0'" >
<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