diff --git a/source/actions/epalclass.actions.ts b/source/actions/epalclass.actions.ts index 2e504cbae20eba911858d9ecf8f1d8e0680c13ed..2bea0b7757aaedbebcc52314d1f59726e53445e7 100644 --- a/source/actions/epalclass.actions.ts +++ b/source/actions/epalclass.actions.ts @@ -1,16 +1,15 @@ +import { NgRedux } from "@angular-redux/store"; +import { Injectable } from "@angular/core"; + import { EPALCLASSES_SAVE } from "../constants"; import { EPALCLASSES_INIT } from "../constants"; -import { Injectable } from "@angular/core"; -import { NgRedux } from "@angular-redux/store"; import { IAppState } from "../store"; - @Injectable() export class EpalClassesActions { constructor( private _ngRedux: NgRedux) { } - saveEpalClassesSelected = (epalClasses) => { return this._ngRedux.dispatch({ type: EPALCLASSES_SAVE, diff --git a/source/actions/index.ts b/source/actions/index.ts index e19f359715bffa67f77519a877792d17704d3de8..fada93a4a3050037478f249d1a95632f382ad753 100644 --- a/source/actions/index.ts +++ b/source/actions/index.ts @@ -3,17 +3,23 @@ import { RegionSchoolsActions } from "./regionschools.actions"; import { SectorCoursesActions } from "./sectorcourses.actions"; import { StudentDataFieldsActions } from "./studentdatafields.actions"; import { EpalClassesActions } from "./epalclass.actions"; -import { LoginInfoActions} from "./logininfo.actions"; +import { LoginInfoActions } from "./logininfo.actions"; -const ACTION_PROVIDERS = [SectorFieldsActions, RegionSchoolsActions, SectorCoursesActions, StudentDataFieldsActions, - EpalClassesActions, LoginInfoActions]; +const ACTION_PROVIDERS = [ + SectorFieldsActions, + RegionSchoolsActions, + SectorCoursesActions, + StudentDataFieldsActions, + EpalClassesActions, + LoginInfoActions +]; export { -SectorFieldsActions, -RegionSchoolsActions, -SectorCoursesActions, -StudentDataFieldsActions, -EpalClassesActions, -LoginInfoActions, -ACTION_PROVIDERS, + SectorFieldsActions, + RegionSchoolsActions, + SectorCoursesActions, + StudentDataFieldsActions, + EpalClassesActions, + LoginInfoActions, + ACTION_PROVIDERS, }; diff --git a/source/actions/logininfo.actions.ts b/source/actions/logininfo.actions.ts index dc6b397e88ac5580245f93d0f1f97119c2287f60..7cd4afd8308ceac9455ef713edd3fefcb12c3917 100644 --- a/source/actions/logininfo.actions.ts +++ b/source/actions/logininfo.actions.ts @@ -1,9 +1,10 @@ -import { LOGININFO_SAVE, PROFILE_SAVE, LOGININFO_RECEIVED, STATEMENTAGREE_SAVE } from "../constants"; -import { LOGININFO_INIT } from "../constants"; -import { Injectable } from "@angular/core"; import { NgRedux } from "@angular-redux/store"; -import { IAppState } from "../store"; +import { Injectable } from "@angular/core"; + +import { LOGININFO_SAVE, PROFILE_SAVE, STATEMENTAGREE_SAVE } from "../constants"; +import { LOGININFO_INIT } from "../constants"; import { HelperDataService } from "../services/helper-data-service"; +import { IAppState } from "../store"; @Injectable() export class LoginInfoActions { diff --git a/source/actions/regionschools.actions.ts b/source/actions/regionschools.actions.ts index f9a832255356ecac4bd72a1c619108c6ae82a044..92ecaa470c247ccdbc408e9d3896250cc666be6a 100644 --- a/source/actions/regionschools.actions.ts +++ b/source/actions/regionschools.actions.ts @@ -1,8 +1,14 @@ -import { REGIONSCHOOLS_RECEIVED, REGIONSCHOOLS_SELECTED_SAVE, REGIONSCHOOLS_ORDER_SAVE, REGIONSCHOOLS_INIT } from "../constants"; -import { Injectable } from "@angular/core"; import { NgRedux } from "@angular-redux/store"; -import { IAppState } from "../store"; +import { Injectable } from "@angular/core"; + +import { + REGIONSCHOOLS_INIT, + REGIONSCHOOLS_ORDER_SAVE, + REGIONSCHOOLS_RECEIVED, + REGIONSCHOOLS_SELECTED_SAVE, +} from "../constants"; import { HelperDataService } from "../services/helper-data-service"; +import { IAppState } from "../store"; @Injectable() export class RegionSchoolsActions { diff --git a/source/actions/sectorcourses.actions.ts b/source/actions/sectorcourses.actions.ts index 2521f3426cfa0ef7b3c42d23a4afa3f8e80116bf..0ab3dfd7ec6f32a2f5c8ad1c7a7ca9fde7dd3f8a 100644 --- a/source/actions/sectorcourses.actions.ts +++ b/source/actions/sectorcourses.actions.ts @@ -1,8 +1,9 @@ -import { SECTORCOURSES_RECEIVED, SECTORCOURSES_SELECTED_SAVE, SECTORCOURSES_INIT } from "../constants"; -import { Injectable } from "@angular/core"; import { NgRedux } from "@angular-redux/store"; -import { IAppState } from "../store"; +import { Injectable } from "@angular/core"; + +import { SECTORCOURSES_INIT, SECTORCOURSES_RECEIVED, SECTORCOURSES_SELECTED_SAVE } from "../constants"; import { HelperDataService } from "../services/helper-data-service"; +import { IAppState } from "../store"; @Injectable() export class SectorCoursesActions { diff --git a/source/actions/sectorfields.actions.ts b/source/actions/sectorfields.actions.ts index f6798356111148af60c4890872a5173f1411aea4..c2227ffde5e2f8da56752ddc46ad285228ad7e15 100644 --- a/source/actions/sectorfields.actions.ts +++ b/source/actions/sectorfields.actions.ts @@ -1,8 +1,9 @@ -import { SECTORFIELDS_RECEIVED, SECTORFIELDS_SELECTED_SAVE, SECTORFIELDS_INIT } from "../constants"; -import { Injectable } from "@angular/core"; import { NgRedux } from "@angular-redux/store"; -import { IAppState } from "../store"; +import { Injectable } from "@angular/core"; + +import { SECTORFIELDS_INIT, SECTORFIELDS_RECEIVED, SECTORFIELDS_SELECTED_SAVE } from "../constants"; import { HelperDataService } from "../services/helper-data-service"; +import { IAppState } from "../store"; @Injectable() export class SectorFieldsActions { diff --git a/source/actions/studentdatafields.actions.ts b/source/actions/studentdatafields.actions.ts index a650b5c513108f9080ec903e2a96bc15c8d103a5..0c3f1ed5242e6c81a9578944824e2768d4a477da 100644 --- a/source/actions/studentdatafields.actions.ts +++ b/source/actions/studentdatafields.actions.ts @@ -1,6 +1,7 @@ -import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from "../constants"; -import { Injectable } from "@angular/core"; import { NgRedux } from "@angular-redux/store"; +import { Injectable } from "@angular/core"; + +import { STUDENTDATAFIELDS_INIT, STUDENTDATAFIELDS_SAVE } from "../constants"; import { IAppState } from "../store"; @Injectable() @@ -15,7 +16,6 @@ export class StudentDataFieldsActions { payload: { studentDataFields } - }); }; diff --git a/source/app.routes.ts b/source/app.routes.ts index c106c17ab7c2a4870d28a863ef3e019e5314e4de..6ab9e083b52f89fe4ff0197cc0810604dc1bbd8f 100644 --- a/source/app.routes.ts +++ b/source/app.routes.ts @@ -1,7 +1,6 @@ -import { RouterModule } from "@angular/router"; +import { RouterModule } from "@angular/router"; -import { MainRoutes, MainDeclarations } -from "./containers/main.routes"; +import { MainDeclarations, MainRoutes } from "./containers/main.routes"; export const routes = [ ...MainRoutes diff --git a/source/app.ts b/source/app.ts index 09a434f62ed48b8da65d32f2b9969caab90047d3..036f8678ca42110ffa7212e80e3f9cbdbe4583e9 100644 --- a/source/app.ts +++ b/source/app.ts @@ -1,55 +1,43 @@ -import "reflect-metadata"; import "babel-polyfill"; import "core-js/es6"; import "core-js/es7/reflect"; -import { NgModule } from "@angular/core"; -import { NgReduxModule, DevToolsExtension, NgRedux } from "@angular-redux/store"; -import {BrowserModule} from "@angular/platform-browser"; -import { CookieModule } from "ngx-cookie"; -import { MyDatePickerModule } from "mydatepicker"; -import { NguiAutoCompleteModule } from "@ngui/auto-complete"; -import { - FormsModule, - ReactiveFormsModule, -} from "@angular/forms"; +import "reflect-metadata"; -import {RouterModule} from "@angular/router"; +import { DevToolsExtension, NgReduxModule } from "@angular-redux/store"; +import { APP_BASE_HREF, HashLocationStrategy, LocationStrategy, NgLocalization } from "@angular/common"; +import { NgModule } from "@angular/core"; +import { enableProdMode } from "@angular/core"; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { HttpModule } from "@angular/http"; -import { - APP_BASE_HREF, - HashLocationStrategy, - LocationStrategy, - NgLocalization, -} from "@angular/common"; - +import { BrowserModule } from "@angular/platform-browser"; import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; -import Main from "./containers/main"; -import { APP_ROUTER_PROVIDERS, APP_DECLARATIONS } from "./app.routes"; +import { RouterModule } from "@angular/router"; +import { NguiAutoCompleteModule } from "@ngui/auto-complete"; +import { MyDatePickerModule } from "mydatepicker"; +import { Ng2SmartTableModule } from "ng2-smart-table"; +import { CookieModule } from "ngx-cookie"; -import {HelperDataService} from "./services/helper-data-service"; -import {LoaderService} from "./services/Spinner.service"; -import {AuthService} from "./services/auth.service"; +import { ACTION_PROVIDERS } from "./actions"; +import { APP_DECLARATIONS, APP_ROUTER_PROVIDERS } from "./app.routes"; +import FooterComponent from "./components/footer/footer.component"; +import HeaderComponent from "./components/header/header.component"; +import MainComponent from "./components/main/main.component"; +import NavbarComponent from "./components/navbar/navbar.component"; +import Main from "./containers/main"; +import EduAdminAuthGuard from "./guards/eduadmin.auth.guard"; +import MinistryAuthGuard from "./guards/ministry.auth.guard"; +import RegionEduAuthGuard from "./guards/regionedu.auth.guard"; +import ReportsAuthGuard from "./guards/reports.auth.guard"; import SchoolAuthGuard from "./guards/school.auth.guard"; -import SchoolStudentsLockedGuard from "./guards/school.students.locked.guard"; import SchoolCapacityLockedGuard from "./guards/school.capacity.locked.guard"; +import SchoolStudentsLockedGuard from "./guards/school.students.locked.guard"; import StudentAuthGuard from "./guards/student.auth.guard"; -import ReportsAuthGuard from "./guards/reports.auth.guard"; import StudentLockGuard from "./guards/student.lock.guard"; -import RegionEduAuthGuard from "./guards/regionedu.auth.guard"; -import EduAdminAuthGuard from "./guards/eduadmin.auth.guard"; -import MinistryAuthGuard from "./guards/ministry.auth.guard"; +import { AuthService } from "./services/auth.service"; +import { HelperDataService } from "./services/helper-data-service"; +import { LoaderService } from "./services/Spinner.service"; import * as $ from "jquery"; -import { ACTION_PROVIDERS } from "./actions"; -import Home from "./components/home"; -import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; - -import HeaderComponent from "./components/header/header.component"; -import NavbarComponent from "./components/navbar/navbar.component"; -import MainComponent from "./components/main/main.component"; -import FooterComponent from "./components/footer/footer.component"; - -import {enableProdMode} from "@angular/core"; class MyLocalization extends NgLocalization { getPluralCategory(value: any) { diff --git a/source/components/director/director-classcapacity.ts b/source/components/director/director-classcapacity.ts index d5263c0775b7f45b22c9e974bed4b741927cdbf9..43ae641b838e2879c738888122d0deec65c4577a 100644 --- a/source/components/director/director-classcapacity.ts +++ b/source/components/director/director-classcapacity.ts @@ -1,25 +1,11 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import {Observable} from "rxjs/Observable"; -import {Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import {Router, ActivatedRoute, Params} from "@angular/router"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { VALID_CAPACITY_PATTERN} from "../../constants"; -import {maxValue} from "../../constants"; -import {minValue} from "../../constants"; - - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; + +import { HelperDataService } from "../../services/helper-data-service"; + @Component({ selector: "director-classcapacity", template: ` diff --git a/source/components/director/director-view.ts b/source/components/director/director-view.ts index 1f7a70d05c97294c8791337a44d9d2f224b111b8..55fd28d902f1cf1dd0891b7156ce43a50c70c4a9 100644 --- a/source/components/director/director-view.ts +++ b/source/components/director/director-view.ts @@ -1,23 +1,11 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import {Observable} from "rxjs/Observable"; -import {Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import {Router, ActivatedRoute, Params} from "@angular/router"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { VALID_CAPACITY_PATTERN} from "../../constants"; -import {maxValue} from "../../constants"; -import {minValue} from "../../constants"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; + +import { HelperDataService } from "../../services/helper-data-service"; + @Component({ selector: "director-classcapacity", template: ` diff --git a/source/components/director/director.buttons.ts b/source/components/director/director.buttons.ts index 9f25872ac8142eb8268b1b1ee59fbc4d600769a9..94ae13e6d66ff7f05c24d8e1f0b618502dbe4f51 100644 --- a/source/components/director/director.buttons.ts +++ b/source/components/director/director.buttons.ts @@ -1,5 +1,5 @@ -import {Router} from "@angular/router"; -import {OnInit, Component, Injectable} from "@angular/core"; +import { Component, Injectable, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; @Component({ selector: "director-buttons", diff --git a/source/components/footer/footer.component.ts b/source/components/footer/footer.component.ts index b7f9c25c74f78db2ce940070fce6b7ac5be4f32f..ccf9139683cb00e63bf131bfaaaf8005a5fc314f 100644 --- a/source/components/footer/footer.component.ts +++ b/source/components/footer/footer.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import { Component } from "@angular/core"; @Component({ selector: "reg-footer", diff --git a/source/components/header/header.component.ts b/source/components/header/header.component.ts index 2ca0f3802d8941a356b474ef42429cc4523136e2..099bdb2c975d1c62b329c8127d085fe1d96c0fce 100644 --- a/source/components/header/header.component.ts +++ b/source/components/header/header.component.ts @@ -1,20 +1,19 @@ -import {Component, OnInit, OnDestroy} from "@angular/core"; -import {Router} from "@angular/router"; -import { Injectable } from "@angular/core"; - +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { HelperDataService } from "../../services/helper-data-service"; -import { LoginInfoActions } from "../../actions/logininfo.actions"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { SCHOOL_ROLE, STUDENT_ROLE, PDE_ROLE, DIDE_ROLE, MINISTRY_ROLE } from "../../constants"; + import { EpalClassesActions } from "../../actions/epalclass.actions"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; +import { LoginInfoActions } from "../../actions/logininfo.actions"; import { RegionSchoolsActions } from "../../actions/regionschools.actions"; import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; +import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions"; +import { DIDE_ROLE, MINISTRY_ROLE, PDE_ROLE, SCHOOL_ROLE, STUDENT_ROLE } from "../../constants"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "reg-header", diff --git a/source/components/home.ts b/source/components/home.ts index 7c29ba759c9210b1dafa1c56eccb4594d2f2b537..bd9f82301e78827978c19615a0352d6fe745cad8 100644 --- a/source/components/home.ts +++ b/source/components/home.ts @@ -1,22 +1,18 @@ -import {Router, ActivatedRoute, Params} from "@angular/router"; -import {OnInit, OnDestroy, Component} from "@angular/core"; -import { LoginInfoActions } from "../actions/logininfo.actions"; -import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; -import { NgRedux, select } from "@angular-redux/store"; -import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { IAppState } from "../store/store"; -import { HelperDataService } from "../services/helper-data-service"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Params, Router } from "@angular/router"; import { CookieService } from "ngx-cookie"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; + +import { LoginInfoActions } from "../actions/logininfo.actions"; +import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings"; import { STUDENT_ROLE } from "../constants"; +import { HelperDataService } from "../services/helper-data-service"; import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray -} from "@angular/forms"; +import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; +import { IAppState } from "../store/store"; -import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings"; @Component({ selector: "home", template: ` diff --git a/source/components/infoviews/eduadmin-view.ts b/source/components/infoviews/eduadmin-view.ts index a116731d16e4fc0fb8852e576879519f04c53e4c..35bfe3765d08b6a524e589fcbdcefbee371d2ff1 100644 --- a/source/components/infoviews/eduadmin-view.ts +++ b/source/components/infoviews/eduadmin-view.ts @@ -1,20 +1,10 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable } from "rxjs/Observable"; -import { Http, Headers, RequestOptions } from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params } from "@angular/router"; +import { Component, Injectable, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; +import { HelperDataService } from "../../services/helper-data-service"; + @Component({ selector: "eduadmin-view", template: ` diff --git a/source/components/infoviews/perfecture-view.ts b/source/components/infoviews/perfecture-view.ts index 31bcd274da9f348ac97113fe85f152a8ec82a0b3..7ba80f9ed52407c8afc5759f7a3b659052e78639 100644 --- a/source/components/infoviews/perfecture-view.ts +++ b/source/components/infoviews/perfecture-view.ts @@ -1,19 +1,10 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Injectable} from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import {Observable} from "rxjs/Observable"; -import {Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import {Router, ActivatedRoute, Params} from "@angular/router"; +import { Component, Injectable, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; + +import { HelperDataService } from "../../services/helper-data-service"; + @Component({ selector: "perfecture-view", template: ` diff --git a/source/components/main/breadcrumbs.ts b/source/components/main/breadcrumbs.ts index 285e0326c9a95792306e65b463e513d8cd1b7df4..ef97d4391d84a8981f6597e193229e71ece7222b 100644 --- a/source/components/main/breadcrumbs.ts +++ b/source/components/main/breadcrumbs.ts @@ -1,9 +1,7 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { Component, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; import { Router } from "@angular/router"; - @Component({ selector: "breadcrumbs", template: ` @@ -15,9 +13,7 @@ import { Router } from "@angular/router";

Νέα Δήλωση Προτίμησης -> Προσωπικά Στοιχεία

Νέα Δήλωση Προτίμησης -> Προεπισκόπηση Δήλωσης Προτίμησης

Υποβληθείσες Δηλώσεις Προτίμησης

-

Διαχειριστής Υπουργείου Παιδείας -> Σύνδεση

- ` }) diff --git a/source/components/main/main.component.ts b/source/components/main/main.component.ts index 617dc2c174fd7c8f9e0b703919954e8bc271ce55..eb5be29ceb7db093cc7e0e3f3c62edae0f0132e7 100644 --- a/source/components/main/main.component.ts +++ b/source/components/main/main.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import { Component } from "@angular/core"; import { Router } from "@angular/router"; @Component({ diff --git a/source/components/minister/chart-creator.ts b/source/components/minister/chart-creator.ts index 4c94c923b387769e4fa57482c3b3375f886eb641..f9c5dacfe38cbe3a34c96b6225b666d336c33e24 100644 --- a/source/components/minister/chart-creator.ts +++ b/source/components/minister/chart-creator.ts @@ -1,5 +1,5 @@ +import { ElementRef, ViewChild } from "@angular/core"; import * as d3 from "d3"; -import { ElementRef, ViewChild } from "@angular/core"; export class ChartCreator { diff --git a/source/components/minister/csv-creator.ts b/source/components/minister/csv-creator.ts index 8eda81dba3371edfa2b5db9dcf0e9d6bed4ae4b1..bc51ae6cc7cc6f21ed4adb8e4e6591a74975e912 100644 --- a/source/components/minister/csv-creator.ts +++ b/source/components/minister/csv-creator.ts @@ -1,6 +1,7 @@ -import {ReportsSchema, TableColumn} from "./reports-schema"; -import { LocalDataSource } from "ng2-smart-table"; import { Input } from "@angular/core"; +import { LocalDataSource } from "ng2-smart-table"; + +import { ReportsSchema, TableColumn } from "./reports-schema"; export class CsvCreator { diff --git a/source/components/minister/minister-informstudents.ts b/source/components/minister/minister-informstudents.ts index c931c8d97e36195adfb858b2b0131af5e2552ba6..ed0d4a0dbcb9279fb29e5004830e9eedb9b8323f 100644 --- a/source/components/minister/minister-informstudents.ts +++ b/source/components/minister/minister-informstudents.ts @@ -1,16 +1,14 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable } from "rxjs/Observable"; -import { Http, Headers, RequestOptions } from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params } from "@angular/router"; +import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; + import { API_ENDPOINT } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "minister-informstudents", diff --git a/source/components/minister/minister-reports.ts b/source/components/minister/minister-reports.ts index c5e44f76727588cb9c5eb0379e7d88623f409366..9c16793a0adfa0a2bf5db9c6a8ff9a18d8bc944f 100644 --- a/source/components/minister/minister-reports.ts +++ b/source/components/minister/minister-reports.ts @@ -1,34 +1,22 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { MINISTRY_ROLE, PDE_ROLE, DIDE_ROLE } from "../../constants"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; import { API_ENDPOINT } from "../../app.settings"; +import { DIDE_ROLE, MINISTRY_ROLE, PDE_ROLE } from "../../constants"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "minister-reports", // encapsulation: ViewEncapsulation.None, template: ` -
-
>Επιλογή Αναφοράς

diff --git a/source/components/minister/minister-settings.ts b/source/components/minister/minister-settings.ts index 983000174790a4c36aa0bb16b6eb13136816269a..63422b76c719bd1e61dbc1936d961deb9a33d682 100644 --- a/source/components/minister/minister-settings.ts +++ b/source/components/minister/minister-settings.ts @@ -1,25 +1,14 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; - - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "minister-settings", diff --git a/source/components/minister/minister-view.ts b/source/components/minister/minister-view.ts index 4d26b458c13eeda3e5825c6aa6d74a6d1e49d191..1ebf0125cc088c9195caf3efff168bb09f7841cc 100644 --- a/source/components/minister/minister-view.ts +++ b/source/components/minister/minister-view.ts @@ -1,18 +1,14 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; - import { API_ENDPOINT } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "minister-view", diff --git a/source/components/minister/report-all-stat.ts b/source/components/minister/report-all-stat.ts index be8efcb93a487be09b901c37e80acd9a1006d202..84900bbc4e30d2fe7e791d2115e5bb775d8d9dd9 100644 --- a/source/components/minister/report-all-stat.ts +++ b/source/components/minister/report-all-stat.ts @@ -1,31 +1,20 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { LocalDataSource } from "ng2-smart-table"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; -import {ReportsSchema, TableColumn} from "./reports-schema"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { DIDE_ROLE, PDE_ROLE, MINISTRY_ROLE } from "../../constants"; -import {CsvCreator} from "./csv-creator"; -import {ChartCreator} from "./chart-creator"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; - import { API_ENDPOINT } from "../../app.settings"; +import { DIDE_ROLE, PDE_ROLE } from "../../constants"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; +import { ChartCreator } from "./chart-creator"; +import { CsvCreator } from "./csv-creator"; +import { ReportsSchema, TableColumn } from "./reports-schema"; @Component({ selector: "report-all-stat", diff --git a/source/components/minister/report-general.ts b/source/components/minister/report-general.ts index 7cbad1245fd8daaf783c085b694bd49d6953c6c8..7e13c771af4b13700546c1ff55805d86b01082e1 100644 --- a/source/components/minister/report-general.ts +++ b/source/components/minister/report-general.ts @@ -1,29 +1,19 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable } from "rxjs/Observable"; -import { Http, Headers, RequestOptions } from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params } from "@angular/router"; +import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { LocalDataSource } from "ng2-smart-table"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; -import { ReportsSchema, TableColumn } from "./reports-schema"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { CsvCreator } from "./csv-creator"; -import { ChartCreator } from "./chart-creator"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; import { API_ENDPOINT } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; +import { ChartCreator } from "./chart-creator"; +import { CsvCreator } from "./csv-creator"; +import { ReportsSchema, TableColumn } from "./reports-schema"; @Component({ selector: "report-general", diff --git a/source/components/minister/report-no-capacity.ts b/source/components/minister/report-no-capacity.ts index cf2abdf470b57ff9cc080ff04449bcc2282e5f60..7d102e0fabd2ca029d0e6453df8de308ad5a07c1 100644 --- a/source/components/minister/report-no-capacity.ts +++ b/source/components/minister/report-no-capacity.ts @@ -1,30 +1,19 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { LocalDataSource } from "ng2-smart-table"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; -import {ReportsSchema, TableColumn} from "./reports-schema"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import {CsvCreator} from "./csv-creator"; -import {ChartCreator} from "./chart-creator"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; - import { API_ENDPOINT } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; +import { ChartCreator } from "./chart-creator"; +import { CsvCreator } from "./csv-creator"; +import { ReportsSchema, TableColumn } from "./reports-schema"; @Component({ selector: "report-no-capacity", diff --git a/source/components/minister/report-users.ts b/source/components/minister/report-users.ts index 9820022fd63879eb25c0d4aabe142587f809a4a9..92a9a31c515d285eaa4993a47c86988fff5e3188 100644 --- a/source/components/minister/report-users.ts +++ b/source/components/minister/report-users.ts @@ -1,20 +1,17 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { HelperDataService } from "../../services/helper-data-service"; -import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { Component, Input, OnDestroy, OnInit } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { LocalDataSource } from "ng2-smart-table"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; -import {ReportsSchema, TableColumn} from "./reports-schema"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import {CsvCreator} from "./csv-creator"; import { API_ENDPOINT } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; +import { CsvCreator } from "./csv-creator"; +import { ReportsSchema, TableColumn } from "./reports-schema"; @Component({ selector: "report-users", diff --git a/source/components/minister/reports-schema.ts b/source/components/minister/reports-schema.ts index 1a43794ca770f8c4d47069c92aba4e90613a940f..a1c51e80bfa2c9b4a68bc4a4ab1bee990c356c42 100644 --- a/source/components/minister/reports-schema.ts +++ b/source/components/minister/reports-schema.ts @@ -10,20 +10,6 @@ export class TableColumn { export class ReportsSchema { - /* - defaultSettings = { - actions: { - columnTitle: "Actions", - add: false, - edit: false, - delete: false - }, - pager: { - display: true, - perPage: 50 - } - }; - */ ReportUsersSchema = { actions: false, noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης", @@ -100,9 +86,6 @@ export class ReportsSchema { } }; - - - reportNoCapacity = { actions: false, pager: { @@ -139,9 +122,6 @@ export class ReportsSchema { } }; - - - reportCompletenessSchema = { actions: false, noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης", @@ -189,7 +169,6 @@ export class ReportsSchema { } }; - constructor() { } } diff --git a/source/components/ministry.home.ts b/source/components/ministry.home.ts index 235e3e67d023e83826e724bfc090fb40a1000f2e..ba4f1fe252f115219f864eb33c590531925047ba 100644 --- a/source/components/ministry.home.ts +++ b/source/components/ministry.home.ts @@ -1,22 +1,16 @@ -import { Router, Params} from "@angular/router"; -import { OnInit, OnDestroy, Component} from "@angular/core"; -import { LoginInfoActions } from "../actions/logininfo.actions"; -import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; -import { NgRedux, select } from "@angular-redux/store"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { Http } from "@angular/http"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { IAppState } from "../store/store"; -import { HelperDataService } from "../services/helper-data-service"; -import {Http, Response, RequestOptions} from "@angular/http"; -import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators -} from "@angular/forms"; +import { LoginInfoActions } from "../actions/logininfo.actions"; import { API_ENDPOINT } from "../app.settings"; +import { HelperDataService } from "../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; +import { IAppState } from "../store/store"; @Component({ selector: "ministry-home", diff --git a/source/components/navbar/navbar.component.ts b/source/components/navbar/navbar.component.ts index 219d067a4fb7b00172f860b75b5f208e88ac6f38..e8f1a4a797bfa600619e555e4ffd3fa26a2a0ae2 100644 --- a/source/components/navbar/navbar.component.ts +++ b/source/components/navbar/navbar.component.ts @@ -1,13 +1,11 @@ -import {Component, OnInit, OnDestroy} from "@angular/core"; -import {Router} from "@angular/router"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; - import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LoginInfoActions } from "../../actions/logininfo.actions"; + import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "reg-navbar", diff --git a/source/components/school.home.ts b/source/components/school.home.ts index 016ed45c1695cd2d4af3749419e5ec4bf8bc8ef9..8cf2bbe3c073471ebe3c42518700cc8fa16f60a2 100644 --- a/source/components/school.home.ts +++ b/source/components/school.home.ts @@ -1,15 +1,16 @@ -import { Router, ActivatedRoute, Params } from "@angular/router"; -import { OnInit, OnDestroy, Component } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Params, Router } from "@angular/router"; +import { CookieService } from "ngx-cookie"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; + import { LoginInfoActions } from "../actions/logininfo.actions"; -import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; +import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings"; +import { HelperDataService } from "../services/helper-data-service"; import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; -import { NgRedux, select } from "@angular-redux/store"; -import { BehaviorSubject, Subscription } from "rxjs/Rx"; +import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; import { IAppState } from "../store/store"; -import { HelperDataService } from "../services/helper-data-service"; -import { CookieService } from "ngx-cookie"; -import { FormBuilder, FormGroup, FormControl, FormArray } from "@angular/forms"; -import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings"; @Component({ selector: "school-home", diff --git a/source/components/student-application-form/after.submit.ts b/source/components/student-application-form/after.submit.ts index 7007bf3bd13e314a102d765974c588412b68b29f..699373fb774957799534789a4764bea363ee1bcb 100644 --- a/source/components/student-application-form/after.submit.ts +++ b/source/components/student-application-form/after.submit.ts @@ -1,18 +1,17 @@ -import {Router} from "@angular/router"; -import {OnInit, OnDestroy, Component, Injectable} from "@angular/core"; -import { HelperDataService } from "../../services/helper-data-service"; +import { NgRedux } from "@angular-redux/store"; +import { Component, Injectable, OnDestroy, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LoginInfoActions } from "../../actions/logininfo.actions"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { SCHOOL_ROLE, STUDENT_ROLE, PDE_ROLE, DIDE_ROLE, MINISTRY_ROLE } from "../../constants"; + import { EpalClassesActions } from "../../actions/epalclass.actions"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; +import { LoginInfoActions } from "../../actions/logininfo.actions"; import { RegionSchoolsActions } from "../../actions/regionschools.actions"; import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; +import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions"; +import { HelperDataService } from "../../services/helper-data-service"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "post-submit", diff --git a/source/components/student-application-form/application.form.main.ts b/source/components/student-application-form/application.form.main.ts index 880ab44bec85254597912ce17b14a11c77ae992f..0b01163b42e1f6c6760780758d4893d18acf7121 100644 --- a/source/components/student-application-form/application.form.main.ts +++ b/source/components/student-application-form/application.form.main.ts @@ -1,26 +1,26 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; -import { BehaviorSubject, Subscription, Observable } from "rxjs/Rx"; +import { NgRedux } from "@angular-redux/store"; import { Injectable } from "@angular/core"; +import { Component, OnInit } from "@angular/core"; +import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { Http } from "@angular/http"; import { Router } from "@angular/router"; -import { NgRedux, select } from "@angular-redux/store"; +import { IMyDpOptions } from "mydatepicker"; +import { BehaviorSubject, Observable, Subscription } from "rxjs/Rx"; + import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions"; -import { IStudentDataFieldRecords } from "../../store/studentdatafields/studentdatafields.types"; +import { + FIRST_SCHOOL_YEAR, + VALID_ADDRESS_PATTERN, + VALID_ADDRESSTK_PATTERN, + VALID_NAMES_PATTERN, + VALID_TELEPHONE_PATTERN, + VALID_UCASE_NAMES_PATTERN, +} from "../../constants"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; import { IAppState } from "../../store/store"; -import { VALID_NAMES_PATTERN, VALID_UCASE_NAMES_PATTERN, VALID_ADDRESS_PATTERN, VALID_ADDRESSTK_PATTERN, VALID_DIGITS_PATTERN, - VALID_DATE_PATTERN, FIRST_SCHOOL_YEAR, VALID_YEAR_PATTERN, VALID_TELEPHONE_PATTERN } from "../../constants"; import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "../../store/studentdatafields/studentdatafields.initial-state"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import {IMyDpOptions} from "mydatepicker"; -import {Http, RequestOptions} from "@angular/http"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; +import { IStudentDataFieldRecords } from "../../store/studentdatafields/studentdatafields.types"; @Component({ selector: "application-form-main", diff --git a/source/components/student-application-form/application.preview.ts b/source/components/student-application-form/application.preview.ts index 65b2fe70a852d90480bcad1e2ad1bbd5febc5a4b..5027e70f3106ea1e7e516f4651a8a7c67ae3c1e8 100644 --- a/source/components/student-application-form/application.preview.ts +++ b/source/components/student-application-form/application.preview.ts @@ -1,22 +1,18 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Injectable } from "@angular/core"; +import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; -import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; -import { RegionSchoolsActions } from "../../actions/regionschools.actions"; -import { EpalClassesActions } from "../../actions/epalclass.actions"; -import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; -import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; -import { IRegionRecord, IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types"; + +import { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state"; import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; -import {AppSettings} from "../../app.settings"; import { REGION_SCHOOLS_INITIAL_STATE } from "../../store/regionschools/regionschools.initial-state"; -import { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state"; +import { IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types"; import { SECTOR_COURSES_INITIAL_STATE } from "../../store/sectorcourses/sectorcourses.initial-state"; +import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; import { SECTOR_FIELDS_INITIAL_STATE } from "../../store/sectorfields/sectorfields.initial-state"; +import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "application-preview-select", diff --git a/source/components/student-application-form/application.submit.ts b/source/components/student-application-form/application.submit.ts index 9f553f7431df98116cc5550764fd9ef50b15b221..e02c4a950ddf3abfe14cbedcc72fda9ed3303a10 100644 --- a/source/components/student-application-form/application.submit.ts +++ b/source/components/student-application-form/application.submit.ts @@ -1,30 +1,28 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Injectable } from "@angular/core"; +import { Component, OnInit } from "@angular/core"; +import { Headers, Http, RequestOptions, Response } from "@angular/http"; import { Router } from "@angular/router"; -import { Http, Response, RequestOptions, Headers } from "@angular/http"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { IStudentDataFieldRecords } from "../../store/studentdatafields/studentdatafields.types"; -import { IRegionRecord, IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types"; -import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; -import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; -import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; -import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "../../store/studentdatafields/studentdatafields.initial-state"; -import { REGION_SCHOOLS_INITIAL_STATE } from "../../store/regionschools/regionschools.initial-state"; -import { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state"; -import { SECTOR_COURSES_INITIAL_STATE } from "../../store/sectorcourses/sectorcourses.initial-state"; -import { SECTOR_FIELDS_INITIAL_STATE } from "../../store/sectorfields/sectorfields.initial-state"; -import { StudentEpalChosen, StudentCourseChosen, StudentSectorChosen } from "../students/student"; -import { AppSettings } from "../../app.settings"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; + import { EpalClassesActions } from "../../actions/epalclass.actions"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { RegionSchoolsActions } from "../../actions/regionschools.actions"; import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; +import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions"; +import { AppSettings } from "../../app.settings"; import { HelperDataService } from "../../services/helper-data-service"; +import { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state"; +import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IRegionRecords } from "../../store/regionschools/regionschools.types"; +import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; +import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; +import { IAppState } from "../../store/store"; +import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "../../store/studentdatafields/studentdatafields.initial-state"; +import { IStudentDataFieldRecords } from "../../store/studentdatafields/studentdatafields.types"; +import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../students/student"; @Component({ selector: "application-submit", diff --git a/source/components/student-application-form/disclaimer.ts b/source/components/student-application-form/disclaimer.ts index d89d3bb00fec5b18b9dabdd636eb871f34123ea9..a37542c4187527681a80c63771ccc903abd37716 100644 --- a/source/components/student-application-form/disclaimer.ts +++ b/source/components/student-application-form/disclaimer.ts @@ -1,22 +1,14 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; -import { Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; -import { Router, ActivatedRoute, Params} from "@angular/router"; +import { FormBuilder, FormGroup } from "@angular/forms"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { LoginInfoActions } from "../../actions/logininfo.actions"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; +import { LoginInfoActions } from "../../actions/logininfo.actions"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "intro-statement", diff --git a/source/components/student-application-form/epal.class.select.ts b/source/components/student-application-form/epal.class.select.ts index fb8fbefd65ecb90f272ec5d24f775ae56b8892bb..be1b742679b630f7469d329665a46f34996cad3f 100644 --- a/source/components/student-application-form/epal.class.select.ts +++ b/source/components/student-application-form/epal.class.select.ts @@ -1,22 +1,17 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Injectable } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; + import { EpalClassesActions } from "../../actions/epalclass.actions"; -import { NgRedux, select } from "@angular-redux/store"; -import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { RegionSchoolsActions } from "../../actions/regionschools.actions"; import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; -import { IAppState } from "../../store/store"; +import { SectorFieldsActions } from "../../actions/sectorfields.actions"; import { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray -} from "@angular/forms"; -import {AppSettings} from "../../app.settings"; +import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "epal-class-select", diff --git a/source/components/student-application-form/help-desk.ts b/source/components/student-application-form/help-desk.ts index 6d4dd2ef27498c2f9f3dce2ef7d8f91ab4d99ee6..9d274bb181d7ad32be401f3fbd66967a2d66794a 100644 --- a/source/components/student-application-form/help-desk.ts +++ b/source/components/student-application-form/help-desk.ts @@ -1,21 +1,15 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; -import {Location} from "@angular/common"; +import { NgRedux } from "@angular-redux/store"; +import { Location } from "@angular/common"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { VALID_EMAIL_PATTERN, VALID_NAMES_PATTERN } from "../../constants"; -import {Router} from "@angular/router"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; + +import { VALID_EMAIL_PATTERN, VALID_NAMES_PATTERN } from "../../constants"; import { HelperDataService } from "../../services/helper-data-service"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { NgRedux, select } from "@angular-redux/store"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; import { IAppState } from "../../store/store"; -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; @Component({ selector: "helpdesk", diff --git a/source/components/student-application-form/info.ts b/source/components/student-application-form/info.ts index 266e775740f089a01713ac14f9d207644c89b538..22c9e3a2c66b0476c676794fa10aca65e930f625 100644 --- a/source/components/student-application-form/info.ts +++ b/source/components/student-application-form/info.ts @@ -1,13 +1,14 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Injectable } from "@angular/core"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../../store/store"; +import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; -import { HelperDataService } from "../../services/helper-data-service"; + import { LoginInfoActions } from "../../actions/logininfo.actions"; -import {Router} from "@angular/router"; +import { HelperDataService } from "../../services/helper-data-service"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { ILoginInfoRecords } from "../../store/logininfo/logininfo.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "info", diff --git a/source/components/student-application-form/legalinfos.ts b/source/components/student-application-form/legalinfos.ts index 4d9ee5837eb85384590e6af8921ff907b7ac4dac..3e95970a04daaf58f2397fbf556b00e30664e2fe 100644 --- a/source/components/student-application-form/legalinfos.ts +++ b/source/components/student-application-form/legalinfos.ts @@ -1,6 +1,6 @@ +import { Location } from "@angular/common"; import { Component, Injectable } from "@angular/core"; import { Router } from "@angular/router"; -import {Location} from "@angular/common"; @Component({ selector: "legal-info", diff --git a/source/components/student-application-form/parent.form.ts b/source/components/student-application-form/parent.form.ts index ba9ec853d7552507ca1fa9fc48a48a6c04682702..6829939e1a299291698050e1e763319e6a87385f 100644 --- a/source/components/student-application-form/parent.form.ts +++ b/source/components/student-application-form/parent.form.ts @@ -1,18 +1,11 @@ -import { Component, OnInit, OnDestroy, Injectable, ViewChild, ElementRef, Renderer } from "@angular/core"; +import { Component, Injectable, OnDestroy, OnInit, Renderer } from "@angular/core"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { Router } from "@angular/router"; -import { BehaviorSubject, Subscription, Observable } from "rxjs/Rx"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; + +import { LoginInfoActions } from "../../actions/logininfo.actions"; import { VALID_EMAIL_PATTERN, VALID_UCASE_NAMES_PATTERN } from "../../constants"; import { HelperDataService } from "../../services/helper-data-service"; -import { LoginInfoActions } from "../../actions/logininfo.actions"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray, - Validators, -} from "@angular/forms"; -import {AppSettings} from "../../app.settings"; @Component({ selector: "parent-form", diff --git a/source/components/student-application-form/region.schools.select.ts b/source/components/student-application-form/region.schools.select.ts index 53580dba94757b7fdccef7a2c7245b3eb5837dc0..94751257994c19097e9f047783b090a0bc25103a 100644 --- a/source/components/student-application-form/region.schools.select.ts +++ b/source/components/student-application-form/region.schools.select.ts @@ -1,25 +1,17 @@ -import { Component, OnInit, OnDestroy} from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Injectable } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup } from "@angular/forms"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; + import { RegionSchoolsActions } from "../../actions/regionschools.actions"; -import { NgRedux, select } from "@angular-redux/store"; -import { IRegionRecord, IRegionRecords } from "../../store/regionschools/regionschools.types"; +import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; import { REGION_SCHOOLS_INITIAL_STATE } from "../../store/regionschools/regionschools.initial-state"; +import { IRegionRecords } from "../../store/regionschools/regionschools.types"; import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; -import { IAppState } from "../../store/store"; -import { RemoveSpaces } from "../../pipes/removespaces"; -import { IEpalClassRecords } from "../../store/epalclasses/epalclasses.types"; import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; - - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray -} from "@angular/forms"; -import {AppSettings} from "../../app.settings"; +import { IAppState } from "../../store/store"; @Component({ selector: "region-schools-select", diff --git a/source/components/student-application-form/schools-order-select.ts b/source/components/student-application-form/schools-order-select.ts index d1770514953c53730f22a7eaa14bea5d37fae449..c3023e7d67362162c60cda6ed736c46d5f90ce1f 100644 --- a/source/components/student-application-form/schools-order-select.ts +++ b/source/components/student-application-form/schools-order-select.ts @@ -1,13 +1,12 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Injectable } from "@angular/core"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; -import { NgRedux, select } from "@angular-redux/store"; + import { RegionSchoolsActions } from "../../actions/regionschools.actions"; -import { IRegionRecord, IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types"; -import { REGION_SCHOOLS_INITIAL_STATE } from "../../store/regionschools/regionschools.initial-state"; +import { IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types"; import { IAppState } from "../../store/store"; -import {AppSettings} from "../../app.settings"; @Component({ selector: "schools-order-select", diff --git a/source/components/student-application-form/sector.courses.select.ts b/source/components/student-application-form/sector.courses.select.ts index 64414e9c79bab37c770b9d753a29aba9d8a8c57a..bc3a645d3aac61f7b4f72c6f36e8a98876f699cd 100644 --- a/source/components/student-application-form/sector.courses.select.ts +++ b/source/components/student-application-form/sector.courses.select.ts @@ -1,23 +1,15 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Injectable } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup } from "@angular/forms"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; + +import { RegionSchoolsActions } from "../../actions/regionschools.actions"; import { SectorCoursesActions } from "../../actions/sectorcourses.actions"; -import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; import { SECTOR_COURSES_INITIAL_STATE } from "../../store/sectorcourses/sectorcourses.initial-state"; -import { NgRedux, select } from "@angular-redux/store"; +import { ISectorRecords } from "../../store/sectorcourses/sectorcourses.types"; import { IAppState } from "../../store/store"; -import {RemoveSpaces} from "../../pipes/removespaces"; - -import { RegionSchoolsActions } from "../../actions/regionschools.actions"; - -import { - FormBuilder, - FormGroup, - FormControl, - FormArray -} from "@angular/forms"; -import {AppSettings} from "../../app.settings"; @Component({ selector: "sectorcourses-fields-select", diff --git a/source/components/student-application-form/sector.fields.select.ts b/source/components/student-application-form/sector.fields.select.ts index 6e231e35cb0c82f8e853099c69af53ea2df67b33..45ef89360b8a022dca33e287de51bdd8160a27cb 100644 --- a/source/components/student-application-form/sector.fields.select.ts +++ b/source/components/student-application-form/sector.fields.select.ts @@ -1,16 +1,14 @@ -import { Component, OnInit, OnDestroy } from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Injectable } from "@angular/core"; import { Router } from "@angular/router"; import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import { Injectable } from "@angular/core"; -import { SectorFieldsActions } from "../../actions/sectorfields.actions"; -import { NgRedux, select } from "@angular-redux/store"; -import { ISectorFieldRecord, ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; -import { IAppState } from "../../store/store"; -import { SECTOR_FIELDS_INITIAL_STATE } from "../../store/sectorfields/sectorfields.initial-state"; import { RegionSchoolsActions } from "../../actions/regionschools.actions"; - -import {AppSettings} from "../../app.settings"; +import { SectorFieldsActions } from "../../actions/sectorfields.actions"; +import { SECTOR_FIELDS_INITIAL_STATE } from "../../store/sectorfields/sectorfields.initial-state"; +import { ISectorFieldRecords } from "../../store/sectorfields/sectorfields.types"; +import { IAppState } from "../../store/store"; @Component({ selector: "sector-fields-select", diff --git a/source/components/student-application-form/submited.aplication.preview.ts b/source/components/student-application-form/submited.aplication.preview.ts index f615c2c289766e111b90bd9b4794ae79ad716fc2..ae6dd37ba5917401d402867c459418d7beba236f 100644 --- a/source/components/student-application-form/submited.aplication.preview.ts +++ b/source/components/student-application-form/submited.aplication.preview.ts @@ -1,13 +1,12 @@ -import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core"; +import { NgRedux } from "@angular-redux/store"; +import { Location } from "@angular/common"; +import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from "../../app.settings"; +import { ActivatedRoute, Router } from "@angular/router"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; + import { HelperDataService } from "../../services/helper-data-service"; -import {Http, Headers, RequestOptions} from "@angular/http"; -import { NgRedux, select } from "@angular-redux/store"; import { IAppState } from "../../store/store"; -import {Router, ActivatedRoute, Params} from "@angular/router"; -import { BehaviorSubject, Subscription } from "rxjs/Rx"; -import {Location} from "@angular/common"; @Component({ selector: "submited-preview", diff --git a/source/components/students/student.ts b/source/components/students/student.ts index 9efc1eaffaccf9785ee0f7a5603f4ce0758c2db1..d0fd1ed90778a4f1fa691b5d4a0e3818c2fe97f6 100644 --- a/source/components/students/student.ts +++ b/source/components/students/student.ts @@ -1,4 +1,4 @@ -// used by dubmit component +// used by submit component export class StudentEpalChosen { constructor( public student_id: number, diff --git a/source/constants.ts b/source/constants.ts index 0f8ad6c7a7734198b40545d2fb22a00692064375..a8ba2f5187a78c3c52e6981fd93e1a25144bcfcd 100644 --- a/source/constants.ts +++ b/source/constants.ts @@ -1,6 +1,5 @@ - -import {ValidatorFn} from "@angular/forms"; -import {AbstractControl} from "@angular/forms"; +import { ValidatorFn } from "@angular/forms"; +import { AbstractControl } from "@angular/forms"; export const COURSEFIELDS_RECEIVED = "COURSEFIELDS_RECEIVED"; export const COURSEFIELDS_SELECTED_SAVE = "COURSEFIELDS_SELECTED_SAVE"; diff --git a/source/containers/main.routes.ts b/source/containers/main.routes.ts index afeb09f709b65a2c1e6168abc0de9dc6d7fccd11..228c002d60f670fcf50d365d5cf016982b894f5e 100644 --- a/source/containers/main.routes.ts +++ b/source/containers/main.routes.ts @@ -1,51 +1,48 @@ -import { - Routes, - RouterModule, -} from "@angular/router"; +import { Routes } from "@angular/router"; -import {CamelCasePipe} from "../pipes/camelcase"; -import {RemoveSpaces} from "../pipes/removespaces"; -import Info from "../components/student-application-form/info"; -import ParentForm from "../components/student-application-form/parent.form"; -import StudentApplicationMain from "../components/student-application-form/application.form.main"; -import Home from "../components/home"; -import SchoolHome from "../components/school.home"; -import MinistryHome from "../components/ministry.home"; -import Disclaimer from "../components/student-application-form/disclaimer"; -import EpalClassesSelect from "../components/student-application-form/epal.class.select"; -import SectorFieldsSelect from "../components/student-application-form/sector.fields.select"; -import RegionSchoolsSelect from "../components/student-application-form/region.schools.select"; -import SectorCoursesSelect from "../components/student-application-form/sector.courses.select"; -import ApplicationPreview from "../components/student-application-form/application.preview"; -import SchoolsOrderSelect from "../components/student-application-form/schools-order-select"; -import ApplicationSubmit from "../components/student-application-form/application.submit"; -import SubmitedPreview from "../components/student-application-form/submited.aplication.preview"; -import AfterSubmit from "../components/student-application-form/after.submit"; +import DirectorClassCapacity from "../components/director/director-classcapacity"; import DirectorView from "../components/director/director-view"; import DirectorButtons from "../components/director/director.buttons"; -import PerfectureView from "../components/infoviews/perfecture-view"; +import Home from "../components/home"; import EduadminView from "../components/infoviews/eduadmin-view"; -import DirectorClassCapacity from "../components/director/director-classcapacity"; -import MinisterView from "../components/minister/minister-view"; +import PerfectureView from "../components/infoviews/perfecture-view"; +import Breadcrumbs from "../components/main/breadcrumbs"; +import InformStudents from "../components/minister/minister-informstudents"; import MinisterReports from "../components/minister/minister-reports"; +import MinisterSettings from "../components/minister/minister-settings"; +import MinisterView from "../components/minister/minister-view"; import ReportAllStat from "../components/minister/report-all-stat"; import ReportGeneral from "../components/minister/report-general"; -import ReportUsers from "../components/minister/report-users"; import ReportNoCapacity from "../components/minister/report-no-capacity"; -import InformStudents from "../components/minister/minister-informstudents"; -import MinisterSettings from "../components/minister/minister-settings"; +import ReportUsers from "../components/minister/report-users"; +import MinistryHome from "../components/ministry.home"; +import SchoolHome from "../components/school.home"; +import AfterSubmit from "../components/student-application-form/after.submit"; +import StudentApplicationMain from "../components/student-application-form/application.form.main"; +import ApplicationPreview from "../components/student-application-form/application.preview"; +import ApplicationSubmit from "../components/student-application-form/application.submit"; +import Disclaimer from "../components/student-application-form/disclaimer"; +import EpalClassesSelect from "../components/student-application-form/epal.class.select"; +import HelpDesk from "../components/student-application-form/help-desk"; +import Info from "../components/student-application-form/info"; +import LegalInfo from "../components/student-application-form/legalinfos"; +import ParentForm from "../components/student-application-form/parent.form"; +import RegionSchoolsSelect from "../components/student-application-form/region.schools.select"; +import SchoolsOrderSelect from "../components/student-application-form/schools-order-select"; +import SectorCoursesSelect from "../components/student-application-form/sector.courses.select"; +import SectorFieldsSelect from "../components/student-application-form/sector.fields.select"; +import SubmitedPreview from "../components/student-application-form/submited.aplication.preview"; +import EduAdminAuthGuard from "../guards/eduadmin.auth.guard"; +import MinistryAuthGuard from "../guards/ministry.auth.guard"; +import RegionEduAuthGuard from "../guards/regionedu.auth.guard"; +import ReportsAuthGuard from "../guards/reports.auth.guard"; import SchoolAuthGuard from "../guards/school.auth.guard"; -import SchoolStudentsLockedGuard from "../guards/school.students.locked.guard"; import SchoolCapacityLockedGuard from "../guards/school.capacity.locked.guard"; +import SchoolStudentsLockedGuard from "../guards/school.students.locked.guard"; import StudentAuthGuard from "../guards/student.auth.guard"; import StudentLockGuard from "../guards/student.lock.guard"; -import RegionEduAuthGuard from "../guards/regionedu.auth.guard"; -import EduAdminAuthGuard from "../guards/eduadmin.auth.guard"; -import HelpDesk from "../components/student-application-form/help-desk"; -import LegalInfo from "../components/student-application-form/legalinfos"; -import MinistryAuthGuard from "../guards/ministry.auth.guard"; -import ReportsAuthGuard from "../guards/reports.auth.guard"; -import Breadcrumbs from "../components/main/breadcrumbs"; +import { CamelCasePipe } from "../pipes/camelcase"; +import { RemoveSpaces } from "../pipes/removespaces"; export const MainRoutes: Routes = [ { path: "", component: Home }, diff --git a/source/containers/main.ts b/source/containers/main.ts index c6f2790eb8ba6739ef5dba79e6e04d58984c8483..750fc9480ab29232dd325a83e7cf03cf5f4b2276 100644 --- a/source/containers/main.ts +++ b/source/containers/main.ts @@ -1,28 +1,10 @@ -import { Component, Inject, OnInit, OnDestroy } -from "@angular/core"; -import { - Router, - ActivatedRoute, - NavigationStart -} -from "@angular/router"; import "./globalstyles.css"; -import { DevToolsExtension, NgRedux, select } from "@angular-redux/store"; -import { - IAppState, - rootReducer, - middleware, - // enhancers, -} from "../store"; +import { DevToolsExtension, NgRedux } from "@angular-redux/store"; +import { Component } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; -import { - applyMiddleware, - Store, - combineReducers, - compose, - createStore -} from "redux"; +import { IAppState, rootReducer } from "../store"; @Component({ selector: "main", @@ -45,14 +27,14 @@ export default class Main { ) { const tools = _devTools.enhancer({ - // deserializeState: reimmutify, + // deserializeState: reimmutify, }); _ngRedux.configureStore( rootReducer, {}, -// middleware, - // tools ? [ ...enhancers, tools ] : enhancers); -// tools); - ); + // middleware, + // tools ? [ ...enhancers, tools ] : enhancers); + // tools); + ); } } diff --git a/source/guards/eduadmin.auth.guard.ts b/source/guards/eduadmin.auth.guard.ts index f6be941a25314ba92360c143267719ed95fcdd29..721425c6a8479c8f7cb606690e7105533c153c0c 100644 --- a/source/guards/eduadmin.auth.guard.ts +++ b/source/guards/eduadmin.auth.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { DIDE_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { DIDE_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class EduAdminAuthGuard implements CanActivate { diff --git a/source/guards/ministry.auth.guard.ts b/source/guards/ministry.auth.guard.ts index 6f7e220f959a4933a984f0e8a2d66a118208a6ac..72f5e8dd8c22a38ad0720232e5bca50c80f67b83 100644 --- a/source/guards/ministry.auth.guard.ts +++ b/source/guards/ministry.auth.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { MINISTRY_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { MINISTRY_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class MinistryAuthGuard implements CanActivate { diff --git a/source/guards/regionedu.auth.guard.ts b/source/guards/regionedu.auth.guard.ts index ef711002d5b9732dea18391f3df1c3829b0de7e6..d5b09bc99acd1316e05ad2b364af3768eccd35ae 100644 --- a/source/guards/regionedu.auth.guard.ts +++ b/source/guards/regionedu.auth.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { PDE_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { PDE_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class RegionEduAuthGuard implements CanActivate { diff --git a/source/guards/reports.auth.guard.ts b/source/guards/reports.auth.guard.ts index 14d87f042082fe6df3e6cf75d443dfd53de48e8f..d1e1f0415a905ad92cb04fe04c5b365c39a5aac7 100644 --- a/source/guards/reports.auth.guard.ts +++ b/source/guards/reports.auth.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { MINISTRY_ROLE, DIDE_ROLE, PDE_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { DIDE_ROLE, MINISTRY_ROLE, PDE_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class ReportsAuthGuard implements CanActivate { diff --git a/source/guards/school.auth.guard.ts b/source/guards/school.auth.guard.ts index 6b2c3e2b5f584a72e00e0d1f9632395b4808325e..c31b48e6f3667448eee6938e078ba174ae03abe4 100644 --- a/source/guards/school.auth.guard.ts +++ b/source/guards/school.auth.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { SCHOOL_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { SCHOOL_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class SchoolAuthGuard implements CanActivate { diff --git a/source/guards/school.capacity.locked.guard.ts b/source/guards/school.capacity.locked.guard.ts index e98f9311b559daafa3a3beec53b7c7e3d1351ae9..5aeda0cb996da6e7a189be8bc482aae39fe6d908 100644 --- a/source/guards/school.capacity.locked.guard.ts +++ b/source/guards/school.capacity.locked.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { SCHOOL_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { SCHOOL_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class SchoolCapacityLockedGuard implements CanActivate { diff --git a/source/guards/school.students.locked.guard.ts b/source/guards/school.students.locked.guard.ts index a6464d24251ef542eae47bf99255ad23f8fdf274..f42c8120fcf648bafdc82f3eecd3e4e14fde5b32 100644 --- a/source/guards/school.students.locked.guard.ts +++ b/source/guards/school.students.locked.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { SCHOOL_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { SCHOOL_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class SchoolStudentsLockedGuard implements CanActivate { diff --git a/source/guards/student.lock.guard.ts b/source/guards/student.lock.guard.ts index fd146e1b11d2a986634b4482bd3a9b59823b8559..5d748022a2a54e7f87559b6c98ed0af545b3b126 100644 --- a/source/guards/student.lock.guard.ts +++ b/source/guards/student.lock.guard.ts @@ -1,9 +1,10 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { AuthService } from "../services/auth.service"; -import { STUDENT_ROLE } from "../constants"; import { Router } from "@angular/router"; +import { STUDENT_ROLE } from "../constants"; +import { AuthService } from "../services/auth.service"; + @Injectable() export default class StudentLockGuard implements CanActivate { diff --git a/source/pipes/camelcase.ts b/source/pipes/camelcase.ts index 8fa89bff5211efd2a53929132e34aae6eac97388..0e253ba84bf494a016e90beee875ff9e637d4d4b 100644 --- a/source/pipes/camelcase.ts +++ b/source/pipes/camelcase.ts @@ -1,4 +1,4 @@ -import {Pipe, PipeTransform} from "@angular/core"; +import { Pipe, PipeTransform } from "@angular/core"; @Pipe({ name: "camelcase" }) export class CamelCasePipe implements PipeTransform { diff --git a/source/pipes/removehtmltags.ts b/source/pipes/removehtmltags.ts index 37217c0bba39f4600b5103ef82961b498d70b193..386ef30ccb68df8fd21bb6024f921809595d504c 100644 --- a/source/pipes/removehtmltags.ts +++ b/source/pipes/removehtmltags.ts @@ -1,4 +1,4 @@ -import {Pipe, PipeTransform} from "@angular/core"; +import { Pipe, PipeTransform } from "@angular/core"; @Pipe({ name: "removetags" }) export class Removetags implements PipeTransform { diff --git a/source/pipes/removespaces.ts b/source/pipes/removespaces.ts index b7f997ab83279b9010db923e55048e1ee376e702..c1ccbfcacc65c0f1a2d14f91cbe13c752656fd94 100644 --- a/source/pipes/removespaces.ts +++ b/source/pipes/removespaces.ts @@ -1,4 +1,4 @@ -import {Pipe, PipeTransform} from "@angular/core"; +import { Pipe, PipeTransform } from "@angular/core"; @Pipe({ name: "removeSpaces" diff --git a/source/services/auth.service.ts b/source/services/auth.service.ts index beb80c4525f11060ce7e9ca59a753bdc3b46d0fd..6dbc46e0e8b22fdba40de2905cf5a27449542313 100644 --- a/source/services/auth.service.ts +++ b/source/services/auth.service.ts @@ -1,12 +1,11 @@ -import {Injectable} from "@angular/core"; -import {BehaviorSubject} from "rxjs/Rx"; import "rxjs/add/operator/map"; -import { AppSettings } from "../app.settings"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../store/store"; -import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; + +import { NgRedux } from "@angular-redux/store"; +import { Injectable } from "@angular/core"; + import { MINISTRY_ROLE } from "../constants"; +import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; +import { IAppState } from "../store/store"; @Injectable() export class AuthService { diff --git a/source/services/helper-data-service.ts b/source/services/helper-data-service.ts index 5babdd7d454b96c06be341b94888b05ba15a424b..c4399feaa96f56d0cef8b824be0281426cfe4958 100644 --- a/source/services/helper-data-service.ts +++ b/source/services/helper-data-service.ts @@ -1,17 +1,19 @@ -import { Http, Headers, RequestOptions, ResponseContentType, Response } from "@angular/http"; -import { Injectable, OnInit, OnDestroy } from "@angular/core"; -import { BehaviorSubject, Subscription } from "rxjs/Rx"; import "rxjs/add/operator/map"; -import { ISectorField } from "../store/sectorfields/sectorfields.types"; -import { IRegionRecord, IRegionSchoolRecord, IRRegion, IRRegionSchool } from "../store/regionschools/regionschools.types"; -import { ISectorRecord, ISectorRecords, ISectorCourse } from "../store/sectorcourses/sectorcourses.types"; + +import { NgRedux } from "@angular-redux/store"; +import { Injectable, OnDestroy, OnInit } from "@angular/core"; +import { Headers, Http, RequestOptions, ResponseContentType } from "@angular/http"; +import { CookieService } from "ngx-cookie"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; + import { AppSettings } from "../app.settings"; -import { NgRedux, select } from "@angular-redux/store"; -import { IAppState } from "../store/store"; -import { ILoginInfoRecords, ILoginInfoObj, ILoginInfoRecord } from "../store/logininfo/logininfo.types"; +import { DIDE_ROLE, MINISTRY_ROLE, PDE_ROLE, SCHOOL_ROLE } from "../constants"; import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state"; -import { SCHOOL_ROLE, STUDENT_ROLE, PDE_ROLE, DIDE_ROLE, MINISTRY_ROLE } from "../constants"; -import { CookieService } from "ngx-cookie"; +import { ILoginInfoRecords } from "../store/logininfo/logininfo.types"; +import { IRRegionSchool } from "../store/regionschools/regionschools.types"; +import { ISectorCourse } from "../store/sectorcourses/sectorcourses.types"; +import { ISectorField } from "../store/sectorfields/sectorfields.types"; +import { IAppState } from "../store/store"; import * as FileSaver from "file-saver"; diff --git a/source/store/epalclasses/epalclasses.initial-state.ts b/source/store/epalclasses/epalclasses.initial-state.ts index 7b9eee6bad4eddb318ac24dae07503a897beb71e..62915a9f8e1562476017c9421bd0d8bfa25dbd24 100644 --- a/source/store/epalclasses/epalclasses.initial-state.ts +++ b/source/store/epalclasses/epalclasses.initial-state.ts @@ -1,5 +1,4 @@ import { List } from "immutable"; import { IEpalClassRecord} from "./epalclasses.types"; - export const EPALCLASSES_INITIAL_STATE = List(); diff --git a/source/store/epalclasses/epalclasses.reducer.ts b/source/store/epalclasses/epalclasses.reducer.ts index 39b163a9e750365b5f6211881c8a4463429c1d34..e0633835e7552ce7603474744085bd59a4be1cf7 100644 --- a/source/store/epalclasses/epalclasses.reducer.ts +++ b/source/store/epalclasses/epalclasses.reducer.ts @@ -1,9 +1,9 @@ -import { IEpalClassRecords, IEpalClass, IEpalClassRecord } from "./epalclasses.types"; -import { EPALCLASSES_INITIAL_STATE } from "./epalclasses.initial-state"; import { List } from "immutable"; -import {recordify} from "typed-immutable-record"; +import { recordify } from "typed-immutable-record"; -import { EPALCLASSES_SAVE, EPALCLASSES_INIT } from "../../constants"; +import { EPALCLASSES_INIT, EPALCLASSES_SAVE } from "../../constants"; +import { EPALCLASSES_INITIAL_STATE } from "./epalclasses.initial-state"; +import { IEpalClass, IEpalClassRecord, IEpalClassRecords } from "./epalclasses.types"; export function epalclassesReducer(state: IEpalClassRecords = EPALCLASSES_INITIAL_STATE, action): IEpalClassRecords { diff --git a/source/store/epalclasses/epalclasses.types.ts b/source/store/epalclasses/epalclasses.types.ts index ec9a1a5623e499ed8cc2692ef6b04e94654d792c..628d61be7ee4689877fd4c2e9cf62f6be5ed0443 100644 --- a/source/store/epalclasses/epalclasses.types.ts +++ b/source/store/epalclasses/epalclasses.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface IEpalClass { name: string; diff --git a/source/store/epalclasses/index.ts b/source/store/epalclasses/index.ts index d2409e9a2879b3e7426457b2de3270a4b9b816d0..888c8188840aa47c63f490bffa0c36498b475f94 100644 --- a/source/store/epalclasses/index.ts +++ b/source/store/epalclasses/index.ts @@ -1,11 +1,11 @@ -import { IEpalClass, IEpalClassRecords, IEpalClassRecord } from "./epalclasses.types"; -import { epalclassesReducer } from "./epalclasses.reducer"; import { deimmutifyEpalClasses } from "./epalclasses.transformers"; +import { epalclassesReducer } from "./epalclasses.reducer"; +import { IEpalClass, IEpalClassRecord, IEpalClassRecords } from "./epalclasses.types"; export { -IEpalClass, -IEpalClassRecords, -IEpalClassRecord, -epalclassesReducer, -deimmutifyEpalClasses, + IEpalClass, + IEpalClassRecords, + IEpalClassRecord, + epalclassesReducer, + deimmutifyEpalClasses, }; diff --git a/source/store/index.ts b/source/store/index.ts index 359e777f5071ee9ec2b08eef82c22e52b4392ba6..ea644793347f57fdaea68cd41e507da98c005ed4 100644 --- a/source/store/index.ts +++ b/source/store/index.ts @@ -1,4 +1,4 @@ -import {createLogger} from "redux-logger"; +import { createLogger } from "redux-logger"; import { IAppState, rootReducer, deimmutify } from "./store"; import { ISectorFieldRecord, ISectorFieldRecords } from "./sectorfields/sectorfields.types"; @@ -9,30 +9,30 @@ import { IEpalClass, IEpalClassRecord, IEpalClassRecords } from "./epalclasses/e import { ILoginInfoObj, ILoginInfoRecord, ILoginInfoRecords } from "./logininfo/logininfo.types"; export { -IAppState, -rootReducer, -ISectorFieldRecord, -ISectorFieldRecords, -IRRegion, -IRegionRecord, -IRegionRecords, -IRegionSchoolRecord, -IRegionSchoolRecords, -IRRegionSchool, -ISectorRecords, -ISectorRecord, -ISector, -ISectorCourseRecords, -ISectorCourseRecord, -ISectorCourse, -IStudentDataFieldRecord, -IStudentDataFieldRecords, -IEpalClass, -IEpalClassRecord, -IEpalClassRecords, -ILoginInfoObj, -ILoginInfoRecord, -ILoginInfoRecords + IAppState, + rootReducer, + ISectorFieldRecord, + ISectorFieldRecords, + IRRegion, + IRegionRecord, + IRegionRecords, + IRegionSchoolRecord, + IRegionSchoolRecords, + IRRegionSchool, + ISectorRecords, + ISectorRecord, + ISector, + ISectorCourseRecords, + ISectorCourseRecord, + ISectorCourse, + IStudentDataFieldRecord, + IStudentDataFieldRecords, + IEpalClass, + IEpalClassRecord, + IEpalClassRecords, + ILoginInfoObj, + ILoginInfoRecord, + ILoginInfoRecords }; const myLogger = createLogger({ @@ -40,6 +40,7 @@ const myLogger = createLogger({ collapsed: true, stateTransformer: deimmutify }); + export const middleware = [ myLogger ]; diff --git a/source/store/logininfo/index.ts b/source/store/logininfo/index.ts index a16282463c32daad77f4707bf735c4c82b5eff78..2281d5dd688f17dc7ca9ebf0adc897cf6392eba7 100644 --- a/source/store/logininfo/index.ts +++ b/source/store/logininfo/index.ts @@ -3,9 +3,9 @@ import { loginInfoReducer } from "./logininfo.reducer"; import { deimmutifyLoginInfo } from "./logininfo.transformers"; export { -ILoginInfoObj, -ILoginInfoRecord, -ILoginInfoRecords, -loginInfoReducer, -deimmutifyLoginInfo, + ILoginInfoObj, + ILoginInfoRecord, + ILoginInfoRecords, + loginInfoReducer, + deimmutifyLoginInfo, }; diff --git a/source/store/logininfo/logininfo.initial-state.ts b/source/store/logininfo/logininfo.initial-state.ts index a8510beb9768f069ddbac4fcc60ee0d891a50b32..1c6acc1ae6909ebbf10f64b04a5e6cb733f0bfa4 100644 --- a/source/store/logininfo/logininfo.initial-state.ts +++ b/source/store/logininfo/logininfo.initial-state.ts @@ -1,4 +1,5 @@ import { List } from "immutable"; + import { ILoginInfoRecord } from "./logininfo.types"; export const LOGININFO_INITIAL_STATE = List(); diff --git a/source/store/logininfo/logininfo.reducer.ts b/source/store/logininfo/logininfo.reducer.ts index debf5cbe8c7a1f25b201ecf0db733fd57d8c2920..6e66ee1f5c56062061074bfc35a180941fa7940e 100644 --- a/source/store/logininfo/logininfo.reducer.ts +++ b/source/store/logininfo/logininfo.reducer.ts @@ -1,14 +1,9 @@ -import { ILoginInfoRecords, ILoginInfoRecord, ILoginInfoObj } from "./logininfo.types"; -import { LOGININFO_INITIAL_STATE } from "./logininfo.initial-state"; -import {recordify} from "typed-immutable-record"; import { List } from "immutable"; +import { recordify } from "typed-immutable-record"; -import { - LOGININFO_SAVE, - LOGININFO_INIT, - PROFILE_SAVE, - STATEMENTAGREE_SAVE -} from "../../constants"; +import { LOGININFO_INIT, LOGININFO_SAVE, PROFILE_SAVE, STATEMENTAGREE_SAVE } from "../../constants"; +import { LOGININFO_INITIAL_STATE } from "./logininfo.initial-state"; +import { ILoginInfoObj, ILoginInfoRecord, ILoginInfoRecords } from "./logininfo.types"; export function loginInfoReducer(state: ILoginInfoRecords = LOGININFO_INITIAL_STATE, action): ILoginInfoRecords { switch (action.type) { diff --git a/source/store/logininfo/logininfo.types.ts b/source/store/logininfo/logininfo.types.ts index 413919836a8df4c041dc048d4e0a7988c958b99e..d47e90c0c3add2d0e4f5318e074169a0b6fbd077 100644 --- a/source/store/logininfo/logininfo.types.ts +++ b/source/store/logininfo/logininfo.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface ILoginInfoObj { auth_token: string; diff --git a/source/store/regionschools/index.ts b/source/store/regionschools/index.ts index ab575c8c67700a8337144e3e3b382ff4ea0c8f53..af7d22e2361302c62e3c4dc1010fbb3e849a9f3b 100644 --- a/source/store/regionschools/index.ts +++ b/source/store/regionschools/index.ts @@ -3,12 +3,12 @@ import { regionSchoolsReducer } from "./regionschools.reducer"; import { deimmutifyRegionSchools } from "./regionschools.transformers"; export { -IRRegion, -IRegionRecord, -IRegionRecords, -IRegionSchoolRecord, -IRegionSchoolRecords, -IRRegionSchool, -regionSchoolsReducer, -deimmutifyRegionSchools, + IRRegion, + IRegionRecord, + IRegionRecords, + IRegionSchoolRecord, + IRegionSchoolRecords, + IRRegionSchool, + regionSchoolsReducer, + deimmutifyRegionSchools, }; diff --git a/source/store/regionschools/regionschools.initial-state.ts b/source/store/regionschools/regionschools.initial-state.ts index 362989c16987d5c7f4df5c45c3378c84e4dd1c5d..aff596775d121cfeecebdff42beeb44581254698 100644 --- a/source/store/regionschools/regionschools.initial-state.ts +++ b/source/store/regionschools/regionschools.initial-state.ts @@ -1,4 +1,5 @@ import { List } from "immutable"; + import { IRegionRecord } from "./regionschools.types"; export const REGION_SCHOOLS_INITIAL_STATE = List(); diff --git a/source/store/regionschools/regionschools.reducer.ts b/source/store/regionschools/regionschools.reducer.ts index db5d956e43af23a418b8ce54c2fa634fc7f9ff80..e33d99169ee17a2dad99b98e28baa6937eaf4f90 100644 --- a/source/store/regionschools/regionschools.reducer.ts +++ b/source/store/regionschools/regionschools.reducer.ts @@ -1,14 +1,21 @@ -import { IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords, IRegionRecord, IRegionRecords } from "./regionschools.types"; -import { REGION_SCHOOLS_INITIAL_STATE } from "./regionschools.initial-state"; import { List } from "immutable"; -import {recordify} from "typed-immutable-record"; +import { recordify } from "typed-immutable-record"; import { + REGIONSCHOOLS_INIT, + REGIONSCHOOLS_ORDER_SAVE, REGIONSCHOOLS_RECEIVED, REGIONSCHOOLS_SELECTED_SAVE, - REGIONSCHOOLS_ORDER_SAVE, - REGIONSCHOOLS_INIT } from "../../constants"; +import { REGION_SCHOOLS_INITIAL_STATE } from "./regionschools.initial-state"; +import { + IRegionRecord, + IRegionRecords, + IRegionSchoolRecord, + IRegionSchoolRecords, + IRRegion, + IRRegionSchool, +} from "./regionschools.types"; export function regionSchoolsReducer(state: IRegionRecords = REGION_SCHOOLS_INITIAL_STATE, action): IRegionRecords { switch (action.type) { diff --git a/source/store/regionschools/regionschools.types.ts b/source/store/regionschools/regionschools.types.ts index 137fbb1dd705f6c75acbb1bd3a3672f2c267b188..9a30cbe0f6556587ee4b2ebb69deac481f2b0ede 100644 --- a/source/store/regionschools/regionschools.types.ts +++ b/source/store/regionschools/regionschools.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface IRRegion { region_id: string; diff --git a/source/store/sectorcourses/index.ts b/source/store/sectorcourses/index.ts index 8e3aee22267f2142d258753cd4834016bc5c43ba..bb140b937e043f74c5e034c5a0b3fd1826905384 100644 --- a/source/store/sectorcourses/index.ts +++ b/source/store/sectorcourses/index.ts @@ -3,12 +3,12 @@ import { sectorCoursesReducer } from "./sectorcourses.reducer"; import { deimmutifySectorCourses } from "./sectorcourses.transformers"; export { -ISectorRecords, -ISectorRecord, -ISector, -ISectorCourseRecords, -ISectorCourseRecord, -ISectorCourse, -sectorCoursesReducer, -deimmutifySectorCourses, + ISectorRecords, + ISectorRecord, + ISector, + ISectorCourseRecords, + ISectorCourseRecord, + ISectorCourse, + sectorCoursesReducer, + deimmutifySectorCourses, }; diff --git a/source/store/sectorcourses/sectorcourses.initial-state.ts b/source/store/sectorcourses/sectorcourses.initial-state.ts index 624570d5827539149313d97bae0fe0a55753a518..0598990f36ce0b981747b473b0eb8b79aa0a83f4 100644 --- a/source/store/sectorcourses/sectorcourses.initial-state.ts +++ b/source/store/sectorcourses/sectorcourses.initial-state.ts @@ -1,4 +1,5 @@ import { List } from "immutable"; + import { ISectorRecord } from "./sectorcourses.types"; export const SECTOR_COURSES_INITIAL_STATE = List(); diff --git a/source/store/sectorcourses/sectorcourses.reducer.ts b/source/store/sectorcourses/sectorcourses.reducer.ts index e1da006048575287a08c3ea6186864599889a565..ab596a4752d661928b756e993655a05f9d725d91 100644 --- a/source/store/sectorcourses/sectorcourses.reducer.ts +++ b/source/store/sectorcourses/sectorcourses.reducer.ts @@ -1,13 +1,9 @@ -import { ISectorRecords, ISectorRecord, ISectorCourseRecord, ISector, ISectorCourse } from "./sectorcourses.types"; -import { SECTOR_COURSES_INITIAL_STATE } from "./sectorcourses.initial-state"; import { List } from "immutable"; -import {recordify} from "typed-immutable-record"; +import { recordify } from "typed-immutable-record"; -import { - SECTORCOURSES_RECEIVED, - SECTORCOURSES_SELECTED_SAVE, - SECTORCOURSES_INIT -} from "../../constants"; +import { SECTORCOURSES_INIT, SECTORCOURSES_RECEIVED, SECTORCOURSES_SELECTED_SAVE } from "../../constants"; +import { SECTOR_COURSES_INITIAL_STATE } from "./sectorcourses.initial-state"; +import { ISector, ISectorCourse, ISectorCourseRecord, ISectorRecord, ISectorRecords } from "./sectorcourses.types"; export function sectorCoursesReducer(state: ISectorRecords = SECTOR_COURSES_INITIAL_STATE, action): ISectorRecords { switch (action.type) { diff --git a/source/store/sectorcourses/sectorcourses.types.ts b/source/store/sectorcourses/sectorcourses.types.ts index cba20bd579ed8234ca54d781c470ea9633081c58..1d76f7edcc9958acb4e316cd040d71e51ce878c7 100644 --- a/source/store/sectorcourses/sectorcourses.types.ts +++ b/source/store/sectorcourses/sectorcourses.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface ISector { sector_id: string; diff --git a/source/store/sectorfields/index.ts b/source/store/sectorfields/index.ts index d03767dfea2c11e0cf80d32cc1f56c836f0d5558..d7ccd3b6b0c2541cf678f3638c3a3bb696de12d6 100644 --- a/source/store/sectorfields/index.ts +++ b/source/store/sectorfields/index.ts @@ -3,8 +3,8 @@ import { sectorFieldsReducer } from "./sectorfields.reducer"; import { deimmutifySectorFields } from "./sectorfields.transformers"; export { -ISectorFieldRecord, -ISectorFieldRecords, -sectorFieldsReducer, -deimmutifySectorFields, + ISectorFieldRecord, + ISectorFieldRecords, + sectorFieldsReducer, + deimmutifySectorFields, }; diff --git a/source/store/sectorfields/sectorfields.initial-state.ts b/source/store/sectorfields/sectorfields.initial-state.ts index c6e69559de4c706fca9854d597cfa991d98923a5..59bb88034a9c8279cf5dc235547d134d946f44d7 100644 --- a/source/store/sectorfields/sectorfields.initial-state.ts +++ b/source/store/sectorfields/sectorfields.initial-state.ts @@ -1,4 +1,5 @@ import { List } from "immutable"; + import { ISectorFieldRecord } from "./sectorfields.types"; export const SECTOR_FIELDS_INITIAL_STATE = List(); diff --git a/source/store/sectorfields/sectorfields.reducer.ts b/source/store/sectorfields/sectorfields.reducer.ts index dc62b1c6fc16d81d2cd384b738e0d954cef9e2f9..5e53570d7fdf323b8f783410a158f6c2bb4a6c60 100644 --- a/source/store/sectorfields/sectorfields.reducer.ts +++ b/source/store/sectorfields/sectorfields.reducer.ts @@ -1,13 +1,9 @@ -import { ISectorFieldRecords, ISectorFieldRecord, ISectorField } from "./sectorfields.types"; -import { SECTOR_FIELDS_INITIAL_STATE } from "./sectorfields.initial-state"; import { List } from "immutable"; -import {recordify} from "typed-immutable-record"; +import { recordify } from "typed-immutable-record"; -import { - SECTORFIELDS_RECEIVED, - SECTORFIELDS_SELECTED_SAVE, - SECTORFIELDS_INIT -} from "../../constants"; +import { SECTORFIELDS_INIT, SECTORFIELDS_RECEIVED, SECTORFIELDS_SELECTED_SAVE } from "../../constants"; +import { SECTOR_FIELDS_INITIAL_STATE } from "./sectorfields.initial-state"; +import { ISectorField, ISectorFieldRecord, ISectorFieldRecords } from "./sectorfields.types"; export function sectorFieldsReducer(state: ISectorFieldRecords = SECTOR_FIELDS_INITIAL_STATE, action): ISectorFieldRecords { switch (action.type) { diff --git a/source/store/sectorfields/sectorfields.types.ts b/source/store/sectorfields/sectorfields.types.ts index b6b0d39f3cdccec921c405b22d18e16828cf6cad..aad176733e2d87a229ca564e1352bbd881181338 100644 --- a/source/store/sectorfields/sectorfields.types.ts +++ b/source/store/sectorfields/sectorfields.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface ISectorField { id: number; diff --git a/source/store/store.ts b/source/store/store.ts index 5d2a8a161adbcd94225e9cc0005a5f1563283b62..a7136489ef773038a8b020f3af454ad8be4140de 100644 --- a/source/store/store.ts +++ b/source/store/store.ts @@ -1,10 +1,11 @@ import { combineReducers } from "redux"; -import * as sectorFields from "./sectorfields"; + +import * as epalclasses from "./epalclasses"; +import * as loginInfo from "./logininfo"; import * as regions from "./regionschools"; import * as sectors from "./sectorcourses"; +import * as sectorFields from "./sectorfields"; import * as studentDataFields from "./studentdatafields"; -import * as epalclasses from "./epalclasses"; -import * as loginInfo from "./logininfo"; export interface IAppState { sectorFields?: sectorFields.ISectorFieldRecords; diff --git a/source/store/studentdatafields/index.ts b/source/store/studentdatafields/index.ts index a69b2eb058d10fd783ccc72fe44d04ebb863366c..50d4df1cd727f657d655ccc2190c537ca551b7ef 100644 --- a/source/store/studentdatafields/index.ts +++ b/source/store/studentdatafields/index.ts @@ -3,8 +3,8 @@ import { studentDataFieldsReducer } from "./studentdatafields.reducer"; import { deimmutifyStudentDataFields } from "./studentdatafields.transformers"; export { -IStudentDataFieldRecord, -IStudentDataFieldRecords, -studentDataFieldsReducer, -deimmutifyStudentDataFields, + IStudentDataFieldRecord, + IStudentDataFieldRecords, + studentDataFieldsReducer, + deimmutifyStudentDataFields, }; diff --git a/source/store/studentdatafields/studentdatafields.initial-state.ts b/source/store/studentdatafields/studentdatafields.initial-state.ts index e28fb1e2a7c124706d24c959aac77c553459e227..40950fb19fe19ec612805bef4c81913fbe6b764d 100644 --- a/source/store/studentdatafields/studentdatafields.initial-state.ts +++ b/source/store/studentdatafields/studentdatafields.initial-state.ts @@ -1,4 +1,5 @@ import { List } from "immutable"; + import { IStudentDataFieldRecord } from "./studentdatafields.types"; export const STUDENT_DATA_FIELDS_INITIAL_STATE = List(); diff --git a/source/store/studentdatafields/studentdatafields.reducer.ts b/source/store/studentdatafields/studentdatafields.reducer.ts index bd272ea40797f5ef8d83f58c1a80264e9591a873..8c86c72354b3bf0a741cc150340a0e8b5a3175c0 100644 --- a/source/store/studentdatafields/studentdatafields.reducer.ts +++ b/source/store/studentdatafields/studentdatafields.reducer.ts @@ -1,8 +1,9 @@ -import { IStudentDataFieldRecords, IStudentDataFieldRecord, IStudentDataField } from "./studentdatafields.types"; -import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "./studentdatafields.initial-state"; -import {recordify} from "typed-immutable-record"; import { List } from "immutable"; -import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from "../../constants"; +import { recordify } from "typed-immutable-record"; + +import { STUDENTDATAFIELDS_INIT, STUDENTDATAFIELDS_SAVE } from "../../constants"; +import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "./studentdatafields.initial-state"; +import { IStudentDataField, IStudentDataFieldRecord, IStudentDataFieldRecords } from "./studentdatafields.types"; export function studentDataFieldsReducer(state: IStudentDataFieldRecords = STUDENT_DATA_FIELDS_INITIAL_STATE, action): IStudentDataFieldRecords { switch (action.type) { diff --git a/source/store/studentdatafields/studentdatafields.types.ts b/source/store/studentdatafields/studentdatafields.types.ts index 834a0ff55a21eca512a8b8d181bc5f37c9046f2a..b99f95360a0fdf7129ea5481adde81e453824089 100644 --- a/source/store/studentdatafields/studentdatafields.types.ts +++ b/source/store/studentdatafields/studentdatafields.types.ts @@ -1,5 +1,5 @@ import { List } from "immutable"; -import {TypedRecord} from "typed-immutable-record"; +import { TypedRecord } from "typed-immutable-record"; export interface IStudentDataField { epaluser_id: number;