Commit fd41d417 authored by Νίκος Κατσαούνος's avatar Νίκος Κατσαούνος

Merge branch 'adminVersion' into 'develop'

minor changes

See merge request itminedu/e-eggrafes!151
parents 5e9091b4 2275939a
......@@ -74,7 +74,7 @@ class DirectorView extends ControllerBase
if ($user) {
$epalId = $user->init->value;
//hard
//$epalId = 140;
//$epalId = 250;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $epalId));
$school = reset($schools);
if (!$school) {
......@@ -996,7 +996,7 @@ class DirectorView extends ControllerBase
if ($user) {
$schoolid = $user->init->value;
//hard
//$schoolid = 140;
//$schoolid = 250;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......
......@@ -134,7 +134,7 @@ class ReportsCreator extends ControllerBase
//υπολογισμός αριθμού αιτήσεων για τρίτη περίοδο
$datelimit = '31-8-2017';
$datelimit = '31-8-2018';
$datelimitInt = strtotime($datelimit);
$sCon = $this->connection
......@@ -144,8 +144,8 @@ class ReportsCreator extends ControllerBase
->condition('created', $datelimitInt, '>=')
->condition('eStudent.delapp', 0, '=');
$numApplications = $sCon->countQuery()->execute()->fetchField();
//array_push($list, (object) array('name' => "Αριθμός Αιτήσεων περιόδου Σεπτεμβρίου", 'numStudents' => $numApplications));
array_push($list, (object) array('name' => "Αριθμός Αιτήσεων περιόδου Σεπτεμβρίου", 'numStudents' => 0));
array_push($list, (object) array('name' => "Αριθμός Αιτήσεων περιόδου Σεπτεμβρίου", 'numStudents' => $numApplications));
//array_push($list, (object) array('name' => "Αριθμός Αιτήσεων περιόδου Σεπτεμβρίου", 'numStudents' => 0));
//υπολογισμός αριθμού χρηστών
......@@ -1589,7 +1589,7 @@ class ReportsCreator extends ControllerBase
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($sectorsInEpal->approved_sector == "1")
array_push($isApprovedColumn,"NAI");
array_push($isApprovedColumn,"ΝΑΙ");
else if ($sectorsInEpal->approved_sector == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
......@@ -1643,7 +1643,7 @@ class ReportsCreator extends ControllerBase
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($specialtiesInEpal->approved_speciality == "1")
array_push($isApprovedColumn,"NAI");
array_push($isApprovedColumn,"ΝΑΙ");
else if ($specialtiesInEpal->approved_speciality == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
......@@ -1699,7 +1699,7 @@ class ReportsCreator extends ControllerBase
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($specialtiesInEpal->approved_speciality_d == "1")
array_push($isApprovedColumn,"NAI");
array_push($isApprovedColumn,"ΝΑΙ");
else if ($specialtiesInEpal->approved_speciality_d == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
......@@ -1769,7 +1769,7 @@ class ReportsCreator extends ControllerBase
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($epalSchool->approved_a == "1")
array_push($isApprovedColumn,"NAI");
array_push($isApprovedColumn,"ΝΑΙ");
else if ($epalSchool->approved_a == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
......@@ -1778,9 +1778,11 @@ class ReportsCreator extends ControllerBase
} // end εύρεση αριθμού μαθητών για κάθε τάξη
for ($j = 0; $j < sizeof($schoolNameColumn); $j++) {
//$this->logger->warning("Test " . $isApprovedColumn[$j] . " Num " . $numColumn[$j] . " Limit " . $limitDownColumn[$j]);
if (
($num[$j] >= $limitDownColumn[$j] && $isApprovedColumn[$j] != "NAI") ||
($isApprovedColumn[$j] == null)
($numColumn[$j] >= $limitDownColumn[$j] && $isApprovedColumn[$j] != "ΝΑΙ"
&& $schoolSectionColumn[$j] !== "Β τάξη" && $schoolSectionColumn[$j] !== "Γ τάξη" && $schoolSectionColumn[$j] !== "Δ τάξη")
//|| ($isApprovedColumn[$j] == null)
)
array_push($isCheckedColumn, 'ΠΡΟΒΛΗΜΑ!!!');
else
......@@ -2306,7 +2308,8 @@ class ReportsCreator extends ControllerBase
], Response::HTTP_FORBIDDEN);
}
$schoolid = $user->init->value;
//$schoolid = 2838;
//hardcoded
//$schoolid = 319;
//user role validation
$roles = $user->getRoles();
......
......@@ -1113,6 +1113,7 @@ public function deleteApplicationFromDirector(Request $request)
$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([
......@@ -1120,6 +1121,7 @@ public function deleteApplicationFromDirector(Request $request)
], Response::HTTP_FORBIDDEN);
}
}
*/
$epalStudent->set('delapp', 1);
$timestamp = strtotime(date("Y-m-d"));
......
......@@ -2763,8 +2763,8 @@ public function FindCoursesPerSchoolGel(Request $request)
if ($user) {
$schoolid = $user->init->value;
//hard
//$schoolid = 361;
//$schoolid = 1877;
//$schoolid = 1696;
$schools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......@@ -3132,8 +3132,7 @@ public function getStudentPerSchoolGel(Request $request, $classId)
if ($user) {
$gelId = $user->init->value;
//hard
//$gelId = 361;
//$gelId = 1877;
//$gelId = 1696;
//$this->logger->warning($gelId."kvdikos sxoleiou".$classId);
$schools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('id' => $gelId));
$school = reset($schools);
......@@ -3207,7 +3206,7 @@ public function getStudentPerSchoolGel(Request $request, $classId)
->condition('gStudent.nextclass', $classId , '=')
//->condition('gStudent.lastschool_class', $classId-1 , '=')
//->condition('gStudent.changed', 1535536903 , '<')
->condition('gStudent.changed', $dateStartInt , '<')
->condition('gStudent.created', $dateStartInt , '<')
->condition('gStudent.delapp', '0' , '=');
//->condition(db_or()->condition('myschool_promoted', 1)->condition('myschool_promoted', 2));
$existingstudents_prom = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......@@ -3237,7 +3236,7 @@ public function getStudentPerSchoolGel(Request $request, $classId)
->condition('gSchool.id', $gelId , '=')
->condition('gStudent.nextclass', $classId , '=')
//->condition('gStudent.lastschool_class', $classId-4 , '=')
->condition('gStudent.changed', $dateStartInt , '<')
->condition('gStudent.created', $dateStartInt , '<')
->condition('gStudent.delapp', '0' , '=');
//->condition(db_or()->condition('myschool_promoted', 1)->condition('myschool_promoted', 2));
$existingstudents_prom = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......
......@@ -15,7 +15,7 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-close"></i>&nbsp;&nbsp;Διαγραφή Δήλωσης Προτίμησης ΕΠΑΛ</h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#applicationDeleteConfirm')">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
......@@ -35,7 +35,7 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-ban"></i>&nbsp;&nbsp;Αποτυχία Διαγραφής Δήλωσης Προτίμησης ΕΠΑΛ</h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#applicationDeleteError')">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
......
......@@ -14,7 +14,7 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-close"></i>&nbsp;&nbsp;Διαγραφή Δήλωσης Προτίμησης ΓΕΛ</h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#applicationDeleteConfirm')">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
......@@ -34,7 +34,7 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-ban"></i>&nbsp;&nbsp;Αποτυχία Διαγραφής Δήλωσης Προτίμησης </h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#applicationDeleteError')">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
......
......@@ -67,6 +67,7 @@ import { GelStudentDataFieldsActions } from "../actions/gelstudentdatafields.act
</p>
-->
<!--
<p style = "font-size:1.0em">
<strong>Ενημέρωση: </strong>
Ευχαριστούμε για τη συνεργασία. Από τις <strong>02/07 (για τα ΕΠΑ.Λ.)</strong> και από τις <strong>05/07 (για τα ΓΕ.Λ.)</strong>
......@@ -74,7 +75,12 @@ import { GelStudentDataFieldsActions } from "../actions/gelstudentdatafields.act
Σε περίπτωση που δεν μπορείτε να δείτε το αποτέλεσμα της κατανομής σας ή υπάρχει κάποιο σφάλμα σε αυτό,
παρακαλούμε να επικοινωνήσετε με τον διευθυντή του λυκείου από τις <strong>03/09/2018</strong>.
</p>
-->
<p style = "font-size:1.0em">
<strong>Ενημέρωση: </strong>
Η εφαρμογή θα ανοίξει από τις <strong>03/09</strong> και ώρα 12:00 έως και <strong>09/09 και ώρα 24:00</strong> για υποβολή αιτήσεων για τις κατ’ εξαίρεση εγγραφές και τροποποίηση.
Για περισσότερες πληροφορίες, παρακαλούμε, συμβουλευτείτε τις ανακοινώσεις της εφαρμογής και επικοινωνήστε με το Διευθυντή του οικείου Λυκείου.
</p>
<p style = "font-size:0.9em" >
<strong>Ενημέρωση περί νομιμότητας της επεξεργασίας των δεδομένων προσωπικού χαρακτήρα της εφαρμογής e-eggrafes: </strong>
......
......@@ -267,6 +267,8 @@ import { IAppState } from "../../store/store";
guardianIdentEnabled:["",[]],
});
this.formGroup.get("smallClassApproved").disable();
this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
this.settings$ = new BehaviorSubject([{}]);
this.modalTitle = new BehaviorSubject("");
......
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