Merge branch 'edge_v4' into 'develop_v4'

Restructured ILoginInfo

See merge request !244
parents 94b9c239 b790526b
...@@ -81,7 +81,6 @@ class DirectorView extends ControllerBase ...@@ -81,7 +81,6 @@ class DirectorView extends ControllerBase
'error_code' => 4003, 'error_code' => 4003,
], Response::HTTP_FORBIDDEN); ], Response::HTTP_FORBIDDEN);
} elseif ($userRole === 'epal') { } elseif ($userRole === 'epal') {
$selectIdNew = $selectId;
if ($classId == 1) { if ($classId == 1) {
$selectIdNew = -1; $selectIdNew = -1;
} elseif ($classId == 2) { } elseif ($classId == 2) {
...@@ -374,6 +373,7 @@ class DirectorView extends ControllerBase ...@@ -374,6 +373,7 @@ class DirectorView extends ControllerBase
$userRole = $tmpRole; $userRole = $tmpRole;
} }
} }
if ($userRole === '') { if ($userRole === '') {
return $this->respondWithStatus([ return $this->respondWithStatus([
'error_code' => 4003, 'error_code' => 4003,
...@@ -390,6 +390,7 @@ class DirectorView extends ControllerBase ...@@ -390,6 +390,7 @@ class DirectorView extends ControllerBase
} else { } else {
$schools = []; $schools = [];
} }
if ($schools) { if ($schools) {
$list = array(); $list = array();
...@@ -582,6 +583,27 @@ class DirectorView extends ControllerBase ...@@ -582,6 +583,27 @@ class DirectorView extends ControllerBase
} }
} }
protected function getLimit($name, $categ)
{
static $limits = array();
$key = "{$name}_{$categ}";
if (isset($limits[$key])) {
$limit = $limits[$key];
} else {
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => $name, 'category' => $categ));
$limitdown = reset($limit_down);
if ($limitdown) {
$limit = $limitdown->limit_down->value;
} else {
$limit = -1;
}
$limits[$key] = $limit;
}
return $limit;
}
public function returnstatus($id) public function returnstatus($id)
{ {
$schoolid = $id; $schoolid = $id;
...@@ -595,13 +617,7 @@ class DirectorView extends ControllerBase ...@@ -595,13 +617,7 @@ class DirectorView extends ControllerBase
$CourseA = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id' => $schoolid)); $CourseA = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id' => $schoolid));
if ($CourseA) { if ($CourseA) {
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => 1, 'category' => $categ)); $limit = $this->getLimit(1, $categ);
$limitdown = reset($limit_down);
if ($limitdown) {
$limit = $limitdown->limit_down->value;
} else {
$limit = -1;
}
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => -1, 'currentclass' => 1)); $studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => -1, 'currentclass' => 1));
...@@ -610,42 +626,45 @@ class DirectorView extends ControllerBase ...@@ -610,42 +626,45 @@ class DirectorView extends ControllerBase
} }
} }
$CourseB = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id' => $schoolid)); $limit = $this->getLimit(2, $categ);
if ($CourseB) { $sCon = $this->connection->select('eepal_sectors_in_epal_field_data', 'eSchool');
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => 2, 'category' => $categ)); $sCon->leftJoin('epal_student_class', 'eStudent',
$limitdown = reset($limit_down); 'eStudent.epal_id = ' . $schoolid . ' ' .
if ($limitdown) { 'AND eStudent.specialization_id = eSchool.sector_id ' .
$limit = $limitdown->limit_down->value; 'AND eStudent.currentclass = 2');
} else { $sCon->fields('eSchool', array('sector_id'))
$limit = -1; ->fields('eStudent', array('specialization_id'))
} ->groupBy('specialization_id')
->groupBy('sector_id')
foreach ($CourseB as $object) { ->condition('eSchool.epal_id', $schoolid, '=');
$sectorid = $object->sector_id->entity->id(); $sCon->addExpression('count(eStudent.id)', 'eStudent_count');
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $sectorid, 'currentclass' => 2));
if (sizeof($studentPerSchool) < $limit) { $results = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
return false;
} foreach ($results as $result) {
if ($result->eStudent_count < $limit) {
return false;
} }
} }
$CourseC = $this->entityTypeManager->getStorage('eepal_specialties_in_epal')->loadByProperties(array('epal_id' => $schoolid)); $limit = $this->getLimit(3, $categ);
if ($CourseC) { $sCon = $this->connection->select('eepal_specialties_in_epal_field_data', 'eSchool');
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name' => 3, 'category' => $categ)); $sCon->leftJoin('epal_student_class', 'eStudent',
$limitdown = reset($limit_down); 'eStudent.epal_id = ' . $schoolid . ' ' .
if ($limitdown) { 'AND eStudent.specialization_id = eSchool.specialty_id ' .
$limit = $limitdown->limit_down->value; 'AND eStudent.currentclass = 3');
} else { $sCon->fields('eSchool', array('specialty_id'))
$limit = -1; ->fields('eStudent', array('specialization_id'))
} ->groupBy('specialization_id')
->groupBy('specialty_id')
foreach ($CourseC as $object) { ->condition('eSchool.epal_id', $schoolid, '=');
$specialityid = $object->specialty_id->entity->id(); $sCon->addExpression('count(eStudent.id)', 'eStudent_count');
$studentPerSchool = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array('epal_id' => $schoolid, 'specialization_id' => $specialityid, 'currentclass' => 3));
$results = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
if (sizeof($studentPerSchool) < $limit) {
return false; foreach ($results as $result) {
} if ($result->eStudent_count < $limit) {
return false;
} }
} }
......
...@@ -101,5 +101,5 @@ class MyLocalization extends NgLocalization { ...@@ -101,5 +101,5 @@ class MyLocalization extends NgLocalization {
}) })
class AppModule { } class AppModule { }
// enableProdMode(); enableProdMode();
platformBrowserDynamic().bootstrapModule(AppModule); platformBrowserDynamic().bootstrapModule(AppModule);
...@@ -8,7 +8,6 @@ import { NgRedux, select } from "@angular-redux/store"; ...@@ -8,7 +8,6 @@ import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../../store/store"; import { IAppState } from "../../store/store";
import {Router, ActivatedRoute, Params} from "@angular/router"; import {Router, ActivatedRoute, Params} from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { ILoginInfo } from "../../store/logininfo/logininfo.types";
import { VALID_CAPACITY_PATTERN} from "../../constants"; import { VALID_CAPACITY_PATTERN} from "../../constants";
import {maxValue} from "../../constants"; import {maxValue} from "../../constants";
import {minValue} from "../../constants"; import {minValue} from "../../constants";
...@@ -66,7 +65,6 @@ import { ...@@ -66,7 +65,6 @@ import {
</form> </form>
</div> </div>
<div id="checksaved1" (onHidden)="onHidden('#checksaved1')" <div id="checksaved1" (onHidden)="onHidden('#checksaved1')"
class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"> class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
...@@ -102,10 +100,6 @@ import { ...@@ -102,10 +100,6 @@ import {
private courseActive = <number>-1; private courseActive = <number>-1;
private showLoader: BehaviorSubject<boolean>; private showLoader: BehaviorSubject<boolean>;
constructor(private fb: FormBuilder, constructor(private fb: FormBuilder,
private _hds: HelperDataService, private _hds: HelperDataService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
...@@ -121,8 +115,6 @@ import { ...@@ -121,8 +115,6 @@ import {
} }
public showModal(popupMsgId): void { public showModal(popupMsgId): void {
(<any>$(popupMsgId)).modal("show"); (<any>$(popupMsgId)).modal("show");
} }
...@@ -135,7 +127,6 @@ import { ...@@ -135,7 +127,6 @@ import {
} }
ngOnDestroy() { ngOnDestroy() {
} }
...@@ -153,7 +144,6 @@ import { ...@@ -153,7 +144,6 @@ import {
}); });
} }
handleChange(e: Event) { handleChange(e: Event) {
this.newvalue = e.target["value"]; this.newvalue = e.target["value"];
} }
...@@ -166,7 +156,6 @@ import { ...@@ -166,7 +156,6 @@ import {
else { else {
this.showLoader.next(true); this.showLoader.next(true);
let std = this.CapacityPerCourse$.getValue(); let std = this.CapacityPerCourse$.getValue();
std[ind].capacity = this.newvalue; std[ind].capacity = this.newvalue;
this.saveCapacitySub = this._hds.saveCapacity(taxi, sect, spec, this.newvalue).subscribe(data => { this.saveCapacitySub = this._hds.saveCapacity(taxi, sect, spec, this.newvalue).subscribe(data => {
...@@ -179,9 +168,7 @@ import { ...@@ -179,9 +168,7 @@ import {
this.showLoader.next(false); this.showLoader.next(false);
console.log("Error Saving Capacity"); console.log("Error Saving Capacity");
}); });
} }
} }
else { else {
if (oldvalue === null) if (oldvalue === null)
...@@ -189,7 +176,6 @@ import { ...@@ -189,7 +176,6 @@ import {
} }
} }
setActive(ind) { setActive(ind) {
this.courseActive = ind; this.courseActive = ind;
} }
......
...@@ -8,12 +8,9 @@ import { NgRedux, select } from "@angular-redux/store"; ...@@ -8,12 +8,9 @@ import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../../store/store"; import { IAppState } from "../../store/store";
import {Router, ActivatedRoute, Params} from "@angular/router"; import {Router, ActivatedRoute, Params} from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { ILoginInfo } from "../../store/logininfo/logininfo.types";
import { VALID_CAPACITY_PATTERN} from "../../constants"; import { VALID_CAPACITY_PATTERN} from "../../constants";
import {maxValue} from "../../constants"; import {maxValue} from "../../constants";
import {minValue} from "../../constants"; import {minValue} from "../../constants";
import { import {
FormBuilder, FormBuilder,
FormGroup, FormGroup,
...@@ -114,11 +111,6 @@ import { ...@@ -114,11 +111,6 @@ import {
<option value="3" [selected]="StudentDetails$.checkstatus != '0' && StudentDetails$.checkstatus != '1'">Δεν ελέγχθηκε</option> <option value="3" [selected]="StudentDetails$.checkstatus != '0' && StudentDetails$.checkstatus != '1'">Δεν ελέγχθηκε</option>
</select> </select>
</div> </div>
<!-- <div class="col-md-2">
<button type="button" class="btn-primary btn-sm pull-right" (click)="confirmStudent(StudentDetails$.id, cb, j)">
Ενημέρωση
</button>
</div> -->
</div> </div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
...@@ -277,8 +269,6 @@ import { ...@@ -277,8 +269,6 @@ import {
</div> </div>
</div> </div>
</div> </div>
` `
}) })
...@@ -302,8 +292,6 @@ import { ...@@ -302,8 +292,6 @@ import {
private sector = <number>0; private sector = <number>0;
private special = <number>0; private special = <number>0;
constructor(private fb: FormBuilder, constructor(private fb: FormBuilder,
private _hds: HelperDataService, private _hds: HelperDataService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
...@@ -321,7 +309,6 @@ import { ...@@ -321,7 +309,6 @@ import {
} }
public showConfirmModal(): void { public showConfirmModal(): void {
(<any>$("#applicationDeleteConfirm")).modal("show"); (<any>$("#applicationDeleteConfirm")).modal("show");
} }
...@@ -337,7 +324,6 @@ import { ...@@ -337,7 +324,6 @@ import {
(<any>$("#applicationDeleteError")).modal("hide"); (<any>$("#applicationDeleteError")).modal("hide");
} }
public showModal(popupMsgId): void { public showModal(popupMsgId): void {
(<any>$(popupMsgId)).modal("show"); (<any>$(popupMsgId)).modal("show");
} }
...@@ -351,7 +337,6 @@ import { ...@@ -351,7 +337,6 @@ import {
} }
ngOnDestroy() { ngOnDestroy() {
(<any>$("#applicationDeleteConfirm")).remove(); (<any>$("#applicationDeleteConfirm")).remove();
(<any>$("#applicationDeleteError")).remove(); (<any>$("#applicationDeleteError")).remove();
...@@ -367,17 +352,14 @@ import { ...@@ -367,17 +352,14 @@ import {
this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => { this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => {
this.CoursesPerSchool$.next(x); this.CoursesPerSchool$.next(x);
this.showLoader.next(false); this.showLoader.next(false);
}, },
error => { error => {
this.CoursesPerSchool$.next([{}]); this.CoursesPerSchool$.next([{}]);
console.log("Error Getting courses perSchool"); console.log("Error Getting courses perSchool");
this.showLoader.next(false); this.showLoader.next(false);
}); });
} }
findstudent(taxi, sector, special) { findstudent(taxi, sector, special) {
this.showLoader.next(true); this.showLoader.next(true);
this.retrievedStudent.next(false); this.retrievedStudent.next(false);
...@@ -396,7 +378,6 @@ import { ...@@ -396,7 +378,6 @@ import {
} }
setActive(ind) { setActive(ind) {
this.StudentActive = -1; this.StudentActive = -1;
if (this.courseActive === ind) { if (this.courseActive === ind) {
...@@ -421,8 +402,6 @@ import { ...@@ -421,8 +402,6 @@ import {
this.StudentActive = ind; this.StudentActive = ind;
} }
confirmStudent(student, cb, ind) { confirmStudent(student, cb, ind) {
let rtype; let rtype;
if (cb.value === 1) if (cb.value === 1)
...@@ -451,7 +430,6 @@ import { ...@@ -451,7 +430,6 @@ import {
}); });
} }
deleteApplication(appId: number, taxi, sector, special): void { deleteApplication(appId: number, taxi, sector, special): void {
this.applicationId = appId; this.applicationId = appId;
...@@ -461,10 +439,6 @@ import { ...@@ -461,10 +439,6 @@ import {
this.showConfirmModal(); this.showConfirmModal();
} }
deleteApplicationDo(): void { deleteApplicationDo(): void {
this.hideConfirmModal(); this.hideConfirmModal();
...@@ -485,8 +459,6 @@ import { ...@@ -485,8 +459,6 @@ import {
console.log("Error Getting courses perSchool"); console.log("Error Getting courses perSchool");
this.showLoader.next(false); this.showLoader.next(false);
}); });
this.StudentInfoSub = this._hds.getStudentPerSchool(this.taxi, this.sector, this.special) this.StudentInfoSub = this._hds.getStudentPerSchool(this.taxi, this.sector, this.special)
.subscribe(data => { .subscribe(data => {
this.StudentInfo$.next(data); this.StudentInfo$.next(data);
...@@ -499,8 +471,6 @@ import { ...@@ -499,8 +471,6 @@ import {
this.showLoader.next(false); this.showLoader.next(false);
this.showModal("#emptyselection"); this.showModal("#emptyselection");
}); });
}).catch(err => { }).catch(err => {
this.showErrorModal(); this.showErrorModal();
this.showLoader.next(false); this.showLoader.next(false);
......
...@@ -5,7 +5,7 @@ import { Injectable } from "@angular/core"; ...@@ -5,7 +5,7 @@ import { Injectable } from "@angular/core";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { NgRedux, select } from "@angular-redux/store"; import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../../store/store"; import { IAppState } from "../../store/store";
import { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types"; import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import { LoginInfoActions } from "../../actions/logininfo.actions"; import { LoginInfoActions } from "../../actions/logininfo.actions";
import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
...@@ -25,7 +25,7 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -25,7 +25,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
private studentRole = STUDENT_ROLE; private studentRole = STUDENT_ROLE;
private authRole: string; private authRole: string;
private cuName: string; private cuName: string;
private loginInfo$: BehaviorSubject<ILoginInfo>; private loginInfo$: BehaviorSubject<ILoginInfoRecords>;
private cuser: any; private cuser: any;
private showLoader$: BehaviorSubject<boolean>; private showLoader$: BehaviorSubject<boolean>;
private modalTitle: BehaviorSubject<string>; private modalTitle: BehaviorSubject<string>;
...@@ -66,14 +66,14 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -66,14 +66,14 @@ export default class HeaderComponent implements OnInit, OnDestroy {
ngOnInit() { ngOnInit() {
(<any>$("#headerNotice")).appendTo("body"); (<any>$("#headerNotice")).appendTo("body");
this.loginInfoSub = this._ngRedux.select("loginInfo") this.loginInfoSub = this._ngRedux.select("loginInfo")
.map(loginInfo => <ILoginInfo>loginInfo) .map(loginInfo => <ILoginInfoRecords>loginInfo)
.subscribe(loginInfo => { .subscribe(loginInfo => {
if (loginInfo.size > 0) { if (loginInfo.size > 0) {
loginInfo.reduce(({}, loginInfoToken) => { loginInfo.reduce(({}, loginInfoObj) => {
this.authToken = loginInfoToken.auth_token; this.authToken = loginInfoObj.auth_token;
this.authRole = loginInfoToken.auth_role; this.authRole = loginInfoObj.auth_role;
this.cuName = loginInfoToken.cu_name; this.cuName = loginInfoObj.cu_name;
return loginInfoToken; return loginInfoObj;
}, {}); }, {});
if (this.hasvalue === false) { if (this.hasvalue === false) {
...@@ -88,17 +88,11 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -88,17 +88,11 @@ export default class HeaderComponent implements OnInit, OnDestroy {
console.log("Error Getting courses perSchool"); console.log("Error Getting courses perSchool");
this.showLoader.next(false); this.showLoader.next(false);
}); });
} }
} }
this.loginInfo$.next(loginInfo); this.loginInfo$.next(loginInfo);
}); });
} }
ngOnDestroy() { ngOnDestroy() {
...@@ -106,7 +100,6 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -106,7 +100,6 @@ export default class HeaderComponent implements OnInit, OnDestroy {
if (this.loginInfoSub) { if (this.loginInfoSub) {
this.loginInfoSub.unsubscribe(); this.loginInfoSub.unsubscribe();
} }
} }
signOut() { signOut() {
......
import {Router, ActivatedRoute, Params} from "@angular/router"; import {Router, ActivatedRoute, Params} from "@angular/router";
import {OnInit, OnDestroy, Component} from "@angular/core"; import {OnInit, OnDestroy, Component} from "@angular/core";
import { LoginInfoActions } from "../actions/logininfo.actions"; import { LoginInfoActions } from "../actions/logininfo.actions";
import { ILoginInfo } from "../store/logininfo/logininfo.types"; import { ILoginInfoRecords } from "../store/logininfo/logininfo.types";
import { NgRedux, select } from "@angular-redux/store"; import { NgRedux, select } from "@angular-redux/store";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { IAppState } from "../store/store"; import { IAppState } from "../store/store";
...@@ -60,7 +60,7 @@ export default class Home implements OnInit, OnDestroy { ...@@ -60,7 +60,7 @@ export default class Home implements OnInit, OnDestroy {
private authRole: string; private authRole: string;
private name: any; private name: any;
private xcsrftoken: any; private xcsrftoken: any;
private loginInfo$: BehaviorSubject<ILoginInfo>; private loginInfo$: BehaviorSubject<ILoginInfoRecords>;
private apiEndPoint = API_ENDPOINT; private apiEndPoint = API_ENDPOINT;
private apiEndPointParams = API_ENDPOINT_PARAMS; private apiEndPointParams = API_ENDPOINT_PARAMS;
private loginInfoSub: Subscription; private loginInfoSub: Subscription;
...@@ -83,20 +83,21 @@ export default class Home implements OnInit, OnDestroy { ...@@ -83,20 +83,21 @@ export default class Home implements OnInit, OnDestroy {
ngOnInit() { ngOnInit() {
this.loginInfoSub = this._ngRedux.select("loginInfo").subscribe(loginInfo => { this.loginInfoSub = this._ngRedux.select("loginInfo")
let linfo = <ILoginInfo>loginInfo; .map(loginInfo => <ILoginInfoRecords>loginInfo)
.subscribe(linfo => {
if (linfo.size > 0) { if (linfo.size > 0) {
linfo.reduce(({}, loginInfoToken) => { linfo.reduce(({}, loginInfoObj) => {
this.authToken = loginInfoToken.auth_token; this.authToken = loginInfoObj.auth_token;
this.authRole = loginInfoToken.auth_role; this.authRole = loginInfoObj.auth_role;
if (this.authToken && this.authToken.length > 0 && this.authRole && this.authRole === STUDENT_ROLE) { if (this.authToken && this.authToken.length > 0 && this.authRole && this.authRole === STUDENT_ROLE) {
if (loginInfoToken.lock_application === 1) if (loginInfoObj.lock_application === 1)
this.router.navigate(["/info"]); this.router.navigate(["/info"]);
else { else {
this.router.navigate(["/parent-form"]); this.router.navigate(["/parent-form"]);
} }
} }
return loginInfoToken; return loginInfoObj;
}, {}); }, {});
} }
......
...@@ -7,7 +7,6 @@ import { NgRedux, select } from "@angular-redux/store"; ...@@ -7,7 +7,6 @@ import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../../store/store"; import { IAppState } from "../../store/store";
import { Router, ActivatedRoute, Params } from "@angular/router"; import { Router, ActivatedRoute, Params } from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { ILoginInfo } from "../../store/logininfo/logininfo.types";
import { import {
FormBuilder, FormBuilder,
......
...@@ -7,8 +7,6 @@ import { NgRedux, select } from "@angular-redux/store"; ...@@ -7,8 +7,6 @@ import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../../store/store"; import { IAppState } from "../../store/store";
import {Router, ActivatedRoute, Params} from "@angular/router"; import {Router, ActivatedRoute, Params} from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx"; import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { ILoginInfo } from "../../store/logininfo/logininfo.types";
import { import {
FormBuilder, FormBuilder,
FormGroup, FormGroup,
...@@ -124,7 +122,6 @@ import { ...@@ -124,7 +122,6 @@ import {
this.showModal(); this.showModal();
this.showLoader.next(false);