several changes

parent 5a6bb2f2
......@@ -476,3 +476,9 @@ epal.svc.transition-bperiod:
_controller: '\Drupal\epal\Controller\WSConsumer::transitionToBPeriod'
requirements:
_user_is_logged_in: 'TRUE'
epal.svc.test:
path: '/epal/encodeddata'
defaults:
_controller: '\Drupal\epal\Controller\CreateEncodedData::createData'
requirements:
_access: 'TRUE'
<?php
/**
* @file
* Contains \Drupal\query_example\Controller\QueryExampleController.
*/
namespace Drupal\epal\Controller;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Drupal\Core\Controller\ControllerBase;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Core\Database\Connection;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\epal\Crypt;
class CreateEncodedData extends ControllerBase {
protected $entity_query;
protected $entityTypeManager;
protected $logger;
protected $connection;
public function __construct(
EntityTypeManagerInterface $entityTypeManager,
QueryFactory $entity_query,
Connection $connection,
LoggerChannelFactoryInterface $loggerChannel)
{
$this->entityTypeManager = $entityTypeManager;
$this->entity_query = $entity_query;
//$connection = Database::getConnection();
$this->connection = $connection;
$this->logger = $loggerChannel->get('epal');
}
public static function create(ContainerInterface $container)
{
return new static(
$container->get('entity.manager'),
$container->get('entity.query'),
$container->get('database'),
$container->get('logger.factory')
);
}
public function createData() {
$crypt = new Crypt();
print_r(date("Y-m-d H:i:s", 1530118246));
print_r(date("Y-m-d H:i:s", 1530205696));
print_r(date("Y-m-d H:i:s", 1530212831));
print_r(date("Y-m-d H:i:s", 1530220482));
print_r("decodedname: " . "<br>");
$name_encoded = $crypt->decrypt("def5020043fd2d3ba4746f43be836efa09e9033a3d041c75104bd8700cb59c03b3fb525773b099e8dbd3e9567a9587c9bed063b5a6d4df0af4e8da0f299045ad363395186e484fae498ea9d86f426747bdc658156ca7bd571f");
print_r("Decrypted: " . $name_encoded);
print_r("<br>");
//ΕΠΑΛ
/*
$sCon = $this->connection
->select('epal_student', 'eStudent')
->fields('eStudent', array('id', 'guardian_surname','guardian_name','epaluser_id'))
->condition('eStudent.delapp', 0, '=');
$epalSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($epalSurnames as $epalSurname) {
if ($epalSurname->guardian_surname != null)
$str1 = $crypt->decrypt($epalSurname->guardian_surname);
else
$str1 = "EMPTY";
//$str1_n = $crypt->decrypt($epalSurname->guardian_name);
$sCon = $this->connection
->select('applicant_users', 'eApplicant')
->fields('eApplicant', array('surname','name'))
->condition('eApplicant.id', $epalSurname->epaluser_id, '=');
$applicantSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$applicantSurname = reset($applicantSurnames);
if ($applicantSurname->surname != null)
$str2 = $crypt->decrypt($applicantSurname->surname);
else
$str2 = "EMPTY";
//$str2_n = $crypt->decrypt($applicantSurname->name);
if ($str1 != $str2
//|| ($str1 == $str2 && $str1_n != $str2_n )
)
{
print_r("id: " . $epalSurname->epaluser_id . " epalSurname: " . $str1 . " applicantName: " . $str2 );
print_r("\r");
}
}
*/
//ΓΕΛ
/*
$sCon = $this->connection
->select('gel_student', 'eStudent')
->fields('eStudent', array('id', 'guardian_surname','guardian_name', 'gel_userid'))
->condition('eStudent.delapp', 0, '=');
$gelSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($gelSurnames as $gelSurname) {
if ($gelSurname->guardian_surname != null)
$str1 = $crypt->decrypt($gelSurname->guardian_surname);
else
$str1 = "EMPTY";
//$str1_n = $crypt->decrypt($gelSurname->guardian_name);
$sCon = $this->connection
->select('applicant_users', 'eApplicant')
->fields('eApplicant', array('surname','name'))
->condition('eApplicant.id', $gelSurname->gel_userid, '=');
$applicantSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$applicantSurname = reset($applicantSurnames);
if ($applicantSurname->surname != null)
$str2 = $crypt->decrypt($applicantSurname->surname);
else
$str2 = "EMPTY";
//$str2_n = $crypt->decrypt($applicantSurname->name);
//if ($str1 != $str2) {
if ( $str1 != $str2
//|| ($str1 == $str2 && $str1_n != $str2_n )
) {
print_r("id: " . $gelSurname->id . " gel_userid: " . $gelSurname->gel_userid . " gelSurname: " . $str1 . " applicantName: " . $str2 );
print_r("\r");
}
}
*/
//ΕΛΕΓΧΟΣ ΕΠΙΒΕΒΑΙΩΣΗΣ
/*
$sCon = $this->connection
->select('gel_student', 'eStudent')
->fields('eStudent', array('id', 'guardian_surname', 'gel_userid'))
->condition('eStudent.delapp', 0, '=');
$gelSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($gelSurnames as $gelSurname) {
if ($gelSurname->id == 739 || $gelSurname->id == 1000 || $gelSurname->id == 1014 || $gelSurname->id == 2588 || $gelSurname->id == 3379 ||
$gelSurname->id == 6919 || $gelSurname->id == 13884 || $gelSurname->id == 13988 || $gelSurname->id == 14255 || $gelSurname->id == 14482 ||
$gelSurname->id == 19543 || $gelSurname->id == 19691 || $gelSurname->id == 23855 || $gelSurname->id == 25097 || $gelSurname->id == 25196 ||
$gelSurname->id == 25773 || $gelSurname->id == 27097 || $gelSurname->id == 28375 || $gelSurname->id == 32468 || $gelSurname->id == 34116 ||
$gelSurname->id == 38145 || $gelSurname->id == 46005 || $gelSurname->id == 47575 || $gelSurname->id == 50425 || $gelSurname->id == 52831 ||
$gelSurname->id == 52916
) {
$sCon = $this->connection
->select('epal_student', 'eEpalStudent')
->fields('eEpalStudent', array('guardian_surname','epaluser_id'))
->condition('eEpalStudent.id', $gelSurname->id, '=');
$epalSurnames = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($epalSurnames as $epalSurname) {
$name1 = $crypt->decrypt($gelSurname->guardian_surname);
$name2 = $crypt->decrypt($epalSurname->guardian_surname);
print_r("id: " . $gelSurname->id . " gelGuardianSurname: " . $name1 . " epalGuardianSurname: " . $name2);
print_r("\r");
}
}
}
*/
//για ΔΔΕ ΑΧΑΙΑΣ!
/*
$sCon = $this->connection
->select('gel_school', 'eSchool')
->fields('eSchool', array('registry_no', 'name'))
->condition('eSchool.edu_admin_id', 17, '=');
$epalSchools = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($epalSchools as $epalSchool) {
$sCon = $this->connection
->select('epal_student', 'eStudent')
->fields('eStudent', array('id', 'am'))
->condition('eStudent.delapp', 0, '=')
->condition('eStudent.lastschool_registrynumber',$epalSchool->registry_no , '=');
$epalStudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($epalStudents as $epalStudent) {
if ($epalStudent->am != null) {
print_r("Am," . $crypt->decrypt($epalStudent->am) . ",reg_no," . strval($epalSchool->registry_no) . ", schName," . $epalSchool->name );
print_r("<br/>");
}
}
}
*/
print_r("\rΤΕΛΟΣ!");
}
}
......@@ -73,7 +73,7 @@ class DirectorView extends ControllerBase
$user = reset($users);
if ($user) {
$epalId = $user->init->value;
//$epalId = 76;
//$epalId = 191;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $epalId));
$school = reset($schools);
if (!$school) {
......@@ -930,7 +930,7 @@ class DirectorView extends ControllerBase
$user = reset($users);
if ($user) {
$schoolid = $user->init->value;
//$schoolid = 76;
//$schoolid = 191;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid));
$school = reset($schools);
if (!$school) {
......
......@@ -285,14 +285,14 @@ class Distribution extends ControllerBase
$total_count = 0;
try {
$sCon = $this->connection->select('epal_student', 'eStudent')
->fields('eStudent', array('id', 'currentclass', 'currentepal', 'second_period', 'created'))
->fields('eStudent', array('id', 'currentclass', 'currentepal', 'second_period', 'created', 'changed'))
->condition('eStudent.delapp', 1, '!=');
if ($period === self::IS_SECOND_PERIOD) {
$sCon->condition('eStudent.second_period', 1, '=');
//$datelimit = '7-9-2017';
$datelimitInt = strtotime($datelimit);
$sCon->condition('eStudent.created', $datelimitInt, '>=');
$sCon->condition('eStudent.changed', $datelimitInt, '>=');
}
......@@ -913,7 +913,8 @@ class Distribution extends ControllerBase
try {
$this->connection->delete('epal_student_class')
->condition('second_period', 1)
->condition('created', $datelimitInt, '>=')
//->condition('created', $datelimitInt, '>=')
->condition('changed', $datelimitInt, '>=')
->execute();
} catch (\Exception $e) {
$this->logger->error($e->getMessage());
......
......@@ -221,12 +221,14 @@ class PDFCreator extends ControllerBase {
else
$this->pdf->MultiCell(0, 8, $this->prepareString('με αριθμό δήλωσης: ' . $student->id->value . ' / ' . date('d-m-y (ώρα: H:i:s)', $student->created->value)), 0, 'C');
/*
$this->pdf->SetFont($this->fontLight, '', 11);
//if ($this->applicantsResultsDisabled === "1")
if ($status === "0" || $status === "3" || $status === "4" || $status === "5" || $status === "6" || $status === "7")
$this->pdf->MultiCell(0, 8, $this->prepareString('(Αρχική)'), 0, 'R');
else if ($status === "1" || $status === "2")
$this->pdf->MultiCell(0, 8, $this->prepareString('(Οριστική)'), 0, 'R');
*/
$this->pdf->Ln();
}
......
......@@ -574,31 +574,62 @@ class SubmitedApplications extends ControllerBase
//$this->logger->warning("Trace2.." . $applicantsResultsDisabled . " " . $es->myschool_promoted );
if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted === "1" || $es->myschool_promoted === "2") ) {
if ($epalStudent->finalized === "1")
$status = "1";
else if ($epalStudent->finalized === "0")
//$status = "2"; Τροποποίηση για να βγαίνει μήνυμα ότι τοποθετήθηκε "κανονικά" και ας είναι ολιγομελές
$status = "1";
else if ( ($epalStudent->second_period === "0" && /*$studInDistr === false*/ $epalStudent->finalized === null) ||
($epalStudent->second_period === "1" && $epalStudent->changed < $dateStartInt) )
$status = "3";
else if ($epalStudent->second_period === "1" &&
$epalStudent->changed >= $dateStartInt)
$status = "4";
if ($epalStudent->second_period === "0") {
if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted === "1" || $es->myschool_promoted === "2") ) {
if ($epalStudent->finalized === "1")
$status = "1";
else if ($epalStudent->finalized === "0")
//$status = "2"; Τροποποίηση για να βγαίνει μήνυμα ότι τοποθετήθηκε "κανονικά" και ας είναι ολιγομελές
$status = "1";
else if ( ($epalStudent->second_period === "0" && /*$studInDistr === false*/ $epalStudent->finalized === null) ||
($epalStudent->second_period === "1" && $epalStudent->changed < $dateStartInt) )
$status = "3";
else if ($epalStudent->second_period === "1" &&
$epalStudent->changed >= $dateStartInt)
$status = "4";
}
else if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted === "6" || $es->myschool_promoted === "7") )
$status = "5";
else if ($applicantsResultsDisabled === "0" &&
$es->myschool_promoted != null && $es->myschool_promoted != "0" &&
$es->myschool_promoted != "1" && $es->myschool_promoted != "2" &&
$es->myschool_promoted != "6" && $es->myschool_promoted != "7"
)
$status = "6";
else if ($applicantsResultsDisabled === "0" && $es->myschool_promoted === "0" )
$status = "7";
else
$status = "0";
}
else if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted === "6" || $es->myschool_promoted === "7") )
$status = "5";
else if ($applicantsResultsDisabled === "0" &&
$es->myschool_promoted != null && $es->myschool_promoted != "0" &&
$es->myschool_promoted != "1" && $es->myschool_promoted != "2" &&
$es->myschool_promoted != "6" && $es->myschool_promoted != "7"
)
$status = "6";
else if ($applicantsResultsDisabled === "0" && $es->myschool_promoted === "0" )
$status = "7";
else
$status = "0";
else if ($epalStudent->second_period === "1") {
if ($applicantsResultsDisabled === "0" && ($es->myschool_promoted != "3" && $es->myschool_promoted != "4" &&
$es->myschool_promoted != "5" && $es->myschool_promoted != "14") )
{
if ($epalStudent->finalized === "1")
$status = "1";
else if ($epalStudent->finalized === "0")
//$status = "2"; Τροποποίηση για να βγαίνει μήνυμα ότι τοποθετήθηκε "κανονικά" και ας είναι ολιγομελές
$status = "1";
else if ( $epalStudent->changed < $dateStartInt )
$status = "3";
else if ($epalStudent->changed >= $dateStartInt)
$status = "4";
}
else if ($applicantsResultsDisabled === "0" &&
$es->myschool_promoted === "3" || $es->myschool_promoted === "4" ||
$es->myschool_promoted === "5" || $es->myschool_promoted != "14"
)
$status = "6";
else
$status = "0";
}
if ($epalStudent->changed != 1529867143)
$appchanged = $epalStudent->changed;
......
......@@ -2218,8 +2218,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//'birthdate' => substr($gelStudent->birthdate->value, 8, 10) . '/' . substr($gelStudent->birthdate->value, 6, 8) . '/' . substr($gelStudent->birthdate->value, 0, 4),
'birthdate' => date("d-m-Y", strtotime($gelStudent->birthdate->value)),
'checkstatus' => $gelStudent -> directorconfirm ->value,
//'lock_delete' => $lock_delete,
'lock_delete' => "0",
'lock_delete' => $lock_delete,
//'lock_delete' => "0",
'created' => date('d/m/Y H:i', $gelStudent -> created ->value),
'choices' => $choices
......@@ -2328,8 +2328,8 @@ public function getStudentPerSchoolGel(Request $request, $classId)
//'birthdate' => substr($object->birthdate , 8, 10) . '/' . substr($object->birthdate , 6, 8) . '/' . substr($object->birthdate , 0, 4),
'birthdate' => date("d-m-Y", strtotime($object->birthdate )),
'checkstatus' => $object -> directorconfirm ,
//'lock_delete' => $lock_delete,
'lock_delete' => "0",
'lock_delete' => $lock_delete,
//'lock_delete' => "0",
'created' => date('d/m/Y H:i', $object -> created ),
'choices' => $choices
......
......@@ -488,20 +488,15 @@ class GelSubmittedApplications extends ControllerBase
$schoolTel = $gelStudent->phone_number;
//$this->logger->warning("Trace.." . $gelStudent->myschool_promoted . " " . $gelStudent->second_period . " " . $gelStudent->changed . " " . $dateStartInt);
//new piece of code concerning to enable / disable edit functionality
//$this->logger->warning("Trace2.." . $gelStudent->changed . " " . $dateStartInt );
$canedit = '0';
if ( $applicantsAppModifyDisabled == "0"
&& $eggrafesConfig->activate_second_period->value == $gelStudent->second_period
/*&& $gelStudent->changed >= $dateStartInt*/
)
$canedit = '1';
//end new piece
if ($applicantsResultsDisabled === "0" && ($gelStudent->myschool_promoted === "1" || $gelStudent->myschool_promoted === "2")) {
//new piece of code
// περιττό (?), στη Β' περίοδο οι αιτήσεις λογικά δεν έχουν ενημερωμένο το myschool_promoted ?
if ($gelStudent->second_period === "1" && $gelStudent->changed >= $dateStartInt)
//η αίτηση είναι της β' περιόδου με ημερομηνία μεταγενέστερη της ημερομηνίας έναρξης β' περιόδου
......@@ -552,6 +547,7 @@ class GelSubmittedApplications extends ControllerBase
else
$status = "0";
if ($gelStudent->changed != 1529867143)
$appchanged = $gelStudent->changed;
else
......
......@@ -194,12 +194,14 @@ class PDFCreator extends ControllerBase {
else
$this->pdf->MultiCell(0, 8, $this->prepareString('με αριθμό δήλωσης: ' . $student->id->value . ' / ' . date('d-m-y (ώρα: H:i:s)', $student->created->value)), 0, 'C');
/*
$this->pdf->SetFont($this->fontLight, '', 11);
//if ($this->applicantsResultsDisabled === "1")
if ($status === "0" || $status === "2" || $status === "3" || $status === "5" || $status === "6" || $status === "7" || $status === "8")
$this->pdf->MultiCell(0, 8, $this->prepareString('(Αρχική)'), 0, 'R');
else if ($status === "1" || $status === "4" )
$this->pdf->MultiCell(0, 8, $this->prepareString('(Οριστική)'), 0, 'R');
*/
$this->pdf->Ln();
......
......@@ -59,11 +59,17 @@ import { GelStudentDataFieldsActions } from "../actions/gelstudentdatafields.act
</p>
-->
<!--
<p style = "font-size:1.0em">
<strong>Ενημέρωση: </strong>
Μπορείτε να ενημερωθείτε μέσω της εφαρμογής για το αποτέλεσμα της δήλωσης προτίμησής σας χωρίς δυνατότητα τροποποίησης.
Από <strong>25/6/2018 έως και 29/6/2018 (ώρα 14:00)</strong> για όσους απορρίφθηκαν ή δεν έχουν υποβάλει Ηλεκτρονική Αίτηση εγγραφής για λόγους ανωτέρας βίας, θα υπάρχει δυνατότητα υποβολής Ηλεκτρονικής Αίτησης εγγραφής-Δήλωσης προτίμησης για τα ΓΕ.Λ. και ΕΠΑ.Λ. μέσω της εφαρμογής.
</p>
-->
<p style = "font-size:1.0em">
<strong>Ενημέρωση: </strong>
Ευχαριστούμε για τη συνεργασία.
Από <strong>22/6/2018 έως και 29/6/2018</strong> θα μπορείτε να ενημερωθείτε μέσω της εφαρμογής για το αποτέλεσμα της δήλωσης προτίμησής σας χωρίς δυνατότητα τροποποίησης.
Από <strong>25/6/2018 έως και 29/6/2018</strong> για όσους απορρίφθηκαν ή δεν έχουν υποβάλει Ηλεκτρονική Αίτηση εγγραφής για λόγους ανωτέρας βίας, θα υπάρχει δυνατότητα υποβολής Ηλεκτρονικής Αίτησης εγγραφής-Δήλωσης προτίμησης για τα ΓΕ.Λ. και ΕΠΑ.Λ. μέσω της εφαρμογής.
Ευχαριστούμε για τη συνεργασία. Θα μπορείτε να ενημερωθείτε για το αποτέλεσμα της κατανομής της αίτησής σας από τις
<strong>02/07 (για τα ΕΠΑ.Λ.)</strong> και από τις <strong>04/07 (για τα ΓΕ.Λ.)</strong> και να εκτυπώσετε την αίτησή σας μέσω της εφαρμογής e-eggrafes.
</p>
......
......@@ -44,7 +44,7 @@
</div>
<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') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
</li>
</div>
......
......@@ -209,6 +209,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
private birtdateFormView: BehaviorSubject<string>;
private father1: string;
private father2:string;
private bypassGuardianVer: number;
constructor(
private _hds: HelperDataService,
......@@ -253,6 +254,8 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
this.birtdateFormView = new BehaviorSubject("");
this.bypassGuardianVer = 0;
//this.wsIdentSub = this._hds.isWS_ident_enabled().subscribe(z => {
// this.wsEnabled.next(Number(z.res)) ;
//});
......@@ -271,6 +274,10 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
this.epalUserDataSub = this._hds.getApplicantUserData().subscribe(x => {
if ( Number(x.numAppSelf) > 0 && Number(x.numAppChildren) >= Number(x.numChildren))
this.hasright = 0;
if (Number(x.verificationCodeVerified) == 1)
this.bypassGuardianVer = 1;
});
this.loginInfoSub = this._ngRedux.select("loginInfo")
......@@ -554,7 +561,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
}
if (this.guardianEnabled.getValue() === 1 && (aitisiObj[0].websrv_cu_surname === null || aitisiObj[0].websrv_cu_surname === "") ) {
if (this.bypassGuardianVer === 0 && this.guardianEnabled.getValue() === 1 && (aitisiObj[0].websrv_cu_surname === null || aitisiObj[0].websrv_cu_surname === "") ) {
let mTitle = "Αποτυχία Ταυτοποίησης Κηδεμόνα";
let mText = "Δεν έχει δηλωθεί Κηδεμόνας στο Πληροφοριακό Σύστημα του Σχολείου. " +
"Παρακαλείστε να επικοινωνήσετε με το σχολείο όπου φοιτά τώρα το παιδί για να επιβεβαιώσετε ότι το ονοματεπώνυμο του κηδεμόνα έχει καταχωρηθεί στο Πληροφοριακό Σύστημα του Σχολείου (myschοol) όπως είναι καταχωρημένο στην εφορία. " +
......@@ -570,7 +577,7 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
return;
}
if (this.guardianEnabled.getValue() === 1 && aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "") !== aitisiObj[0].cu_surname.replace(/ |-/g, "")) {
if (this.bypassGuardianVer === 0 && this.guardianEnabled.getValue() === 1 && aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "") !== aitisiObj[0].cu_surname.replace(/ |-/g, "")) {
this.father1 = aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "");
this.father2 = aitisiObj[0].cu_surname.replace(/ |-/g, "");
......
......@@ -223,8 +223,9 @@ import { StudentGelCourseChosen } from "../students/student";
//private guardianIdentSub: Subscription;
private guardianEnabled: BehaviorSubject<number>;
private birtdateFormView: BehaviorSubject<string>;
private father1: string;
private father1: string;
private father2:string;
private bypassGuardianVer: number;
constructor(
private _hds: HelperDataService,
......@@ -262,6 +263,8 @@ import { StudentGelCourseChosen } from "../students/student";
this.hasright = 1;
this.limitSchoolYear = "2013-2014";
this.bypassGuardianVer = 0;
//this.wsIdentSub = this._hds.isWS_ident_enabled().subscribe(z => {
// this.wsEnabled.next(Number(z.res)) ;
//});
......@@ -276,8 +279,13 @@ import { StudentGelCourseChosen } from "../students/student";
this.gelUserDataSub = this._hds.getApplicantUserData().subscribe(x => {
if ( Number(x.numAppSelf) > 0 && Number(x.numAppChildren) >= Number(x.numChildren))
this.hasright = 0;
if (Number(x.verificationCodeVerified) == 1)
this.bypassGuardianVer = 1;
});
//this.guardianIdentSub = this._hds.isGuardian_ident_enabled().subscribe(w => {
// this.guardianEnabled.next(Number(w.res)) ;
//});
......@@ -549,7 +557,7 @@ import { StudentGelCourseChosen } from "../students/student";
return;
}
if (this.guardianEnabled.getValue() === 1 && (aitisiObj[0].websrv_cu_surname === null || aitisiObj[0].websrv_cu_surname === "")) {
if (this.bypassGuardianVer === 0 && this.guardianEnabled.getValue() === 1 && (aitisiObj[0].websrv_cu_surname === null || aitisiObj[0].websrv_cu_surname === "")) {
let mTitle = "Αποτυχία Ταυτοποίησης Κηδεμόνα";
let mText = "Δεν έχει δηλωθεί Κηδεμόνας στο Πληροφοριακό Σύστημα του Σχολείου. " +
"Παρακαλείστε να επικοινωνήσετε με το σχολείο όπου φοιτά τώρα το παιδί για να επιβεβαιώσετε ότι το ονοματεπώνυμο του κηδεμόνα έχει καταχωρηθεί στο Πληροφοριακό Σύστημα του Σχολείου (myschοol) όπως είναι καταχωρημένο στην εφορία. " +
......@@ -565,7 +573,7 @@ import { StudentGelCourseChosen } from "../students/student";
return;
}
if (this.guardianEnabled.getValue() === 1 && aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "") !== aitisiObj[0].cu_surname.replace(/ |-/g, "")) {
if (this.bypassGuardianVer === 0 && this.guardianEnabled.getValue() === 1 && aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "") !== aitisiObj[0].cu_surname.replace(/ |-/g, "")) {
this.father1 = aitisiObj[0].websrv_cu_surname.replace(/ |-/g, "");
this.father2 = aitisiObj[0].cu_surname.replace(/ |-/g, "");
......
......@@ -33,8 +33,8 @@ export default class Main {
//make storeEnhancers = [] in order for PRODUCTION MODE
const storeEnhancers =
_devTools.isEnabled() ?
[ _devTools.enhancer() ] :
//_devTools.isEnabled() ?
//[ _devTools.enhancer() ] :
[];
_ngRedux.configureStore(
......
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