Merge branch 'edge_v4' into 'develop_v4'

Warning fix. Deactivated test code

See merge request !254
parents 1a2b7843 6f6b82ad
...@@ -304,14 +304,14 @@ class CBController extends ControllerBase ...@@ -304,14 +304,14 @@ class CBController extends ControllerBase
public function getXMLElements($doc){ public function getXMLElements($doc){
$webUserDetails = $doc->getElementsByTagName( "WebUserDetails" ); $webUserDetails = $doc->getElementsByTagName( "WebUserDetails" );
if (!$webUserDetails || $webUserDetails->length === 0) if (!$webUserDetails || $webUserDetails->length === 0)
// return false; return false;
return array( // to be changed to empty array /* return array( // to be changed to empty array
'firstName' => '', 'firstName' => '',
'surname' => '', 'surname' => '',
'fathersName' => '', 'fathersName' => '',
'comments' => '', 'comments' => '',
'tin' => '12345' 'tin' => '12345'
); ); */
foreach( $webUserDetails as $element ) foreach( $webUserDetails as $element )
{ {
...@@ -331,14 +331,14 @@ class CBController extends ControllerBase ...@@ -331,14 +331,14 @@ class CBController extends ControllerBase
$tin = $tins->item(0)->nodeValue; $tin = $tins->item(0)->nodeValue;
if (!$tin || $tin === '') if (!$tin || $tin === '')
// return false; return false;
return array( // to be changed to empty array /* return array( // to be changed to empty array
'firstName' => '', 'firstName' => '',
'surname' => '', 'surname' => '',
'fathersName' => '', 'fathersName' => '',
'comments' => '', 'comments' => '',
'tin' => '12345' 'tin' => '12345'
); ); */
return array( return array(
'firstName' => $firstName, 'firstName' => $firstName,
'surname' => $surname, 'surname' => $surname,
......
...@@ -17,8 +17,6 @@ import { IAppState } from "../store/store"; ...@@ -17,8 +17,6 @@ import { IAppState } from "../store/store";
template: ` template: `
<div> <div>
<form method = "POST" action="{{apiEndPoint}}/oauth/login{{apiEndPointParams}}" #form> <form method = "POST" action="{{apiEndPoint}}/oauth/login{{apiEndPointParams}}" #form>
<!-- <input type="hidden" name="X-oauth-enabled" value="true"> -->
<div class="bg-warning" style="padding: 2em;"> <div class="bg-warning" style="padding: 2em;">
<p> <p>
<strong>Ανακοίνωση:</strong> Παρακαλείσθε να μην καταχωρείτε δήλωση προτίμησης επιλέγοντας τα παρακάτω:</p> <strong>Ανακοίνωση:</strong> Παρακαλείσθε να μην καταχωρείτε δήλωση προτίμησης επιλέγοντας τα παρακάτω:</p>
...@@ -50,7 +48,6 @@ import { IAppState } from "../store/store"; ...@@ -50,7 +48,6 @@ import { IAppState } from "../store/store";
}) })
export default class Home implements OnInit, OnDestroy { export default class Home implements OnInit, OnDestroy {
private authToken: string; private authToken: string;
private authRole: string; private authRole: string;
private name: any; private name: any;
...@@ -73,9 +70,7 @@ export default class Home implements OnInit, OnDestroy { ...@@ -73,9 +70,7 @@ export default class Home implements OnInit, OnDestroy {
this.name = ""; this.name = "";
this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE); this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
}; };
ngOnInit() { ngOnInit() {
this.loginInfoSub = this._ngRedux.select("loginInfo") this.loginInfoSub = this._ngRedux.select("loginInfo")
.map(loginInfo => <ILoginInfoRecords>loginInfo) .map(loginInfo => <ILoginInfoRecords>loginInfo)
.subscribe(linfo => { .subscribe(linfo => {
......
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