Commit b9c5d724 authored by Ασπασία Κατσή's avatar Ασπασία Κατσή

Merge branch 'develop' of https://git.minedu.gov.gr/itminedu/e-eggrafes into distribution

parents f4d79b9a eacdbd47
......@@ -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();
}
......
......@@ -73,7 +73,8 @@ class DirectorView extends ControllerBase
$user = reset($users);
if ($user) {
$epalId = $user->init->value;
//$epalId = 191;
//hard
//$epalId = 46;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $epalId));
$school = reset($schools);
if (!$school) {
......@@ -473,7 +474,7 @@ class DirectorView extends ControllerBase
}elseif ($userRole === 'ministry') {
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')
->loadByProperties(array('id' => $schoolid));
}
}
$SchoolCat = reset($SchoolCats);
if ($SchoolCat) {
......@@ -994,7 +995,8 @@ class DirectorView extends ControllerBase
$user = reset($users);
if ($user) {
$schoolid = $user->init->value;
//$schoolid = 191;
//hard
//$schoolid = 46;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......@@ -1223,17 +1225,17 @@ public function getpde(Request $request)
$sCon = $this->connection->select('eepal_region_field_data', 'eStudent');
$sCon->fields('eStudent', array('id','name' ));
$studentPerSchool = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($studentPerSchool as $object) {
$list[] = array(
'id' => $object -> id,
'name' => $object -> name,
);
++$i;
}
return $this->respondWithStatus($list, Response::HTTP_OK);
} //end try
......@@ -1287,7 +1289,7 @@ public function getpde(Request $request)
$schools = $this->entityTypeManager
->getStorage('eepal_school')
->loadByProperties(array('region_edu_admin_id' => $pdeId));
if ($schools) {
......@@ -1303,7 +1305,7 @@ public function getpde(Request $request)
}
return $this->respondWithStatus($list, Response::HTTP_OK);
}
}
}//end try
catch (\Exception $e) {
$this->logger->warning($e->getMessage());
......@@ -1311,7 +1313,7 @@ public function getpde(Request $request)
"message" => t("An unexpected problem occured during report")
], Response::HTTP_INTERNAL_SERVER_ERROR);
}
}
......@@ -1353,7 +1355,7 @@ public function getpde(Request $request)
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')
->loadByProperties(array('id' => $schoolid));
$SchoolCat = reset($SchoolCats);
if ($SchoolCat) {
......@@ -1602,7 +1604,7 @@ public function getpde(Request $request)
}//end try
catch (\Exception $e) {
$this->logger->warning($e->getMessage());
......@@ -1610,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();
......
......@@ -487,7 +487,7 @@ class GelSubmittedApplications extends ControllerBase
$schoolAddress = $gelStudent->street_address;
$schoolTel = $gelStudent->phone_number;
//$this->logger->warning("Trace.." . $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,16 +495,18 @@ class GelSubmittedApplications extends ControllerBase
)
$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")) {
// περιττό (?), στη Β' περίοδο οι αιτήσεις λογικά δεν έχουν ενημερωμένο το myschool_promoted ?
if ($gelStudent->second_period === "1" && $gelStudent->changed >= $dateStartInt)
if ($gelStudent->second_period == "1" && $gelStudent->changed >= $dateStartInt)
//η αίτηση είναι της β' περιόδου με ημερομηνία μεταγενέστερη της ημερομηνίας έναρξης β' περιόδου
$status = "2";
// end new piece of code
else if ($gelStudent->school_id)
if ($gelStudent->school_id)
//υπάρχει σχολείο στον πίνακα gelstudenthighschool
$status = "1";
//else if ($gelStudent->lastschool_unittypeid == 40)
......@@ -512,7 +514,7 @@ class GelSubmittedApplications extends ControllerBase
// $status = "3";
else if ($gelStudent->student_id != null && $gelStudent->school_id == null)
//υπάρχει ο μαθητής αλλά όχι το σχολείο στον πίνακα gelstudenthighschool
$status = "8";
$status = "3";
else if ($gelStudent->student_id == null) {
//ο μαθητής δεν υπάρχει στον πίνακα gelstudenthighschool, άρα πάει αυτοδίκαια στο σχολείο τρέχουσας φοίτησης
$status = "4";
......
......@@ -342,7 +342,8 @@ class SdeDistribution extends ControllerBase
$sCon->fields('gStudent', array('lastschool_registrynumber','lastschool_unittypeid', 'lastschool_class' , 'delapp','nextclass','am','regionarea','regiontk','regionaddress','id','second_period'))
->fields('gSchool', array('id', 'name','edu_admin_id', 'registry_no','extra_unitid'))
->condition('gStudent.delapp', 0, '=')
->condition('gSchool.extra_unitid',300,'=');
->condition(db_or()->condition('gSchool.extra_unitid', 300 , '=') ->condition('gSchool.extra_unitid',1300,'='));
//->condition('gSchool.extra_unitid',300,'=');
$studentPerSchool = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
}
......
......@@ -66,7 +66,8 @@ import { HelperDataService } from "../../services/helper-data-service";
[class.oddout]="isOdd" [class.evenout]="isEven" [class.selectedout]="courseActive === i" >
<div class="row" style="line-height: 2em;">
<div class="col-md-10" style="font-weight: bold;" >{{CoursesPerSchools$.taxi}}</div>
<div class="col-md-2" style="font-weight: bold;" ><span class="pull-right" style="text-align: right; padding-right: 2px;">{{CoursesPerSchools$.size}}</span></div>
<!--<div class="col-md-2" style="font-weight: bold;" ><span class="pull-right" style="text-align: right; padding-right: 2px;">{{CoursesPerSchools$.size}}</span></div>-->
<div *ngIf = "courseActive == i" class="col-md-2" style="font-weight: bold;" ><span class="pull-right" style="text-align: right; padding-right: 2px;">{{dynamicCount | async}}</span></div>
</div>
</li>
......@@ -290,6 +291,8 @@ import { HelperDataService } from "../../services/helper-data-service";
private sector = <number>0;
private special = <number>0;
private dynamicCount: BehaviorSubject<string>;
constructor(
private _hds: HelperDataService,
private activatedRoute: ActivatedRoute,
......@@ -301,6 +304,8 @@ import { HelperDataService } from "../../services/helper-data-service";
this.retrievedStudent = new BehaviorSubject(false);
this.SavedStudents$ = new BehaviorSubject({});
this.opened = false;
this.dynamicCount = new BehaviorSubject("");
}
public showConfirmModal(): void {
......@@ -357,12 +362,14 @@ import { HelperDataService } from "../../services/helper-data-service";
findstudent(taxi) {
this.showLoader.next(true);
this.dynamicCount.next("");
this.retrievedStudent.next(false);
this.StudentInfoSub = this._hds.getStudentPerSchoolGel(taxi)
.subscribe(data => {
this.StudentInfo$.next(data);
this.retrievedStudent.next(true);
this.showLoader.next(false);
this.dynamicCount.next(data.length);
},
error => {
this.StudentInfo$.next([{}]);
......
......@@ -69,7 +69,7 @@ import { GelStudentDataFieldsActions } from "../actions/gelstudentdatafields.act
<p style = "font-size:1.0em">
<strong>Ενημέρωση: </strong>
Ευχαριστούμε για τη συνεργασία. Θα μπορείτε να ενημερωθείτε για το αποτέλεσμα της κατανομής της αίτησής σας από τις
<strong>02/07 (για τα ΕΠΑ.Λ.)</strong> και από τις <strong>04/07 (για τα ΓΕ.Λ.)</strong> και να εκτυπώσετε την αίτησή σας μέσω της εφαρμογής e-eggrafes.
<strong>02/07 (για τα ΕΠΑ.Λ.)</strong> και από τις <strong>05/07 (για τα ΓΕ.Λ.)</strong> και να εκτυπώσετε την αίτησή σας μέσω της εφαρμογής e-eggrafes.
</p>
......
......@@ -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