Commit c746bffe authored by Open Source Developer's avatar Open Source Developer

ui improvement

parent 674560cc
...@@ -79,7 +79,7 @@ epal.allocation: ...@@ -79,7 +79,7 @@ epal.allocation:
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
sectorperschool: sectorperschool:
path: '/epal/sectorperSchool/{epalId}' path: '/epal/sectorperSchool'
options: options:
_auth: [ 'basic_auth' ] _auth: [ 'basic_auth' ]
defaults: defaults:
...@@ -87,7 +87,7 @@ sectorperschool: ...@@ -87,7 +87,7 @@ sectorperschool:
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
specialityperschool: specialityperschool:
path: '/epal/specialityperSchool/{epalId}/{sectorId}' path: '/epal/specialityperSchool/{sectorId}'
options: options:
_auth: [ 'basic_auth' ] _auth: [ 'basic_auth' ]
defaults: defaults:
...@@ -103,7 +103,7 @@ confirmstudents: ...@@ -103,7 +103,7 @@ confirmstudents:
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
studentperschool: studentperschool:
path: '/epal/studentperSchool/{epalId}/{selectId}/{classId}/{limitdown}/{limitup}' path: '/epal/studentperSchool/{selectId}/{classId}/{limitdown}/{limitup}'
options: options:
_auth: [ 'basic_auth' ] _auth: [ 'basic_auth' ]
defaults: defaults:
...@@ -111,7 +111,7 @@ studentperschool: ...@@ -111,7 +111,7 @@ studentperschool:
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
savecapacity: savecapacity:
path: '/epal/savecapacity/{taxi}/{tomeas}/{specialit}/{schoolid}' path: '/epal/savecapacity/{taxi}/{tomeas}/{specialit}'
options: options:
_auth: [ 'basic_auth' ] _auth: [ 'basic_auth' ]
defaults: defaults:
...@@ -207,7 +207,7 @@ critirioschosen: ...@@ -207,7 +207,7 @@ critirioschosen:
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
findcapacity: findcapacity:
path: '/epal/findCapacity/{taxi}/{tomeas}/{specialit}/{schoolid}' path: '/epal/findCapacity/{taxi}/{tomeas}/{specialit}'
options: options:
_auth: [ 'basic_auth' ] _auth: [ 'basic_auth' ]
defaults: defaults:
...@@ -222,3 +222,13 @@ findschoolid: ...@@ -222,3 +222,13 @@ findschoolid:
_controller: '\Drupal\epal\Controller\DirectorView::getSchoolID' _controller: '\Drupal\epal\Controller\DirectorView::getSchoolID'
requirements: requirements:
_user_is_logged_in: 'TRUE' _user_is_logged_in: 'TRUE'
gettypeofschool:
path: '/epal/gettypeofschool'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\DirectorView::gettypeofschool'
requirements:
_user_is_logged_in: 'TRUE'
...@@ -34,7 +34,7 @@ class DirectorView extends ControllerBase ...@@ -34,7 +34,7 @@ class DirectorView extends ControllerBase
public function getSectorsPerSchool(Request $request, $epalId) public function getSectorsPerSchool(Request $request)
{ {
$authToken = $request->headers->get('PHP_AUTH_USER'); $authToken = $request->headers->get('PHP_AUTH_USER');
...@@ -42,8 +42,10 @@ public function getSectorsPerSchool(Request $request, $epalId) ...@@ -42,8 +42,10 @@ public function getSectorsPerSchool(Request $request, $epalId)
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users); $user = reset($users);
if ($user) { if ($user) {
// $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $user->mail->value, 'id' => intval($epalId))); $epalId = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => intval($epalId)));
$schools = $this->entityTypeManager->getStorage('eepal_school')->
loadByProperties(array('id' => $epalId));
$school = reset($schools); $school = reset($schools);
if (!$school) { if (!$school) {
$this->logger->warning("no access to this school=" . $user->id()); $this->logger->warning("no access to this school=" . $user->id());
...@@ -56,8 +58,8 @@ public function getSectorsPerSchool(Request $request, $epalId) ...@@ -56,8 +58,8 @@ public function getSectorsPerSchool(Request $request, $epalId)
$userid = $user -> id(); $userid = $user -> id();
$epalIdNew = intval($epalId); //$epalIdNew = intval($epalId);
$sectorPerSchool = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id'=> $epalIdNew)); $sectorPerSchool = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id'=> $epalId));
$i = 0; $i = 0;
if ($sectorPerSchool) { if ($sectorPerSchool) {
...@@ -92,7 +94,7 @@ public function getSectorsPerSchool(Request $request, $epalId) ...@@ -92,7 +94,7 @@ public function getSectorsPerSchool(Request $request, $epalId)
} }
public function getSpecialPerSchool(Request $request, $epalId , $sectorId) public function getSpecialPerSchool(Request $request , $sectorId)
{ {
$authToken = $request->headers->get('PHP_AUTH_USER'); $authToken = $request->headers->get('PHP_AUTH_USER');
...@@ -100,8 +102,9 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId) ...@@ -100,8 +102,9 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId)
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users); $user = reset($users);
if ($user) { if ($user) {
// $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $user->mail->value, 'id' => intval($epalId))); $epalId = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array( 'id' => intval($epalId)));
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array( 'id' => $epalId));
$school = reset($schools); $school = reset($schools);
if (!$school) { if (!$school) {
$this->logger->warning("no access to this school=" . $user->id()); $this->logger->warning("no access to this school=" . $user->id());
...@@ -112,8 +115,8 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId) ...@@ -112,8 +115,8 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId)
return $response; return $response;
} }
$userid = $user -> id(); $userid = $user -> id();
$epalIdNew = intval($epalId); //$epalIdNew = intval($epalId);
$specialityPerSchool = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id'=> $epalIdNew)); $specialityPerSchool = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id'=> $epalId));
$i = 0; $i = 0;
if ($specialityPerSchool) { if ($specialityPerSchool) {
...@@ -155,7 +158,7 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId) ...@@ -155,7 +158,7 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId)
} }
public function getStudentPerSchool(Request $request, $epalId , $selectId, $classId, $limitdown, $limitup) public function getStudentPerSchool(Request $request , $selectId, $classId, $limitdown, $limitup)
{ {
$authToken = $request->headers->get('PHP_AUTH_USER'); $authToken = $request->headers->get('PHP_AUTH_USER');
...@@ -163,8 +166,8 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas ...@@ -163,8 +166,8 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users); $user = reset($users);
if ($user) { if ($user) {
// $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $user->mail->value, 'id' => intval($epalId))); $epalId = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array( 'id' => intval($epalId))); $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array( 'id' => $epalId));
$school = reset($schools); $school = reset($schools);
if (!$school) { if (!$school) {
$this->logger->warning("no access to this school=" . $user->id()); $this->logger->warning("no access to this school=" . $user->id());
...@@ -176,17 +179,17 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas ...@@ -176,17 +179,17 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas
} }
$userid = $user -> id(); $userid = $user -> id();
$epalIdNew = intval($epalId); //$epalIdNew = intval($epalId);
$selectIdNew = intval($selectId); $selectIdNew = intval($selectId);
if ($classId == 1) if ($classId == 1)
{ {
$selectIdNew = -1; $selectIdNew = -1;
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id'=> $epalIdNew, 'specialization_id' => $selectIdNew, 'currentclass' => $classId )); $studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id'=> $epalId, 'specialization_id' => $selectIdNew, 'currentclass' => $classId ));
} }
else else
{ {
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id'=> $epalIdNew, 'specialization_id' => $selectIdNew, 'currentclass' => $classId )); $studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id'=> $epalId, 'specialization_id' => $selectIdNew, 'currentclass' => $classId ));
} }
$i = 0; $i = 0;
...@@ -325,7 +328,7 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas ...@@ -325,7 +328,7 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas
public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid) public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
{ {
...@@ -340,7 +343,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -340,7 +343,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users); $user = reset($users);
if ($user) { if ($user) {
// $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $user->mail->value, 'id' => intval($epalId))); $schoolid = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid)); $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid));
$school = reset($schools); $school = reset($schools);
if (!$school) { if (!$school) {
...@@ -379,7 +382,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -379,7 +382,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
} }
if (($tomeas != 0) && ($specialit != 0)) if (($tomeas != 0) && ($specialit != 0) && ($taxi == 3))
{ {
$CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialit)); $CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialit));
$classcapacity = reset($CapacityPerClass); $classcapacity = reset($CapacityPerClass);
...@@ -390,7 +393,15 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -390,7 +393,15 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
} }
if (($tomeas != 0) && ($specialit != 0) && ($taxi == 4))
{
$CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialit));
$classcapacity = reset($CapacityPerClass);
if ($classcapacity) {
$classcapacity->set('capacity_class_specialty_d', $cap);
$classcapacity->save();
}
}
...@@ -414,7 +425,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -414,7 +425,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
public function getSchoolsPerPerfetcure(Request $request, $perfectureId) public function getSchoolsPerPerfetcure(Request $request)
{ {
$authToken = $request->headers->get('PHP_AUTH_USER'); $authToken = $request->headers->get('PHP_AUTH_USER');
...@@ -423,6 +434,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -423,6 +434,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
$user = reset($users); $user = reset($users);
if ($user) if ($user)
{ {
$perfectureId = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('region_edu_admin_id'=> $perfectureId )); $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('region_edu_admin_id'=> $perfectureId ));
if ($schools) if ($schools)
{ {
...@@ -472,6 +484,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -472,6 +484,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
$user = reset($users); $user = reset($users);
if ($user) if ($user)
{ {
$list= array(); $list= array();
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid )); $SchoolCats = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid ));
...@@ -588,8 +601,7 @@ public function returnstatus($id) ...@@ -588,8 +601,7 @@ public function returnstatus($id)
public function findCapacity(Request $request,$taxi,$tomeas,$specialit)
public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid)
{ {
$tomeasnew = intval($tomeas); $tomeasnew = intval($tomeas);
...@@ -599,6 +611,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -599,6 +611,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users); $user = reset($users);
if ($user) { if ($user) {
$schoolid = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid)); $schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid));
$school = reset($schools); $school = reset($schools);
if (!$school) { if (!$school) {
...@@ -624,9 +637,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -624,9 +637,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
$list[] = array( $list[] = array(
'taxi' => $taxi, 'taxi' => $taxi,
'capacity' => $classcapacity -> capacity_class_a -> value , 'capacity' => $classcapacity -> capacity_class_a -> value ,
'test' => "lalalala", );
'school' => $schoolid
);
} }
} }
...@@ -647,7 +658,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -647,7 +658,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
} }
if (($tomeasnew != 0) && ($specialitnew != 0)) if (($tomeasnew != 0) && ($specialitnew != 0) && ($taxi == 3))
{ {
$CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialitnew)); $CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialitnew));
$classcapacity = reset($CapacityPerClass); $classcapacity = reset($CapacityPerClass);
...@@ -663,6 +674,21 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid ...@@ -663,6 +674,21 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit,$schoolid
} }
} }
if (($tomeasnew != 0) && ($specialitnew != 0) && ($taxi == 4))
{
$CapacityPerClass = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid, 'specialty_id' => $specialitnew));
$classcapacity = reset($CapacityPerClass);
if ($classcapacity) {
$list[] = array(
'taxi' =>$taxi,
'tomeas' => $tomeasnew,
'special' =>$specialitnew,
'tomeas' => $classcapacity -> specialty_id -> value,
'capacity' => $classcapacity -> capacity_class_specialty_d -> value ,
'specialty' =>"fromspecialityd"
);
}
}
...@@ -716,11 +742,46 @@ public function getSchoolID(Request $request) ...@@ -716,11 +742,46 @@ public function getSchoolID(Request $request)
public function gettypeofschool(Request $request)
{
$authToken = $request->headers->get('PHP_AUTH_USER');
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users);
if ($user) {
$schid = intval($user -> init -> value );
$schools = $this->entityTypeManager->getStorage('eepal_school')->
loadByProperties(array('id' => $schid));
$school = reset($schools);
if (!$school) {
$this->logger->warning("no access to this school=" . $user->id());
$response = new Response();
$response->setContent('No access to this school');
$response->setStatusCode(Response::HTTP_FORBIDDEN);
$response->headers->set('Content-Type', 'application/json');
return $response;
}
else
{
$list = array();
$list[] = array(
'type' => $school -> operation_shift -> value,
);
return $this->respondWithStatus(
$list
, Response::HTTP_OK);
}
} else {
return $this->respondWithStatus([
'message' => t("User not found!"),
], Response::HTTP_FORBIDDEN);
}
}
private function respondWithStatus($arr, $s) { private function respondWithStatus($arr, $s) {
......
...@@ -28,7 +28,10 @@ import { ...@@ -28,7 +28,10 @@ import {
<option value="1" >Α' Λυκείου</option> <option value="1" >Α' Λυκείου</option>
<option value="2" >Β' Λυκείου</option> <option value="2" >Β' Λυκείου</option>
<option value="3" >Γ' Λυκείου</option> <option value="3" >Γ' Λυκείου</option>
<option *ngIf="(selectiontype | async)" value="4" >Δ' Λυκείου</option>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -86,6 +89,7 @@ import { ...@@ -86,6 +89,7 @@ import {
private StudentSelectedSpecialSub: Subscription; private StudentSelectedSpecialSub: Subscription;
private saveCapacitySub: Subscription; private saveCapacitySub: Subscription;
private selectionBClass: BehaviorSubject<boolean>; private selectionBClass: BehaviorSubject<boolean>;
private selectiontype: BehaviorSubject<boolean>;
private selectionCClass: BehaviorSubject<boolean>; private selectionCClass: BehaviorSubject<boolean>;
private School$: BehaviorSubject<any>; private School$: BehaviorSubject<any>;
private SchoolSub: Subscription; private SchoolSub: Subscription;
...@@ -106,6 +110,7 @@ import { ...@@ -106,6 +110,7 @@ import {
this.StudentSelectedSpecial$ = new BehaviorSubject([{}]); this.StudentSelectedSpecial$ = new BehaviorSubject([{}]);
this.classCapacity$ = new BehaviorSubject([{}]); this.classCapacity$ = new BehaviorSubject([{}]);
this.selectionBClass = new BehaviorSubject(false); this.selectionBClass = new BehaviorSubject(false);
this.selectiontype = new BehaviorSubject(true);
this.selectionCClass = new BehaviorSubject(false); this.selectionCClass = new BehaviorSubject(false);
this.retrievedStudent = new BehaviorSubject(false); this.retrievedStudent = new BehaviorSubject(false);
this.School$ = new BehaviorSubject([{}]); this.School$ = new BehaviorSubject([{}]);
...@@ -118,9 +123,6 @@ import { ...@@ -118,9 +123,6 @@ import {
} }
public showModal(popupMsgId):void { public showModal(popupMsgId):void {
console.log("about to show modal"); console.log("about to show modal");
//(<any>$('#distributionWaitingNotice')).modal('show'); //(<any>$('#distributionWaitingNotice')).modal('show');
...@@ -155,11 +157,13 @@ import { ...@@ -155,11 +157,13 @@ import {
(<any>$('#capacitysaved')).appendTo("body"); (<any>$('#capacitysaved')).appendTo("body");
this.retrievedStudent.next(false); this.retrievedStudent.next(false);
this.SchoolSub = this._hds.getSchoolId().subscribe(x => { this.SchoolSub = this._hds.gettypeofschool().subscribe(x => {
this.School$.next(x); this.School$.next(x);
console.log(x[0].id, "schoolid!"); console.log(x[0].type, "schoolid!");
this.SchoolId = x[0].id; this.SchoolId = x[0].type;
if (this.SchoolId == 'ΗΜΕΡΗΣΙΟ'){
this.selectiontype.next(false);
}
}, },
error => { error => {
...@@ -182,7 +186,7 @@ import { ...@@ -182,7 +186,7 @@ import {
capacity: '', capacity: '',
}); });
console.log("a class"); console.log("a class");
this.classCapacitySub = this._hds.getCapacityPerSchool(this.formGroup.value.taxi, 0, 0, this.SchoolId).subscribe(data => { this.classCapacitySub = this._hds.getCapacityPerSchool(this.formGroup.value.taxi, 0, 0).subscribe(data => {
this.classCapacity$.next(data); this.classCapacity$.next(data);
this.retrievedStudent.next(true); this.retrievedStudent.next(true);
this.formGroup.patchValue({ this.formGroup.patchValue({
...@@ -206,9 +210,9 @@ import { ...@@ -206,9 +210,9 @@ import {
this.selectionBClass.next(true); this.selectionBClass.next(true);
this.selectionCClass.next(false); this.selectionCClass.next(false);
this.StudentSelected$ = new BehaviorSubject([{}]); this.StudentSelected$ = new BehaviorSubject([{}]);
this.StudentSelectedSub = this._hds.getSectorPerSchool(this.SchoolId).subscribe(this.StudentSelected$); this.StudentSelectedSub = this._hds.getSectorPerSchool().subscribe(this.StudentSelected$);
} }
else if (txop.value === "3") { else if (txop.value === "3" || txop.value === "4" ) {
this.formGroup.patchValue({ this.formGroup.patchValue({
tomeas: '', tomeas: '',
specialit: '', specialit: '',
...@@ -220,12 +224,12 @@ import { ...@@ -220,12 +224,12 @@ import {
if (this.formGroup.value.tomeas != '') { if (this.formGroup.value.tomeas != '') {
var sectorint = +this.formGroup.value.tomeas; var sectorint = +this.formGroup.value.tomeas;
this.StudentSelectedSpecial$ = new BehaviorSubject([{}]); this.StudentSelectedSpecial$ = new BehaviorSubject([{}]);
this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool(this.SchoolId, sectorint).subscribe(this.StudentSelectedSpecial$); this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool( sectorint).subscribe(this.StudentSelectedSpecial$);
} }
this.selectionBClass.next(true); this.selectionBClass.next(true);
this.selectionCClass.next(true); this.selectionCClass.next(true);
this.StudentSelected$ = new BehaviorSubject([{}]); this.StudentSelected$ = new BehaviorSubject([{}]);
this.StudentSelectedSub = this._hds.getSectorPerSchool(this.SchoolId).subscribe(this.StudentSelected$); this.StudentSelectedSub = this._hds.getSectorPerSchool().subscribe(this.StudentSelected$);
} }
...@@ -235,12 +239,13 @@ import { ...@@ -235,12 +239,13 @@ import {
checkbclass(tmop, txop) { checkbclass(tmop, txop) {
var sectorint = +this.formGroup.value.tomeas; var sectorint = +this.formGroup.value.tomeas;
console.log(sectorint, "tomeas"); console.log(tmop, txop, "tomeas!!!!");
if (txop.value === "2") { if (txop.value === "2") {
console.log("b class");