From c858dedcc499e09e0918ff99a11e9933258f73c2 Mon Sep 17 00:00:00 2001 From: Haris Papadopoulos Date: Tue, 20 Jun 2017 18:30:25 +0300 Subject: [PATCH] Created a bypass for second chance schools. A minor fix in CBController --- .../modules/oauthost/src/Controller/CBController.php | 12 +++++++----- .../application.form.main.html | 2 +- .../application.form.main.ts | 5 ++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drupal/modules/oauthost/src/Controller/CBController.php b/drupal/modules/oauthost/src/Controller/CBController.php index 078662a..72797d3 100644 --- a/drupal/modules/oauthost/src/Controller/CBController.php +++ b/drupal/modules/oauthost/src/Controller/CBController.php @@ -304,14 +304,15 @@ class CBController extends ControllerBase public function getXMLElements($doc){ $webUserDetails = $doc->getElementsByTagName( "WebUserDetails" ); if (!$webUserDetails || $webUserDetails->length === 0) - return array( // to be changed to empty array + return false; +/* return array( // to be changed to empty array 'firstName' => '', 'surname' => '', 'fathersName' => '', 'comments' => '', 'tin' => '12345' - ); -// return false; + ); */ + foreach( $webUserDetails as $element ) { $comments = $element->getElementsByTagName( "comments" ); @@ -330,13 +331,14 @@ class CBController extends ControllerBase $tin = $tins->item(0)->nodeValue; if (!$tin || $tin === '') - return array( // to be changed to empty array + return false; +/* return array( // to be changed to empty array 'firstName' => '', 'surname' => '', 'fathersName' => '', 'comments' => '', 'tin' => '12345' - ); + ); */ return array( 'firstName' => $firstName, 'surname' => $surname, diff --git a/source/components/student-application-form/application.form.main.html b/source/components/student-application-form/application.form.main.html index acecdf8..6887444 100644 --- a/source/components/student-application-form/application.form.main.html +++ b/source/components/student-application-form/application.form.main.html @@ -218,4 +218,4 @@ - + diff --git a/source/components/student-application-form/application.form.main.ts b/source/components/student-application-form/application.form.main.ts index 6e3339d..2d4af03 100644 --- a/source/components/student-application-form/application.form.main.ts +++ b/source/components/student-application-form/application.form.main.ts @@ -185,8 +185,11 @@ import { return 1; else if ((new Date().getFullYear()) - d.date.year < 15) return 2; - if (!this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no) + if (!this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no && + this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id!==38) return 3; + else if (this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id===38) + this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no='0000000' if (this.studentDataGroup.controls["telnum"].value.length !== 10 ) return 4; -- GitLab