updated to latest versions. Fixing subscriptioning bug(WIP)

parent 8074c820
...@@ -12,57 +12,51 @@ ...@@ -12,57 +12,51 @@
"typings": "rimraf typings/ && typings install" "typings": "rimraf typings/ && typings install"
}, },
"devDependencies": { "devDependencies": {
"@types/d3": "^4.8.0", "@types/redux-logger": "^3.0.0",
"@types/node": "^6.0.48",
"@types/systemjs": "^0.20.2", "@types/systemjs": "^0.20.2",
"angular2-router-loader": "^0.3.4", "angular2-router-loader": "^0.3.4",
"angular2-template-loader": "^0.6.0", "angular2-template-loader": "^0.6.0",
"babel-core": "^6.20.0",
"babel-loader": "^6.2.9",
"babel-preset-env": "^1.1.4",
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-1": "^6.16.0",
"babili-webpack-plugin": "^0.1.1", "babili-webpack-plugin": "^0.1.1",
"bootstrap-loader": "^2.0.0-beta.20", "bootstrap-loader": "^2.0.0-beta.20",
"css-loader": "^0.25.0",
"node-sass": "^4.5.0", "node-sass": "^4.5.0",
"redux-logger": "^2.7.4",
"resolve-url-loader": "^1.6.1", "resolve-url-loader": "^1.6.1",
"sass-loader": "^4.1.1", "sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"to-string-loader": "^1.1.5", "to-string-loader": "^1.1.5",
"tslint": "^3.15.1", "tslint": "^3.15.1",
"tslint-loader": "^2.1.5", "tslint-loader": "^2.1.5",
"typescript": "^2.0.10",
"url-loader": "^0.5.7",
"webpack": "^1.14.0",
"webpack-cleanup-plugin": "^0.5.1", "webpack-cleanup-plugin": "^0.5.1",
"webpack-closure-compiler": "^2.1.4",
"webpack-dashboard": "^0.2.0", "webpack-dashboard": "^0.2.0",
"webpack-dev-server": "^1.16.2" "webpack-dev-server": "^1.16.2"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^4.0.0", "@angular-redux/store": "^6.5.7",
"@angular/common": "^4.0.0", "@angular/animations": "^4.3.1",
"@angular/compiler": "^4.0.0", "@angular/common": "^4.3.1",
"@angular/compiler-cli": "^4.0.0", "@angular/compiler": "^4.3.1",
"@angular/core": "^4.0.0", "@angular/compiler-cli": "^4.3.1",
"@angular/forms": "^4.0.0", "@angular/core": "^4.3.1",
"@angular/http": "^4.0.0", "@angular/forms": "^4.3.1",
"@angular/platform-browser": "^4.0.0", "@angular/http": "^4.3.1",
"@angular/platform-browser-dynamic": "^4.0.0", "@angular/platform-browser": "^4.3.1",
"@angular/platform-server": "^4.0.0", "@angular/platform-browser-dynamic": "^4.3.1",
"@angular/router": "^4.0.0", "@angular/platform-server": "^4.3.1",
"@angular/router": "^4.3.1",
"@ngui/auto-complete": "^0.13.3", "@ngui/auto-complete": "^0.13.3",
"@types/d3": "^4.10.0",
"@types/file-saver": "0.0.1", "@types/file-saver": "0.0.1",
"@types/jquery": "^2.0.48", "@types/jquery": "^2.0.48",
"@types/node": "^6.0.60", "@types/node": "^6.0.85",
"@types/node-sass": "^3.10.32", "@types/node-sass": "^3.10.32",
"babel-polyfill": "^6.20.0", "babel-core": "^6.25.0",
"babel-loader": "^6.4.1",
"babel-polyfill": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"bootstrap": "^4.0.0-alpha.6", "bootstrap": "^4.0.0-alpha.6",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"css-loader": "^0.25.0", "css-loader": "^0.25.0",
"d3": "^4.4.0", "d3": "^4.10.0",
"es6-promise": "^4.0.5", "es6-promise": "^4.0.5",
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"file-loader": "^0.9.0", "file-loader": "^0.9.0",
...@@ -72,23 +66,24 @@ ...@@ -72,23 +66,24 @@
"html-webpack-plugin": "^2.24.1", "html-webpack-plugin": "^2.24.1",
"immutable": "^3.8.1", "immutable": "^3.8.1",
"jquery": "^3.2.1", "jquery": "^3.2.1",
"mydatepicker": "^2.0.13", "mydatepicker": "^2.0.26",
"ng2-redux": "^5.1.0",
"ng2-smart-table": "^1.2.1", "ng2-smart-table": "^1.2.1",
"ngx-cookie": "^1.0.0", "ngx-cookie": "^1.0.0",
"ngx-uploader": "^2.2.5", "ngx-uploader": "^2.2.5",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"redux": "^3.6.0", "redux": "^3.7.2",
"redux-logger": "^2.10.2",
"reflect-metadata": "0.1.8", "reflect-metadata": "0.1.8",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",
"roboto-fontface": "^0.7.0", "roboto-fontface": "^0.7.1",
"rxjs": "^5.0.0-rc.3", "rxjs": "^5.0.0-rc.3",
"style-loader": "^0.13.1", "style-loader": "^0.13.1",
"ts-loader": "^1.2.1", "ts-loader": "^1.2.1",
"typed-immutable-record": "0.0.6", "typed-immutable-record": "0.0.6",
"typescript": "^2.4.1", "typescript": "^2.4.2",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"webpack": "^1.13.3", "webpack": "^1.13.3",
"zone.js": ">=0.6.26" "webpack-closure-compiler": "^2.1.5",
"zone.js": "^0.8.14"
} }
} }
import { COURSEFIELDS_RECEIVED, COURSEFIELDS_SELECTED_SAVE } from '../constants'; import { COURSEFIELDS_RECEIVED, COURSEFIELDS_SELECTED_SAVE } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { CRITERIA_RECEIVED, CRITERIA_SAVE, CRITERIA_INIT } from '../constants'; import { CRITERIA_RECEIVED, CRITERIA_SAVE, CRITERIA_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { EPALCLASSES_SAVE } from '../constants'; import { EPALCLASSES_SAVE } from '../constants';
import { EPALCLASSES_INIT } from '../constants'; import { EPALCLASSES_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
......
import { LOGININFO_SAVE, PROFILE_SAVE, LOGININFO_RECEIVED, STATEMENTAGREE_SAVE } from '../constants'; import { LOGININFO_SAVE, PROFILE_SAVE, LOGININFO_RECEIVED, STATEMENTAGREE_SAVE } from '../constants';
import { LOGININFO_INIT } from '../constants'; import { LOGININFO_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { REGIONSCHOOLS_RECEIVED, REGIONSCHOOLS_SELECTED_SAVE, REGIONSCHOOLS_ORDER_SAVE, REGIONSCHOOLS_INIT } from '../constants'; import { REGIONSCHOOLS_RECEIVED, REGIONSCHOOLS_SELECTED_SAVE, REGIONSCHOOLS_ORDER_SAVE, REGIONSCHOOLS_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { SECTORCOURSES_RECEIVED, SECTORCOURSES_SELECTED_SAVE, SECTORCOURSES_INIT } from '../constants'; import { SECTORCOURSES_RECEIVED, SECTORCOURSES_SELECTED_SAVE, SECTORCOURSES_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { SECTORFIELDS_RECEIVED, SECTORFIELDS_SELECTED_SAVE, SECTORFIELDS_INIT } from '../constants'; import { SECTORFIELDS_RECEIVED, SECTORFIELDS_SELECTED_SAVE, SECTORFIELDS_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from '../constants'; import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from '@angular-redux/store';
import { IAppState } from '../store'; import { IAppState } from '../store';
//import { UserDataService } from '../services/user-data-service'; //import { UserDataService } from '../services/user-data-service';
......
...@@ -3,7 +3,7 @@ import "babel-polyfill"; ...@@ -3,7 +3,7 @@ import "babel-polyfill";
import "core-js/es6"; import "core-js/es6";
import "core-js/es7/reflect"; import "core-js/es7/reflect";
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { NgReduxModule, DevToolsExtension, NgRedux } from "ng2-redux"; import { NgReduxModule, DevToolsExtension, NgRedux } from "@angular-redux/store";
import {BrowserModule} from "@angular/platform-browser"; import {BrowserModule} from "@angular/platform-browser";
import { CookieModule } from "ngx-cookie"; import { CookieModule } from "ngx-cookie";
import { MyDatePickerModule } from "mydatepicker"; import { MyDatePickerModule } from "mydatepicker";
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import {Observable} from "rxjs/Observable"; import {Observable} from "rxjs/Observable";
import {Http, Headers, RequestOptions} from '@angular/http'; import {Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import {Observable} from "rxjs/Observable"; import {Observable} from "rxjs/Observable";
import {Http, Headers, RequestOptions} from '@angular/http'; import {Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -3,7 +3,7 @@ import {Router} from "@angular/router"; ...@@ -3,7 +3,7 @@ import {Router} from "@angular/router";
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { BehaviorSubject, Subscription } from 'rxjs/Rx'; import { BehaviorSubject, Subscription } from 'rxjs/Rx';
import { NgRedux, select } from "ng2-redux"; 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 { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
......
...@@ -2,7 +2,7 @@ import {Router, ActivatedRoute, Params} from '@angular/router'; ...@@ -2,7 +2,7 @@ import {Router, ActivatedRoute, Params} from '@angular/router';
import {OnInit, Component} from '@angular/core'; import {OnInit, Component} from '@angular/core';
import { LoginInfoActions } from '../actions/logininfo.actions'; import { LoginInfoActions } from '../actions/logininfo.actions';
import { ILoginInfo } from '../store/logininfo/logininfo.types'; import { ILoginInfo } from '../store/logininfo/logininfo.types';
import { NgRedux, select } from 'ng2-redux'; import { NgRedux, select } from '@angular-redux/store';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { IAppState } from '../store/store'; import { IAppState } from '../store/store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
...@@ -3,7 +3,7 @@ import { AppSettings } from "../../app.settings"; ...@@ -3,7 +3,7 @@ import { AppSettings } from "../../app.settings";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import { Http, Headers, RequestOptions } from "@angular/http"; import { Http, Headers, RequestOptions } from "@angular/http";
import { NgRedux, select } from "ng2-redux"; 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";
......
...@@ -3,7 +3,7 @@ import { AppSettings } from "../../app.settings"; ...@@ -3,7 +3,7 @@ import { AppSettings } from "../../app.settings";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import {Observable} from "rxjs/Observable"; import {Observable} from "rxjs/Observable";
import {Http, Headers, RequestOptions} from "@angular/http"; import {Http, Headers, RequestOptions} from "@angular/http";
import { NgRedux, select } from "ng2-redux"; 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";
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import { Http, Headers, RequestOptions } from '@angular/http'; import { Http, Headers, RequestOptions } from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings"; ...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from "@angular/http"; import { Http, Headers, RequestOptions} from "@angular/http";
import { NgRedux, select } from "ng2-redux"; 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";
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from '@angular/http'; import { Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from '@angular/http'; import { Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from '@angular/http'; import { Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings"; ...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import { Http, Headers, RequestOptions } from "@angular/http"; import { Http, Headers, RequestOptions } from "@angular/http";
import { NgRedux, select } from "ng2-redux"; 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";
......
...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings'; ...@@ -4,7 +4,7 @@ import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from '@angular/http'; import { Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux'; 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';
......
...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings"; ...@@ -4,7 +4,7 @@ import { AppSettings } from "../../app.settings";
import { HelperDataService } from "../../services/helper-data-service"; import { HelperDataService } from "../../services/helper-data-service";
import { Observable} from "rxjs/Observable"; import { Observable} from "rxjs/Observable";
import { Http, Headers, RequestOptions} from "@angular/http"; import { Http, Headers, RequestOptions} from "@angular/http";
import { NgRedux, select } from "ng2-redux"; 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";
......
...@@ -2,7 +2,7 @@ import { Router, Params} from '@angular/router'; ...@@ -2,7 +2,7 @@ import { Router, Params} from '@angular/router';
import { OnInit, Component} from '@angular/core'; import { OnInit, Component} from '@angular/core';
import { LoginInfoActions } from '../actions/logininfo.actions'; import { LoginInfoActions } from '../actions/logininfo.actions';
import { ILoginInfo } from '../store/logininfo/logininfo.types'; import { ILoginInfo } from '../store/logininfo/logininfo.types';
import { NgRedux, select } from 'ng2-redux'; import { NgRedux, select } from '@angular-redux/store';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { IAppState } from '../store/store'; import { IAppState } from '../store/store';
import { HelperDataService } from '../services/helper-data-service'; import { HelperDataService } from '../services/helper-data-service';
......
...@@ -3,7 +3,7 @@ import {Router} from '@angular/router'; ...@@ -3,7 +3,7 @@ import {Router} from '@angular/router';
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { BehaviorSubject } from 'rxjs/Rx'; import { BehaviorSubject } from 'rxjs/Rx';
import { NgRedux, select } from 'ng2-redux'; 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 { ILoginInfo, ILoginInfoToken } from '../../store/logininfo/logininfo.types';
import { LoginInfoActions } from '../../actions/logininfo.actions'; import { LoginInfoActions } from '../../actions/logininfo.actions';
......
...@@ -3,7 +3,7 @@ import { OnInit, OnDestroy, Component } from "@angular/core"; ...@@ -3,7 +3,7 @@ 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 { ILoginInfo } from "../store/logininfo/logininfo.types";
import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state";
import { NgRedux, select } from "ng2-redux"; 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";
import { HelperDataService } from "../services/helper-data-service"; import { HelperDataService } from "../services/helper-data-service";
......
...@@ -2,7 +2,7 @@ import {Router} from '@angular/router'; ...@@ -2,7 +2,7 @@ import {Router} from '@angular/router';
import {OnInit, OnDestroy, Component, Injectable} from '@angular/core'; import {OnInit, OnDestroy, Component, Injectable} from '@angular/core';
import { HelperDataService } from '../../services/helper-data-service'; import { HelperDataService } from '../../services/helper-data-service';
import { BehaviorSubject } from 'rxjs/Rx'; import { BehaviorSubject } from 'rxjs/Rx';
import { NgRedux, select } from 'ng2-redux'; 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 { ILoginInfo, ILoginInfoToken } from '../../store/logininfo/logininfo.types';
import { LoginInfoActions } from '../../actions/logininfo.actions'; import { LoginInfoActions } from '../../actions/logininfo.actions';
......
...@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core"; ...@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core";
import { BehaviorSubject, Subscription, Observable } from "rxjs/Rx"; import { BehaviorSubject, Subscription, Observable } from "rxjs/Rx";
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { NgRedux, select } from "ng2-redux"; import { NgRedux, select } from "@angular-redux/store";
import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions"; import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions";
import { IStudentDataFields } from "../../store/studentdatafields/studentdatafields.types"; import { IStudentDataFields } from "../../store/studentdatafields/studentdatafields.types";
import { CriteriaActions } from "../../actions/criteria.actions"; import { CriteriaActions } from "../../actions/criteria.actions";
......
...@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; ...@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { BehaviorSubject, Subscription } from 'rxjs/Rx'; import { BehaviorSubject, Subscription } from 'rxjs/Rx';
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { NgRedux, select } from 'ng2-redux'; import { NgRedux, select } from '@angular-redux/store';
import { IAppState } from '../../store/store'; import { IAppState } from '../../store/store';
import { SectorFieldsActions } from '../../actions/sectorfields.actions'; import { SectorFieldsActions } from '../../actions/sectorfields.actions';
import { SectorCoursesActions } from '../../actions/sectorcourses.actions'; import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
...@@ -84,6 +84,7 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel ...@@ -84,6 +84,7 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
private selectedSchools$: BehaviorSubject<Array<IRegionSchoolRecord>> = new BehaviorSubject(Array()); private selectedSchools$: BehaviorSubject<Array<IRegionSchoolRecord>> = new BehaviorSubject(Array());
private sectorFields$: BehaviorSubject<ISectorFields>; private sectorFields$: BehaviorSubject<ISectorFields>;
private epalclasses$: BehaviorSubject<IEpalClasses>; private epalclasses$: BehaviorSubject<IEpalClasses>;
private epalclassesSub: Subscription;