modified report regarding small classes

parent 54ae7d54
......@@ -217,8 +217,6 @@ class ApplicationSubmit extends ControllerBase
], Response::HTTP_FORBIDDEN);
}
//$second_period = $eggrafesConfig->activate_second_period->value;
$student = array(
'langcode' => 'el',
'user_id' => $epalUser->user_id->target_id,
......@@ -500,7 +498,6 @@ class ApplicationSubmit extends ControllerBase
], Response::HTTP_FORBIDDEN);
}
//$second_period = $eggrafesConfig->activate_second_period->value;
$student = array(
'langcode' => 'el',
'user_id' => $epalUser->user_id->target_id,
......@@ -613,7 +610,7 @@ class ApplicationSubmit extends ControllerBase
$epalStudent->set('myschool_currentlevelname', $applicationForm[0]['level_name']);
//if ($applicationForm[0]['unittype_name'] != null)
$epalStudent->set('myschool_currentunittype', $applicationForm[0]['unittype_name']);
//$epalStudent->set('second_period', $eggrafesConfig->activate_second_period->value);
$epalStudent->set('second_period', $eggrafesConfig->activate_second_period->value);
$epalStudent->save();
}
......
......@@ -74,7 +74,7 @@ class DirectorView extends ControllerBase
if ($user) {
$epalId = $user->init->value;
//hard
//$epalId = 245;
//$epalId = 46;
$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 = 245;
//$schoolid = 46;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......@@ -1355,7 +1355,7 @@ public function getpde(Request $request)
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')
->loadByProperties(array('id' => $schoolid));
$SchoolCat = reset($SchoolCats);
if ($SchoolCat) {
......@@ -1604,7 +1604,7 @@ public function getpde(Request $request)
}//end try
catch (\Exception $e) {
$this->logger->warning($e->getMessage());
......@@ -1612,7 +1612,7 @@ public function getpde(Request $request)
"message" => t("An unexpected problem occured during report")
], Response::HTTP_INTERNAL_SERVER_ERROR);
}
}
......
......@@ -523,6 +523,8 @@ class GelApplicationSubmit extends ControllerBase
$gelStudent->set('myschool_currentlevelname', $applicationForm[0]['level_name']);
$gelStudent->set('myschool_currentunittype', $applicationForm[0]['unittype_name']);
$gelStudent->set('second_period', $second_period);
$gelStudent->save();
}
$entity_storage_student->resetCache();
......
......@@ -2735,7 +2735,7 @@ public function FindCoursesPerSchoolGel(Request $request)
$user = reset($users);
if ($user) {
$schoolid = $user->init->value;
//hard
//hard
//$schoolid = 2420;
$schools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
......@@ -3154,9 +3154,9 @@ public function getStudentPerSchoolGel(Request $request, $classId)
->condition('gStudent.delapp', '0' , '=')
->condition(db_or()->condition('myschool_promoted', 1)->condition('myschool_promoted', 2)->condition('myschool_promoted', 6)->condition('myschool_promoted', 7));
$existingstudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
}
......
......@@ -487,7 +487,7 @@ class GelSubmittedApplications extends ControllerBase
$schoolAddress = $gelStudent->street_address;
$schoolTel = $gelStudent->phone_number;
$this->logger->warning("Trace.." . $applicantsResultsDisabled . " " . $gelStudent->myschool_promoted . " " . $gelStudent->second_period . " " . $gelStudent->changed . " " . $dateStartInt);
//$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
......@@ -495,14 +495,12 @@ class GelSubmittedApplications extends ControllerBase
)
$canedit = '1';
$applicantsResultsDisabled = "0";
//$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")) {
$this->logger->warning("Test!!!..");
// περιττό (?), στη Β' περίοδο οι αιτήσεις λογικά δεν έχουν ενημερωμένο το myschool_promoted ?
if ($gelStudent->second_period == "1" && $gelStudent->changed >= $dateStartInt)
//η αίτηση είναι της β' περιόδου με ημερομηνία μεταγενέστερη της ημερομηνίας έναρξης β' περιόδου
$status = "2";
......
......@@ -57,6 +57,7 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
<option value="0"></option>
<option *ngFor="let SchoolSelection$ of SchoolSelections$ | async; let i=index" [value] = "SchoolSelection$.epal_id"> {{SchoolSelection$.epal_name}} </option>
</select>
<br/>
</div>
<div *ngIf = "reportId === 3 || reportId === 5" >
......@@ -71,6 +72,7 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
<option value="3" >Γ' Λυκείου</option>
<option value="4" >Δ' Λυκείου</option>
</select>
<br/>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4) ">Τομέας</label>
......
......@@ -276,6 +276,12 @@ export class ReportsSchema {
width: "8%",
filter: false
},
approved: {
title: "Εγκεκριμένο",
width: "8%",
filter: false
}
/*
capacity: {
title: "Χωρ/κα",
width: "8%",
......@@ -286,6 +292,7 @@ export class ReportsSchema {
width: "8%",
filter: false
}
*/
}
};
......
......@@ -83,6 +83,12 @@
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='supervisor'" class="nav-item">
<a class="nav-link" [routerLink]="['/ministry/smallclassapprovementmin']" [routerLinkActive]="['active']"><b>Εγκρίσεις Ολιγομελών </b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (userType | async) === 'epal'" class="nav-item">
<li *ngIf="authRole=='supervisor'" class="nav-item">
<a class="nav-link"><b>ΔΙΑΧΕΙΡΙΣΗ ΕΠΑΛ</b></a>
......@@ -154,14 +160,6 @@
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='supervisor'" class="nav-item">
<a class="nav-link" [routerLink]="['/ministry/smallclassapprovementmin']" [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>
......
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