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

Merge branch 'adminVersion' into 'develop'

several changes regarding September period

See merge request !150
parents 3c8dfafd af6edf7a
......@@ -167,9 +167,41 @@ class ApplicationSubmit extends ControllerBase
}
}
}
//τέλος ελέγχου πληρότητας
//έλεγχος μη εγκεκριμένων τμημάτων
//-->ΑΛΛΑΓΗ: έλεγχος μη εγκεκριμένων τμημάτων (ΔΕΝ διαβάζουμε τη ρύθμιση διαχειριστή, ΔΕΝ ισχύει πλέον)
//if ($eggrafesConfig->lock_small_classes) {
for ($i = 0; $i < sizeof($applicationForm[1]); $i++) {
if ($applicationForm[0]['currentclass'] === "1")
$epalSchools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(
array('id' => $applicationForm[1][$i]['epal_id'], 'approved_a' => 1));
else if ($applicationForm[0]['currentclass'] === "2")
$epalSchools = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'sector_id' => $applicationForm[2]['sectorfield_id'], 'approved_sector' => 1));
else if ($applicationForm[0]['currentclass'] === "3")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality' => 1));
else if ($applicationForm[0]['currentclass'] === "4")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality_d' => 1));
$epalSchool = reset($epalSchools);
if (!$epalSchool) {
$schoolName = $this->retrieveSchoolName($applicationForm[1][$i]['epal_id']);
$err_code = 9003;
return $this->respondWithStatus([
"error_code" => $err_code,
"school_name" => $schoolName
], Response::HTTP_OK);
}
}
//}
//τέλος ελέχου μη εγκεκριμένων τμημάτων
}
//τέλος ελέγχου πληρότητας
$crypt = new Crypt();
try {
......@@ -419,37 +451,42 @@ class ApplicationSubmit extends ControllerBase
}
}
} //end for
}
//τέλος ελέγχου πληρότητας
//τέλος ελέγχου πληρότητας
//έλεγχος μη εγκεκριμένων τμημάτων - γίνεται στην τροποποίηση αίτησης και όταν είναι ενεργή η μη προβολή μη εγκεκριμένων τμημάτων
if ($eggrafesConfig->lock_small_classes) {
for ($i = 0; $i < sizeof($applicationForm[1]); $i++) {
if ($applicationForm[0]['currentclass'] === "1")
$epalSchools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(
array('id' => $applicationForm[1][$i]['epal_id'], 'approved_a' => 1));
else if ($applicationForm[0]['currentclass'] === "2")
$epalSchools = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'sector_id' => $applicationForm[2]['sectorfield_id'], 'approved_sector' => 1));
else if ($applicationForm[0]['currentclass'] === "3")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality' => 1));
else if ($applicationForm[0]['currentclass'] === "4")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality_d' => 1));
$epalSchool = reset($epalSchools);
if (!$epalSchool) {
$schoolName = $this->retrieveSchoolName($applicationForm[1][$i]['epal_id']);
$err_code = 9003;
return $this->respondWithStatus([
"error_code" => $err_code,
"school_name" => $schoolName
], Response::HTTP_OK);
//έλεγχος μη εγκεκριμένων τμημάτων - γίνεται στην τροποποίηση αίτησης και (ΔΕΝ ΙΣΧΥΕΙ: όταν είναι ενεργή η μη προβολή μη εγκεκριμένων τμημάτων)
//-->ΑΛΛΑΓΗ: έλεγχος μη εγκεκριμένων τμημάτων (ΔΕΝ διαβάζουμε τη ρύθμιση διαχειριστή, ΔΕΝ ισχύει πλέον)
//if ($eggrafesConfig->lock_small_classes) {
for ($i = 0; $i < sizeof($applicationForm[1]); $i++) {
if ($applicationForm[0]['currentclass'] === "1")
$epalSchools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(
array('id' => $applicationForm[1][$i]['epal_id'], 'approved_a' => 1));
else if ($applicationForm[0]['currentclass'] === "2")
$epalSchools = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'sector_id' => $applicationForm[2]['sectorfield_id'], 'approved_sector' => 1));
else if ($applicationForm[0]['currentclass'] === "3")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality' => 1));
else if ($applicationForm[0]['currentclass'] === "4")
$epalSchools = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(
array('epal_id' => $applicationForm[1][$i]['epal_id'] ,'specialty_id' => $applicationForm[2]['coursefield_id'], 'approved_speciality_d' => 1));
$epalSchool = reset($epalSchools);
if (!$epalSchool) {
$schoolName = $this->retrieveSchoolName($applicationForm[1][$i]['epal_id']);
$err_code = 9003;
return $this->respondWithStatus([
"error_code" => $err_code,
"school_name" => $schoolName
], Response::HTTP_OK);
}
}
}
//}
//τέλος ελέχου εγκεκριμένου τμήματος
}
//end
$crypt = new Crypt();
......
......@@ -74,7 +74,7 @@ class DirectorView extends ControllerBase
if ($user) {
$epalId = $user->init->value;
//hard
//$epalId = 46;
//$epalId = 140;
$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 = 46;
//$schoolid = 140;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......
......@@ -1512,7 +1512,7 @@ class ReportsCreator extends ControllerBase
$sCon = $this->connection->select('eepal_school_field_data', 'eSchool');
$sCon->join('eepal_region_field_data', 'eRegion', 'eRegion.id = eSchool.region_edu_admin_id');
$sCon->join('eepal_admin_area_field_data', 'eAdmin', 'eAdmin.id = eSchool.edu_admin_id');
$sCon->fields('eSchool', array('id', 'name', 'capacity_class_a', 'region_edu_admin_id', 'edu_admin_id','operation_shift', 'metathesis_region'))
$sCon->fields('eSchool', array('id', 'name', 'capacity_class_a', 'approved_a', 'region_edu_admin_id', 'edu_admin_id','operation_shift', 'metathesis_region'))
->fields('eRegion', ['name'])
->fields('eAdmin', ['name']);
if ($regionId != 0) {
......@@ -1537,6 +1537,8 @@ class ReportsCreator extends ControllerBase
$percColumn = array();
$limitDownColumn = array();
$numNotConfirmedColumn = array();
$isApprovedColumn = array();
$isCheckedColumn = array();
$smallClass = array();
......@@ -1553,10 +1555,11 @@ class ReportsCreator extends ControllerBase
'AND eStudent.specialization_id = eSchool.sector_id ' .
//'AND eStudent.currentclass = 2 AND eStudent.directorconfirm = 1');
'AND eStudent.currentclass = 2');
$sCon->fields('eSchool', array('sector_id','capacity_class_sector'))
$sCon->fields('eSchool', array('sector_id','capacity_class_sector','approved_sector'))
->fields('eSectors', ['name'])
->groupBy('sector_id')
->groupBy('capacity_class_sector')
->groupBy('approved_sector')
->groupBy('eSectors.name')
->condition('eSchool.epal_id', $epalSchool->id, '=');
//$sCon->addExpression('count(eStudent.id)', 'eStudent_count');
......@@ -1585,6 +1588,13 @@ class ReportsCreator extends ControllerBase
array_push($limitDownColumn,$this->retrieveDownLimit($epalSchool->metathesis_region,"2"));
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($sectorsInEpal->approved_sector == "1")
array_push($isApprovedColumn,"NAI");
else if ($sectorsInEpal->approved_sector == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
array_push($isApprovedColumn,"");
$numClassSec += $sectorsInEpal->capacity_class_sector;
}
} // end εύρεση αριθμού μαθητών για κάθε τομέα της Β' τάξης
......@@ -1598,10 +1608,11 @@ class ReportsCreator extends ControllerBase
'AND eStudent.specialization_id = eSchool.specialty_id ' .
//'AND eStudent.currentclass = 3 AND eStudent.directorconfirm = 1');
'AND eStudent.currentclass = 3');
$sCon->fields('eSchool', array('specialty_id', 'capacity_class_specialty'))
$sCon->fields('eSchool', array('specialty_id', 'capacity_class_specialty','approved_speciality'))
->fields('eSpecialties', ['name'])
->groupBy('specialty_id')
->groupBy('capacity_class_specialty')
->groupBy('approved_speciality')
->groupBy('eSpecialties.name')
->condition('eSchool.epal_id', $epalSchool->id, '=');
//$sCon->addExpression('count(eStudent.id)', 'eStudent_count');
......@@ -1631,6 +1642,13 @@ class ReportsCreator extends ControllerBase
array_push($limitDownColumn,$this->retrieveDownLimit($epalSchool->metathesis_region,"3"));
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($specialtiesInEpal->approved_speciality == "1")
array_push($isApprovedColumn,"NAI");
else if ($specialtiesInEpal->approved_speciality == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
array_push($isApprovedColumn,"");
$numClassCour += $specialtiesInEpal->capacity_class_specialty;
}
} // end εύρεση αριθμού μαθητών για κάθε ειδικότητα της Γ' τάξης
......@@ -1645,10 +1663,11 @@ class ReportsCreator extends ControllerBase
'AND eStudent.specialization_id = eSchool.specialty_id ' .
//'AND eStudent.currentclass = 4 AND eStudent.directorconfirm = 1');
'AND eStudent.currentclass = 4');
$sCon->fields('eSchool', array('specialty_id', 'capacity_class_specialty_d'))
$sCon->fields('eSchool', array('specialty_id', 'capacity_class_specialty_d','approved_speciality_d'))
->fields('eSpecialties', ['name'])
->groupBy('specialty_id')
->groupBy('capacity_class_specialty_d')
->groupBy('approved_speciality_d')
->groupBy('eSpecialties.name')
->condition('eSchool.epal_id', $epalSchool->id, '=');
//$sCon->addExpression('count(eStudent.id)', 'eStudent_count');
......@@ -1679,6 +1698,13 @@ class ReportsCreator extends ControllerBase
array_push($limitDownColumn,$this->retrieveDownLimit($epalSchool->metathesis_region,"4"));
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($specialtiesInEpal->approved_speciality_d == "1")
array_push($isApprovedColumn,"NAI");
else if ($specialtiesInEpal->approved_speciality_d == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
array_push($isApprovedColumn,"");
$numClassCour_D += $specialtiesInEpal->capacity_class_specialty_d;
}
}
......@@ -1741,9 +1767,26 @@ class ReportsCreator extends ControllerBase
array_push($capacityColumn, $capacityColumnValue);
array_push($limitDownColumn,$this->retrieveDownLimit($epalSchool->metathesis_region,$clId));
array_push($percColumn, $capacityColumnValue > 0 ? number_format($numStud / $capacityColumnValue * 100, 2) : 0);
if ($epalSchool->approved_a == "1")
array_push($isApprovedColumn,"NAI");
else if ($epalSchool->approved_a == "0")
array_push($isApprovedColumn,"ΟΧΙ");
else
array_push($isApprovedColumn,"");
}
} // end εύρεση αριθμού μαθητών για κάθε τάξη
for ($j = 0; $j < sizeof($schoolNameColumn); $j++) {
if (
($num[$j] >= $limitDownColumn[$j] && $isApprovedColumn[$j] != "NAI") ||
($isApprovedColumn[$j] == null)
)
array_push($isCheckedColumn, 'ΠΡΟΒΛΗΜΑ!!!');
else
array_push($isCheckedColumn, 'OK');
}
for ($j = 0; $j < sizeof($schoolNameColumn); $j++) {
// αν έγινε αίτημα για εμφάνιση ολιγομελών και είναι το τρέχον τμήμα ολιγομελές
if (($finalized === "1") ||
......@@ -1760,6 +1803,8 @@ class ReportsCreator extends ControllerBase
'percentage' => $percColumn[$j],
'limit_down' => $limitDownColumn[$j],
'num_not_confirmed' => $numNotConfirmedColumn[$j],
'is_approved' => $isApprovedColumn[$j],
'check_it' => $isCheckedColumn[$j],
));
}
}
......
......@@ -3195,6 +3195,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//else
//{
$dateStartInt = strtotime($eggrafesConfig->date_start_b_period->value);
if ( $operation_shift == 'ΗΜΕΡΗΣΙΟ'){
$sCon = $this->connection->select('gel_student', 'gStudent');
......@@ -3204,6 +3206,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
->condition('gSchool.id', $gelId , '=')
->condition('gStudent.nextclass', $classId , '=')
//->condition('gStudent.lastschool_class', $classId-1 , '=')
//->condition('gStudent.changed', 1535536903 , '<')
->condition('gStudent.changed', $dateStartInt , '<')
->condition('gStudent.delapp', '0' , '=');
//->condition(db_or()->condition('myschool_promoted', 1)->condition('myschool_promoted', 2));
$existingstudents_prom = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......@@ -3233,6 +3237,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.delapp', '0' , '=');
//->condition(db_or()->condition('myschool_promoted', 1)->condition('myschool_promoted', 2));
$existingstudents_prom = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......@@ -3400,8 +3405,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//'birthdate' => substr($gelStudent->birthdate->value, 8, 10) . '/' . substr($gelStudent->birthdate->value, 6, 8) . '/' . substr($gelStudent->birthdate->value, 0, 4),
'birthdate' => date("d-m-Y", strtotime($gelStudent->birthdate->value)),
'checkstatus' => $gelStudent -> directorconfirm ->value,
'lock_delete' => $lock_delete,
//'lock_delete' => "0",
//'lock_delete' => $lock_delete,
'lock_delete' => "1",
'created' => date('d/m/Y H:i', $gelStudent -> created ->value),
'choices' => $choices
......@@ -3519,8 +3524,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//'birthdate' => substr($object->birthdate , 8, 10) . '/' . substr($object->birthdate , 6, 8) . '/' . substr($object->birthdate , 0, 4),
'birthdate' => date("d-m-Y", strtotime($object->birthdate )),
'checkstatus' => $object -> directorconfirm ,
'lock_delete' => $lock_delete,
//'lock_delete' => "0",
//'lock_delete' => $lock_delete,
'lock_delete' => "1",
'created' => date('d/m/Y H:i', $object -> created ),
'choices' => $choices
......
......@@ -272,7 +272,7 @@ class GelSubmittedApplications extends ControllerBase
$crypt = new Crypt();
foreach ($gelStudents as $object) {
$canDelete = 1;
//$canDelete = 1;
//ανάκτηση τιμής από ρυθμίσεις διαχειριστή για lock_delete
$config_storage = $this->entityTypeManager->getStorage('eggrafes_config');
......@@ -292,13 +292,20 @@ class GelSubmittedApplications extends ControllerBase
//$this->logger->warning("Trace.." . $eggrafesConfig->activate_second_period->value . " " . $object->second_period->value );
//στα ΓΕΛ πάντα θα υπάρχει αποτέλεσμα - είτε η ΔΔΕ τοποθέτησε, είτε δεν τοποθέτησε η ΔΔΕ ενώ έπρεπε,
//είτε τοποθετήθηκε αυτοδίκαια
if (!$applicantsAppDelDisabled /*&& $applicantsViewResultsDisabled */
&& $eggrafesConfig->activate_second_period->value == $object->second_period->value)
$canDelete = 1;
//στα ΓΕΛ πάντα θα υπάρχει αποτέλεσμα - είτε η ΔΔΕ τοποθέτησε, είτε δεν τοποθέτησε η ΔΔΕ ενώ έπρεπε,//είτε τοποθετήθηκε αυτοδίκαια
$dateStartInt = strtotime($eggrafesConfig->date_start_b_period->value);
if (!$applicantsAppDelDisabled &&
(
($eggrafesConfig->activate_second_period->value == $object->second_period->value)
&& $object->changed->value >= $dateStartInt)
||
($this->isInvalidApp($object->id->value))
)
$canDelete = 1;
else
$canDelete = 0;
$canDelete = 0;
try {
$name_decoded = $crypt->decrypt($object->name->value);
......@@ -489,29 +496,30 @@ class GelSubmittedApplications extends ControllerBase
//$this->logger->warning("Trace.." . $applicantsResultsDisabled . " " . $gelStudent->myschool_promoted . " " . $gelStudent->second_period . " " . $gelStudent->changed . " " . $dateStartInt);
$canedit = '0';
if ( $applicantsAppModifyDisabled == "0"
&& $eggrafesConfig->activate_second_period->value == $gelStudent->second_period
/*&& $gelStudent->changed >= $dateStartInt*/
if ( $applicantsAppModifyDisabled == "0" &&
(
($eggrafesConfig->activate_second_period->value == $gelStudent->second_period
&& $gelStudent->changed >= $dateStartInt)
||
($this->isInvalidApp($gelStudent->id))
)
)
$canedit = '1';
//$applicantsResultsDisabled = "0";
//if ($applicantsResultsDisabled === "0" && ($gelStudent->myschool_promoted === "1" || $gelStudent->myschool_promoted === "2")) {
if ($applicantsResultsDisabled === "0" && ($gelStudent->myschool_promoted != "3" && $gelStudent->myschool_promoted != "4"
&& $gelStudent->myschool_promoted != "5" && $gelStudent->myschool_promoted != "14")) {
&& $gelStudent->myschool_promoted != "5" && $gelStudent->myschool_promoted != "14" && $gelStudent->myschool_promoted != "0")) {
// περιττό (?), στη Β' περίοδο οι αιτήσεις λογικά δεν έχουν ενημερωμένο το myschool_promoted ?
$this->logger->warning("Trace.." . $gelStudent->second_period . ".." . $gelStudent->changed . ".. " . $dateStartInt );
if ($gelStudent->second_period == "1" && $gelStudent->changed >= $dateStartInt)
//η αίτηση είναι της β' περιόδου με ημερομηνία μεταγενέστερη της ημερομηνίας έναρξης β' περιόδου
$status = "2";
// end new piece of code
if ($gelStudent->school_id)
$status = "2";
else if ($gelStudent->school_id)
//υπάρχει σχολείο στον πίνακα gelstudenthighschool
$status = "1";
//else if ($gelStudent->lastschool_unittypeid == 40)
//ειδικές περιπτώσεις: μαθητές από ΣΔΕ / σχολεία εξωτερικού
// $status = "3";
//$status = "3";
else if ($gelStudent->student_id != null && $gelStudent->school_id == null)
//υπάρχει ο μαθητής αλλά όχι το σχολείο στον πίνακα gelstudenthighschool
$status = "3";
......@@ -612,7 +620,17 @@ class GelSubmittedApplications extends ControllerBase
}
private function isInvalidApp($appId)
{
$sCon = $this->connection->select('invalid_apps', 'invalid');
$sCon->fields('invalid', array('id'))
->condition('invalid.id', $appId , '=');
$appInvalid = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
if (sizeof($appInvalid) == 0 )
return false;
else
return true;
}
private function respondWithStatus($arr, $s)
{
......
......@@ -93,7 +93,10 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="col-md-8">&nbsp;</div>
<div class="col-md-4">
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<!--
<select [disabled] = true class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)" >
-->
<select class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)" >
<option value="1" [selected]="StudentDetails$.checkstatus === '1' ">Ναι</option>
<option value="2" [selected]="StudentDetails$.checkstatus === '0' ">Όχι</option>
<option value="3" [selected]="StudentDetails$.checkstatus != '0' && StudentDetails$.checkstatus != '1'">Δεν ελέγχθηκε</option>
......
......@@ -89,12 +89,13 @@ import { HelperDataService } from "../../services/helper-data-service";
<div style="width: 100%; color: #000000;">
<div [hidden]="StudentActive !== j" style="margin: 20px 10px 10px 10px;">
<p style="margin-top: 10px; margin-bottom: 5px; line-height: 2em;"> Παρακαλούμε, αφού γίνει ο έλεγχος των στοιχείων του μαθητή επιβεβαιώστε τη δυνατότητα εγγραφής του.</p>
<p style="margin-top: 10px; margin-bottom: 5px; line-height: 2em;"> Παρακαλούμε, αφού γίνει ο έλεγχος των στοιχείων του μαθητή επιβεβαιώστε τη δυνατότητα εγγραφής του.</p>
<div class="row" style="margin-bottom: 20px;">
<div class="col-md-8">&nbsp;</div>
<div class="col-md-4">
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<!--<select [disabled] = true class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)">-->
<select class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)">
<option value="1" [selected]="StudentDetails$.checkstatus === '1' ">Ναι</option>
<option value="2" [selected]="StudentDetails$.checkstatus === '0' ">Όχι</option>
......@@ -103,6 +104,7 @@ import { HelperDataService } from "../../services/helper-data-service";
</div>
</div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Αριθμός Δήλωσης Προτίμησης ΓΕΛ</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.id}}</div>
......
......@@ -53,44 +53,61 @@ export class ReportsSchema {
columns: {
name: {
title: "Σχολείο",
width: "18%",
width: "10%",
filter: false
},
region: {
title: "Περιφερειακή Διεύθυνση",
width: "15%",
title: "Περιφ/κή Διεύθυνση",
width: "8%",
filter: false
},
admin: {
title: ιεύθυνση Εκπαίδευσης",
width: "15%",
title: /νση Εκπ/σης",
width: "6%",
filter: false
},
section: {
title: "Τάξη/Τομέας/Ειδικότητα",
width: "18%",
width: "10%",
filter: false
},
num_not_confirmed: {
title: "Κατανεμημένοι Μαθητές",
width: "8%",
title: "Κατανε-μημένοι Μαθητές",
width: "5%",
filter: false
},
num: {
title: "Εγγεγραμμένοι Μαθητές",
width: "8%",
title: "Εγγεγραμ-μένοι Μαθητές",
width: "5%",
filter: false
},
limit_down: {
title: "Όριο",
width: "5%",
filter: false
},
capacity: {
title: "Χωρ/κα",
width: "8%",
width: "5%",
filter: false
},
/*
percentage: {
title: "Ποσοστό (%)",
width: "8%",
filter: false
}
},
*/
is_approved: {
title: "Εγκεκρ/νο",
width: "5%",
filter: false
},
check_it: {
title: "ΕΛΕΓΧΟΣ",
width: "5%",
filter: false
},
}
};
......
......@@ -130,34 +130,48 @@
<a class="nav-link" [routerLink]="['/school/eduadmin-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='dide' && (schtype == 2)" class="nav-item">
<a class="nav-link" [routerLink]="['/school/mergeschools']" [routerLinkActive]="['active']"><b>Συνενώσεις Τμημάτων</b></a>
</li>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async;">
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='dide' && schtype == 2 && !loginInfoRow$.lock_capacity " class="nav-item">
<a class="nav-link" [routerLink]="['/school/mergeschools']" [routerLinkActive]="['active']"><b>Συνενώσεις Τμημάτων</b></a>
</li>
</div>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole =='dide' && (schtype == 2) " class="nav-item">
<a class="nav-link" [routerLink]="['/school/undomerge']" [routerLinkActive]="['active']"><b>Αναιρέσεις συνενώσεων</b></a>
</li>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async;">
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole =='dide' && schtype == 2 && !loginInfoRow$.lock_capacity " class="nav-item">
<a class="nav-link" [routerLink]="['/school/undomerge']" [routerLinkActive]="['active']"><b>Αναιρέσεις συνενώσεων</b></a>
</li>
</div>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='pde' "
class="nav-item">
<a class="nav-link" [routerLink]="['/school/mergeschools']" [routerLinkActive]="['active']"><b>Συνενώσεις Τμημάτων</b></a>
</li>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async;">
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='pde' && !loginInfoRow$.lock_capacity"
class="nav-item">
<a class="nav-link" [routerLink]="['/school/mergeschools']" [routerLinkActive]="['active']"><b>Συνενώσεις Τμημάτων</b></a>
</li>
</div>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole =='pde' "
class="nav-item">
<a class="nav-link" [routerLink]="['/school/undomerge']" [routerLinkActive]="['active']"><b>Αναιρέσεις συνενώσεων</b></a>
</li>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async;">
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole =='pde' && !loginInfoRow$.lock_capacity "
class="nav-item">
<a class="nav-link" [routerLink]="['/school/undomerge']" [routerLinkActive]="['active']"><b>Αναιρέσεις συνενώσεων</b></a>
</li>
</div>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='pde'" class="nav-item">
<a class="nav-link" [routerLink]="['/school/smallclassapprovement']" [routerLinkActive]="['active']"><b>Εγκρίσεις Ολιγομελών </b></a>
</li>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async;">
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='pde' && !loginInfoRow$.lock_capacity " class="nav-item">
<a class="nav-link" [routerLink]="['/school/smallclassapprovement']" [routerLinkActive]="['active']"><b>Εγκρίσεις Ολιγομελών </b></a>
</li>
</div>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
......
......@@ -214,7 +214,7 @@
<!--
<option *ngIf = "(appUpdate | async)" [selected]="true" value={{reltostud.value}}>{{reltostud.value}}</option>
-->
<option *ngIf = "(numAppChildren | async) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα</option>
<option *ngIf = "(numAppChildren | async) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα ή εξουσιοδοτημένο Διευθυντή Σχολικής Μονάδας</option>
<option *ngIf = "!(numAppSelf | async)" value="Μαθητή">Μαθητή</option>
<!--
<option *ngIf = "(appUpdate | async) && (reltostud.value != 'Γονέα/Κηδεμόνα') && (numAppChildren | async) < (numChildren | async)" value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα</option>
......
......@@ -214,7 +214,7 @@
<!--
<option *ngIf = "(appUpdate | async)" [selected]="true" value={{reltostud.value}}>{{reltostud.value}}</option>
-->
<option *ngIf = "(numAppChildren | async) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα</option>
<option *ngIf = "(numAppChildren | async) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα ή εξουσιοδοτημένο Διευθυντή Σχολικής Μονάδας</option>
<option *ngIf = "!(numAppSelf | async)" value="Μαθητή">Μαθητή</option>
</select>
......
......@@ -302,7 +302,7 @@ import {
//λύση προβλήματος πεδίου "Αίτηση από" στο edit app
if (this.appUpdate.getValue() === true) {
if (studentDataField.get("relationtostudent") === 'Γονέα/Κηδεμόνα')
if (studentDataField.get("relationtostudent") === 'Γονέα/Κηδεμόνα')
this.numAppChildren.next(this.numAppChildren.getValue() -1) ;
else if (studentDataField.get("relationtostudent") === 'Μαθητή')
this.numAppSelf.next(this.numAppSelf.getValue() - 1);
......
......@@ -256,7 +256,7 @@ div.changecolorbalck {
.d3-chart {
width: 100%;
height: 550px;
height: 550px;
}
.d3-chart .axis path, .d3-chart .axis line {
......@@ -361,11 +361,11 @@ label {
}
.reports-container { min-height: 550px; }
.reports-container h5,
.reports-container h5,
.reports-container h6,
.reports-container button {
margin: 0 0 1em 0;
}
}
.smart-table-container {
overflow-x: scroll;
......@@ -389,14 +389,14 @@ label {
outline: none;
height: 80px;
}
.buttonGelHov span {
cursor: pointer;
display: inline-block;
position: relative;
transition: 0.5s;
}
.buttonGelHov span:after {
content: '\00bb';
position: absolute;
......@@ -405,11 +405,11 @@ label {
right: -20px;
transition: 0.5s;
}
.buttonGelHov:hover span {
padding-right: 25px;
}
.buttonGelHov:hover span:after {
opacity: 1;
right: 0;
......@@ -423,4 +423,9 @@ label {
.buttonGelHov:hover {
opacity: 1;
}
\ No newline at end of file
}
.disabled {
pointer-events:none;