...
 
Commits (10)
......@@ -7,7 +7,7 @@ deploysystem.ministry.retrievesettings:
requirements:
_user_is_logged_in: 'TRUE'
deploysystem.ministry.storesettings:
path: '/ministry/store-settings/{capacityDisabled}/{directorViewDisabled}/{applicantsLoginDisabled}/{applicantsAppModifyDisabled}/{applicantsAppDeleteDisabled}/{applicantsResultsDisabled}/{secondPeriodEnabled}/{dateStart}/{dateFinal}/{ws}/{gsis}/{guardian}'
path: '/ministry/store-settings/{capacityDisabled}/{directorViewDisabled}/{applicantsLoginDisabled}/{applicantsAppModifyDisabled}/{applicantsAppDeleteDisabled}/{applicantsResultsDisabled}/{secondPeriodEnabled}/{dateStart}/{dateFinal}/{dd}/{gsis}/{guardian}'
options:
_auth: [ 'basic_auth' ]
defaults:
......@@ -23,7 +23,7 @@ deploysystem.ministry.retrievesettings.gel:
requirements:
_user_is_logged_in: 'TRUE'
deploysystem.ministry.storesettings.gel:
path: '/ministry/store-settings-gel/{distr}/{capac}/{directorViewDisabled}/{applicantsLoginDisabled}/{applicantsAppModifyDisabled}/{applicantsAppDeleteDisabled}/{applicantsResultsDisabled}/{secondPeriodEnabled}/{dateStart}/{dateFinal}/{ws}/{gsis}/{guardian}'
path: '/ministry/store-settings-gel/{distr}/{capac}/{directorViewDisabled}/{applicantsLoginDisabled}/{applicantsAppModifyDisabled}/{applicantsAppDeleteDisabled}/{applicantsResultsDisabled}/{secondPeriodEnabled}/{dateStart}/{dateFinal}/{dd}/{gsis}/{guardian}'
options:
_auth: [ 'basic_auth' ]
defaults:
......@@ -46,14 +46,6 @@ deploysystem.ministry.log_out_go:
_controller: '\Drupal\deploysystem\Controller\MinistryLogin::logoutGo'
requirements:
_user_is_logged_in: 'TRUE'
deploysystem.is_ws_enabled:
path: '/deploysystem/iswsenabled'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\deploysystem\Controller\MinisterSettings::isWSIdentEnabled'
requirements:
_user_is_logged_in: 'TRUE'
deploysystem.is_gsis_enabled:
path: '/deploysystem/isgsisenabled'
options:
......
......@@ -51,7 +51,7 @@ class MinisterSettings extends ControllerBase {
);
}
//refers to EPAL
public function retrieveSettings(Request $request) {
try {
......@@ -105,7 +105,7 @@ class MinisterSettings extends ControllerBase {
$dateStart = $eggrafesConfig->date_start_b_period->getString();
//$smallClassApproved = $eggrafesConfig->lock_small_classes->getString();
$dateAppFinal = $eggrafesConfig->date_app_final->getString();
$wsIdentEnabled = $eggrafesConfig->ws_ident->getString();
$dirDelDisabled = $eggrafesConfig->dir_del->getString();
$gsisIdentEnabled = $eggrafesConfig->gsis_ident->getString();
$guardianIdentEnabled = $eggrafesConfig->guardian_ident->getString();
}
......@@ -123,7 +123,7 @@ class MinisterSettings extends ControllerBase {
'dateStart' => $dateStart,
//'smallClassApproved' => $smallClassApproved,
'dateFinal' => $dateAppFinal,
'wsIdentEnabled' => $wsIdentEnabled,
'dirDelDisabled' => $dirDelDisabled,
'gsisIdentEnabled' => $gsisIdentEnabled,
'guardianIdentEnabled' => $guardianIdentEnabled
], Response::HTTP_OK);
......@@ -144,7 +144,7 @@ class MinisterSettings extends ControllerBase {
//refers to EPAL
public function storeSettings(Request $request, $capacityDisabled, $directorViewDisabled, $applicantsLoginDisabled, $applicantsAppModifyDisabled,
$applicantsAppDeleteDisabled, $applicantsResultsDisabled, $secondPeriodEnabled,
$dateStart, $dateFinal, $ws, $gsis, $guardian ) {
$dateStart, $dateFinal, $dd, $gsis, $guardian ) {
try {
if (!$request->isMethod('GET')) {
......@@ -196,13 +196,13 @@ public function storeSettings(Request $request, $capacityDisabled, $directorView
$eggrafesConfig->set('date_start_b_period', $dateStart);
//$eggrafesConfig->set('lock_small_classes', $smallClass);
$eggrafesConfig->set('date_app_final', $dateFinal);
$eggrafesConfig->set('ws_ident', $ws);
$eggrafesConfig->set('dir_del', $dd);
$eggrafesConfig->set('gsis_ident', $gsis);
$eggrafesConfig->set('guardian_ident', $guardian);
$eggrafesConfig->save();
}
//αποθήκευση ίδιας τιμής σε ΓΕΛ, για τις ρυθμίσεις ws / gsis
//αποθήκευση ίδιας τιμής σε ΓΕΛ, για τη ρύθμιση gsis_ident, guardian_ident
$eggrafesGelConfigs = $config_storage->loadByProperties(array('name' => 'eggrafes_config_gel'));
$eggrafesGelConfig = reset($eggrafesGelConfigs);
if (!$eggrafesGelConfig) {
......@@ -211,7 +211,7 @@ public function storeSettings(Request $request, $capacityDisabled, $directorView
], Response::HTTP_FORBIDDEN);
}
else {
$eggrafesGelConfig->set('ws_ident', $ws );
//$eggrafesGelConfig->set('ws_ident', $ws );
$eggrafesGelConfig->set('gsis_ident', $gsis );
$eggrafesGelConfig->set('guardian_ident', $guardian );
$eggrafesGelConfig->save();
......@@ -233,7 +233,7 @@ public function storeSettings(Request $request, $capacityDisabled, $directorView
'dateStart' => $dateStart,
//'smallClassApproved' =>$smallClass,
'dateFinal' => $dateFinal,
'$wsIdentEnabled' =>$ws,
'$dirDelDisabled' =>$dd,
'$gsisIdentEnabled' =>$gsis,
'$guardianIdentEnabled' =>$guardian
], Response::HTTP_OK);
......@@ -307,7 +307,7 @@ public function retrieveSettingsGel(Request $request) {
$dateStart = $eggrafesConfig->date_start_b_period->getString();
//$smallClassApproved = $eggrafesConfig->lock_small_classes->getString();
$dateAppFinal = $eggrafesConfig->date_app_final->getString();
$wsIdentEnabled = $eggrafesConfig->ws_ident->getString();
$dirDelDisabled = $eggrafesConfig->dir_del->getString();
$gsisIdentEnabled = $eggrafesConfig->gsis_ident->getString();
$guardianIdentEnabled = $eggrafesConfig->guardian_ident->getString();
}
......@@ -325,7 +325,7 @@ public function retrieveSettingsGel(Request $request) {
'dateStart' => $dateStart,
//'smallClassApproved' => $smallClassApproved,
'dateFinal' => $dateAppFinal,
'wsIdentEnabled' => $wsIdentEnabled,
'dirDelDisabled' => $dirDelDisabled,
'gsisIdentEnabled' => $gsisIdentEnabled,
'guardianIdentEnabled' => $guardianIdentEnabled
], Response::HTTP_OK);
......@@ -346,7 +346,7 @@ public function retrieveSettingsGel(Request $request) {
public function storeSettingsGel(Request $request, $distr, $capac, $directorViewDisabled, $applicantsLoginDisabled, $applicantsAppModifyDisabled,
$applicantsAppDeleteDisabled, $applicantsResultsDisabled, $secondPeriodEnabled,
$dateStart, $dateFinal, $ws, $gsis, $guardian ) {
$dateStart, $dateFinal, $dd, $gsis, $guardian ) {
try {
......@@ -400,13 +400,13 @@ public function storeSettingsGel(Request $request, $distr, $capac, $directorView
$eggrafesConfig->set('date_start_b_period', $dateStart);
//$eggrafesConfig->set('lock_small_classes', $smallClass);
$eggrafesConfig->set('date_app_final', $dateFinal);
$eggrafesConfig->set('ws_ident', $ws );
$eggrafesConfig->set('dir_del', $dd );
$eggrafesConfig->set('gsis_ident', $gsis );
$eggrafesConfig->set('guardian_ident', $guardian );
$eggrafesConfig->save();
}
//αποθήκευση ίδιας τιμής σε ΕΠΑΛ, για τις ρυθμίσεις ws / gsis
//αποθήκευση ίδιας τιμής σε ΕΠΑΛ, για τις ρυθμίσεις gsis_ident / guardian_ident
$eggrafesEpalConfigs = $config_storage->loadByProperties(array('name' => 'eggrafes_config_epal'));
$eggrafesEpalConfig = reset($eggrafesEpalConfigs);
if (!$eggrafesEpalConfig) {
......@@ -415,7 +415,7 @@ public function storeSettingsGel(Request $request, $distr, $capac, $directorView
], Response::HTTP_FORBIDDEN);
}
else {
$eggrafesEpalConfig->set('ws_ident', $ws );
//$eggrafesEpalConfig->set('ws_ident', $ws );
$eggrafesEpalConfig->set('gsis_ident', $gsis );
$eggrafesEpalConfig->set('guardian_ident', $guardian );
$eggrafesEpalConfig->save();
......@@ -436,7 +436,7 @@ public function storeSettingsGel(Request $request, $distr, $capac, $directorView
'dateStart' => $dateStart,
//'smallClassApproved' =>$smallClass,
'dateFinal' => $dateFinal,
'$wsIdentEnabled' =>$ws,
'$dirDelDisabled' =>$dd,
'$gsisIdentEnabled' =>$gsis,
'$guardianIdentEnabled' =>$guardian
], Response::HTTP_OK);
......@@ -456,6 +456,7 @@ public function storeSettingsGel(Request $request, $distr, $capac, $directorView
//OBSOLETE
/*
public function isWSIdentEnabled(Request $request)
{
$authToken = $request->headers->get('PHP_AUTH_USER');
......@@ -478,6 +479,7 @@ public function isWSIdentEnabled(Request $request)
return $this->respondWithStatus(array('res' => $eggrafesConfig->ws_ident->value), Response::HTTP_OK);
}
*/
public function isGsisIdentEnabled(Request $request)
{
......
......@@ -389,9 +389,9 @@ class EggrafesConfig extends ContentEntityBase implements EggrafesConfigInterfac
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['ws_ident'] = BaseFieldDefinition::create('boolean')
->setLabel(t('Ενεργοποίηση web service για ταυτοποίηση μαθητή'))
->setDescription(t('Ενεργοποίηση web service για ταυτοποίηση μαθητή'))
$fields['dir_del'] = BaseFieldDefinition::create('boolean')
->setLabel(t('Ενεργοποίηση διαγραφής αίτησης μαθητή από Διευθυντή'))
->setDescription(t('Ενεργοποίηση διαγραφής αίτησης μαθητή από Διευθυντή'))
->setSettings(array(
'text_processing' => 0,
))
......
......@@ -528,6 +528,7 @@ class SubmitedApplications extends ControllerBase
->fields('esc',
array('finalized',
'directorconfirm',
'epal_id',
'initial_epal_id',
'merging_role'
))
......@@ -661,12 +662,13 @@ class SubmitedApplications extends ControllerBase
if ($epalStudent->currentclass === "1") {
$approved = $epalStudent->approved_a;
} else if ($epalStudent->currentclass === "2"){
$approvedStudents = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id' => $epalStudent->id, 'sector_id' => $epalStudent->eese_id));
//\Drupal::logger('deploysystem epalid'.$epalStudent->epal_id.' sectorid:'.$epalStudent->eese_id)->info('hello sector');
$approvedStudents = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id' => $epalStudent->epal_id, 'sector_id' => $epalStudent->eese_id));
$approvedStudent = reset($approvedStudents);
if ($approvedStudent) $approved = $approvedStudent->approved_sector->value;
} else if ($epalStudent->currentclass === "3" || $epalStudent->currentclass === "4"){
// \Drupal::logger('deploysystem epalid'.$epalStudent->id.' specialtyid:'.$epalStudent->eesp_id)->info('hello specialty');
$approvedStudents = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $epalStudent->id, 'specialty_id' => $epalStudent->eesp_id));
//\Drupal::logger('deploysystem epalid'.$epalStudent->epal_id.' specialtyid:'.$epalStudent->eesp_id)->info('hello specialty');
$approvedStudents = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $epalStudent->epal_id, 'specialty_id' => $epalStudent->eesp_id));
$approvedStudent = reset($approvedStudents);
if ($approvedStudent){
if ($epalStudent->currentclass === "3" ) $approved = $approvedStudent->approved_speciality->value;
......@@ -693,11 +695,11 @@ class SubmitedApplications extends ControllerBase
'guardian_surname' => ($role === "applicant")?$guardian_surname_decoded:'',
'guardian_fathername' => ($role === "applicant")?$guardian_fathername_decoded:'',
'guardian_mothername' => ($role === "applicant")?$guardian_mothername_decoded:'',
'lastschool_schoolname' => ($role === "applicant")?$epalStudent->lastschool_schoolname:'',
'lastschool_schoolname' => $epalStudent->lastschool_schoolname,
'lastschool_registrynumber' => ($role === "applicant")?$epalStudent->lastschool_registrynumber:'',
'lastschool_unittypeid' => ($role === "applicant")?$epalStudent->lastschool_unittypeid:'',
'lastschool_schoolyear' => ($role === "applicant")?$epalStudent->lastschool_schoolyear:'',
'lastschool_class' => ($role === "applicant")?$epalStudent->lastschool_class:'',
'lastschool_unittypeid' => $epalStudent->lastschool_unittypeid,
'lastschool_schoolyear' => $epalStudent->lastschool_schoolyear,
'lastschool_class' => $epalStudent->lastschool_class,
'currentclass' => $epalStudent->currentclass,
'currentsector' => $epalStudent->eese_name,
'currentsector_id' => $epalStudent->eese_id,
......@@ -722,6 +724,7 @@ class SubmitedApplications extends ControllerBase
'merging_role'=> $epalStudent-> merging_role,
'secondPeriod' => $epalStudent->second_period,
'directorconfirm' => $epalStudent->directorconfirm,
'myschool_promoted' => $epalStudent->myschool_promoted,
'approved' => ($approved?$approved:'0'),
'delapp' => $epalStudent->delapp,
'delapp_changed' => date('d/m/Y H:i', $epalStudent->delapp_changed),
......
......@@ -76,44 +76,46 @@ class WSConsumer extends ControllerBase
$didactic_year_id=$this->getdidacticyear($didactic_year);
if ($testmode) {
$obj = array(
'message' => 'Επιτυχία',
'data' => array(
//'id' => '15800',
'studentId' => 12340001,
'lastname' => 'ΚΑΤΣΑΟΥΝΟΣ',
'firstname' => 'ΝΙΚΟΣ',
'custodianLastName' => 'κAΤσαούNΟΣ',
'custodianFirstName' => 'ΑΝΑΣΤΑΣΙΟΣ',
'birthDate' => '1997-01-04T00:00:00',
'addressStreet' => 'ΧΑΤΖΗ Β. 16',
'addressPostCode' => '26333',
'addressArea' => 'ΜΠΕΓΟΥΛΑΚΙ',
'unitTypeDescription' => 'Εσπερινό ΕΠΑΛ',
'levelName' => 'Β',
'sectionName' => 'Τεχνικός Μηχανοσυνθέτης',
'promoted' => 1
)
//return null
//'data' => null
);
$obj = array(
'message' => 'Επιτυχία',
'data' => array(
//'id' => '15800',
'studentId' => 12340000,
'lastname' => 'ΚΑΤΣΑΟΥΝΟΣ',
'firstname' => 'ΓΕΛ ΑΠΟ ΕΣΠΕΡΙΝΟ',
'custodianLastName' => 'Γεωργούλας',
'custodianFirstName' => 'ΑΝΑΣΤΑΣΙΟΣ',
'birthDate' => '1997-01-04T00:00:00',
'addressStreet' => 'ΧΑΤΖΗ Β. 16',
'addressPostCode' => '26333',
'addressArea' => 'ΜΠΕΓΟΥΛΑΚΙ',
'unitTypeDescription' => 'Εσπερινό ΕΠΑΛ',
'levelName' => 'Α',
'sectionName' => 'Τεχνικός Μηχανοσυνθέτης',
'promoted' => 6
)
//return null
//'data' => null
);
if (($errorCode = $this->validateWSStudentData(
$bypass_guardian,
$guardian_enabled,
$cu_surname,
$app_prom,
$obj['data']['custodianLastName'],
$obj['data']['addressStreet'],
$obj['data']['levelName'],
$obj['data']['promoted']
)) > 0) {
return $this->respondWithStatus([
"error_code" => $errorCode
], Response::HTTP_OK);
}
if (($errorCode = $this->validateWSStudentData(
$bypass_guardian,
$guardian_enabled,
$cu_surname,
$app_prom,
$obj['data']['custodianLastName'],
$obj['data']['addressStreet'],
$obj['data']['levelName'],
$obj['data']['promoted']
)) > 0) {
return $this->respondWithStatus([
"error_code" => $errorCode
], Response::HTTP_OK);
}
return (new JsonResponse($obj))
->setStatusCode(Response::HTTP_OK);
......
......@@ -79,7 +79,7 @@ gel.gethighschoolsmart:
requirements:
_user_is_logged_in: 'TRUE'
gel.getstudentsperschool:
path: '/gel/getstudentsperschool/{schoolid}/{class_selected}'
path: '/gel/getstudentsperschool/{schoolid}/{class_selected}/{choice}'
options:
_auth: [ 'basic_auth' ]
defaults:
......@@ -87,7 +87,7 @@ gel.getstudentsperschool:
requirements:
_user_is_logged_in: 'TRUE'
gel.savehighscoolselection:
path: '/gel/saveselection/{studentid}/{schoolid}/{oldschool}/{nextclass}/{undoselection}'
path: '/gel/saveselection/{studentid}/{schoolid}'
options:
_auth: [ 'basic_auth' ]
defaults:
......@@ -292,3 +292,12 @@ gel.getepalstudents:
_controller: '\Drupal\gel\Controller\GelDistribution::getStudentEpalPerSchoolGel'
requirements:
_user_is_logged_in: 'TRUE'
gel.changeDDE:
path: '/gel/changeDDE/{studentid}/{dide_id}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::ChangeDDE'
requirements:
_user_is_logged_in: 'TRUE'
gel.gethighschoolperstudent:
\ No newline at end of file
......@@ -79,22 +79,50 @@ class CreateGelDemoData extends ControllerBase {
$cnt = 0;
foreach ($gelStudents as $gelStudent)
{
$sCon = $this->connection->select('gel_school', 'eSchool')
->fields('eSchool', array('id'))
->condition('eSchool.registry_no', $gelStudent->lastschool_registrynumber, '=');
$gelSchools = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
/*
$gelSchools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('registry_no' => $gelStudent->lastschool_registrynumber));
$gelSchool = reset($gelSchools);
$gel_id = null;
if ($gelSchool)
$gel_id = $gelSchool->id();
else {
$epalSchools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $gelStudent->lastschool_registrynumber));
$epalSchool = reset($epalSchools);
if ($epalSchool)
$gel_id = $epalSchool->id();
}
*/
//απόφαση: NEXTCLASS / SAMECLASS
$validation_type = "NEXTCLASS";
//απόφαση: αυτοδίκαια ή μέσω ΔΔΕ τοποθέτηση
$this->logger->warning("Nikos " . $gelStudent->lastschool_registrynumber);
list ($gelId, $gelDde, $gelLastSchoolExtraType) = $this->getSchoolIdFromRegNo($gelStudent->lastschool_registrynumber);
//η πληροφορία αίτησης για αλλαγή τύπου σχολείου βρίσκεται σε νέο πεδίο στη φόρμα αίτησης, $applicationForm[0]['special_type'],με τιμές ΑΛΛΟ / ΓΕΛ
$distrType = $this->calcDistributionType(
$gelStudent->lastschool_class,
$gelStudent->nextclass,
$gelStudent->lastschool_unittypeid,
$gelLastSchoolExtraType,
'ΓΕΛ');
if ($distrType == "dide")
$gelId = null;
$myschool_promoted = $gelStudent->myschool_promoted->value;
if ( ($gelStudent->lastschool_schoolyear < '2013-2014' || $gelStudent->lastschool_unittypeid == '40' )
&& ($gelStudent->myschool_promoted == 0 || $gelStudent->myschool_promoted == null) ) {
$myschool_promoted = 1;
}
$studentClass = array(
'name' => null,
'student_id'=> $gelStudent->id,
'gel_id' => $gelSchool->id,
'dide'=> null,
'distribution_type' => null,
'gel_id' => $gel_id,
'dide'=> $gelDde,
'distribution_type' => $distrType,
'directorconfirm' => null,
'validation_type' => null,
'myschool_promoted' => null,
'validation_type' => 'NEXTCLASS',
'myschool_promoted' => $myschool_promoted,
'app_status'=> 'FINAL'
);
......@@ -102,14 +130,14 @@ class CreateGelDemoData extends ControllerBase {
$entity_object = $entity_storage_studentclass->create($studentClass);
$entity_storage_studentclass->save($entity_object);
/*
++$cnt;
if ($cnt == 10) {
$response = new JsonResponse(['hello' => 'world']);
$response->headers->set('X-AUTH-TOKEN', 'HELLOTOKEN');
return $response;
}
*/
}
......@@ -120,6 +148,78 @@ class CreateGelDemoData extends ControllerBase {
}
private function getSchoolIdFromRegNo($reg_no) {
$gelSchools = $this->entityTypeManager->getStorage('gel_school')->loadByProperties(array('registry_no' => $reg_no));
$gelSchool = reset($gelSchools);
if ($gelSchool)
return array($gelSchool->id(), $gelSchool->edu_admin_id->target_id, $gelSchool->extra_unitid->value);
else {
$epalSchools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('registry_no' => $reg_no));
$epalSchool = reset($epalSchools);
if ($epalSchool)
return array(null, $epalSchool->edu_admin_id->target_id, null);
else
return null;
}
}
private function calcDistributionType($last_class, $next_class, $last_sch_type, $last_sch_extratype, $change_sch_type) {
$distType = null;
if (
//από ΗΜΕΡ-ΓΕΛ σε ΕΣΠ-ΓΕΛ
($next_class >= 4 && $next_class <= 7 && $last_sch_extratype == 40)
//από ΕΣΠ-ΓΕΛ σε ΗΜΕΡ-ΓΕΛ
|| ($next_class >= 1 && $next_class <= 3 && $last_sch_extratype == 41)
//από Πρότυπο Λύκειο / Πειραματικό Λύκειο / Λύκειο Ειδικής Αγωγής / Λύκειο Διαπολιτισμικής Εκπαίδευσης /
//Μουσικό Γενικό Λύκειο / Εκκλησιαστικό Γενικό Λύκειο ΣΕ ΓΕΛ με αίτησή τους
|| ($last_sch_extratype >= 42 && $last_sch_extratype <= 47 && $change_sch_type == "ΓΕΛ")
//από Ιδιωτικό Λύκειο / Ιδιωτικό Εσπερινό Λύκειο σε ΓΕΛ
|| ($last_sch_extratype == 48 || $last_sch_extratype == 49)
//από ΕΠΑΛ (ΣΕΚ / ΕΕΕΚ ?) σε ΓΕΛ
|| ($last_sch_type == 5 )
//από ΓΥΜ σε ΓΕΛ
|| ($last_sch_type == 3)
//από ΓΥΜ-ΛΤ με Γ' Γυμνασίου' σε ΓΕΛ-ΗΜΕΡ
|| ($last_class == 33 && $last_sch_type == 6 )
//από ΕΣΠ ΓΥΜ-ΛΤ σε ΓΕΛ-ΗΜΕΡ
|| ($next_class >= 1 && $next_class <= 3 && $last_sch_extratype == 660 )
//από ΗΜΕΡ ΓΥΜ-ΛΤ σε ΓΕΛ-ΕΣΠ
|| ($next_class >= 4 && $next_class <= 7 && $last_sch_extratype == 661)
// από Μουσικό Γυμνάσιο με Μουσικές Λυκειακές Τάξεις / Ειδικό Επαγγελματικό Γυμνάσιο - Λύκειο /
// Πειραματικό Γυμνάσιο με Λυκειακές Τάξεις / Καλλιτεχνικό Γυμνάσιο με Λυκειακές Τάξεις /
// Γυμνάσιο Ειδικής Αγωγής με Λυκειακές Τάξεις / Γυμνάσιο Διαπολιτισμικής Εκπαίδευσης με Λυκειακές Τάξεις
// Γυμνάσιο Μειονοτικής Εκπαίδευσης με Λυκειακές Τάξεις / Ειδικό Επαγγελματικό Γυμνάσιο - Λύκειο
// Γενικό Εκκλησιαστικό Λύκειο - Γυμνάσιο / Ιεροσπουδαστήριο
// ζητάνε σε σε ΓΕΛ
|| ( $last_sch_extratype >= 662 && $last_sch_extratype <= 672 && $change_sch_type == "ΓΕΛ")
//από Ιδιωτικό Γυμνάσιο με Λυκειακές Τάξεις / Γενικό Εκκλησιαστικό Λύκειο - Γυμνάσιο /Ιεροσπουδαστήριο, σε ΓΕΛ
//|| ($last_sch_extratype >= 671 && $last_sch_extratype <= 672)
//από ΣΔΕ / εξωτερικό κλπ
|| ($last_sch_type == 40)
)
$distType = "dide";
else
$distType = "auto";
return $distType;
}
/*
$crypt = new Crypt();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -623,12 +623,12 @@ class GelSubmittedApplications extends ControllerBase
'guardian_surname' => ($role === "applicant")?$guardian_surname_decoded:'',
'guardian_fathername' => ($role === "applicant")?$guardian_fathername_decoded:'',
'guardian_mothername' => ($role === "applicant")?$guardian_mothername_decoded:'',
'lastschool_schoolname' => ($role === "applicant")?$gelStudent->lastschool_schoolname:'',
'lastschool_unittypeid' => ($role === "applicant")?$gelStudent->lastschool_unittypeid:'',
'lastschool_schoolyear' => ($role === "applicant")?$gelStudent->lastschool_schoolyear:'',
'lastschool_schoolname' => $gelStudent->lastschool_schoolname,
'lastschool_unittypeid' => $gelStudent->lastschool_unittypeid,
'lastschool_schoolyear' => $gelStudent->lastschool_schoolyear,
'lastschool_operation_shift' => ($role === "applicant")?$lastschoolDetails->operation_shift:'',
'lastschool_extra_unitid' => ($role === "applicant")?$lastschoolDetails->extra_unitid:'',
'lastschool_class' => ($role === "applicant")?$gelStudent->lastschool_class:'',
'lastschool_class' => $gelStudent->lastschool_class,
'nextclass' => $gelStudent->nextclass,
'regionaddress' => ($role === "applicant")?$regionaddress_decoded:'',
'regiontk' => ($role === "applicant")?$regiontk_decoded:'',
......
......@@ -75,6 +75,10 @@ class CBController extends ControllerBase
//return new RedirectResponseWithCookieExt("http://www.in.gr", 302, []);
//end test
//test uuid
//$uuid = \Drupal::service('uuid')->generate();
//$this->logger->warning($uuid);
$oauthostSessions = $this->entityTypeManager->getStorage('oauthost_session')->loadByProperties(array('name' => $request->query->get('sid_ost')));
$this->oauthostSession = reset($oauthostSessions);
if ($this->oauthostSession) {
......@@ -398,4 +402,4 @@ class CBController extends ControllerBase
);
}
}
}
\ No newline at end of file
}
......@@ -71,6 +71,7 @@ class CurrentUser extends ControllerBase
$userRoles = $user->getRoles();
foreach ($userRoles as $userRole) {
if (($userRole === 'epal') ||($userRole === 'gel') || ($userRole === 'regioneduadmin') || ($userRole === 'eduadmin') || ($userRole === 'gym') || ($userRole === 'gymlt')) {
//$this->logger->warning("Yes " . $eggrafesConfigGel->lock_school_students_view->value );
return $this->respondWithStatus([
'cu_name' => $user->mail->value,
'cu_surname' => '',
......
......@@ -48,7 +48,7 @@ import { HelperDataService } from "../../services/helper-data-service";
<div [hidden]="StudentActive !== j" style="margin: 20px 10px 10px 10px;">
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-6" style="font-size: 0.8em;">Αριθμός Δήλωσης Προτίμησης ΓΕΛ</div>
<div class="col-md-6" style="font-size: 0.8em;">Αριθμός Δήλωσης Προτίμησης ΕΠΑΛ</div>
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.applicationId}}</div>
</div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
......
......@@ -19,17 +19,25 @@ import { IAppState } from "../../store/store";
<h5>Επιλογή Αναφοράς</h5>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(0)"><i class="fa fa-file-text"></i> Δηλώσεις Μαθητών</button>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(0)"><i class="fa fa-file-text"></i> Κατανεμημένοι μαθητές</button>
</div>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(1)"><i class="fa fa-file-text"></i> Επιλογές μαθητών</button>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(1)"><i class="fa fa-file-text"></i> Επιλογές κατανεμημένων μαθητών</button>
</div>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(2)"><i class="fa fa-file-text"></i> Κατάσταση αιτήσεων των μαθητών μου</button>
</div>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(3)"><i class="fa fa-file-text"></i> Μη τοποθετημένοι μαθητές μου</button>
</div>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(4)"><i class="fa fa-file-text"></i> Μεττεγραφές</button>
</div>
</div>
`
......
This diff is collapsed.
......@@ -50,7 +50,7 @@ import { SchoolTypeActions } from "../../actions/schooltype.actions";
navigatepdegel() {
this._sta.saveSchoolTypeSelected(1,"ΓΕΛ");
//this.router.navigate(["/school/eduadmingel-view"]);
this.router.navigate(["/school/gel-distribution"]);
this.router.navigate(["/school/gel-distribution/pending"]);
}
}
......@@ -103,11 +103,22 @@ import { IAppState } from "../../store/store";
(click)="toggleApplicantsAppDelete()" >
</div>
<div class="col-md-9">
<label for="applicantsAppDeleteDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης </label>
<label for="applicantsAppDeleteDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης από μαθητή </label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="dirDelDisabled" formControlName="dirDelDisabled"
(click)="toggleDirDel()" >
</div>
<div class="col-md-9">
<label for="dirDelDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης από Διευθυντή</label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="applicantsResultsDisabled" formControlName="applicantsResultsDisabled"
......@@ -164,17 +175,6 @@ import { IAppState } from "../../store/store";
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="wsIdentEnabled" formControlName="wsIdentEnabled"
(click)="toggleWsIdent()" >
</div>
<div class="col-md-9">
<label for="wsIdentEnabled">Ενεργοποίηση Web Service Ταυτοποίησης Μαθητή του ΠΣ Myschool</label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="gsisIdentEnabled" formControlName="gsisIdentEnabled"
......@@ -232,7 +232,7 @@ import { IAppState } from "../../store/store";
private dateStartBPeriod: string;
private dateAppFinal: string;
private dataRetrieved: number;
private wsIdentEnabled: boolean;
private dirDelDisabled: boolean;
private gsisIdentEnabled: boolean;
private guardianIdentEnabled: boolean;
private showLoader: BehaviorSubject<boolean>;
......@@ -263,7 +263,7 @@ import { IAppState } from "../../store/store";
secondPeriodEnabled: ["", []],
distributionstartdate:["", [Validators.required]],
appfinaldate:["", [Validators.required]],
wsIdentEnabled:["",[]],
dirDelDisabled:["",[]],
gsisIdentEnabled:["",[]],
guardianIdentEnabled:["",[]],
});
......@@ -352,7 +352,7 @@ import { IAppState } from "../../store/store";
this.formGroup.controls["appfinaldate"].setValue( {date: {year: Number(dateparts[2]), month: Number(dateparts[1]), day: Number(dateparts[0])}} );
}
this.wsIdentEnabled = Boolean(Number(this.settings$.value["wsIdentEnabled"]));
this.dirDelDisabled = Boolean(Number(this.settings$.value["dirDelDisabled"]));
this.gsisIdentEnabled = Boolean(Number(this.settings$.value["gsisIdentEnabled"]));
this.guardianIdentEnabled = Boolean(Number(this.settings$.value["guardianIdentEnabled"]));
......@@ -385,7 +385,7 @@ import { IAppState } from "../../store/store";
this.capacityDisabled, this.directorViewDisabled, this.applicantsLoginDisabled,
this.applicantsAppModifyDisabled, this.applicantsAppDeleteDisabled, this.applicantsResultsDisabled,
this.secondPeriodEnabled, this.dateStartBPeriod, this.dateAppFinal,
this.wsIdentEnabled, this.gsisIdentEnabled, this.guardianIdentEnabled)
this.dirDelDisabled, this.gsisIdentEnabled, this.guardianIdentEnabled)
.subscribe(data => {
this.settings$.next(data);
this.dataRetrieved = 1;
......@@ -438,8 +438,8 @@ import { IAppState } from "../../store/store";
this.secondPeriodEnabled = !this.secondPeriodEnabled;
}
toggleWsIdent(){
this.wsIdentEnabled =!this.wsIdentEnabled;
toggleDirDel(){
this.dirDelDisabled =!this.dirDelDisabled;
}
toggleGsisIdent(){
......
......@@ -113,11 +113,22 @@ import { IAppState } from "../../store/store";
(click)="toggleApplicantsAppDelete()" >
</div>
<div class="col-md-9">
<label for="applicantsAppDeleteDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης </label>
<label for="applicantsAppDeleteDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης από μαθητή </label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="dirDelDisabled" formControlName="dirDelDisabled"
(click)="toggleDirDel()" >
</div>
<div class="col-md-9">
<label for="dirDelDisabled">Απενεργοποίηση δυνατότητας διαγραφής αίτησης από Διευθυντή</label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="applicantsResultsDisabled" formControlName="applicantsResultsDisabled"
......@@ -174,17 +185,6 @@ import { IAppState } from "../../store/store";
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="wsIdentEnabled" formControlName="wsIdentEnabled"
(click)="toggleWsIdent()" >
</div>
<div class="col-md-9">
<label for="wsIdentEnabled">Ενεργοποίηση Web Service Ταυτοποίησης Μαθητή του ΠΣ Myschool</label>
</div>
</div>
<br>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="gsisIdentEnabled" formControlName="gsisIdentEnabled"
......@@ -241,7 +241,7 @@ import { IAppState } from "../../store/store";
private dateStartBPeriod: string;
private dateAppFinal: string;
private dataRetrieved: number;
private wsIdentEnabled: boolean;
private dirDelDisabled: boolean;
private gsisIdentEnabled: boolean;
private guardianIdentEnabled: boolean;
private showLoader: BehaviorSubject<boolean>;
......@@ -271,7 +271,7 @@ import { IAppState } from "../../store/store";
secondPeriodEnabled: ["", []],
distributionstartdate:["", [Validators.required]],
appfinaldate:["", [Validators.required]],
wsIdentEnabled:["",[]],
dirDelDisabled:["",[]],
gsisIdentEnabled:["",[]],
guardianIdentEnabled:["",[]],
});
......@@ -285,7 +285,7 @@ import { IAppState } from "../../store/store";
this.showLoader = new BehaviorSubject(false);
this.formGroup.controls["appfinaldate"].disable();
}
public showModal(popupMsgId): void {
......@@ -360,7 +360,7 @@ import { IAppState } from "../../store/store";
this.formGroup.controls["appfinaldate"].setValue( {date: {year: Number(dateparts[2]), month: Number(dateparts[1]), day: Number(dateparts[0])}} );
}
this.wsIdentEnabled = Boolean(Number(this.settings$.value["wsIdentEnabled"]));
this.dirDelDisabled = Boolean(Number(this.settings$.value["dirDelDisabled"]));
this.gsisIdentEnabled = Boolean(Number(this.settings$.value["gsisIdentEnabled"]));
this.guardianIdentEnabled = Boolean(Number(this.settings$.value["guardianIdentEnabled"]));
......@@ -393,7 +393,7 @@ import { IAppState } from "../../store/store";
this.capacityDisabled, this.directorViewDisabled, this.applicantsLoginDisabled,
this.applicantsAppModifyDisabled, this.applicantsAppDeleteDisabled, this.applicantsResultsDisabled,
this.secondPeriodEnabled, this.dateStartBPeriod, this.dateAppFinal,
this.wsIdentEnabled, this.gsisIdentEnabled, this.guardianIdentEnabled)
this.dirDelDisabled, this.gsisIdentEnabled, this.guardianIdentEnabled)
.subscribe(data => {
this.settings$.next(data);
this.dataRetrieved = 1;
......@@ -467,8 +467,8 @@ import { IAppState } from "../../store/store";
}
*/
toggleWsIdent(){
this.wsIdentEnabled =!this.wsIdentEnabled;
toggleDirDel(){
this.dirDelDisabled =!this.dirDelDisabled;
}
toggleGsisIdent(){
......
......@@ -39,8 +39,9 @@
<a class="nav-link" [routerLink]="['/school/directorgym-view']" [routerLinkActive]="['active']"><b>Λίστα Μαθητών</b></a>
</li>
</div>
<!--&& (lockStudentsGel | async) )-->
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<li *ngIf=" ( (authRole=='director_gel') || (authRole=='director_gymlt') ) " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'final' ]" [routerLinkActive]="['active']"><b>Κατανεμημένοι Μαθητές</b></a>
</li>
</div>
......@@ -228,14 +229,29 @@
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['school/gel-distribution']" [routerLinkActive]="['active']"><b>Τοποθετήσεις Μαθητών</b></a>
<a class="nav-link" [routerLink]="['school/gel-distribution','pending']" [routerLinkActive]="['active']"><b>Τοποθετήσεις Μαθητών</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['/school/eduadmingel-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
<a class="nav-link" [routerLink]="['school/gel-distribution','done']" [routerLinkActive]="['active']"><b>Τοποθετήμενοι Μαθητές</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['school/gel-distribution','other']" [routerLinkActive]="['active']"><b>Μαθητές από άλλες ΔΔΕ</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['school/gel-distribution-chdde']" [routerLinkActive]="['active']"><b>Μεταφορά Αίτησης</b></a>
</li>
</div>
<!--<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['/school/eduadmingel-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
</li>
</div> -->
<div *ngIf="(loginInfo$ | async).size > 0 && (schtype == 1)" class="nav-item">
<li *ngIf="authRole=='dide'" class="nav-item">
<a class="nav-link" [routerLink]="['dide/didegel-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
......
......@@ -27,6 +27,10 @@ import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "../../store/studentdatafields
import { IStudentDataFieldRecords } from "../../store/studentdatafields/studentdatafields.types";
import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../students/student";
import {
SCHOOL_YEAR_LIMIT,
} from "../../constants";
@Component({
selector: "application-submit",
template: `
......@@ -83,7 +87,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
</div>
<div><label for="lastschool_schoolyear">Σχολικό έτος τελευταίας φοίτησης</label> <p class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("lastschool_schoolyear")}} </p></div>
<div><label for="lastschool_schoolname">Σχολείο τελευταίας φοίτησης</label> <p class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("lastschool_schoolname").name}} </p></div>
<div *ngIf="( studentDataField$.get('lastschool_schoolyear') < '2013-2014' || (wsEnabled | async) === 0 ) || studentDataField$.get('lastschool_schoolname').unit_type_id==40">
<div *ngIf="( studentDataField$.get('lastschool_schoolyear') < SCHOOL_YEAR_LIMIT ) || studentDataField$.get('lastschool_schoolname').unit_type_id==40">
<label for="lastschool_class">Τάξη τελευταίας φοίτησης</label>
<div *ngIf="studentDataField$.get('lastschool_class') === '1'"> <p class="form-control" style="border:1px solid #eceeef;">Α'</p></div>
<div *ngIf="studentDataField$.get('lastschool_class') === '2'"><p class="form-control" style="border:1px solid #eceeef;">Β'</p></div>
......@@ -94,8 +98,8 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Προσωπικά Στοιχεία μαθητή</div>
</div>
<div>
<label *ngIf="studentDataField$.get('lastschool_schoolyear') >= '2013-2014' && studentDataField$.get('lastschool_schoolname').unit_type_id !=40" for="am">Αριθμός Μητρώου Μαθητη</label>
<p *ngIf="studentDataField$.get('lastschool_schoolyear') >= '2013-2014' && studentDataField$.get('lastschool_schoolname').unit_type_id !=40" class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("am")}} </p>
<label *ngIf="studentDataField$.get('lastschool_schoolyear') >= SCHOOL_YEAR_LIMIT && studentDataField$.get('lastschool_schoolname').unit_type_id !=40" for="am">Αριθμός Μητρώου Μαθητη</label>
<p *ngIf="studentDataField$.get('lastschool_schoolyear') >= SCHOOL_YEAR_LIMIT && studentDataField$.get('lastschool_schoolname').unit_type_id !=40" class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("am")}} </p>
</div>
<div><label for="name">Όνομα μαθητή</label> <p class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("name")}} </p> </div>
<div><label for="studentsurname">Επώνυμο μαθητή</label> <p class="form-control" style="border:1px solid #eceeef;"> {{studentDataField$.get("studentsurname")}} </p></div>
......@@ -109,7 +113,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
<div class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Στοιχεία Επικοινωνίας μαθητή</div>
</div>
<table class="col-md-12" align="left" *ngIf="( studentDataField$.get('lastschool_schoolyear') < '2013-2014' || (wsEnabled | async) === 0 ) || studentDataField$.get('lastschool_schoolname').unit_type_id==40">
<table class="col-md-12" align="left" *ngIf="( studentDataField$.get('lastschool_schoolyear') < SCHOOL_YEAR_LIMIT ) || studentDataField$.get('lastschool_schoolname').unit_type_id==40">
<tr>
<td>
<div><label for="regionaddress">Διεύθυνση Κατοικίας μαθητή</label></div>
......@@ -202,8 +206,8 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
private previousCourse: BehaviorSubject<string>;
private previousSchools: BehaviorSubject<string>;
//private wsIdentSub: Subscription;
private wsEnabled: BehaviorSubject<number>;
private limitSchoolYear: string;
//private wsEnabled: BehaviorSubject<number>;
//private limitSchoolYear: string;
//private guardianIdentSub: Subscription;
private guardianEnabled: BehaviorSubject<number>;
private birtdateFormView: BehaviorSubject<string>;
......@@ -242,7 +246,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
this.previousSector = new BehaviorSubject("");
this.previousCourse = new BehaviorSubject("");
this.previousSchools = new BehaviorSubject("");
this.wsEnabled = new BehaviorSubject(-1);
//this.wsEnabled = new BehaviorSubject(-1);
this.guardianEnabled = new BehaviorSubject(-1);
this.sectorSelected = null;
......@@ -250,7 +254,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
this.hasright = 1;
this.previousSchools.next("");
this.limitSchoolYear = "2013-2014";
//this.limitSchoolYear = "2013-2014";
this.birtdateFormView = new BehaviorSubject("");
......@@ -294,7 +298,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
this.disclaimer_checked = loginInfoObj.disclaimer_checked;
//if ( Number(loginInfoObj.numapp_self) > 0 && Number(loginInfoObj.numapp_children) >= Number(loginInfoObj.numchildren) )
// this.hasright = 0;
this.wsEnabled.next(loginInfoObj.ws_ident);
//this.wsEnabled.next(loginInfoObj.ws_ident);
this.guardianEnabled.next(loginInfoObj.guardian_ident);
return loginInfoObj;
......@@ -494,7 +498,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
aitisiObj[0].currentclass = this.classSelected;
//aitisiObj[0].am = null;
//if (aitisiObj[0].lastschool_schoolyear >= this.limitSchoolYear)
//if (aitisiObj[0].lastschool_schoolyear >= SCHOOL_YEAR_LIMIT)
// aitisiObj[0].am = std.get("am");
// else {
// aitisiObj[0].regionaddress = std.get("regionaddress");
......@@ -520,7 +524,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
}
//κλήση myschool web service
if (this.wsEnabled.getValue() === 1 && aitisiObj[0].lastschool_schoolyear >= this.limitSchoolYear && aitisiObj[0].lastschool_unittypeid != "40") {
if (/*this.wsEnabled.getValue() === 1 &&*/ aitisiObj[0].lastschool_schoolyear >= SCHOOL_YEAR_LIMIT && aitisiObj[0].lastschool_unittypeid != "40") {
this.showLoader.next(true);
......@@ -785,12 +789,12 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
break;
case 1024:
mTitle = "Αποτυχία Υποβολής Δήλωσης Προτίμησης";
mText = "Παρακαλούμε ελέγξτε τα στοιχεία που υποβάλλετε. Ύπαρξη επιστρεφόμενου μοναδικού αριθμόυ μαθητή για σχολικό έτος < " + this.limitSchoolYear + ".";
mText = "Παρακαλούμε ελέγξτε τα στοιχεία που υποβάλλετε. Ύπαρξη επιστρεφόμενου μοναδικού αριθμόυ μαθητή για σχολικό έτος < " + SCHOOL_YEAR_LIMIT + ".";
mHeader = "modal-header-danger";
break;
case 1025:
mTitle = "Αποτυχία Υποβολής Δήλωσης Προτίμησης";
mText = "Παρακαλούμε ελέγξτε τα στοιχεία που υποβάλλετε. Μη ύπαρξη επιστρεφόμενου μοναδικού αριθμόυ μαθητή για σχολικό έτος >= " + this.limitSchoolYear + ".";
mText = "Παρακαλούμε ελέγξτε τα στοιχεία που υποβάλλετε. Μη ύπαρξη επιστρεφόμενου μοναδικού αριθμόυ μαθητή για σχολικό έτος >= " + SCHOOL_YEAR_LIMIT + ".";
mHeader = "modal-header-danger";
break;
case 3002:
......
......@@ -96,14 +96,14 @@
Η επιλογή από αυτή τη λίστα είναι απαραίτητη!
</div>
<div *ngIf=" (studentDataGroup.get('lastschool_schoolyear').value !='' && studentDataGroup.get('lastschool_schoolyear').value < '2013-2014') || (wsEnabled | async)===0 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40" class="form-group">
<div *ngIf=" (studentDataGroup.get('lastschool_schoolyear').value !='' && studentDataGroup.get('lastschool_schoolyear').value < limitSchoolYear) || (wsEnabled | async)===0 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde" class="form-group">
<label for="lastschool_class">Τάξη τελευταίας φοίτησης(<span style="color: #ff0000;">*</span>)</label><br/>
<select class="form-control" formControlName="lastschool_class" (change)="schoolyearselected()">
<option value="">Παρακαλώ επιλέξτε...</option>
<option *ngIf=" (studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==3 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==6 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40)" value="33">Γ' Γυμνασίου</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40) )" value="1">Α’ Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40) )" value="2">Β’ Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40) )" value="3">Γ' Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" (studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==3 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==6 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde)" value="33">Γ' Γυμνασίου</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde) )" value="1">Α’ Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde) )" value="2">Β’ Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" ((studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΗΜΕΡΗΣΙΟ') || (studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde) )" value="3">Γ' Λυκείου (ΗΜΕΡΗΣΙΟ)</option>
<option *ngIf=" (studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΕΣΠΕΡΙΝΟ')" value="4">Α’ Λυκείου (ΕΣΠΕΡΙΝΟ)</option>
<option *ngIf=" (studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΕΣΠΕΡΙΝΟ')" value="5">Β’ Λυκείου (ΕΣΠΕΡΙΝΟ)</option>
<option *ngIf=" (studentDataGroup.get('lastschool_schoolname').value.unit_type_id >3 && studentDataGroup.get('lastschool_schoolname').value.operation_shift =='ΕΣΠΕΡΙΝΟ')" value="6">Γ’ Λυκείου (ΕΣΠΕΡΙΝΟ)</option>
......@@ -148,13 +148,13 @@
</div>
<!--
<div *ngIf="(studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40) || !(isStudentDataDisabled | async)" class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div *ngIf="(studentDataGroup.get('lastschool_schoolyear').value >= limitSchoolYear && studentDataGroup.get('lastschool_schoolname').value.unit_type_id != SCHOOL_NO_DDE) || !(isStudentDataDisabled | async)" class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
-->
<div class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Προσωπικά Στοιχεία μαθητή</div>
</div>
<div class="form-group" *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40">
<div class="form-group" *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= limitSchoolYear && studentDataGroup.get('lastschool_schoolname').value.unit_type_id != schoolNoDde">
<label for="am">Αριθμός Μητρώου Μαθητη(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="am">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('am').touched && studentDataGroup.get('am').hasError('required')">
......@@ -162,12 +162,13 @@
</div>
<!--
<button *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40 && (isStudentDataDisabled | async)" type="submit" class="btn btn-alert pull-right" (click)="getStudentData()" >
<button *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= limitSchoolYear && studentDataGroup.get('lastschool_schoolname').value.unit_type_id != SCHOOL_NO_DDE && (isStudentDataDisabled | async)" type="submit" class="btn btn-alert pull-right" (click)="getStudentData()" >
Επιστροφή
</button>
-->
<div *ngIf = "(studentDataGroup.get('lastschool_schoolyear').value < '2013-2014' && studentDataGroup.get('lastschool_schoolyear').value != '') " class="form-group">
<div *ngIf = " ( (studentDataGroup.get('lastschool_schoolyear').value < limitSchoolYear && studentDataGroup.get('lastschool_schoolyear').value != '')
|| studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde )" class="form-group">
<label for="sex">Φύλο μαθητή(<span style="color: #ff0000;">*</span>)</label>
<select class="form-control" formControlName="sex">
<option value="">Παρακαλώ επιλέξτε...</option>
......@@ -227,7 +228,7 @@
Συμπληρώστε την ημερομηνία γέννησης του μαθητή!
</div>
<div *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40 && (isStudentDataDisabled | async)" class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= limitSchoolYear && studentDataGroup.get('lastschool_schoolname').value.unit_type_id != schoolNoDde && (isStudentDataDisabled | async)" class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div class="col-md-6"></div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-md pull-right isclickable" style="width: 11em;" (click)="getStudentData()">
......@@ -240,7 +241,7 @@
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Στοιχεία Επικοινωνίας</div>
</div>
<table class="col-md-12" align="left" *ngIf=" (studentDataGroup.get('lastschool_schoolyear').value !='' && studentDataGroup.get('lastschool_schoolyear').value < '2013-2014') || (wsEnabled | async)===0 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40">
<table class="col-md-12" align="left" *ngIf=" (studentDataGroup.get('lastschool_schoolyear').value !='' && studentDataGroup.get('lastschool_schoolyear').value < limitSchoolYear) || (wsEnabled | async)===0 || studentDataGroup.get('lastschool_schoolname').value.unit_type_id == schoolNoDde">
<tr>
<td>
<div>
......@@ -296,7 +297,7 @@
</table>
<!--
<div class="form-group" *ngIf="studentDataGroup.get('lastschool_schoolname').value.unit_type_id ==40">
<div class="form-group" *ngIf="studentDataGroup.get('lastschool_schoolname').value.unit_type_id == SCHOOL_NO_DDE">
<label for="assigned_dde">ΔΔΕ Σχολείου Τοποθέτησης(<span style="color: #ff0000;">*</span>)</label>
<select class="form-control" formControlName="assigned_dde">
<option value="">Παρακαλώ επιλέξτε...</option>
......
......@@ -35,6 +35,10 @@ import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types";
import { HelperDataService } from "../../services/helper-data-service";
import { IAppState } from "../../store/store";
import {
SCHOOL_YEAR_LIMIT,
} from "../../constants";
@Component({
selector: "submited-preview",
template: `
......@@ -190,7 +194,7 @@ import { IAppState } from "../../store/store";
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{GelStudentDetails$.lastschool_schoolyear}}</div>
</div>
<div *ngIf="(GelStudentDetails$.lastschool_class !== '' && GelStudentDetails$.lastschool_schoolyear < '2013-2014') || (wsEnabled | async)===0 || GelStudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="(GelStudentDetails$.lastschool_class !== '' && GelStudentDetails$.lastschool_schoolyear < SCHOOL_YEAR_LIMIT) || GelStudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Τάξη τελευταίας φοίτησης</div>
<div *ngIf="GelStudentDetails$.lastschool_class === '33'" class="col-md-9" style="font-size: 0.8em; font-weight: bold">Γ' ΓΥΜΝΑΣΙΟΥ</div>
<div *ngIf="GelStudentDetails$.lastschool_class === '1'" class="col-md-9" style="font-size: 0.8em; font-weight: bold">Α’ ΛΥΚΕΙΟΥ (ΗΜΕΡΗΣΙΟ)</div>
......@@ -247,7 +251,7 @@ import { IAppState } from "../../store/store";
<div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center">Στοιχεία Επικοινωνίας</div>
</div>
<div *ngIf="(GelStudentDetails$.lastschool_class !== '' && GelStudentDetails$.lastschool_schoolyear < '2013-2014') || (wsEnabled | async)===0 || GelStudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="(GelStudentDetails$.lastschool_class !== '' && GelStudentDetails$.lastschool_schoolyear < SCHOOL_YEAR_LIMIT) || GelStudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Διεύθυνση</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{GelStudentDetails$.regionaddress}}</div>
<div class="col-md-3" style="font-size: 0.8em;">ΤΚ - Πόλη</div>
......@@ -427,7 +431,7 @@ import { IAppState } from "../../store/store";
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.lastschool_schoolyear}}</div>
</div>
<div *ngIf="(StudentDetails$.lastschool_class !== '' && StudentDetails$.lastschool_schoolyear < '2013-2014') || (wsEnabled | async)===0 || StudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="(StudentDetails$.lastschool_class !== '' && StudentDetails$.lastschool_schoolyear < SCHOOL_YEAR_LIMIT) || StudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="StudentDetails$.lastschool_class !== ''" class="col-md-3" style="font-size: 0.8em;">Τάξη τελευταίας φοίτησης</div>
<div *ngIf="StudentDetails$.lastschool_class === '1'" class="col-md-9" style="font-size: 0.8em; font-weight: bold">Α</div>
<div *ngIf="StudentDetails$.lastschool_class === '2'" class="col-md-9" style="font-size: 0.8em; font-weight: bold">Β</div>
......@@ -461,7 +465,7 @@ import { IAppState } from "../../store/store";
<div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία Επικοινωνίας</div>
</div>
<div *ngIf="(StudentDetails$.lastschool_class !== '' && StudentDetails$.lastschool_schoolyear < '2013-2014') || (wsEnabled | async)===0 || StudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="(StudentDetails$.lastschool_class !== '' && StudentDetails$.lastschool_schoolyear < SCHOOL_YEAR_LIMIT) || StudentDetails$.lastschool_unittypeid =='40'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Διεύθυνση</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.regionaddress}}</div>
<div class="col-md-3" style="font-size: 0.8em;">ΤΚ - Πόλη</div>
......@@ -576,7 +580,7 @@ import { IAppState } from "../../store/store";
private schooltype: string;
//private wsIdentSub: Subscription;
private wsEnabled: BehaviorSubject<number>;
//private wsEnabled: BehaviorSubject<number>;
private loginInfoSub: Subscription;
@ViewChild("target") element: ElementRef;
......@@ -606,7 +610,7 @@ import { IAppState } from "../../store/store";
this.GelSubmittedApplic$ = new BehaviorSubject([{}]);
this.GelSubmittedDetails$=new BehaviorSubject([{}]);
this.wsEnabled = new BehaviorSubject(-1);
//this.wsEnabled = new BehaviorSubject(-1);
}
......@@ -678,7 +682,7 @@ import { IAppState } from "../../store/store";
//new piece of code
if (linfo.size > 0) {
linfo.reduce(({ }, loginInfoObj) => {
this.wsEnabled.next(loginInfoObj.ws_ident);
//this.wsEnabled.next(loginInfoObj.ws_ident);
return loginInfoObj;
}, {});
}
......
......@@ -95,6 +95,8 @@ export const PDE_ROLE = "pde";
export const DIDE_ROLE = "dide";
export const MINISTRY_ROLE = "supervisor";
export const FIRST_SCHOOL_YEAR = 1950;
export const SCHOOL_YEAR_LIMIT = "2013-2014";
export const SCHOOL_NO_DDE = 40;
export function maxValue(max: Number): ValidatorFn {
return (control: AbstractControl): { [key: string]: any } => {
......
......@@ -90,6 +90,9 @@ import ReportGelChoices from "../components/director/report-gel-choices";
import DirectorViewGelTranscription from "../components/director/directorgel-transcription";
import { SortingStudentsPipe } from "../pipes/sortingstudents";
import { FilterAddressPipe } from "../pipes/filteraddress";
import GelDistributionChdde from "../components/geldistribution/gel-distribution-chdde";
import DirectorGelViewEpal from "../components/director/directorgel-epalview";
export const MainRoutes: Routes = [
......@@ -159,12 +162,13 @@ export const MainRoutes: Routes = [
{ path: "gelstudent-application-form-main", component: GelStudentApplicationMain, canActivate: [StudentAuthGuard, StudentGelLockGuard] },
{ path: "school-type-select", component: SchoolTypeSelection, canActivate: [StudentAuthGuard]},
{ path: "gel-application-submit", component: GelApplicationSubmit, canActivate: [StudentAuthGuard, StudentGelLockGuard] },
{ path: "school/gel-distribution", component: GelDistribution, canActivate: [EduDistribAuthGuard] },
{ path: "school/gel-distribution/:choice", component: GelDistribution, canActivate: [EduDistribAuthGuard] },
{ path: "dide/didegel-reports", component: DideGelReports, canActivate: [EduAdminAuthGuard] },
{ path: "dide/didegel-distrib-report", component: ReportGelDistrib, canActivate: [EduAdminAuthGuard] },
{ path: "dide/didegel-complet-report", component: ReportGelComplet, canActivate: [EduAdminAuthGuard] },
{ path: "school/eduadmingel-view", component: EduadminGelView, canActivate: [EduAdminAuthGuard] },
{ path: "school/directorgym-view", component: DirectorViewGym, canActivate: [SchoolGymAuthGuard, SchoolGymStudentsLockedGuard] }, //SchoolGelStudentsLockedGuard
{ path: "school/gel-distribution-chdde", component: GelDistributionChdde, canActivate: [EduDistribAuthGuard] },
];
......@@ -241,6 +245,7 @@ export const MainDeclarations = [
DirectorViewGel,
EduadminGelView,
DirectorViewGym,
GelDistributionChdde,
DirectorViewGelTranscription,
DirectorGelViewEpal,
];
......@@ -471,8 +471,8 @@ export class HelperDataService implements OnInit, OnDestroy {
"lock_application_epal": parseInt(userlogin.lock_application_epal),
"lock_application_gel": parseInt(userlogin.lock_application_gel),
"disclaimer_checked": parseInt(userlogin.disclaimer_checked),
"ws_ident": parseInt(userlogin.ws_ident),
//"ws_ident": parseInt(userlogin.ws_ident),
"dir_del": parseInt(userlogin.dir_del),
"guardian_ident": parseInt(userlogin.guardian_ident),
});
return rsa;
......@@ -1664,7 +1664,8 @@ createGelPdfServerSide(headerid, status, schname, schaddress, schtel, schdide) {
err => console.error(err));
}
//OBSOLETE
/*
isWS_ident_enabled()
{
this.loginInfo$.getValue().forEach(loginInfoToken => {
......@@ -1680,6 +1681,7 @@ isWS_ident_enabled()
.map(response => response.json());
}
*/
isGSIS_ident_enabled()
{
......@@ -1760,9 +1762,8 @@ getHighSchoolperDide()
}
getStudentsPerSchool(schoolid,class_selected)
getStudentsPerSchool(schoolid,class_selected,choice)
{
console.log(schoolid,class_selected,"type");
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
......@@ -1773,14 +1774,14 @@ getStudentsPerSchool(schoolid,class_selected)
});
this.createAuthorizationHeader(headers);
let options = new RequestOptions({ headers: headers });
return this.http.get(`${AppSettings.API_ENDPOINT}/gel/getstudentsperschool/`+ schoolid +'/'+ class_selected, options)
return this.http.get(`${AppSettings.API_ENDPOINT}/gel/getstudentsperschool/`+ schoolid +'/'+ class_selected+'/'+choice, options)
.map(response => response.json());
}
saveHighScoolSelection(studentid,oldschool, schoolid, nextclass, undosel)
saveHighScoolSelection(studentid, schoolid)
{
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
......@@ -1791,11 +1792,8 @@ saveHighScoolSelection(studentid,oldschool, schoolid, nextclass, undosel)
});
this.createAuthorizationHeader(headers);
let options = new RequestOptions({ headers: headers });
if (oldschool == false)
{
oldschool = 999999;
}
return this.http.get(`${AppSettings.API_ENDPOINT}/gel/saveselection/`+ studentid + '/'+schoolid +'/'+ oldschool + '/'+ nextclass + '/' + undosel, options)
return this.http.get(`${AppSettings.API_ENDPOINT}/gel/saveselection/`+ studentid + '/'+schoolid, options)
.map(response => response.json());
}
......@@ -2275,4 +2273,22 @@ saveApprovedClassesMin(taxi, classid, type,username, userpassword)
}
changeDDE(studentid, schoolid){
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
this.authRole = loginInfoToken.auth_role;
});
let headers = new Headers({
"Content-Type": "application/json",
});
this.createAuthorizationHeader(headers);
let options = new RequestOptions({ headers: headers });
return this.http.get(`${AppSettings.API_ENDPOINT}/gel/changeDDE/`+ studentid + '/'+schoolid, options)
.map(response => response.json());
}
}//end helper-data-service
......@@ -34,7 +34,7 @@ export function loginInfoReducer(state: ILoginInfoRecords = LOGININFO_INITIAL_ST
lock_application_epal: loginInfo.lock_application_epal,
lock_application_gel: loginInfo.lock_application_gel,
disclaimer_checked: loginInfo.disclaimer_checked,
ws_ident: loginInfo.ws_ident,
dir_del: loginInfo.dir_del,
guardian_ident: loginInfo.guardian_ident
}));
......
......@@ -23,7 +23,7 @@ export interface ILoginInfoObj {
lock_application_epal: number;
lock_application_gel: number;
disclaimer_checked: number;
ws_ident: number;
dir_del: number;
guardian_ident: number;
}
......