Merge branch 'pde-dde-views' into 'develop'

Pde dde views

See merge request !170
parents ce24213d 0285b30b
......@@ -446,13 +446,16 @@ class DirectorView extends ControllerBase
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid, 'edu_admin_id' => $newid));
}
$SchoolCat = reset($SchoolCats);
if ($SchoolCat) {
$list = array();
$categ = $SchoolCat->metathesis_region->value;
$operation_shift = $SchoolCat -> operation_shift -> value;
}
// $CourseA = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id' => $schoolid));
$CourseA = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid));
$CourseA = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
if ($CourseA) {
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => 1, 'category' => $categ));
......@@ -519,6 +522,29 @@ class DirectorView extends ControllerBase
);
}
}
if ($CourseC && $operation_shift != 'ΗΜΕΡΗΣΙΟ' ) {
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => 4, 'category' => $categ));
$limitdown = reset($limit_down);
if ($limitdown) {
$limit = $limitdown->limit_down->value;
}
foreach ($CourseC as $object) {
$specialityid = $object->specialty_id->entity->id();
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $specialityid, 'currentclass' => 4));
$list[] = array(
'id' => $object->specialty_id->entity->id(),
'name' => 'Δ Λυκείου '.$object->specialty_id->entity->get('name')->value,
'size' => sizeof($studentPerSchool),
'categ' => $categ,
'classes' => 4,
'limitdown' => $limit,
);
}
}
if ($CourseA || $CourseB || $CourseC) {
return $this->respondWithStatus(
$list, Response::HTTP_OK);
......
File mode changed from 100755 to 100644
......@@ -52,7 +52,26 @@ import {
<p>Επίσης πρέπει να γνωρίζετε ότι η Ηλεκτρονική Δήλωση Προτίμησης υπέχει θέση Υπ. Δήλωσης του ν. 1599/1986 (Α ́ 75) και οφείλετε τα στοιχεία που καταχωρίζετε σε αυτή να είναι αληθή.</p>
<form [formGroup]="formGroup" #form>
<ul>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
</ul>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="disclaimerChecked | async" formControlName="disclaimerChecked" >
......
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