Skip to content

GitLab

E
e-epal
Commit c939aceb authored by Open Source Developer's avatar Open Source Developer
Browse files
Options

capacities

parent 1a7ce5e7
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 6 deletions
drupal/modules/epal/src/Controller/DirectorView.php
View file @ c939aceb
......@@ -446,6 +446,7 @@ class DirectorView extends ControllerBase
if ($SchoolCat) {
$categ = $SchoolCat->metathesis_region->value;
$operation_shift = $SchoolCat->operation_shift->value;
$capacity_class_a = ($SchoolCat -> capacity_class_a ->value) *25;
} else {
return $this->respondWithStatus([
'message' => t('No school located'),
......@@ -476,6 +477,8 @@ class DirectorView extends ControllerBase
'categ' => $categ,
'classes' => 1,
'limitdown' => $limit,
'capc' => $capacity_class_a,
);
}
}
......@@ -494,6 +497,7 @@ class DirectorView extends ControllerBase
foreach ($CourseB as $object) {
$sectorid = $object->sector_id->entity->id();
$capacity_class_b = ($object -> capacity_class_sector ->value) *25;
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')
->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $sectorid, 'currentclass' => 2));
$list[] = array(
......@@ -503,6 +507,8 @@ class DirectorView extends ControllerBase
'categ' => $categ,
'classes' => 2,
'limitdown' => $limit,
'capc' => $capacity_class_b,
);
}
}
......@@ -520,6 +526,7 @@ class DirectorView extends ControllerBase
foreach ($CourseC as $object) {
$specialityid = $object->specialty_id->entity->id();
$capacity_class_c = ($object -> capacity_class_specialty ->value) *25;
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')
->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $specialityid, 'currentclass' => 3));
$list[] = array(
......@@ -529,6 +536,8 @@ class DirectorView extends ControllerBase
'categ' => $categ,
'classes' => 3,
'limitdown' => $limit,
'capc' => $capacity_class_c,
);
}
}
......@@ -546,7 +555,7 @@ class DirectorView extends ControllerBase
$specialityid = $object->specialty_id->entity->id();
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')
->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $specialityid, 'currentclass' => 4));
$capacity_class_d = ($object -> capacity_class_specialty_d ->value) *25;
$list[] = array(
'id' => $object->specialty_id->entity->id(),
'name' => 'Δ Λυκείου '.$object->specialty_id->entity->get('name')->value,
......@@ -554,6 +563,7 @@ class DirectorView extends ControllerBase
'categ' => $categ,
'classes' => 4,
'limitdown' => $limit,
'capc' => $capacity_class_d,
);
}
}
......
source/components/infoviews/eduadmin-view.ts
View file @ c939aceb
......@@ -56,8 +56,9 @@ import {
[class.changecolorbalck]="calccolor(CoursesNames$.limitdown, CoursesNames$.size)"
[class.selectedappout]="regionActive === j"
[hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-9">{{CoursesNames$.name}}</div>
<div class="col-md-3">{{CoursesNames$.size}}</div>
<div class="col-md-8">{{CoursesNames$.name}}</div>
<div class="col-md-2">{{CoursesNames$.size}}</div>
<div class="col-md-2">{{CoursesNames$.capc}}</div>
</div>
</li>
</div>
......
source/components/infoviews/perfecture-view.ts
View file @ c939aceb
......@@ -46,12 +46,18 @@ import {
[class.oddout]="isOdd"
[class.evenout]="isEven" [class.selectedout]="regionActive === SchoolNames$.id" >
<div [class.changelistcolor]= "SchoolNames$.status === false" class="col-md-12">{{SchoolNames$.name}}</div>
<div class = "row" [hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-8">Τμήματα</div>
<div class="col-md-2">Επιλεχθέντες</div>
<div class="col-md-2">Χωρητικότητα</div>
</div>
<div class = "row" *ngFor="let CoursesNames$ of CoursesPerPerf$ | async; let j=index; let isOdd2=odd; let isEven2=even"
[class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.size,CoursesNames$.limitdown)"
[class.selectedappout]="regionActive === j"
[hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-9">{{CoursesNames$.name}}</div>
<div class="col-md-3">{{CoursesNames$.size}}</div>
<div class="col-md-8">{{CoursesNames$.name}}</div>
<div class="col-md-2">{{CoursesNames$.size}}</div>
<div class="col-md-2">{{CoursesNames$.capc}}</div>
</div>
</li>
</div>
......
source/components/navbar/navbar.component.html
View file @ c939aceb
......@@ -46,17 +46,27 @@
<a class="nav-link" [routerLink]="['/ministry/minister-informstudents']" [routerLinkActive]="['active']"><b>Αποστολή Ειδοποιήσεων</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
<li *ngIf="authRole=='pde'" class="nav-item" >
<a class="nav-link" [routerLink]="['/school/perfecture-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
<li *ngIf="authRole=='pde'" class="nav-item" >
<a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
<li *ngIf="authRole=='dide'" class="nav-item" >
<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'" class="nav-item" >
<a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']" ><b>Αναφορές</b></a>
</li>
</div>
</div>
......
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