Commit 002ff911 authored by Ασπασία Κατσή's avatar Ασπασία Κατσή

Merge branch 'distribution' into 'develop'

Distribution

See merge request itminedu/e-eggrafes!120
parents 196ba55c f7c775b0
uuid: d9e8d99c-6e9b-4ac8-bb0c-4aacc248179f
langcode: el
status: true
dependencies: { }
id: gymlt
label: gymlt
weight: 8
is_admin: null
permissions:
- 'add gel choices entities'
- 'add gel class choices entities'
- 'add gel classes entities'
- 'add gel student choices entities'
- 'add gel student entities'
- 'add gel_school entities'
- 'add gelstudenthighschool entities'
- 'delete applicant users entities'
- 'delete gel choices entities'
- 'delete gel class choices entities'
- 'delete gel classes entities'
- 'delete gel student choices entities'
- 'delete gel student entities'
- 'delete gel_school entities'
- 'delete gelstudenthighschool entities'
- 'edit applicant users entities'
- 'edit gel choices entities'
- 'edit gel class choices entities'
- 'edit gel classes entities'
- 'edit gel student choices entities'
- 'edit gel student entities'
- 'edit gel_school entities'
- 'edit gelstudenthighschool entities'
- 'view published applicant users entities'
- 'view published eepal admin area entities'
- 'view published eepal region entities'
- 'view published gel choices entities'
- 'view published gel class choices entities'
- 'view published gel classes entities'
- 'view published gel student choices entities'
- 'view published gel student entities'
- 'view published gel_school entities'
- 'view published gelstudenthighschool entities'
- 'view unpublished applicant users entities'
- 'view unpublished eepal admin area entities'
- 'view unpublished eepal region entities'
- 'view unpublished gel choices entities'
- 'view unpublished gel class choices entities'
- 'view unpublished gel classes entities'
- 'view unpublished gel student choices entities'
- 'view unpublished gel student entities'
- 'view unpublished gel_school entities'
- 'view unpublished gelstudenthighschool entities'
......@@ -2003,6 +2003,7 @@ public function getStudentPerSchoolGel(Request $request, $classId)
}
try {
$authToken = $request->headers->get('PHP_AUTH_USER');
......@@ -2026,6 +2027,30 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//$this->logger->warning($gelId."kvdikos sxoleiou".$classId);
$schools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('id' => $gelId));
$school = reset($schools);
$operation_shift = $schools->operation_shift->value;
if ( $operation_shift != 'ΗΜΕΡΗΣΙΟ')
{
$this->logger->warning($operation_shift."esperino");
if ($classId == 4)
{
$classIdNew = 'Α';
}
elseif ($classId == 5)
{
$classIdNew = 'Β';
}
elseif ($classId == 6)
{
$classIdNew = 'Γ';
}
else
{
$classIdNew = 'Δ';
}
}
if (!$school) {
$this->logger->warning('no access to this school='.$user->id());
return $this->respondWithStatus([
......@@ -2048,6 +2073,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
$studentPerSchool = $this->entityTypeManager->getStorage('gelstudenthighschool')->loadByProperties(array('school_id' => $gelId, 'taxi' => $classIdNew));
if ($classIdNew === "Α")
{
$existingstudents =array();
......
......@@ -18,7 +18,7 @@ import { LocalDataSource } from "ng2-smart-table";
<div class = "loading" *ngIf="validCreator == 0" ></div>
<div style="min-height: 500px;">
<p style="margin-top: 20px; line-height: 2em;"> H παρακάτω λίστα περιλαμβάνει τους μαθητές της Γ 'ταξης του σχολείου σας που εχουν υποβάλει αίτηση δήλωση προτίμησης για εγγραφή σε ΓΕΛ/ΕΠΑΛ και για τους οποίους έχει εκδοθεί απολυτήριο. </p>
<p style="margin-top: 20px; line-height: 2em;"> H παρακάτω λίστα περιλαμβάνει τους μαθητές της Γ 'ταξης Γυμνασίου του σχολείου σας που εχουν υποβάλει αίτηση δήλωση προτίμησης για εγγραφή σε ΓΕΛ/ΕΠΑΛ και για τους οποίους έχει εκδοθεί απολυτήριο. </p>
<p style="margin-top: 20px; line-height: 2em;"> Παρακαλούμε ελέγξτε τη λίστα και επικοινωνήστε με την οικεία Διεύθυνση Δευτεροβάθμιας Εκπαίδευσης σε περίπτωση που εντοπίσετε ελλείψεις. </p>
......
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