...
 
Commits (7)
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'
......@@ -2513,6 +2513,7 @@ class ReportsCreator extends ControllerBase
$idColumn = array();
$classColumn = array();
$opColumn = array();
$firstnameColumn = array();
$surnameColumn = array();
$addressColumn = array();
......@@ -2539,7 +2540,7 @@ class ReportsCreator extends ControllerBase
array_push($hgids, $gelClass->student_id);
$sCon = $this->connection
->select('gel_student', 'eStudent')
->fields('eStudent', array('id', 'name', 'studentsurname','regionaddress', 'regiontk', 'regionarea','telnum','directorconfirm'))
->fields('eStudent', array('id', 'nextclass', 'name', 'studentsurname','regionaddress', 'regiontk', 'regionarea','telnum','directorconfirm'))
->condition('eStudent.id', $gelClass->student_id, '=')
->condition('eStudent.delapp', 0 , '=')
->condition('eStudent.myschool_promoted', 2 , '<=')
......@@ -2547,6 +2548,19 @@ class ReportsCreator extends ControllerBase
$gelStudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($gelStudents as $gelStudent) {
array_push($idColumn, $gelStudent->id);
/*
if ($gelStudent->nextclass != 1 && $gelStudent->nextclass != 4 && $gelStudent->nextclass != 5) {
$sCon = $this->connection
->select('gel_student_choices', 'eChoices')
->fields('eChoices', array('choice_id'))
->condition('eChoices.student_id', $gelStudent->id , '=')
->condition('eChoices.choice_id', 15 , '>=')
->condition('eChoices.choice_id', 17 , '<=');
$stChoices = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$stChoice = reset($stChoices);
array_push($opColumn, $stChoice->choice_id);
}
*/
array_push($classColumn, $classLogos[$l]);
array_push($firstnameColumn, $crypt->decrypt($gelStudent->name));
array_push($surnameColumn, $crypt->decrypt($gelStudent->studentsurname));
......@@ -2603,6 +2617,22 @@ class ReportsCreator extends ControllerBase
if (!in_array($gelStudent->id, $hgids)) {
array_push($idColumn, $gelStudent->id);
//if ($gelStudent->nextclass != '1' && $gelStudent->nextclass != '4' && $gelStudent->nextclass != '5') {
/*
$sCon = $this->connection
->select('gel_student_choices', 'eChoices')
->fields('eChoices', array('choice_id'))
->condition('eChoices.student_id', $gelStudent->id , '=')
->condition('eChoices.choice_id', 15 , '>=')
->condition('eChoices.choice_id', 17 , '<=');
$stChoices = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$stChoice = reset($stChoices);
array_push($opColumn, $stChoice->choice_id);
*/
//}
array_push($classColumn, $this->retrieveGelClassName($k) . " (αυτοδίκαια) ");
array_push($firstnameColumn, $crypt->decrypt($gelStudent->name));
array_push($surnameColumn, $crypt->decrypt($gelStudent->studentsurname));
......@@ -2635,6 +2665,7 @@ class ReportsCreator extends ControllerBase
array_push($list, (object) array(
'id' => $idColumn[$j],
'section' => $classColumn[$j],
'op' => $opColumn[$j],
'name' => $firstnameColumn[$j],
'surname' => $surnameColumn[$j],
'address' => preg_replace("/,/", " ", $addressColumn[$j]),
......
......@@ -588,8 +588,11 @@ class SubmitedApplications extends ControllerBase
}
else if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted === "6" || $es->myschool_promoted === "7") )
$status = "5";
else if ($applicantsResultsDisabled === "0" && $es->myschool_promoted != "1" && $es->myschool_promoted != "2"
&& $es->myschool_promoted != "6" && $es->myschool_promoted != "7" && $es->myschool_promoted != "0")
else if ($applicantsResultsDisabled === "0" &&
$es->myschool_promoted != null && $es->myschool_promoted != "0" &&
$es->myschool_promoted != "1" && $es->myschool_promoted != "2" &&
$es->myschool_promoted != "6" && $es->myschool_promoted != "7"
)
$status = "6";
else if ($applicantsResultsDisabled === "0" && $es->myschool_promoted === "0" )
$status = "7";
......
......@@ -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();
......
......@@ -494,7 +494,7 @@ class GelSubmittedApplications extends ControllerBase
$canedit = '0';
if ( $applicantsAppModifyDisabled == "0"
&& $eggrafesConfig->activate_second_period->value == $gelStudent->second_period
&& $gelStudent->changed >= $dateStartInt
/*&& $gelStudent->changed >= $dateStartInt*/
)
$canedit = '1';
//end new piece
......@@ -530,19 +530,22 @@ class GelSubmittedApplications extends ControllerBase
$schoolAddress = $schoolNameDest->street_address;
$schoolTel = $schoolNameDest->phone_number;
//new piece of code
//$this->logger->warning("Trace " . $schoolNameDest->unit_type_id . " " . $schoolNameDest->extra_unitid );
if ( $schoolNameDest->unit_type_id == 3 && $schoolNameDest->extra_unitid != 200)
//δεν είναι δυνατό να εμφανιστεί αυτοδίκαια σχολείο τύπου Γυμνασίου, με εξαίρεση τα Γυμνάσια με ΛΤ
//δεν είναι δυνατό να εμφανιστεί αυτοδίκαια σε σχολείο τύπου Γυμνασίου, με εξαίρεση τα Γυμνάσια με ΛΤ
//αυτός ο έλεγχος γεράφεται σε περίπτωση που κάποια ειδική περίπτωση δεν έχει προβλεφθεί
$status = "3";
//end
$status = "8";
//δεν είναι δυνατό να εμφανιστεί αυτοδίκαια σε .. ΕΠΑΛ
if ( $schoolNameDest->unit_type_id == 5)
$status = "8";
}
}
else if ($applicantsResultsDisabled === "0" && ($gelStudent->myschool_promoted === "6" || $gelStudent->myschool_promoted === "7") )
$status = "5";
else if ($applicantsResultsDisabled === "0" && $gelStudent->myschool_promoted != "1" && $gelStudent->myschool_promoted != "2"
&& $gelStudent->myschool_promoted != "6" && $gelStudent->myschool_promoted != "7" && $gelStudent->myschool_promoted != "0")
else if ($applicantsResultsDisabled === "0" &&
$gelStudent->myschool_promoted != null && $gelStudent->myschool_promoted != "0" &&
$gelStudent->myschool_promoted != "1" && $gelStudent->myschool_promoted != "2" &&
$gelStudent->myschool_promoted != "6" && $gelStudent->myschool_promoted != "7"
)
$status = "6";
else if ($applicantsResultsDisabled === "0" && $gelStudent->myschool_promoted === "0" )
$status = "7";
......
......@@ -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>
......
......@@ -545,6 +545,11 @@ export class ReportsSchema {
},
section: {
title: "Τάξη",
width: "11%",
filter: true
},
op: {
title: "ΟΠ",
width: "15%",
filter: true
},
......
......@@ -148,6 +148,13 @@ import { IAppState } from "../../store/store";
Παρακαλώ επικοινωνήστε με τον διευθυντή του σχολείου σας.<br><br>
</div>
</div>
<div *ngIf = "GelStudentDetails$.status == '8' " >
<div class="col-md-12" style="font-size: 1.0em; color: #a52a2a; font-weight: bold;">
Η δήλωσή σας φαίνεται να έχει λάθος στοιχεία. Μπορείτε να προχωρήσετε σε τροποποίηση ή διαγραφή και νέα αίτηση κατά τη Β’ περίοδο αιτήσεων.
Δώστε ιδιαίτερη προσοχή στα πεδία: Σχολείο τελευταίας φοίτησης (για τους ενεργούς μαθητές είναι το σχολείο που φοιτούν αυτή τη στιγμή),
Τάξη τελευταίας φοίτησης, Τάξη φοίτησης στο ερχόμενο σχολικό έτος.<br><br>
</div>
</div>
</div>
......