diff --git a/source/actions/coursefields.actions.ts b/source/actions/coursefields.actions.ts
deleted file mode 100644
index 6dfd2e54c498677cb0aba66a73e0c30a29608504..0000000000000000000000000000000000000000
--- a/source/actions/coursefields.actions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { COURSEFIELDS_RECEIVED, COURSEFIELDS_SELECTED_SAVE } from '../constants';
-import { Injectable } from '@angular/core';
-import { NgRedux } from '@angular-redux/store';
-import { IAppState } from '../store';
-import { HelperDataService } from '../services/helper-data-service';
-
-@Injectable()
-export class CourseFieldsActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>,
-    private _hds: HelperDataService) {}
-
-  getCourseFields = () => {
-    const { courseFields } = this._ngRedux.getState();
-    if (courseFields.size === 0) {
-        return this._hds.getCourseFields().then(courseFields => {
-            return this._ngRedux.dispatch({
-                type: COURSEFIELDS_RECEIVED,
-                payload: {
-                    courseFields
-                }
-            });
-        });
-    }
-  };
-
-  saveCourseFieldsSelected = (courseFieldsSelected) => {
-      return this._ngRedux.dispatch({
-        type: COURSEFIELDS_SELECTED_SAVE,
-        payload: {
-          courseFieldsSelected
-        }
-      });
-  };
-
-}
diff --git a/source/actions/criteria.actions.ts b/source/actions/criteria.actions.ts
deleted file mode 100644
index 06250b806fd9b32ba9e1d3c0779597bfb6d2e434..0000000000000000000000000000000000000000
--- a/source/actions/criteria.actions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { CRITERIA_RECEIVED, CRITERIA_SAVE, CRITERIA_INIT } from '../constants';
-import { Injectable } from '@angular/core';
-import { NgRedux } from '@angular-redux/store';
-import { IAppState } from '../store';
-import { HelperDataService } from '../services/helper-data-service';
-
-@Injectable()
-export class CriteriaActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>,
-    private _hds: HelperDataService) {}
-
-    getCriteria = (reload) => {
-        const { criter } = this._ngRedux.getState();
-        //if (sectorFields.size === 0) {
-        if (reload === true || (reload === false && criter.size === 0)) {
-            return this._hds.getCriteria().then(criteria => {
-                return this._ngRedux.dispatch({
-                    type: CRITERIA_RECEIVED,
-                    payload: {
-                        criteria
-                    }
-                });
-            });
-        }
-    };
-
-  saveCriteria = (criter) => {
-      return this._ngRedux.dispatch({
-        type: CRITERIA_SAVE,
-        payload: {
-          criter
-        }
-      });
-  };
-
-  initCriteria = () => {
-        return this._ngRedux.dispatch({
-            type: CRITERIA_INIT,
-            payload: {
-            }
-        });
-    };
-
-}
diff --git a/source/actions/epalclass.actions.ts b/source/actions/epalclass.actions.ts
index 7f462347874fefaaa11c89ba9ad5e42d7dee952c..2e504cbae20eba911858d9ecf8f1d8e0680c13ed 100644
--- a/source/actions/epalclass.actions.ts
+++ b/source/actions/epalclass.actions.ts
@@ -1,31 +1,31 @@
-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';
+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<IAppState>) {}
+    constructor(
+        private _ngRedux: NgRedux<IAppState>) { }
 
 
-  saveEpalClassesSelected = (epalClasses) => {
-      return this._ngRedux.dispatch({
-        type: EPALCLASSES_SAVE,
-        payload: {
-          epalClasses
-        }
-      });
-  };
+    saveEpalClassesSelected = (epalClasses) => {
+        return this._ngRedux.dispatch({
+            type: EPALCLASSES_SAVE,
+            payload: {
+                epalClasses
+            }
+        });
+    };
 
-  initEpalClasses = () => {
-      return this._ngRedux.dispatch({
-          type: EPALCLASSES_INIT,
-          payload: {
-          }
-      });
-  };
+    initEpalClasses = () => {
+        return this._ngRedux.dispatch({
+            type: EPALCLASSES_INIT,
+            payload: {
+            }
+        });
+    };
 
 }
diff --git a/source/actions/index.ts b/source/actions/index.ts
index f68b54e2d11a64332f0fb7f6208aecd4c64cd9d7..e19f359715bffa67f77519a877792d17704d3de8 100644
--- a/source/actions/index.ts
+++ b/source/actions/index.ts
@@ -1,24 +1,19 @@
-import { CourseFieldsActions } from './coursefields.actions';
-import { SectorFieldsActions } from './sectorfields.actions';
-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 { CriteriaActions} from './criteria.actions';
+import { SectorFieldsActions } from "./sectorfields.actions";
+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";
 
-const ACTION_PROVIDERS = [ CourseFieldsActions, SectorFieldsActions, RegionSchoolsActions, SectorCoursesActions, StudentDataFieldsActions,
-  EpalClassesActions, LoginInfoActions, CriteriaActions];
+const ACTION_PROVIDERS = [SectorFieldsActions, RegionSchoolsActions, SectorCoursesActions, StudentDataFieldsActions,
+    EpalClassesActions, LoginInfoActions];
 
 export {
-  CourseFieldsActions,
-  SectorFieldsActions,
-  RegionSchoolsActions,
-  SectorCoursesActions,
-  StudentDataFieldsActions,
-  EpalClassesActions,
-  LoginInfoActions,
-  CriteriaActions,
-
-  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 321a4ad725ae4373566ab760ef5398547214feae..dc6b397e88ac5580245f93d0f1f97119c2287f60 100644
--- a/source/actions/logininfo.actions.ts
+++ b/source/actions/logininfo.actions.ts
@@ -1,63 +1,63 @@
-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 { HelperDataService } from '../services/helper-data-service';
+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 { HelperDataService } from "../services/helper-data-service";
 
 @Injectable()
 export class LoginInfoActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>,
-    private _hds: HelperDataService) {}
-
-
- getloginInfo = (loginInfo) => {
- return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then (loginInfos => {
-      return this._ngRedux.dispatch({
-        type: LOGININFO_SAVE,
-        payload: {
-          loginInfos
-        }
-      });
-  });
-}
-
- saveMinEduloginInfo = (loginInfos) => {
-   return this._ngRedux.dispatch({
-    type: LOGININFO_SAVE,
-    payload: {
-      loginInfos
+    constructor(
+        private _ngRedux: NgRedux<IAppState>,
+        private _hds: HelperDataService) { }
+
+
+    getloginInfo = (loginInfo) => {
+        return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then(loginInfos => {
+            return this._ngRedux.dispatch({
+                type: LOGININFO_SAVE,
+                payload: {
+                    loginInfos
+                }
+            });
+        });
     }
-  });
-};
-
-saveProfile = (profile) => {
-  return this._ngRedux.dispatch({
-   type: PROFILE_SAVE,
-   payload: {
-     profile
-   }
- });
-};
-
-saveStatementAgree = (disclaimer_checked) => {
-  return this._ngRedux.dispatch({
-   type: STATEMENTAGREE_SAVE,
-   payload: {
-     disclaimer_checked
-   }
- });
-};
-
-
-  initLoginInfo = () => {
-      return this._ngRedux.dispatch({
-          type: LOGININFO_INIT,
-          payload: {
-          }
-      });
-  };
+
+    saveMinEduloginInfo = (loginInfos) => {
+        return this._ngRedux.dispatch({
+            type: LOGININFO_SAVE,
+            payload: {
+                loginInfos
+            }
+        });
+    };
+
+    saveProfile = (profile) => {
+        return this._ngRedux.dispatch({
+            type: PROFILE_SAVE,
+            payload: {
+                profile
+            }
+        });
+    };
+
+    saveStatementAgree = (disclaimer_checked) => {
+        return this._ngRedux.dispatch({
+            type: STATEMENTAGREE_SAVE,
+            payload: {
+                disclaimer_checked
+            }
+        });
+    };
+
+
+    initLoginInfo = () => {
+        return this._ngRedux.dispatch({
+            type: LOGININFO_INIT,
+            payload: {
+            }
+        });
+    };
 
 
 }
diff --git a/source/actions/regionschools.actions.ts b/source/actions/regionschools.actions.ts
index 42ef13126099ea137e1eb22038a5e1b4a84dc928..f9a832255356ecac4bd72a1c619108c6ae82a044 100644
--- a/source/actions/regionschools.actions.ts
+++ b/source/actions/regionschools.actions.ts
@@ -1,71 +1,55 @@
-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 { HelperDataService } from '../services/helper-data-service';
+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 { HelperDataService } from "../services/helper-data-service";
 
 @Injectable()
 export class RegionSchoolsActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>,
-    private _hds: HelperDataService) {}
+    constructor(
+        private _ngRedux: NgRedux<IAppState>,
+        private _hds: HelperDataService) { }
 
-  getRegionSchools = (classActive,courseActive, reload) => {
-    const { regions } = this._ngRedux.getState();
-    if (reload === true || (reload === false && regions.size === 0)) {
-        return this._hds.getRegionsWithSchools(classActive,courseActive).then(regions => {
-            return this._ngRedux.dispatch({
-                type: REGIONSCHOOLS_RECEIVED,
-                payload: {
-                    regions
-                }
+    getRegionSchools = (classActive, courseActive, reload) => {
+        const { regions } = this._ngRedux.getState();
+        if (reload === true || (reload === false && regions.size === 0)) {
+            return this._hds.getRegionsWithSchools(classActive, courseActive).then(regions => {
+                return this._ngRedux.dispatch({
+                    type: REGIONSCHOOLS_RECEIVED,
+                    payload: {
+                        regions
+                    }
+                });
             });
-        });
-    }
-  };
-
-  initRegionSchools = () => {
-      return this._ngRedux.dispatch({
-          type: REGIONSCHOOLS_INIT,
-          payload: {
-          }
-      });
-  };
+        }
+    };
 
-  /*
-  getRegionSchools_Reload = (courseActive) => {
-    const { regions } = this._ngRedux.getState();
-    //if (regions.size === 0) {
-        return this._hds.getRegionsWithSchools(courseActive).then(regions => {
-            return this._ngRedux.dispatch({
-                type: REGIONSCHOOLS_RECEIVED,
-                payload: {
-                    regions
-                }
-            });
+    initRegionSchools = () => {
+        return this._ngRedux.dispatch({
+            type: REGIONSCHOOLS_INIT,
+            payload: {
+            }
         });
-    //}
-  };
-  */
+    };
 
-  saveRegionSchoolsSelected = (checked, i, j) => {
-      return this._ngRedux.dispatch({
-        type: REGIONSCHOOLS_SELECTED_SAVE,
-        payload: {
-          checked: checked,
-          rIndex: i,
-          sIndex: j
-        }
-      });
-  };
+    saveRegionSchoolsSelected = (checked, i, j) => {
+        return this._ngRedux.dispatch({
+            type: REGIONSCHOOLS_SELECTED_SAVE,
+            payload: {
+                checked: checked,
+                rIndex: i,
+                sIndex: j
+            }
+        });
+    };
 
-  saveRegionSchoolsOrder = (selectedSchools) => {
-      return this._ngRedux.dispatch({
-        type: REGIONSCHOOLS_ORDER_SAVE,
-        payload: {
-          selectedSchools
-        }
-      });
-  };
+    saveRegionSchoolsOrder = (selectedSchools) => {
+        return this._ngRedux.dispatch({
+            type: REGIONSCHOOLS_ORDER_SAVE,
+            payload: {
+                selectedSchools
+            }
+        });
+    };
 
 }
diff --git a/source/actions/sectorcourses.actions.ts b/source/actions/sectorcourses.actions.ts
index 5cf041e1a0d2e90333780682d4ae96dfb069a504..8f84a363d7dd202f4bdc4a479924340c9a6b34cb 100644
--- a/source/actions/sectorcourses.actions.ts
+++ b/source/actions/sectorcourses.actions.ts
@@ -1,62 +1,46 @@
-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 { HelperDataService } from '../services/helper-data-service';
+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 { HelperDataService } from "../services/helper-data-service";
 
 @Injectable()
 export class SectorCoursesActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>,
-    private _hds: HelperDataService) {}
+    constructor(
+        private _ngRedux: NgRedux<IAppState>,
+        private _hds: HelperDataService) { }
 
-  getSectorCourses = (reload) => {
-    const { sectors } = this._ngRedux.getState();
-    //if (sectors.size === 0) {
-    if (reload === true || (reload === false && sectors.size === 0)) {
-        return this._hds.getSectorsWithCourses().then(sectors => {
-            return this._ngRedux.dispatch({
-                type: SECTORCOURSES_RECEIVED,
-                payload: {
-                    sectors
-                }
+    getSectorCourses = (reload) => {
+        const { sectors } = this._ngRedux.getState();
+        // if (sectors.size === 0) {
+        if (reload === true || (reload === false && sectors.size === 0)) {
+            return this._hds.getSectorsWithCourses().then(sectors => {
+                return this._ngRedux.dispatch({
+                    type: SECTORCOURSES_RECEIVED,
+                    payload: {
+                        sectors
+                    }
+                });
             });
-        });
-    }
-  };
-
-  initSectorCourses = () => {
-      return this._ngRedux.dispatch({
-          type: SECTORCOURSES_INIT,
-          payload: {
-          }
-      });
-  };
+        }
+    };
 
- /*
-  getSectorCourses_Reload = () => {
-    const { sectors } = this._ngRedux.getState();
-    //if (sectors.size === 0) {
-        return this._hds.getSectorsWithCourses().then(sectors => {
-            return this._ngRedux.dispatch({
-                type: SECTORCOURSES_RECEIVED,
-                payload: {
-                    sectors
-                }
-            });
+    initSectorCourses = () => {
+        return this._ngRedux.dispatch({
+            type: SECTORCOURSES_INIT,
+            payload: {
+            }
         });
-    //}
-  };
-  */
+    };
 
-  saveSectorCoursesSelected = (sectorCoursesSelected,sectorSelected) => {
-      return this._ngRedux.dispatch({
-        type: SECTORCOURSES_SELECTED_SAVE,
-        payload: {
-          sectorCoursesSelected,
-          sectorSelected
-        }
-      });
-  };
+    saveSectorCoursesSelected = (sectorCoursesSelected, sectorSelected) => {
+        return this._ngRedux.dispatch({
+            type: SECTORCOURSES_SELECTED_SAVE,
+            payload: {
+                sectorCoursesSelected,
+                sectorSelected
+            }
+        });
+    };
 
 }
diff --git a/source/actions/sectorfields.actions.ts b/source/actions/sectorfields.actions.ts
index e4c0ed0548c28b014cad4effcebe2bc51660356a..d9d3cd350042ed4c35d4da55fd8cffe12858b501 100644
--- a/source/actions/sectorfields.actions.ts
+++ b/source/actions/sectorfields.actions.ts
@@ -1,8 +1,8 @@
-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 { HelperDataService } from '../services/helper-data-service';
+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 { HelperDataService } from "../services/helper-data-service";
 
 @Injectable()
 export class SectorFieldsActions {
@@ -12,7 +12,7 @@ export class SectorFieldsActions {
 
     getSectorFields = (reload) => {
         const { sectorFields } = this._ngRedux.getState();
-        //if (sectorFields.size === 0) {
+        // if (sectorFields.size === 0) {
         if (reload === true || (reload === false && sectorFields.size === 0)) {
             return this._hds.getSectorFields().then(sectorFields => {
                 return this._ngRedux.dispatch({
diff --git a/source/actions/studentdatafields.actions.ts b/source/actions/studentdatafields.actions.ts
index fb705e023eb909e64e3021a996f78e8e1ef93490..a650b5c513108f9080ec903e2a96bc15c8d103a5 100644
--- a/source/actions/studentdatafields.actions.ts
+++ b/source/actions/studentdatafields.actions.ts
@@ -1,28 +1,26 @@
-import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from '../constants';
-import { Injectable } from '@angular/core';
-import { NgRedux } from '@angular-redux/store';
-import { IAppState } from '../store';
-//import { UserDataService } from '../services/user-data-service';
-
+import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from "../constants";
+import { Injectable } from "@angular/core";
+import { NgRedux } from "@angular-redux/store";
+import { IAppState } from "../store";
 
 @Injectable()
 export class StudentDataFieldsActions {
-  constructor(
-    private _ngRedux: NgRedux<IAppState>) {}
+    constructor(
+        private _ngRedux: NgRedux<IAppState>) { }
 
-  saveStudentDataFields = (studentDataFields) => {
+    saveStudentDataFields = (studentDataFields) => {
 
-      return this._ngRedux.dispatch({
-        type: STUDENTDATAFIELDS_SAVE,
-        payload: {
-          studentDataFields
-        }
+        return this._ngRedux.dispatch({
+            type: STUDENTDATAFIELDS_SAVE,
+            payload: {
+                studentDataFields
+            }
 
-      });
+        });
 
-  };
+    };
 
-  initStudentDataFields = () => {
+    initStudentDataFields = () => {
         return this._ngRedux.dispatch({
             type: STUDENTDATAFIELDS_INIT,
             payload: {
diff --git a/source/app.routes.ts b/source/app.routes.ts
index 62e1b1dffa775209d368dfcca36009eeafd86ffa..c106c17ab7c2a4870d28a863ef3e019e5314e4de 100644
--- a/source/app.routes.ts
+++ b/source/app.routes.ts
@@ -1,14 +1,14 @@
-import { RouterModule }  from '@angular/router';
+import { RouterModule }  from "@angular/router";
 
 import { MainRoutes, MainDeclarations }
- from './containers/main.routes';
+from "./containers/main.routes";
 
 export const routes = [
-  ...MainRoutes
+    ...MainRoutes
 ];
 
 export const APP_DECLARATIONS = [
-  ...MainDeclarations
+    ...MainDeclarations
 ];
 
 export const APP_ROUTER_PROVIDERS = RouterModule.forRoot(routes);
diff --git a/source/app.settings.deployment.ts b/source/app.settings.deployment.ts
index 8c95a3e6e5186e84d7d6ba1289d97039204ea789..067f79253f9ff58f2746e58a82b1eb436f0194cd 100644
--- a/source/app.settings.deployment.ts
+++ b/source/app.settings.deployment.ts
@@ -1,11 +1,11 @@
-export const API_ENDPOINT = '';
-export const API_ENDPOINT_PARAMS = '';
+export const API_ENDPOINT = "";
+export const API_ENDPOINT_PARAMS = "";
 export class AppSettings {
 
-   public static get API_ENDPOINT(): string {
-       return '';
-   }
-   public static get API_ENDPOINT_PARAMS(): string {
-      return '';
-   }
+    public static get API_ENDPOINT(): string {
+        return "";
+    }
+    public static get API_ENDPOINT_PARAMS(): string {
+        return "";
+    }
 }
diff --git a/source/app.ts b/source/app.ts
index 9e17f3293637ae3779fed1c03f8a9a067b2a9b8d..e8e22d6581282c6c7dbee894e7fddcf8603f82f4 100644
--- a/source/app.ts
+++ b/source/app.ts
@@ -9,24 +9,23 @@ import { CookieModule } from "ngx-cookie";
 import { MyDatePickerModule } from "mydatepicker";
 import { NguiAutoCompleteModule } from "@ngui/auto-complete";
 import {
-  FormsModule,
-  ReactiveFormsModule,
+    FormsModule,
+    ReactiveFormsModule,
 } from "@angular/forms";
 
 import {RouterModule} from "@angular/router";
 import { HttpModule } from "@angular/http";
 import {
-  APP_BASE_HREF,
-  HashLocationStrategy,
-  LocationStrategy,
-  NgLocalization,
+    APP_BASE_HREF,
+    HashLocationStrategy,
+    LocationStrategy,
+    NgLocalization,
 } from "@angular/common";
 
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import Main from "./containers/main";
 import { APP_ROUTER_PROVIDERS, APP_DECLARATIONS } from "./app.routes";
 
-/* Here we import services */
 import {HelperDataService} from "./services/helper-data-service";
 import {LoaderService} from "./services/Spinner.service";
 import {AuthService} from "./services/auth.service";
@@ -53,54 +52,54 @@ import FooterComponent from "./components/footer/footer.component";
 import {enableProdMode} from "@angular/core";
 
 class MyLocalization extends NgLocalization {
-   getPluralCategory(value: any) {
-      if (value < 5) {
-         return "few";
-      }
-   }
+    getPluralCategory(value: any) {
+        if (value < 5) {
+            return "few";
+        }
+    }
 }
 
 @NgModule({
-  imports:      [
-    BrowserModule,
-    MyDatePickerModule,
-    FormsModule,
-    NguiAutoCompleteModule,
-    RouterModule,
-    ReactiveFormsModule,
-    APP_ROUTER_PROVIDERS,
-    HttpModule,
-    Ng2SmartTableModule,
-    NgReduxModule,
-    CookieModule.forRoot()
-  ],
-  declarations: [
-    Main, FooterComponent, HeaderComponent, NavbarComponent, MainComponent,
-    APP_DECLARATIONS,
-  ],
-  bootstrap: [ Main ],
-  providers: [
-    { provide: APP_BASE_HREF, useValue: "/" },
-    { provide: LocationStrategy, useClass: HashLocationStrategy },
-    { provide: NgLocalization, useClass: MyLocalization },
-    DevToolsExtension,
-    ACTION_PROVIDERS,
-    // Service1, again services here
-    HelperDataService,
-    LoaderService,
-    AuthService,
-    SchoolAuthGuard,
-    SchoolStudentsLockedGuard,
-    SchoolCapacityLockedGuard,
-    StudentAuthGuard,
-    StudentLockGuard,
-    RegionEduAuthGuard,
-    EduAdminAuthGuard,
-    MinistryAuthGuard,
-    ReportsAuthGuard
-  ]
+    imports: [
+        BrowserModule,
+        MyDatePickerModule,
+        FormsModule,
+        NguiAutoCompleteModule,
+        RouterModule,
+        ReactiveFormsModule,
+        APP_ROUTER_PROVIDERS,
+        HttpModule,
+        Ng2SmartTableModule,
+        NgReduxModule,
+        CookieModule.forRoot()
+    ],
+    declarations: [
+        Main, FooterComponent, HeaderComponent, NavbarComponent, MainComponent,
+        APP_DECLARATIONS,
+    ],
+    bootstrap: [Main],
+    providers: [
+        { provide: APP_BASE_HREF, useValue: "/" },
+        { provide: LocationStrategy, useClass: HashLocationStrategy },
+        { provide: NgLocalization, useClass: MyLocalization },
+        DevToolsExtension,
+        ACTION_PROVIDERS,
+        // Service1, again services here
+        HelperDataService,
+        LoaderService,
+        AuthService,
+        SchoolAuthGuard,
+        SchoolStudentsLockedGuard,
+        SchoolCapacityLockedGuard,
+        StudentAuthGuard,
+        StudentLockGuard,
+        RegionEduAuthGuard,
+        EduAdminAuthGuard,
+        MinistryAuthGuard,
+        ReportsAuthGuard
+    ]
 })
-class AppModule {}
+class AppModule { }
 
 // enableProdMode();
 platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/source/components/director/director-classcapacity.ts b/source/components/director/director-classcapacity.ts
index ae7450e01d851b20844003036ce95ae4e496ac85..ead720463cc8367faa0e372433c1afc5c3406c64 100644
--- a/source/components/director/director-classcapacity.ts
+++ b/source/components/director/director-classcapacity.ts
@@ -1,17 +1,17 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { VALID_CAPACITY_PATTERN} from '../../constants';
-import {maxValue} from '../../constants';
-import {minValue} from '../../constants';
+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 { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { VALID_CAPACITY_PATTERN} from "../../constants";
+import {maxValue} from "../../constants";
+import {minValue} from "../../constants";
 
 
 import {
@@ -20,9 +20,9 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 @Component({
-    selector: 'director-classcapacity',
+    selector: "director-classcapacity",
     template: `
     <div class = "loading" *ngIf="(showLoader | async) === true"></div>
     <div style="min-height: 500px;">
@@ -92,7 +92,7 @@ import {
 
 @Injectable() export default class DirectorClassCapacity implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
 
     private CapacityPerCourse$: BehaviorSubject<any>;
     private CapacityPerCourseSub: Subscription;
@@ -124,12 +124,11 @@ import {
 
 
     public showModal(popupMsgId): void {
-        (<any>$(popupMsgId)).modal('show');
+        (<any>$(popupMsgId)).modal("show");
     }
 
     public hideModal(popupMsgId): void {
-        //(<any>$('#distributionWaitingNotice')).modal('hide');
-        (<any>$(popupMsgId)).modal('hide');
+        (<any>$(popupMsgId)).modal("hide");
     }
 
     public onHidden(popupMsgId): void {
@@ -142,7 +141,7 @@ import {
     }
 
     ngOnInit() {
-        (<any>$('#checksaved1')).appendTo("body");
+        (<any>$("#checksaved1")).appendTo("body");
 
         this.CapacityPerCourseSub = this._hds.FindCapacityPerSchool().subscribe(x => {
             this.CapacityPerCourse$.next(x);
@@ -156,7 +155,7 @@ import {
 
 
     handleChange(e: Event) {
-        this.newvalue = e.target['value'];
+        this.newvalue = e.target["value"];
     }
 
     saveCapacity(spec, sect, taxi, oldvalue, ind) {
diff --git a/source/components/director/director-view.ts b/source/components/director/director-view.ts
index 1a4f706567c2383baeb985e74d29ccca28e1921c..fe69a2629969906c7c83ad8b8e9100600c1ff340 100644
--- a/source/components/director/director-view.ts
+++ b/source/components/director/director-view.ts
@@ -1,17 +1,17 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { VALID_CAPACITY_PATTERN} from '../../constants';
-import {maxValue} from '../../constants';
-import {minValue} from '../../constants';
+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 { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { VALID_CAPACITY_PATTERN} from "../../constants";
+import {maxValue} from "../../constants";
+import {minValue} from "../../constants";
 
 
 import {
@@ -20,9 +20,9 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 @Component({
-    selector: 'director-classcapacity',
+    selector: "director-classcapacity",
     template: `
 
 
@@ -284,7 +284,7 @@ import {
 
 @Injectable() export default class DirectorClassCapacity implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
 
     private CoursesPerSchool$: BehaviorSubject<any>;
     private CoursesPerSchoolSub: Subscription;
@@ -323,28 +323,28 @@ import {
 
 
     public showConfirmModal(): void {
-        (<any>$('#applicationDeleteConfirm')).modal('show');
+        (<any>$("#applicationDeleteConfirm")).modal("show");
     }
 
     public showErrorModal(): void {
-        (<any>$('#applicationDeleteError')).modal('show');
+        (<any>$("#applicationDeleteError")).modal("show");
     }
 
     public hideConfirmModal(): void {
-        (<any>$('#applicationDeleteConfirm')).modal('hide');
+        (<any>$("#applicationDeleteConfirm")).modal("hide");
     }
     public hideErrorModal(): void {
-        (<any>$('#applicationDeleteError')).modal('hide');
+        (<any>$("#applicationDeleteError")).modal("hide");
     }
 
 
     public showModal(popupMsgId): void {
-        (<any>$(popupMsgId)).modal('show');
+        (<any>$(popupMsgId)).modal("show");
     }
 
     public hideModal(popupMsgId): void {
 
-        (<any>$(popupMsgId)).modal('hide');
+        (<any>$(popupMsgId)).modal("hide");
     }
 
     public onHidden(popupMsgId): void {
@@ -353,16 +353,16 @@ import {
 
 
     ngOnDestroy() {
-        (<any>$('#applicationDeleteConfirm')).remove();
-        (<any>$('#applicationDeleteError')).remove();
+        (<any>$("#applicationDeleteConfirm")).remove();
+        (<any>$("#applicationDeleteError")).remove();
     }
 
     ngOnInit() {
-        (<any>$('#checksaved')).appendTo("body");
-        (<any>$('#dangermodal')).appendTo("body");
-        (<any>$('#emptyselection')).appendTo("body");
-        (<any>$('#applicationDeleteConfirm')).appendTo("body");
-        (<any>$('#applicationDeleteError')).appendTo("body");
+        (<any>$("#checksaved")).appendTo("body");
+        (<any>$("#dangermodal")).appendTo("body");
+        (<any>$("#emptyselection")).appendTo("body");
+        (<any>$("#applicationDeleteConfirm")).appendTo("body");
+        (<any>$("#applicationDeleteError")).appendTo("body");
         this.showLoader.next(true);
         this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => {
             this.CoursesPerSchool$.next(x);
@@ -399,7 +399,7 @@ import {
 
     setActive(ind) {
         this.StudentActive = -1;
-        if (this.courseActive == ind) {
+        if (this.courseActive === ind) {
             ind = -1;
         }
         this.courseActive = ind;
@@ -407,7 +407,7 @@ import {
 
     setActiveStudent(ind) {
         this.opened = true;
-        if (this.StudentActive == ind) {
+        if (this.StudentActive === ind) {
             ind = -1;
         }
         this.StudentActive = ind;
@@ -415,7 +415,7 @@ import {
 
     setActiveStudentnew(ind) {
         this.opened = false;
-        if (this.StudentActive == ind) {
+        if (this.StudentActive === ind) {
             ind = -1;
         }
         this.StudentActive = ind;
@@ -424,14 +424,14 @@ import {
 
 
     confirmStudent(student, cb, ind) {
-        var rtype;
-        if (cb.value == 1)
-            rtype = '1';
-        if (cb.value == 2)
-            rtype = '0';
-        if (cb.value == 3)
+        let rtype;
+        if (cb.value === 1)
+            rtype = "1";
+        if (cb.value === 2)
+            rtype = "0";
+        if (cb.value === 3)
             rtype = null;
-        var type = cb.value;
+        let type = cb.value;
         this.showLoader.next(true);
 
         let std = this.StudentInfo$.getValue();
@@ -474,7 +474,6 @@ import {
             this.CoursesPerSchoolSub.unsubscribe();
             this.showLoader.next(false);
             this.StudentActive = -1;
-            //this.courseActive = -1;
 
             this.CoursesPerSchoolSub = this._hds.FindCoursesPerSchool().subscribe(x => {
                 this.CoursesPerSchool$.next(x);
diff --git a/source/components/director/director.buttons.ts b/source/components/director/director.buttons.ts
index 2b9d7ee6b3ac36b3959d79557fece3125a088b8d..9f25872ac8142eb8268b1b1ee59fbc4d600769a9 100644
--- a/source/components/director/director.buttons.ts
+++ b/source/components/director/director.buttons.ts
@@ -1,8 +1,8 @@
-import {Router} from '@angular/router';
-import {OnInit, Component, Injectable} from '@angular/core';
+import {Router} from "@angular/router";
+import {OnInit, Component, Injectable} from "@angular/core";
 
 @Component({
-    selector: 'director-buttons',
+    selector: "director-buttons",
     template: `
            <div class="row" style="margin-top: 130px; margin-bottom: 200px;">
                <div class="col-md-3 offset-md-3">
@@ -23,21 +23,20 @@ import {OnInit, Component, Injectable} from '@angular/core';
 
     constructor(
         private router: Router,
-    )
-    {
+    ) {
     };
 
     ngOnInit() {
 
     }
 
-    navigatedirector(){
-        this.router.navigate(['/school/director-view']);
+    navigatedirector() {
+        this.router.navigate(["/school/director-view"]);
 
     }
 
-    navigatecapacity(){
-        this.router.navigate(['/school/director-classcapacity']);
+    navigatecapacity() {
+        this.router.navigate(["/school/director-classcapacity"]);
     }
 
 }
diff --git a/source/components/footer/footer.component.html b/source/components/footer/footer.component.html
index 18128b2e061b351b105028d64d38c8c642fd0baf..84fd5c4b5d21c3c5b096ef6adc29715aad7e6c78 100644
--- a/source/components/footer/footer.component.html
+++ b/source/components/footer/footer.component.html
@@ -1,20 +1,17 @@
 <div class="subfooter">
 </div>
 <footer class="footer">
-<div class="container">
+    <div class="container">
 
+        <div class="row">
+            <div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2017</span></div>
 
-
-
-    <div class="row">
-    <div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2017</span></div>
-
-    <div class="cols-xs-12 col-md-7 text-center">
-<span class="ft-text align-middle">
+            <div class="cols-xs-12 col-md-7 text-center">
+                <span class="ft-text align-middle">
 	Η εφαρμογή σχεδιάστηκε και υλοποιήθηκε από την <a href="http://ostmgmt.minedu.gov.gr/" target="_blank" >Ομάδα Ανοιχτού Λογισμικού του ΥΠΠΕΘ</a>
         <br></span>
-        <span class="ft-text align-middle"> <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.el" target="_blank" >    Άδεια χρήσης περιεχομένου: CC-BY-SA</a> </span>    </div>
-    <div class="col-xs-12 col-md-2"><span class="ft-text" style="text-align: right;">Version 1.0</span></div>
+                <span class="ft-text align-middle"> <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.el" target="_blank" >    Άδεια χρήσης περιεχομένου: CC-BY-SA</a> </span> </div>
+            <div class="col-xs-12 col-md-2"><span class="ft-text" style="text-align: right;">Version 1.0</span></div>
+        </div>
     </div>
-</div>
 </footer>
diff --git a/source/components/footer/footer.component.ts b/source/components/footer/footer.component.ts
index 12247e8021f23cc624ab9e546eccbf70eacf9efd..b7f9c25c74f78db2ce940070fce6b7ac5be4f32f 100644
--- a/source/components/footer/footer.component.ts
+++ b/source/components/footer/footer.component.ts
@@ -1,7 +1,7 @@
-import {Component} from '@angular/core';
+import {Component} from "@angular/core";
 
 @Component({
-  selector: 'reg-footer',
-  templateUrl: 'footer.component.html'
+    selector: "reg-footer",
+    templateUrl: "footer.component.html"
 })
 export default class FooterComponent { }
diff --git a/source/components/header/header.component.html b/source/components/header/header.component.html
index ee89cdd39e801248dfcc58c5ea2e33cb484777cb..2362601cef868b2539564afda751f815ddd05b96 100644
--- a/source/components/header/header.component.html
+++ b/source/components/header/header.component.html
@@ -29,15 +29,15 @@
                                 <span class="signout isclickable" (click)="goHome()" style="color:#CC3300;">&nbsp;&nbsp;Αρχική</span>
                             </div>
                             <div class="col-md-2">
-                                 <span *ngIf="loginInfoRow$.auth_role===studentRole" class="signout isclickable" (click)="gohelpDesk()" style="color:#CC3300;">Επικοινωνία</span>
+                                <span *ngIf="loginInfoRow$.auth_role===studentRole" class="signout isclickable" (click)="gohelpDesk()" style="color:#CC3300;">Επικοινωνία</span>
                             </div>
-                        <div class="col-md-4">
-                                 <span *ngIf="loginInfoRow$.auth_role===studentRole" class="signout" style="color:#CC3300;">
+                            <div class="col-md-4">
+                                <span *ngIf="loginInfoRow$.auth_role===studentRole" class="signout" style="color:#CC3300;">
                                 <div *ngFor="let TotalStudent$  of TotalStudents$ | async;">
                                     Σύνολο Δηλώσεων: {{TotalStudent$.numStudents}}
                                 </div>
                                 </span>
-                        </div>
+                            </div>
 
 
 
diff --git a/source/components/header/header.component.ts b/source/components/header/header.component.ts
index b1448628ed724a96f216e88614aa27eeb578148b..a8d7c807c2261611ed00a62680a927e6f4182b69 100644
--- a/source/components/header/header.component.ts
+++ b/source/components/header/header.component.ts
@@ -2,7 +2,7 @@ import {Component, OnInit, OnDestroy} from "@angular/core";
 import {Router} from "@angular/router";
 import { Injectable } from "@angular/core";
 
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
 import { NgRedux, select } from "@angular-redux/store";
 import { IAppState } from "../../store/store";
 import { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types";
@@ -14,10 +14,8 @@ 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 { CriteriaActions } from "../../actions/criteria.actions";
 import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions";
 
-
 @Component({
     selector: "reg-header",
     templateUrl: "header.component.html"
@@ -28,7 +26,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
     private authRole: string;
     private cuName: string;
     private loginInfo$: BehaviorSubject<ILoginInfo>;
-    public cuser: any;
+    private cuser: any;
     private showLoader$: BehaviorSubject<boolean>;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
@@ -47,7 +45,6 @@ export default class HeaderComponent implements OnInit, OnDestroy {
         private _rsa: RegionSchoolsActions,
         private _eca: EpalClassesActions,
         private _sdfa: StudentDataFieldsActions,
-        private _cria: CriteriaActions,
         private _ngRedux: NgRedux<IAppState>,
         private router: Router
     ) {
@@ -68,7 +65,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
 
     ngOnInit() {
         (<any>$("#headerNotice")).appendTo("body");
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .map(loginInfo => <ILoginInfo>loginInfo)
             .subscribe(loginInfo => {
                 if (loginInfo.size > 0) {
@@ -79,21 +76,20 @@ export default class HeaderComponent implements OnInit, OnDestroy {
                         return loginInfoToken;
                     }, {});
 
-                if (this.hasvalue == false)
-                {
-                this.showLoader.next(true);
-                this.TotalStudentsSub = this._hds.findTotalStudents().subscribe(x => {
-                this.TotalStudents$.next(x);
-                this.showLoader.next(false);
-                this.hasvalue = true;
-                },
-                error => {
-                    this.TotalStudents$.next([{}]);
-                    console.log("Error Getting courses perSchool");
-                    this.showLoader.next(false);
-                });
-
-                }
+                    if (this.hasvalue === false) {
+                        this.showLoader.next(true);
+                        this.TotalStudentsSub = this._hds.findTotalStudents().subscribe(x => {
+                            this.TotalStudents$.next(x);
+                            this.showLoader.next(false);
+                            this.hasvalue = true;
+                        },
+                            error => {
+                                this.TotalStudents$.next([{}]);
+                                console.log("Error Getting courses perSchool");
+                                this.showLoader.next(false);
+                            });
+
+                    }
 
                 }
 
@@ -110,7 +106,6 @@ export default class HeaderComponent implements OnInit, OnDestroy {
         if (this.loginInfoSub) {
             this.loginInfoSub.unsubscribe();
         }
-//        this.loginInfo$.unsubscribe();
 
     }
 
@@ -119,19 +114,16 @@ export default class HeaderComponent implements OnInit, OnDestroy {
         this._hds.signOut().then(data => {
             this._ata.initLoginInfo();
             if (this.authRole === SCHOOL_ROLE) {
-                // this.router.navigate(['/school']);
                 this.authToken = "";
                 this.authRole = "";
                 window.location.assign((<any>data).next);
             }
             else if (this.authRole === PDE_ROLE) {
-                // this.router.navigate(["/school"]);
                 this.authToken = "";
                 this.authRole = "";
                 window.location.assign((<any>data).next);
             }
             else if (this.authRole === DIDE_ROLE) {
-                // this.router.navigate(["/school"]);
                 this.authToken = "";
                 this.authRole = "";
                 window.location.assign((<any>data).next);
@@ -142,7 +134,6 @@ export default class HeaderComponent implements OnInit, OnDestroy {
                 this._rsa.initRegionSchools();
                 this._csa.initSectorCourses();
                 this._sdfa.initStudentDataFields();
-                this._cria.initCriteria();
                 this.router.navigate([""]);
             }
             else if (this.authRole === MINISTRY_ROLE) {
@@ -159,7 +150,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
 
     goHome() {
         if (this.authRole === SCHOOL_ROLE) {
-            this.router.navigate(['/school']);
+            this.router.navigate(["/school"]);
         }
         else if (this.authRole === PDE_ROLE) {
             this.router.navigate(["/school"]);
@@ -175,9 +166,8 @@ export default class HeaderComponent implements OnInit, OnDestroy {
         }
     }
 
-    gohelpDesk()
-    {
-       this.router.navigate(['/help-desk']);
+    gohelpDesk() {
+        this.router.navigate(["/help-desk"]);
     }
 
     public showModal(): void {
diff --git a/source/components/home.ts b/source/components/home.ts
index 3439f4bc26f8a0616d9402e258cde412115cd4a6..0c2c0c85d2e35207a8ee6c7777b525defc999f01 100644
--- a/source/components/home.ts
+++ b/source/components/home.ts
@@ -1,24 +1,24 @@
-import {Router, ActivatedRoute, Params} from '@angular/router';
-import {OnInit, OnDestroy, Component} from '@angular/core';
-import { LoginInfoActions } from '../actions/logininfo.actions';
-import { ILoginInfo } 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 { CookieService } from 'ngx-cookie';
-import { STUDENT_ROLE } from '../constants';
+import {Router, ActivatedRoute, Params} from "@angular/router";
+import {OnInit, OnDestroy, Component} from "@angular/core";
+import { LoginInfoActions } from "../actions/logininfo.actions";
+import { ILoginInfo } 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 { CookieService } from "ngx-cookie";
+import { STUDENT_ROLE } from "../constants";
 import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state";
 import {
     FormBuilder,
     FormGroup,
     FormControl,
     FormArray
-} from '@angular/forms';
+} from "@angular/forms";
 
-import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings';
+import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings";
 @Component({
-    selector: 'home',
+    selector: "home",
     template: `
   <div>
        <form [formGroup]="formGroup" method = "POST" action="{{apiEndPoint}}/oauth/login{{apiEndPointParams}}" #form>
@@ -39,9 +39,6 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings';
             </p>
             </div>
 
-
-
-
             <div *ngFor="let loginInfoToken$ of loginInfo$ | async; let i=index"></div>
             <div class="row" style="min-height: 300px; margin-top: 100px;">
 
@@ -58,7 +55,7 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings';
 })
 
 export default class Home implements OnInit, OnDestroy {
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private authToken: string;
     private authRole: string;
     private name: any;
@@ -74,11 +71,11 @@ export default class Home implements OnInit, OnDestroy {
         private activatedRoute: ActivatedRoute,
         private _hds: HelperDataService,
         private router: Router,
-        private _cookieService:CookieService
+        private _cookieService: CookieService
     ) {
-        this.authToken = '';
-        this.authRole = '';
-        this.name = '';
+        this.authToken = "";
+        this.authRole = "";
+        this.name = "";
         this.formGroup = this.fb.group({
         });
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
@@ -86,17 +83,17 @@ export default class Home implements OnInit, OnDestroy {
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select('loginInfo').subscribe(loginInfo => {
-            let linfo=<ILoginInfo>loginInfo;
+        this.loginInfoSub = this._ngRedux.select("loginInfo").subscribe(loginInfo => {
+            let linfo = <ILoginInfo>loginInfo;
             if (linfo.size > 0) {
                 linfo.reduce(({}, loginInfoToken) => {
                     this.authToken = loginInfoToken.auth_token;
                     this.authRole = loginInfoToken.auth_role;
                     if (this.authToken && this.authToken.length > 0 && this.authRole && this.authRole === STUDENT_ROLE) {
                         if (loginInfoToken.lock_application === 1)
-                            this.router.navigate(['/info']);
+                            this.router.navigate(["/info"]);
                         else {
-                            this.router.navigate(['/parent-form']);
+                            this.router.navigate(["/parent-form"]);
                         }
                     }
                     return loginInfoToken;
@@ -104,13 +101,13 @@ export default class Home implements OnInit, OnDestroy {
             }
 
             this.loginInfo$.next(linfo);
-        }, error => {console.log("error selecting loginInfo");});
+        }, error => { console.log("error selecting loginInfo"); });
 
         // subscribe to router event
         this.activatedRoute.queryParams.subscribe((params: Params) => {
             if (params) {
-                this.authToken = params['auth_token'];
-                this.authRole = params['auth_role'];
+                this.authToken = params["auth_token"];
+                this.authRole = params["auth_role"];
             }
 
             if (this.authToken && this.authRole)
@@ -119,15 +116,15 @@ export default class Home implements OnInit, OnDestroy {
         });
     }
 
-    ngOnDestroy () {
+    ngOnDestroy() {
         if (this.loginInfoSub) this.loginInfoSub.unsubscribe();
     }
 
-    getCookie(key: string){
+    getCookie(key: string) {
         return this._cookieService.get(key);
     }
 
-    removeCookie(key: string){
+    removeCookie(key: string) {
         return this._cookieService.remove(key);
     }
 
diff --git a/source/components/infoviews/eduadmin-view.ts b/source/components/infoviews/eduadmin-view.ts
index d93122725c2ae34a2624c3888ba620dc5310c350..12aab83ad04d18ab34656b623027ee8706673fd6 100644
--- a/source/components/infoviews/eduadmin-view.ts
+++ b/source/components/infoviews/eduadmin-view.ts
@@ -50,10 +50,10 @@ import {
                         <div class="col-md-8">Τμήματα</div>
                         <div class="col-md-2">Επιλεχθέντες</div>
                         <div class="col-md-2">Χωρητικότητα</div>
-                    </div> 
+                    </div>
                     <div class = "row" *ngFor="let CoursesNames$  of CoursesPerPerf$  | async; let j=index; let isOdd2=odd; let isEven2=even"
-                        [class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.size,CoursesNames$.limitdown)" 
-                        [class.changecolorbalck]="calccolor(CoursesNames$.limitdown, CoursesNames$.size)"    
+                        [class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.size,CoursesNames$.limitdown)"
+                        [class.changecolorbalck]="calccolor(CoursesNames$.limitdown, CoursesNames$.size)"
                         [class.selectedappout]="regionActive === j"
                         [hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
                         <div class="col-md-8">{{CoursesNames$.name}}</div>
@@ -70,7 +70,7 @@ import {
 
 @Injectable() export default class EduadminView implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private SchoolsPerPerf$: BehaviorSubject<any>;
     private SchoolPerPerfSub: Subscription;
     private LimitPerCateg$: BehaviorSubject<any>;
@@ -80,7 +80,6 @@ import {
     private StudentsSize$: BehaviorSubject<any>;
     private StudentsSizeSub: Subscription;
     private showLoader: BehaviorSubject<boolean>;
-    public perfecture;
     private regionActive = <number>-1;
     private School$: BehaviorSubject<any>;
     private SchoolSub: Subscription;
diff --git a/source/components/infoviews/perfecture-view.ts b/source/components/infoviews/perfecture-view.ts
index ef649d0aed9f50948d19b936e6dd4a2ecdd2a270..4e40afdc80638012f39d4d4ff7e9d30d7a61d5be 100644
--- a/source/components/infoviews/perfecture-view.ts
+++ b/source/components/infoviews/perfecture-view.ts
@@ -69,7 +69,7 @@ import {
 
 @Injectable() export default class EduadminView implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private SchoolsPerPerf$: BehaviorSubject<any>;
     private SchoolPerPerfSub: Subscription;
     private LimitPerCateg$: BehaviorSubject<any>;
@@ -79,7 +79,6 @@ import {
     private StudentsSize$: BehaviorSubject<any>;
     private StudentsSizeSub: Subscription;
     private showLoader: BehaviorSubject<boolean>;
-    public perfecture;
     private regionActive = <number>-1;
     private School$: BehaviorSubject<any>;
     private SchoolSub: Subscription;
diff --git a/source/components/main/breadcrumbs.ts b/source/components/main/breadcrumbs.ts
index f33ad397a29f57bedc9cf13282f064303dc5a7c5..285e0326c9a95792306e65b463e513d8cd1b7df4 100644
--- a/source/components/main/breadcrumbs.ts
+++ b/source/components/main/breadcrumbs.ts
@@ -1,20 +1,20 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy } from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { Router } from '@angular/router';
+import { AppSettings } from "../../app.settings";
+import { Router } from "@angular/router";
 
 
 @Component({
-    selector: 'breadcrumbs',
+    selector: "breadcrumbs",
     template: `
           <div [hidden]="currentUrl !== '/epal-class-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Τάξης </p></div>
-    			<div [hidden]="currentUrl !== '/sector-fields-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Τoμέα</p></div>
-    			<div [hidden]="currentUrl !== '/region-schools-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Σχολείου ανα Περιφερειακή Διεύθυνση</p></div>
-    			<div [hidden]="currentUrl !== '/sectorcourses-fields-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Ειδικότητας ανα τoμέα</p></div>
-    			<div [hidden]="currentUrl !== '/schools-order-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Σειρά Προτίμησης Επιλεχθέντων Σχολείων</p></div>
-    			<div [hidden]="currentUrl !== '/student-application-form-main'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Προσωπικά Στοιχεία</p></div>
-	 			  <div [hidden]="currentUrl !== '/application-submit'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Προεπισκόπηση Δήλωσης Προτίμησης</p></div>
-	 			  <div [hidden]="currentUrl !== '/submited-preview'" class="col-sm-12"><p class="crumb" > Υποβληθείσες Δηλώσεις Προτίμησης</p></div>
+          <div [hidden]="currentUrl !== '/sector-fields-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Τoμέα</p></div>
+          <div [hidden]="currentUrl !== '/region-schools-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Σχολείου ανα Περιφερειακή Διεύθυνση</p></div>
+          <div [hidden]="currentUrl !== '/sectorcourses-fields-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Επιλογή Ειδικότητας ανα τoμέα</p></div>
+          <div [hidden]="currentUrl !== '/schools-order-select'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Σειρά Προτίμησης Επιλεχθέντων Σχολείων</p></div>
+          <div [hidden]="currentUrl !== '/student-application-form-main'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Προσωπικά Στοιχεία</p></div>
+          <div [hidden]="currentUrl !== '/application-submit'" class="col-sm-12"><p class="crumb" >Νέα Δήλωση Προτίμησης -> Προεπισκόπηση Δήλωσης Προτίμησης</p></div>
+          <div [hidden]="currentUrl !== '/submited-preview'" class="col-sm-12"><p class="crumb" > Υποβληθείσες Δηλώσεις Προτίμησης</p></div>
 
           <div [hidden]="currentUrl !== '/ministry'" class="col-sm-12"><p class="crumb" > Διαχειριστής Υπουργείου Παιδείας -> Σύνδεση</p></div>
 
@@ -22,13 +22,11 @@ import { Router } from '@angular/router';
 })
 
 @Injectable() export default class Breadcrumbs implements OnInit {
-public currentUrl: string;
+    private currentUrl: string;
 
-constructor(private _router:Router) {}
-   ngOnInit() {
-
-   			this.currentUrl = this._router.url;
-
- 			}
+    constructor(private _router: Router) { }
+    ngOnInit() {
+        this.currentUrl = this._router.url;
+    }
 
 }
diff --git a/source/components/main/main.component.html b/source/components/main/main.component.html
index 05416ed3da7687a132465cd54e00509005055147..aefff7fd3a7ddca0328cd91e8e6a7e3d3ee5fac5 100644
--- a/source/components/main/main.component.html
+++ b/source/components/main/main.component.html
@@ -1,53 +1,53 @@
-  <div class="main-wrapper">
+<div class="main-wrapper">
     <div class="container" id="content">
-      <div class="row">
-      &nbsp;&nbsp;&nbsp;
-      </div>
+        <div class="row">
+            &nbsp;&nbsp;&nbsp;
+        </div>
 
-      <div class="row">
-        <div class="col-sm-12 col-md-3 hidden-md-down">
-          <div class="left-sidebar">
-           <div class="navig-left-img">
-               <img src="../myschool/assets/images/default.png" alt="">
-          </div>
-          <br>
-          <br>
-          <div class="left-choices">
-            <div class="row">
-            <div class="col-md-12">
-                <button type="button" class="btn-primary btn-lg pull-left isclickable" style="width: 10em;" (click)="navigatelegal()" >
+        <div class="row">
+            <div class="col-sm-12 col-md-3 hidden-md-down">
+                <div class="left-sidebar">
+                    <div class="navig-left-img">
+                        <img src="../myschool/assets/images/default.png" alt="">
+                    </div>
+                    <br>
+                    <br>
+                    <div class="left-choices">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <button type="button" class="btn-primary btn-lg pull-left isclickable" style="width: 10em;" (click)="navigatelegal()">
                     <span style="font-size: 0.9em; font-family: arial, sans-serif!important; font-weight: bold; color: #ffffff;"> Νομοθεσία </span>
                 </button>
-            </div>
-            </div>
-          </div>
+                            </div>
+                        </div>
+                    </div>
 
-          <div style="margin-top:15px; margin-bottom: 10px;" class="left-choices">
-            <div class="row">
-            <div class="col-md-12">
-                <a href="/pdfs/files/odigies.pdf" target="_blank" class="btn btn-primary btn-lg pull-left isclickable active" style="width: 10em; " role="button" aria-pressed="true">
-                    <span style="font-size: 0.9em; font-family: arial, sans-serif!important; font-weight: bold; color: #ffffff;">Οδηγίες χρήσης</span>
-                </a>
-            </div>
-            </div>
-          </div>
+                    <div style="margin-top:15px; margin-bottom: 10px;" class="left-choices">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <a href="/pdfs/files/odigies.pdf" target="_blank" class="btn btn-primary btn-lg pull-left isclickable active" style="width: 10em; " role="button" aria-pressed="true">
+                                    <span style="font-size: 0.9em; font-family: arial, sans-serif!important; font-weight: bold; color: #ffffff;">Οδηγίες χρήσης</span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
 
-         <div class="left-choices">
-            <application-preview-select></application-preview-select>
-         </div>
+                    <div class="left-choices">
+                        <application-preview-select></application-preview-select>
+                    </div>
 
-        </div>
-        </div>
-        <div class="col-sm-12 col-md-9">
-          <div class="main-content">
+                </div>
+            </div>
+            <div class="col-sm-12 col-md-9">
+                <div class="main-content">
 
-           <div class="panel panel-primary">
-            <div class="panel-body">
-              <router-outlet></router-outlet>
+                    <div class="panel panel-primary">
+                        <div class="panel-body">
+                            <router-outlet></router-outlet>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
+</div>
diff --git a/source/components/main/main.component.ts b/source/components/main/main.component.ts
index cfc093a0685aaa7e9caf305cac045f78f0656623..617dc2c174fd7c8f9e0b703919954e8bc271ce55 100644
--- a/source/components/main/main.component.ts
+++ b/source/components/main/main.component.ts
@@ -1,18 +1,18 @@
-import {Component} from '@angular/core';
+import {Component} from "@angular/core";
 import { Router } from "@angular/router";
 
 @Component({
-  selector: 'reg-main',
-  templateUrl: 'main.component.html'
+    selector: "reg-main",
+    templateUrl: "main.component.html"
 })
-export default class MainComponent { 
+export default class MainComponent {
 
-	constructor(
+    constructor(
         private router: Router
-    ) {}
+    ) { }
 
-navigatelegal() {
-  this.router.navigate(['/legal-info']);
+    navigatelegal() {
+        this.router.navigate(["/legal-info"]);
     }
 
 }
diff --git a/source/components/minister/chart-creator.ts b/source/components/minister/chart-creator.ts
index 57de74debf56e6e0ea149fae44c7747104d0094c..4c94c923b387769e4fa57482c3b3375f886eb641 100644
--- a/source/components/minister/chart-creator.ts
+++ b/source/components/minister/chart-creator.ts
@@ -1,100 +1,98 @@
-import * as d3 from 'd3';
+import * as d3 from "d3";
 import {  ElementRef, ViewChild } from "@angular/core";
 
-export class chartCreator {
-
-  //d3 test
-  @ViewChild('chart') public chartContainer: ElementRef;
-  //@Input() private d3data: Array<any>;
-  public d3data: Array<any>;
-  private margin: any = { top: 20, bottom: 20, left: 20, right: 20};
-  private chart: any;
-  private width: number;
-  private height: number;
-  private xScale: any;
-  private yScale: any;
-  private colors: any;
-  private xAxis: any;
-  private yAxis: any;
-
-  createChart() {
-      let element = this.chartContainer.nativeElement;
-      this.width = element.offsetWidth - this.margin.left - this.margin.right;
-      this.height = element.offsetHeight - this.margin.top - this.margin.bottom;
-      let svg = d3.select(element).append('svg')
-        .attr('width', element.offsetWidth)
-        .attr('height', element.offsetHeight);
-
-      // chart plot area
-
-      this.chart = svg.append('g')
-        .attr('class', 'bars')
-        .attr('transform', `translate(${this.margin.left}, ${this.margin.top})`);
-
-
-      // define X & Y domains
-      let xDomain = this.d3data.map(d => d[0]);
-      let yDomain = [0, d3.max(this.d3data, d => d[1])];
-      //let yDomain = [0, 1000];
-
-      // create scales
-      this.xScale = d3.scaleBand().padding(0.1).domain(xDomain).rangeRound([0, this.width]);
-      this.yScale = d3.scaleLinear().domain(yDomain).range([this.height, 0]);
-      //this.yScale = d3.scaleLinear().domain(yDomain).range([1000, 0]);
-
-      // bar colors
-      this.colors = d3.scaleLinear().domain([0, this.d3data.length]).range(<any[]>['red', 'blue']);
-
-
-      // x & y axis
-      this.xAxis = svg.append('g')
-        .attr('class', 'axis axis-x')
-        .attr('transform', `translate(${this.margin.left}, ${this.margin.top + this.height})`)
-        .call(d3.axisBottom(this.xScale));
-
-      this.yAxis = svg.append('g')
-        .attr('class', 'axis axis-y')
-        .attr('transform', `translate(${this.margin.left}, ${this.margin.top})`)
-        .call(d3.axisLeft(this.yScale));
+export class ChartCreator {
+
+    @ViewChild("chart") public chartContainer: ElementRef;
+    public d3data: Array<any>;
+    private margin: any = { top: 20, bottom: 20, left: 20, right: 20 };
+    private chart: any;
+    private width: number;
+    private height: number;
+    private xScale: any;
+    private yScale: any;
+    private colors: any;
+    private xAxis: any;
+    private yAxis: any;
+
+    createChart() {
+        let element = this.chartContainer.nativeElement;
+        this.width = element.offsetWidth - this.margin.left - this.margin.right;
+        this.height = element.offsetHeight - this.margin.top - this.margin.bottom;
+        let svg = d3.select(element).append("svg")
+            .attr("width", element.offsetWidth)
+            .attr("height", element.offsetHeight);
+
+        // chart plot area
+
+        this.chart = svg.append("g")
+            .attr("class", "bars")
+            .attr("transform", `translate(${this.margin.left}, ${this.margin.top})`);
+
+
+        // define X & Y domains
+        let xDomain = this.d3data.map(d => d[0]);
+        let yDomain = [0, d3.max(this.d3data, d => d[1])];
+        // let yDomain = [0, 1000];
+
+        // create scales
+        this.xScale = d3.scaleBand().padding(0.1).domain(xDomain).rangeRound([0, this.width]);
+        this.yScale = d3.scaleLinear().domain(yDomain).range([this.height, 0]);
+        // this.yScale = d3.scaleLinear().domain(yDomain).range([1000, 0]);
+
+        // bar colors
+        this.colors = d3.scaleLinear().domain([0, this.d3data.length]).range(<any[]>["red", "blue"]);
+
+
+        // x & y axis
+        this.xAxis = svg.append("g")
+            .attr("class", "axis axis-x")
+            .attr("transform", `translate(${this.margin.left}, ${this.margin.top + this.height})`)
+            .call(d3.axisBottom(this.xScale));
+
+        this.yAxis = svg.append("g")
+            .attr("class", "axis axis-y")
+            .attr("transform", `translate(${this.margin.left}, ${this.margin.top})`)
+            .call(d3.axisLeft(this.yScale));
 
     }
 
     updateChart() {
-     // update scales & axis
-     this.xScale.domain(this.d3data.map(d => d[0]));
-     this.yScale.domain([0, d3.max(this.d3data, d => d[1])]);
-     this.colors.domain([0, this.d3data.length]);
-     this.xAxis.transition().call(d3.axisBottom(this.xScale));
-     this.yAxis.transition().call(d3.axisLeft(this.yScale));
-
-     let update = this.chart.selectAll('.bar')
-       .data(this.d3data);
-
-     // remove exiting bars
-     update.exit().remove();
-
-     // update existing bars
-     this.chart.selectAll('.bar').transition()
-       .attr('x', d => this.xScale(d[0]))
-       .attr('y', d => this.yScale(d[1]))
-       .attr('width', d => this.xScale.bandwidth())
-       .attr('height', d => this.height - this.yScale(d[1]))
-       .style('fill', (d, i) => this.colors(i));
-
-     // add new bars
-     update
-       .enter()
-       .append('rect')
-       .attr('class', 'bar')
-       .attr('x', d => this.xScale(d[0]))
-       .attr('y', d => this.yScale(0))
-       .attr('width', this.xScale.bandwidth())
-       .attr('height', 0)
-       .style('fill', (d, i) => this.colors(i))
-       .transition()
-       .delay((d, i) => i * 10)
-       .attr('y', d => this.yScale(d[1]))
-       .attr('height', d => this.height - this.yScale(d[1]));
-   }
+        // update scales & axis
+        this.xScale.domain(this.d3data.map(d => d[0]));
+        this.yScale.domain([0, d3.max(this.d3data, d => d[1])]);
+        this.colors.domain([0, this.d3data.length]);
+        this.xAxis.transition().call(d3.axisBottom(this.xScale));
+        this.yAxis.transition().call(d3.axisLeft(this.yScale));
+
+        let update = this.chart.selectAll(".bar")
+            .data(this.d3data);
+
+        // remove exiting bars
+        update.exit().remove();
+
+        // update existing bars
+        this.chart.selectAll(".bar").transition()
+            .attr("x", d => this.xScale(d[0]))
+            .attr("y", d => this.yScale(d[1]))
+            .attr("width", d => this.xScale.bandwidth())
+            .attr("height", d => this.height - this.yScale(d[1]))
+            .style("fill", (d, i) => this.colors(i));
+
+        // add new bars
+        update
+            .enter()
+            .append("rect")
+            .attr("class", "bar")
+            .attr("x", d => this.xScale(d[0]))
+            .attr("y", d => this.yScale(0))
+            .attr("width", this.xScale.bandwidth())
+            .attr("height", 0)
+            .style("fill", (d, i) => this.colors(i))
+            .transition()
+            .delay((d, i) => i * 10)
+            .attr("y", d => this.yScale(d[1]))
+            .attr("height", d => this.height - this.yScale(d[1]));
+    }
 
 }
diff --git a/source/components/minister/csv-creator.ts b/source/components/minister/csv-creator.ts
index 5e766f8fe4054c05d7a9a05089535a02083c9e22..8eda81dba3371edfa2b5db9dcf0e9d6bed4ae4b1 100644
--- a/source/components/minister/csv-creator.ts
+++ b/source/components/minister/csv-creator.ts
@@ -1,111 +1,111 @@
-import {reportsSchema, TableColumn} from './reports-schema';
-import { LocalDataSource } from 'ng2-smart-table';
+import {ReportsSchema, TableColumn} from "./reports-schema";
+import { LocalDataSource } from "ng2-smart-table";
 import { Input } from "@angular/core";
 
-export class csvCreator {
+export class CsvCreator {
 
-  public source: LocalDataSource;
-  columnMap: Map<string,TableColumn> = new Map<string,TableColumn>();
-  @Input() settings: any;
-  private reportSchema = new  reportsSchema();
+    public source: LocalDataSource;
+    columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
+    @Input() settings: any;
+    private reportSchema = new ReportsSchema();
 
-  onSearch(query: string = '') {
+    onSearch(query: string = "") {
 
-    this.source.setFilter([
-      // fields we want to include in the search
-      {
-        field: 'name',
-        search: query
-      }
-    ], false);
+        this.source.setFilter([
+            // fields we want to include in the search
+            {
+                field: "name",
+                search: query
+            }
+        ], false);
 
 
-  // second parameter specifying whether to perform 'AND' or 'OR' search
-  // (meaning all columns should contain search query or at least one)
-  // 'AND' by default, so changing to 'OR' by setting false here
-}
-
-
-export2Csv(): void {
-
-  const columns: TableColumn[] = Array.from(this.columnMap.values());
-
-  let encodedStr = columns.reduce((acct, current: TableColumn) => {
-
-    if (current.isExport != false) {
-      return acct += '"' + current.title + '",';
-    }
-    else {
-      return acct;
+        // second parameter specifying whether to perform "AND" or "OR" search
+        // (meaning all columns should contain search query or at least one)
+        // "AND" by default, so changing to "OR" by setting false here
     }
-  }, '');
-  encodedStr = encodedStr.slice(0, -1);
-  encodedStr += '\r\n';
 
-  let fields: string[] = columns.reduce((acct, column: TableColumn) => {
 
-    if (column.isExport != false) {
-      acct.push(column.field);
+    export2Csv(): void {
+
+        const columns: TableColumn[] = Array.from(this.columnMap.values());
+
+        let encodedStr = columns.reduce((acct, current: TableColumn) => {
+
+            if (current.isExport !== false) {
+                return acct += "'" + current.title + "',";
+            }
+            else {
+                return acct;
+            }
+        }, "");
+        encodedStr = encodedStr.slice(0, -1);
+        encodedStr += "\r\n";
+
+        let fields: string[] = columns.reduce((acct, column: TableColumn) => {
+
+            if (column.isExport !== false) {
+                acct.push(column.field);
+            }
+            return acct;
+        }, []);
+
+        this.source.getAll().then((rows) => {
+
+            rows.forEach((row) => {
+                fields.forEach((field) => {
+                    if (row.hasOwnProperty(field)) {
+                        let value = row[field];
+
+                        if (!value) {
+                            value = "";
+                        }
+                        let valuePrepare = this.columnMap.get(field).valuePrepareFunction;
+                        if (valuePrepare) {
+                            value = valuePrepare.call(null, value, row);
+                        }
+                        encodedStr += "'" + value + "',";
+                    }
+                });
+                encodedStr = encodedStr.slice(0, -1);
+                encodedStr += "\r\n";
+            });
+
+            let a = document.createElement("a");
+            a.setAttribute("style", "display:none;");
+            document.body.appendChild(a);
+
+            // Set utf-8 header to let excel recognize its encoding
+            let blob = new Blob(["\ufeff", encodedStr], { type: "text/csv" });
+            a.href = window.URL.createObjectURL(blob);
+            a.download = (this.settings.fileName || "epalSystemReport") + "all_stat" + ".csv";
+            a.click();
+        });
     }
-    return acct;
-  }, []);
-
-  this.source.getAll().then((rows) => {
-
-    rows.forEach((row) => {
-      fields.forEach((field) => {
-        if (row.hasOwnProperty(field)) {
-          let value = row[field];
-
-          if (!value) {
-            value = "";
-          }
-          let valuePrepare = this.columnMap.get(field).valuePrepareFunction;
-          if (valuePrepare) {
-            value = valuePrepare.call(null, value, row);
-          }
-          encodedStr += '"' + value + '",'
-        }
-      });
-      encodedStr = encodedStr.slice(0, -1);
-      encodedStr += '\r\n';
-    });
-
-    let a = document.createElement("a");
-    a.setAttribute('style', 'display:none;');
-    document.body.appendChild(a);
-
-    //Set utf-8 header to let excel recognize its encoding
-    let blob = new Blob(["\ufeff", encodedStr], {type: 'text/csv'});
-    a.href = window.URL.createObjectURL(blob);
-    a.download = (this.settings.fileName || 'epalSystemReport') + "all_stat" +  '.csv';
-    a.click();
-  });
-}
 
 
-prepareColumnMap(): void {
+    prepareColumnMap(): void {
 
-  for (const key in this.settings.columns) {
+        for (const key in this.settings.columns) {
 
-    if (!this.settings.columns.hasOwnProperty(key)) {
-      continue;
-    }
+            if (!this.settings.columns.hasOwnProperty(key)) {
+                continue;
+            }
 
-    const title: string = this.settings.columns[key]['title'];
-    let column: TableColumn = new TableColumn();
-    column.type = this.settings.columns[key]['type'];
-    column.title = this.settings.columns[key]['title'];
-    column.field = key;
-    column.isDisplay = this.settings.columns[key]['isDisplay'];
-    column.isExport = this.settings.columns[key]['isExport'];
-    column.valuePrepareFunction = this.settings.columns[key]['valuePrepareFunction'];
-    this.columnMap.set(column.field, column);
-
-    if (this.settings.columns[key].isDisplay == false) {
-      delete this.settings.columns[key];
+            const title: string = this.settings.columns[key]["title"];
+            let column: TableColumn = new TableColumn();
+            column.type = this.settings.columns[key]["type"];
+            column.title = this.settings.columns[key]["title"];
+            column.field = key;
+            column.isDisplay = this.settings.columns[key]["isDisplay"];
+            column.isExport = this.settings.columns[key]["isExport"];
+            column.valuePrepareFunction = this.settings.columns[key]["valuePrepareFunction"];
+            this.columnMap.set(column.field, column);
+
+            if (this.settings.columns[key].isDisplay === false) {
+                delete this.settings.columns[key];
+            }
+        }
     }
-  }
-}
 
 }
diff --git a/source/components/minister/minister-informstudents.ts b/source/components/minister/minister-informstudents.ts
index e22bca69bdb145a5d9297c14d6229b3954ff000b..c16dd3183188d271491b1a7e5bf384e7d3311b8a 100644
--- a/source/components/minister/minister-informstudents.ts
+++ b/source/components/minister/minister-informstudents.ts
@@ -1,19 +1,19 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild } from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
-import { API_ENDPOINT } 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 { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
+import { API_ENDPOINT } from "../../app.settings";
 
 @Component({
-    selector: 'minister-informstudents',
+    selector: "minister-informstudents",
     template: `
 
     <div
@@ -140,18 +140,20 @@ import { API_ENDPOINT } from '../../app.settings';
 
     ngOnInit() {
 
-        (<any>$('#emaiSentNotice')).appendTo("body");
-
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({ }, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        (<any>$("#emaiSentNotice")).appendTo("body");
+
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({ }, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
         this.numSuccessMails = 0;
         this.numFailMails = 0;
@@ -163,32 +165,25 @@ import { API_ENDPOINT } from '../../app.settings';
 
     ngOnDestroy() {
 
-        (<any>$('#emaiSentNotice')).remove();
+        (<any>$("#emaiSentNotice")).remove();
 
         if (this.loginInfoSub)
             this.loginInfoSub.unsubscribe();
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
         if (this.settingsSub)
             this.settingsSub.unsubscribe();
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
-        if (this.settings$)
-            this.settings$.unsubscribe();
-
 
     }
 
     public showModal(): void {
-        (<any>$('#emaiSentNotice')).modal('show');
+        (<any>$("#emaiSentNotice")).modal("show");
     }
 
     public hideModal(): void {
-        (<any>$('#emaiSentNotice')).modal('hide');
+        (<any>$("#emaiSentNotice")).modal("hide");
     }
 
     public onHidden(): void {
-        //this.isModalShown.next(false);
+        // this.isModalShown.next(false);
     }
 
     informUnlocatedStudents(unallocated, period) {
@@ -206,7 +201,7 @@ import { API_ENDPOINT } from '../../app.settings';
                 this.modalHeader.next("modal-header-success");
                 this.modalTitle.next("Κατανομή Μαθητών");
                 let txtModal = "Έγινε αποστολή " + this.numSuccessMails + " e-mails! ";
-                if (this.numFailMails != 0) {
+                if (this.numFailMails !== 0) {
                     this.modalHeader.next("modal-header-warning");
                     txtModal += "Κάποια e-mail δεν έχουν σταλεί. Δεν ήταν δυνατή η αποστολή " + this.numFailMails + " e-mails!";
                 }
@@ -229,9 +224,9 @@ import { API_ENDPOINT } from '../../app.settings';
         this.settingsSub = this._hds.retrieveAdminSettings(this.minedu_userName, this.minedu_userPassword)
             .subscribe(data => {
                 this.settings$.next(data);
-                this.applicantsResultsDisabled = Boolean(Number(this.settings$.value['applicantsResultsDisabled']));
+                this.applicantsResultsDisabled = Boolean(Number(this.settings$.value["applicantsResultsDisabled"]));
 
-                if (this.applicantsResultsDisabled == false) {
+                if (this.applicantsResultsDisabled === false) {
                     this.modalTitle.next("Κατανομή Μαθητών");
                     this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να αποστείλετε e-mail ενημέρωσης, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
                         ("τη δυνατότητα της προβολής αποτελεσμάτων κατανομής από τους μαθητές."));
diff --git a/source/components/minister/minister-reports.ts b/source/components/minister/minister-reports.ts
index 664948b7d7acc937392732aa642dda57e8e389bb..f5e6f929d7770cd0c5927833d1355a8e5e6558fe 100644
--- a/source/components/minister/minister-reports.ts
+++ b/source/components/minister/minister-reports.ts
@@ -87,9 +87,9 @@ import { API_ENDPOINT } from "../../app.settings";
 
 @Injectable() export default class MinisterReports implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
-    loginInfoSub: Subscription;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
+    private loginInfoSub: Subscription;
     private apiEndPoint = API_ENDPOINT;
     private minedu_userName: string;
     private minedu_userPassword: string;
@@ -116,21 +116,23 @@ import { API_ENDPOINT } from "../../app.settings";
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    if (loginInfoToken.auth_role === PDE_ROLE || loginInfoToken.auth_role === DIDE_ROLE) {
-                        this.userRole = loginInfoToken.auth_role;
-                        this.minedu_userName = loginInfoToken.auth_token;
-                        this.minedu_userPassword = loginInfoToken.auth_token;
-                    }
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        if (loginInfoToken.auth_role === PDE_ROLE || loginInfoToken.auth_role === DIDE_ROLE) {
+                            this.userRole = loginInfoToken.auth_role;
+                            this.minedu_userName = loginInfoToken.auth_token;
+                            this.minedu_userPassword = loginInfoToken.auth_token;
+                        }
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
     }
 
@@ -138,9 +140,6 @@ import { API_ENDPOINT } from "../../app.settings";
         if (this.loginInfoSub) {
             this.loginInfoSub.unsubscribe();
         }
-        if (this.loginInfo$) {
-            this.loginInfo$.unsubscribe();
-        }
     }
 
     nav_to_reportpath(repId) {
diff --git a/source/components/minister/minister-settings.ts b/source/components/minister/minister-settings.ts
index 61a273943fe85057b8595d6e5da7a54763b2c211..c4439262b08c7a4ae8929ef94870c9ef6c416465 100644
--- a/source/components/minister/minister-settings.ts
+++ b/source/components/minister/minister-settings.ts
@@ -1,15 +1,15 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
+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 { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
 
 
 import {
@@ -18,11 +18,11 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 
 
 @Component({
-    selector: 'minister-settings',
+    selector: "minister-settings",
     template: `
 
     <div
@@ -120,13 +120,13 @@ import {
 
 @Injectable() export default class MinisterSettings implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
     private modalHeader: BehaviorSubject<string>;
     private settings$: BehaviorSubject<any>;
-    loginInfoSub: Subscription;
+    private loginInfoSub: Subscription;
     private settingsSub: Subscription;
 
     private capacityDisabled: boolean;
@@ -145,11 +145,11 @@ import {
         private router: Router) {
 
         this.formGroup = this.fb.group({
-            capacityDisabled: ['', []],
-            directorViewDisabled: ['', []],
-            applicantsLoginDisabled: ['', []],
-            applicantsResultsDisabled: ['', []],
-            secondPeriodEnabled: ['', []],
+            capacityDisabled: ["", []],
+            directorViewDisabled: ["", []],
+            applicantsLoginDisabled: ["", []],
+            applicantsResultsDisabled: ["", []],
+            secondPeriodEnabled: ["", []],
         });
 
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
@@ -161,46 +161,44 @@ import {
     }
 
     public showModal(): void {
-        (<any>$('#configNotice')).modal('show');
+        (<any>$("#configNotice")).modal("show");
     }
 
     public hideModal(): void {
-        (<any>$('#configNotice')).modal('hide');
+        (<any>$("#configNotice")).modal("hide");
     }
 
     public onHidden(): void {
-        //this.isModalShown.next(false);
+        // this.isModalShown.next(false);
     }
 
 
     ngOnDestroy() {
 
-        (<any>$('#configNotice')).remove();
+        (<any>$("#configNotice")).remove();
 
         if (this.loginInfoSub)
             this.loginInfoSub.unsubscribe();
         if (this.settingsSub)
             this.settingsSub.unsubscribe();
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
-        if (this.settings$)
-            this.settings$.unsubscribe();
     }
 
     ngOnInit() {
 
-        (<any>$('#configNotice')).appendTo("body");
-
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        (<any>$("#configNotice")).appendTo("body");
+
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
         this.retrieveSettings();
 
@@ -212,11 +210,11 @@ import {
 
         this.settingsSub = this._hds.retrieveAdminSettings(this.minedu_userName, this.minedu_userPassword).subscribe(data => {
             this.settings$.next(data);
-            this.capacityDisabled = Boolean(Number(this.settings$.value['capacityDisabled']));
-            this.directorViewDisabled = Boolean(Number(this.settings$.value['directorViewDisabled']));
-            this.applicantsLoginDisabled = Boolean(Number(this.settings$.value['applicantsLoginDisabled']));
-            this.applicantsResultsDisabled = Boolean(Number(this.settings$.value['applicantsResultsDisabled']));
-            this.secondPeriodEnabled = Boolean(Number(this.settings$.value['secondPeriodEnabled']));
+            this.capacityDisabled = Boolean(Number(this.settings$.value["capacityDisabled"]));
+            this.directorViewDisabled = Boolean(Number(this.settings$.value["directorViewDisabled"]));
+            this.applicantsLoginDisabled = Boolean(Number(this.settings$.value["applicantsLoginDisabled"]));
+            this.applicantsResultsDisabled = Boolean(Number(this.settings$.value["applicantsResultsDisabled"]));
+            this.secondPeriodEnabled = Boolean(Number(this.settings$.value["secondPeriodEnabled"]));
 
             this.dataRetrieved = 1;
         },
diff --git a/source/components/minister/minister-view.ts b/source/components/minister/minister-view.ts
index dfa17ff0354e294f42b8668d33e6c4c685a45c58..17d6fb34a2f8dc7c6477a489bc2a4a556525ecf4 100644
--- a/source/components/minister/minister-view.ts
+++ b/source/components/minister/minister-view.ts
@@ -1,29 +1,24 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
+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 { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
 
 
-import { API_ENDPOINT } from '../../app.settings';
+import { API_ENDPOINT } from "../../app.settings";
 
 @Component({
-    selector: 'minister-view',
+    selector: "minister-view",
     template: `
 
     <h5> >Κατανομή <br></h5>
-    <!--
-    <div class="row">
-         <breadcrumbs></breadcrumbs>
-    </div>
-    -->
 
     <div
       class = "loading" *ngIf=" distStatus === 'STARTED'" >
@@ -100,8 +95,7 @@ import { API_ENDPOINT } from '../../app.settings';
 
 @Injectable() export default class MinisterView implements OnInit, OnDestroy {
 
-    //public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
     private modalHeader: BehaviorSubject<string>;
@@ -123,145 +117,143 @@ import { API_ENDPOINT } from '../../app.settings';
         private _hds: HelperDataService,
         private activatedRoute: ActivatedRoute,
         private router: Router) {
-          this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
-          this.modalTitle =  new BehaviorSubject("");
-          this.modalText =  new BehaviorSubject("");
-          this.modalHeader =  new BehaviorSubject("");
-          this.settings$ = new BehaviorSubject([{}]);
+        this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+        this.modalHeader = new BehaviorSubject("");
+        this.settings$ = new BehaviorSubject([{}]);
     }
 
-    public showModal(popupMsgId):void {
-        (<any>$(popupMsgId)).modal('show');
+    public showModal(popupMsgId): void {
+        (<any>$(popupMsgId)).modal("show");
     }
 
-    public hideModal(popupMsgId):void {
-        (<any>$(popupMsgId)).modal('hide');
+    public hideModal(popupMsgId): void {
+        (<any>$(popupMsgId)).modal("hide");
     }
 
-    public onHidden(popupMsgId):void {
+    public onHidden(popupMsgId): void {
 
     }
 
     ngOnDestroy() {
-      (<any>$('#distributionWaitingNotice')).remove();
-      (<any>$('#distributionNotice')).remove();
-      if (this.loginInfoSub)
-        this.loginInfoSub.unsubscribe();
-      if (this.settingsSub)
-        this.settingsSub.unsubscribe();
-      if (this.loginInfo$)
-        this.loginInfo$.unsubscribe();
-      if (this.settings$)
-        this.settings$.unsubscribe();
+        (<any>$("#distributionWaitingNotice")).remove();
+        (<any>$("#distributionNotice")).remove();
+        if (this.loginInfoSub)
+            this.loginInfoSub.unsubscribe();
+        if (this.settingsSub)
+            this.settingsSub.unsubscribe();
     }
 
     ngOnInit() {
-      (<any>$('#distributionWaitingNotice')).appendTo("body");
-      (<any>$('#distributionNotice')).appendTo("body");
-      this.loginInfoSub = this._ngRedux.select(state => {
-          if (state.loginInfo.size > 0) {
-              state.loginInfo.reduce(({}, loginInfoToken) => {
-                this.minedu_userName = loginInfoToken.minedu_username;
-                this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                  return loginInfoToken;
-              }, {});
-          }
-          return state.loginInfo;
-      }).subscribe(this.loginInfo$);
-
-      this.retrieveSettings();
+        (<any>$("#distributionWaitingNotice")).appendTo("body");
+        (<any>$("#distributionNotice")).appendTo("body");
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
+
+        this.retrieveSettings();
 
     }
 
 
     runDistribution() {
-      this.distStatus = "STARTED";
-      this.showModal("#distributionWaitingNotice");
-      this._hds.makeDistribution(this.minedu_userName, this.minedu_userPassword)
-      .then(msg => {
-          this.modalTitle.next("Κατανομή Μαθητών");
-          this.modalText.next("Η κατανομή ολοκληρώθηκε με επιτυχία!");
-          this.modalHeader.next("modal-header-success");
-          this.showModal("#distributionNotice");
-
-          if (this.distStatus !== "ERROR")
-            this.distStatus = "FINISHED";
-      })
-      .catch(err => {
-          console.log(err);
-          this.distStatus = "ERROR";
-
-          this.modalTitle.next("Κατανομή Μαθητών");
-          this.modalText.next("Αποτυχία κατανομής. Προσπαθήστε ξανά. Σε περίπτωση που το πρόβλημα παραμένει, παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος.");
-          this.modalHeader.next("modal-header-danger");
-          this.showModal("#distributionNotice");
-        });
+        this.distStatus = "STARTED";
+        this.showModal("#distributionWaitingNotice");
+        this._hds.makeDistribution(this.minedu_userName, this.minedu_userPassword)
+            .then(msg => {
+                this.modalTitle.next("Κατανομή Μαθητών");
+                this.modalText.next("Η κατανομή ολοκληρώθηκε με επιτυχία!");
+                this.modalHeader.next("modal-header-success");
+                this.showModal("#distributionNotice");
+
+                if (this.distStatus !== "ERROR")
+                    this.distStatus = "FINISHED";
+            })
+            .catch(err => {
+                console.log(err);
+                this.distStatus = "ERROR";
+
+                this.modalTitle.next("Κατανομή Μαθητών");
+                this.modalText.next("Αποτυχία κατανομής. Προσπαθήστε ξανά. Σε περίπτωση που το πρόβλημα παραμένει, παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος.");
+                this.modalHeader.next("modal-header-danger");
+                this.showModal("#distributionNotice");
+            });
     }
 
     runDistributionSecondPeriod() {
 
-      this.distStatus = "STARTED";
+        this.distStatus = "STARTED";
 
-      this.showModal("#distributionWaitingNotice");
+        this.showModal("#distributionWaitingNotice");
 
-      this._hds.makeDistributionSecondPeriod(this.minedu_userName, this.minedu_userPassword)
-      .then(msg => {
-          this.modalTitle.next("Τοποθέτηση Μαθητών 2ης Περιόδου Αιτήσεων");
-          this.modalText.next("Η τοποθέτηση μαθητών της δεύτερης περιόδου αιτήσεων ολοκληρώθηκε με επιτυχία!");
-          this.modalHeader.next("modal-header-success");
-          this.showModal("#distributionNotice");
+        this._hds.makeDistributionSecondPeriod(this.minedu_userName, this.minedu_userPassword)
+            .then(msg => {
+                this.modalTitle.next("Τοποθέτηση Μαθητών 2ης Περιόδου Αιτήσεων");
+                this.modalText.next("Η τοποθέτηση μαθητών της δεύτερης περιόδου αιτήσεων ολοκληρώθηκε με επιτυχία!");
+                this.modalHeader.next("modal-header-success");
+                this.showModal("#distributionNotice");
 
-          if (this.distStatus !== "ERROR")
-            this.distStatus = "FINISHED";
-      })
-      .catch(err => {
-          console.log(err);
-          this.distStatus = "ERROR";
+                if (this.distStatus !== "ERROR")
+                    this.distStatus = "FINISHED";
+            })
+            .catch(err => {
+                console.log(err);
+                this.distStatus = "ERROR";
 
-          this.modalTitle.next("Τοποθέτηση Μαθητών 2ης Περιόδου Αιτήσεων");
-          this.modalText.next("Αποτυχία τοποθέτησης. Προσπαθήστε ξανά. Σε περίπτωση που το πρόβλημα παραμένει, παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος.");
-          this.modalHeader.next("modal-header-danger");
-          this.showModal("#distributionNotice");
-        });
+                this.modalTitle.next("Τοποθέτηση Μαθητών 2ης Περιόδου Αιτήσεων");
+                this.modalText.next("Αποτυχία τοποθέτησης. Προσπαθήστε ξανά. Σε περίπτωση που το πρόβλημα παραμένει, παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος.");
+                this.modalHeader.next("modal-header-danger");
+                this.showModal("#distributionNotice");
+            });
 
     }
 
-    retrieveSettings()  {
-
-      this.settingsSub = this._hds.retrieveAdminSettings(this.minedu_userName, this.minedu_userPassword).subscribe(data => {
-           this.settings$.next(data);
-           this.capacityDisabled = Boolean(Number(this.settings$.value['capacityDisabled']));
-           this.directorViewDisabled = Boolean(Number(this.settings$.value['directorViewDisabled']));
-           this.applicantsResultsDisabled = Boolean(Number(this.settings$.value['applicantsResultsDisabled']));
-
-           this.secondPeriodEnabled = Boolean(Number(this.settings$.value['secondPeriodEnabled']));
-
-           if (this.capacityDisabled == false) {
-             this.modalTitle.next("Κατανομή Μαθητών");
-             this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
-                                 ("τη δυνατότητα των Διευθυντών να τροποποιούν τη χωρητικότητα του σχολείου τους.") );
-             this.modalHeader.next("modal-header-warning");
-             this.showModal("#distributionNotice");
-           }
-           else if (this.directorViewDisabled == false) {
-             this.modalTitle.next("Κατανομή Μαθητών");
-             this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
-                                 ("τη δυνατότητα των Διευθυντών της προβολής κατανομής των μαθητών του σχολείου τους.") );
-             this.modalHeader.next("modal-header-warning");
-             this.showModal("#distributionNotice");
-           }
-           else if (this.applicantsResultsDisabled == false) {
-             this.modalTitle.next("Κατανομή Μαθητών");
-             this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
-                                 ("τη δυνατότητα της προβολής αποτελεσμάτων κατανομής από τους μαθητές.") );
-             this.modalHeader.next("modal-header-warning");
-             this.showModal("#distributionNotice");
-           }
-       },
-         error => {
-           this.settings$.next([{}]);
-           console.log("Error Getting MinisterRetrieveSettings");
-       });
+    retrieveSettings() {
+
+        this.settingsSub = this._hds.retrieveAdminSettings(this.minedu_userName, this.minedu_userPassword).subscribe(data => {
+            this.settings$.next(data);
+            this.capacityDisabled = Boolean(Number(this.settings$.value["capacityDisabled"]));
+            this.directorViewDisabled = Boolean(Number(this.settings$.value["directorViewDisabled"]));
+            this.applicantsResultsDisabled = Boolean(Number(this.settings$.value["applicantsResultsDisabled"]));
+
+            this.secondPeriodEnabled = Boolean(Number(this.settings$.value["secondPeriodEnabled"]));
+
+            if (this.capacityDisabled === false) {
+                this.modalTitle.next("Κατανομή Μαθητών");
+                this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
+                    ("τη δυνατότητα των Διευθυντών να τροποποιούν τη χωρητικότητα του σχολείου τους."));
+                this.modalHeader.next("modal-header-warning");
+                this.showModal("#distributionNotice");
+            }
+            else if (this.directorViewDisabled === false) {
+                this.modalTitle.next("Κατανομή Μαθητών");
+                this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
+                    ("τη δυνατότητα των Διευθυντών της προβολής κατανομής των μαθητών του σχολείου τους."));
+                this.modalHeader.next("modal-header-warning");
+                this.showModal("#distributionNotice");
+            }
+            else if (this.applicantsResultsDisabled === false) {
+                this.modalTitle.next("Κατανομή Μαθητών");
+                this.modalText.next(("ΠΡΟΣΟΧΗ: Για να μπορείτε να εκτελέσετε την κατανομή, παρακαλώ πηγαίνετε στις Ρυθμίσεις και ΑΠΕΝΕΡΓΟΠΟΙΗΣΤΕ  ") +
+                    ("τη δυνατότητα της προβολής αποτελεσμάτων κατανομής από τους μαθητές."));
+                this.modalHeader.next("modal-header-warning");
+                this.showModal("#distributionNotice");
+            }
+        },
+            error => {
+                this.settings$.next([{}]);
+                console.log("Error Getting MinisterRetrieveSettings");
+            });
     }
 
 }
diff --git a/source/components/minister/report-all-stat.ts b/source/components/minister/report-all-stat.ts
index b39caef1c2a973aca12323d625d00e6a67f94432..20ec26ea4aa34f51168be8f39e2ef68f7b5c0842 100644
--- a/source/components/minister/report-all-stat.ts
+++ b/source/components/minister/report-all-stat.ts
@@ -1,20 +1,20 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } 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 { 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 { ILoginInfo } 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,
@@ -22,20 +22,20 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 
 
-import { API_ENDPOINT } from '../../app.settings';
+import { API_ENDPOINT } from "../../app.settings";
 
 @Component({
-    selector: 'report-all-stat',
+    selector: "report-all-stat",
     template: `
 
   <div>
 
 
         <div
-          class = "loading" *ngIf="validCreator == 0" >
+          class = "loading" *ngIf="validCreator === 0" >
         </div>
 
         <form [formGroup]="formGroup"  #form>
@@ -44,22 +44,22 @@ import { API_ENDPOINT } from '../../app.settings';
           <br>
           <button type="button" class="btn-link" (click)="toggleRegionFilter()" >
 
-          <div *ngIf = "userLoggedIn == 'supervisor'">    > Φίλτρο Επιλογής Περιφ/κής Δ/νσης - Δ/νσης Εκπ/σης - Σχολείου </div>
-          <div *ngIf = "userLoggedIn == 'dide'" >    > Φίλτρο Επιλογής Σχολείου </div>
-          <div *ngIf = "userLoggedIn == 'pde'">    > Φίλτρο Επιλογής Δ/νσης Εκπ/σης - Σχολείου </div>
+          <div *ngIf = "userLoggedIn === 'supervisor'">    > Φίλτρο Επιλογής Περιφ/κής Δ/νσης - Δ/νσης Εκπ/σης - Σχολείου </div>
+          <div *ngIf = "userLoggedIn === 'dide'" >    > Φίλτρο Επιλογής Σχολείου </div>
+          <div *ngIf = "userLoggedIn === 'pde'">    > Φίλτρο Επιλογής Δ/νσης Εκπ/σης - Σχολείου </div>
 
           </button>
 
           <div  class="col-md-11 offset-md-1">
-                <label *ngIf = "enableRegionFilter && userLoggedIn == 'supervisor'"> Περιφερειακή Διεύθυνση </label>
-                <select #regsel class="form-control" (change)="checkregion(regsel)" *ngIf = "enableRegionFilter" [value] = "regionSelected" [hidden] = "userLoggedIn != 'supervisor'" formControlName="region">
+                <label *ngIf = "enableRegionFilter && userLoggedIn === 'supervisor'"> Περιφερειακή Διεύθυνση </label>
+                <select #regsel class="form-control" (change)="checkregion(regsel)" *ngIf = "enableRegionFilter" [value] = "regionSelected" [hidden] = "userLoggedIn !== 'supervisor'" formControlName="region">
                   <option value="0"></option>
                   <option *ngFor="let RegionSelection$  of RegionSelections$ | async; let i=index" [value] = "RegionSelection$.id"> {{RegionSelection$.name}} </option>
                 </select>
           </div>
           <div class="col-md-11 offset-md-1">
-                <label *ngIf="(showAdminList | async) && enableRegionFilter && userLoggedIn != 'dide'">Διεύθυνση Εκπαίδευσης</label>
-                <select #admsel class="form-control"  *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkadminarea(admsel)" [hidden] = "userLoggedIn == 'dide'" formControlName="adminarea">
+                <label *ngIf="(showAdminList | async) && enableRegionFilter && userLoggedIn !== 'dide'">Διεύθυνση Εκπαίδευσης</label>
+                <select #admsel class="form-control"  *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkadminarea(admsel)" [hidden] = "userLoggedIn === 'dide'" formControlName="adminarea">
                   <option value="0"></option>
                   <option *ngFor="let AdminAreaSelection$  of AdminAreaSelections$ | async; let i=index" [value] = "AdminAreaSelection$.id"> {{AdminAreaSelection$.name}}</option>
                 </select>
@@ -72,7 +72,7 @@ import { API_ENDPOINT } from '../../app.settings';
                 </select>
           </div>
 
-          <div *ngIf = "reportId == 3 || reportId == 5" >
+          <div *ngIf = "reportId === 3 || reportId === 5" >
             <button type="button" class="btn-link" (click)="toggleCourseFilter()" >
                   > Φίλτρο Επιλογής Τομέα / Ειδικότητας
             </button>
@@ -89,49 +89,49 @@ import { API_ENDPOINT } from '../../app.settings';
                 </select>
           </div>
           <div class="col-md-11 offset-md-1">
-                <label *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected == 2 || classSelected == 3 || classSelected == 4) ">Τομέας</label>
-                <select #secsel class="form-control"  *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected == 2 || classSelected == 3 || classSelected == 4)"
+                <label *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4) ">Τομέας</label>
+                <select #secsel class="form-control"  *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4)"
                       (change)="checksector(secsel)" formControlName="sector">
                   <option value="0"></option>
                   <option *ngFor="let SectorSelection$  of SectorSelections$ | async; let i=index" [value] = "SectorSelection$.id"> {{SectorSelection$.name}}</option>
                 </select>
           </div>
           <div class="col-md-11 offset-md-1">
-                <label *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected == 3 || classSelected == 4)">Ειδικότητα</label>
-                <select #coursel class="form-control"  *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected == 3 || classSelected == 4)"
+                <label *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)">Ειδικότητα</label>
+                <select #coursel class="form-control"  *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)"
                       (change)="checkcourse(coursel)" formControlName="course">
                   <option value="0"></option>
                   <option *ngFor="let CourseSelection$  of CourseSelections$ | async; let i=index" [value] = "CourseSelection$.id"> {{CourseSelection$.name}}</option>
                 </select>
           </div>
           <br>
-          <button type="submit" class="btn btn-alert"  (click)="createReport(regsel)" [hidden]="minedu_userName == ''" >
+          <button type="submit" class="btn btn-alert"  (click)="createReport(regsel)" [hidden]="minedu_userName === ''" >
           <i class="fa fa-file-text"></i>
               Δημιουργία Αναφοράς
           </button>
-          <button type="submit" class="btn btn-alert pull-right"  (click)="navigateBack()" [hidden]="minedu_userName == ''" >
+          <button type="submit" class="btn btn-alert pull-right"  (click)="navigateBack()" [hidden]="minedu_userName === ''" >
               Επιστροφή
           </button>
           <br><br>
         </form>
 
-        <div *ngIf="validCreator == 1 ">
+        <div *ngIf="validCreator === 1 ">
           <input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
           <div class="smart-table-container" reportScroll>
             <ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
           </div>
         </div>
 
-        <button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1">
+        <button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator !== 1">
         <i class="fa fa-download"></i>
             <br>Εξαγωγή σε csv
         </button>
-        <button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator != 1 || schSelected == 0 || (reportId != 2 ) ">
+        <button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator !== 1 || schSelected === 0 || (reportId !== 2 ) ">
         <i class="fa fa-bar-chart"></i>
             Διάγραμμα
         </button>
 
-        <div class="d3-chart" *ngIf = "validCreator == 1" #chart>
+        <div class="d3-chart" *ngIf = "validCreator === 1" #chart>
         </div>
         <br><br><br><br><br>
 
@@ -142,9 +142,9 @@ import { API_ENDPOINT } from '../../app.settings';
 
 @Injectable() export default class ReportAllStat implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
-    loginInfoSub: Subscription;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
+    private loginInfoSub: Subscription;
     private generalReport$: BehaviorSubject<any>;
     private RegionSelections$: BehaviorSubject<any>;
     private AdminAreaSelections$: BehaviorSubject<any>;
@@ -163,7 +163,7 @@ import { API_ENDPOINT } from '../../app.settings';
     private minedu_userName: string;
     private minedu_userPassword: string;
     private distStatus = "READY";
-    private data;
+    private data: any;
     private validCreator: number;
     private reportId: number;
     private source: LocalDataSource;
@@ -183,18 +183,18 @@ import { API_ENDPOINT } from '../../app.settings';
 
     columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
     @Input() settings: any;
-    private reportSchema = new reportsSchema();
+    private reportSchema = new ReportsSchema();
 
-    //csvObj:csvCreator ;
-    private csvObj = new csvCreator();
+    // csvObj:CsvCreator ;
+    private csvObj = new CsvCreator();
 
     private createGraph: boolean;
-    //d3 creator
-    private chartObj = new chartCreator();
-    @ViewChild('chart') public chartContainer: ElementRef;
+    // d3 creator
+    private chartObj = new ChartCreator();
+    @ViewChild("chart") public chartContainer: ElementRef;
     private d3data: Array<any>;
 
-    //private repid: number;
+    // private repid: number;
     private routerSub: any;
 
     constructor(private fb: FormBuilder,
@@ -204,12 +204,12 @@ import { API_ENDPOINT } from '../../app.settings';
         private router: Router) {
 
         this.formGroup = this.fb.group({
-            region: ['', []],
-            adminarea: ['', []],
-            schoollist: ['', []],
-            classid: ['', []],
-            sector: ['', []],
-            course: ['', []],
+            region: ["", []],
+            adminarea: ["", []],
+            schoollist: ["", []],
+            classid: ["", []],
+            sector: ["", []],
+            course: ["", []],
         });
 
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
@@ -220,7 +220,7 @@ import { API_ENDPOINT } from '../../app.settings';
         this.SectorSelections$ = new BehaviorSubject([{}]);
         this.CourseSelections$ = new BehaviorSubject([{}]);
         this.RegionRetrieve$ = new BehaviorSubject([{}]);
-        this.minedu_userName = '';
+        this.minedu_userName = "";
         this.validCreator = -1;
         this.showAdminList = new BehaviorSubject(false);
         this.showSectorList = new BehaviorSubject(false);
@@ -239,49 +239,51 @@ import { API_ENDPOINT } from '../../app.settings';
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-
-                    this.userLoggedIn = loginInfoToken.auth_role;
-                    if (loginInfoToken.auth_role == PDE_ROLE || loginInfoToken.auth_role == DIDE_ROLE) {
-                        let regId = -1;
-                        this.minedu_userName = loginInfoToken.auth_token;
-                        this.minedu_userPassword = loginInfoToken.auth_token;
-                        if (loginInfoToken.auth_role == PDE_ROLE || loginInfoToken.auth_role == DIDE_ROLE) {
-
-                            this.RegionRetrieveSub = this._hds.getUserRegistryNo(this.minedu_userName, this.minedu_userPassword).subscribe(data => {
-                                this.RegionRetrieve$.next(data);
-                                this.data = data;
-                                regId = this.data['id'];
-
-                                if (loginInfoToken.auth_role == PDE_ROLE) {
-                                    this.regionSelected = regId;
-                                    this.showAdminList.next(true);
-
-                                    this.checkregion(this.regionSelected);
-                                }
-                                else if (loginInfoToken.auth_role == DIDE_ROLE) {
-                                    this.adminAreaSelected = regId;
-                                    this.showAdminList.next(false);
-                                    this.checkadminarea(this.adminAreaSelected);
-                                }
-                            },
-                                error => {
-                                    this.RegionRetrieve$.next([{}]);
-                                });
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+
+                        this.userLoggedIn = loginInfoToken.auth_role;
+                        if (loginInfoToken.auth_role === PDE_ROLE || loginInfoToken.auth_role === DIDE_ROLE) {
+                            let regId = -1;
+                            this.minedu_userName = loginInfoToken.auth_token;
+                            this.minedu_userPassword = loginInfoToken.auth_token;
+                            if (loginInfoToken.auth_role === PDE_ROLE || loginInfoToken.auth_role === DIDE_ROLE) {
+
+                                this.RegionRetrieveSub = this._hds.getUserRegistryNo(this.minedu_userName, this.minedu_userPassword).subscribe(data => {
+                                    this.RegionRetrieve$.next(data);
+                                    this.data = data;
+                                    regId = this.data["id"];
+
+                                    if (loginInfoToken.auth_role === PDE_ROLE) {
+                                        this.regionSelected = regId;
+                                        this.showAdminList.next(true);
+
+                                        this.checkregion(this.regionSelected);
+                                    }
+                                    else if (loginInfoToken.auth_role === DIDE_ROLE) {
+                                        this.adminAreaSelected = regId;
+                                        this.showAdminList.next(false);
+                                        this.checkadminarea(this.adminAreaSelected);
+                                    }
+                                },
+                                    error => {
+                                        this.RegionRetrieve$.next([{}]);
+                                    });
+                            }
                         }
-                    }
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
         this.routerSub = this.activatedRoute.params.subscribe(params => {
-            this.reportId = +params['reportId'];
+            this.reportId = +params["reportId"];
         });
 
 
@@ -305,31 +307,8 @@ import { API_ENDPOINT } from '../../app.settings';
             this.SectorSelectionsSub.unsubscribe();
         if (this.CourseSelectionsSub)
             this.CourseSelectionsSub.unsubscribe();
-
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
-        if (this.generalReport$)
-            this.generalReport$.unsubscribe();
-        if (this.RegionSelections$)
-            this.RegionSelections$.unsubscribe();
-        if (this.AdminAreaSelections$)
-            this.AdminAreaSelections$.unsubscribe();
-        if (this.SchoolSelections$)
-            this.SchoolSelections$.unsubscribe();
-        if (this.SectorSelections$)
-            this.SectorSelections$.unsubscribe();
-        if (this.CourseSelections$)
-            this.CourseSelections$.unsubscribe();
-        if (this.showAdminList)
-            this.showAdminList.unsubscribe();
-        if (this.showSectorList)
-            this.showSectorList.unsubscribe();
-        if (this.showCourseList)
-            this.showCourseList.unsubscribe();
         if (this.RegionRetrieveSub)
             this.RegionRetrieveSub.unsubscribe();
-        if (this.RegionRetrieve$)
-            this.RegionRetrieve$.unsubscribe();
 
     }
 
@@ -361,8 +340,8 @@ import { API_ENDPOINT } from '../../app.settings';
 
         let regSel = 0, admSel = 0, schSel = 0;
         if (this.enableRegionFilter) {
-            //if (regionSel.value != 0)
-            //regSel = regionSel.value;
+            // if (regionSel.value !== 0)
+            // regSel = regionSel.value;
             regSel = this.regionSelected;
             admSel = this.adminAreaSelected;
             schSel = this.schSelected;
@@ -375,10 +354,10 @@ import { API_ENDPOINT } from '../../app.settings';
             courSel = this.courseSelected;
         }
 
-        if (this.userLoggedIn == PDE_ROLE) {
+        if (this.userLoggedIn === PDE_ROLE) {
             regSel = this.regionSelected;
         }
-        else if (this.userLoggedIn == DIDE_ROLE)
+        else if (this.userLoggedIn === DIDE_ROLE)
             admSel = this.adminAreaSelected;
 
         this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, regSel, admSel, schSel, clSel, secSel, courSel, this.distribFinalized).subscribe(data => {
@@ -398,11 +377,11 @@ import { API_ENDPOINT } from '../../app.settings';
             this.source = new LocalDataSource(this.data);
             this.columnMap = new Map<string, TableColumn>();
 
-            //pass parametes to csv class object
+            // pass parametes to csv class object
             this.csvObj.columnMap = this.columnMap;
             this.csvObj.source = this.source;
             this.csvObj.settings = this.settings;
-            //this.prepareColumnMap();
+            // this.prepareColumnMap();
             this.csvObj.prepareColumnMap();
         },
             error => {
@@ -413,7 +392,7 @@ import { API_ENDPOINT } from '../../app.settings';
     }
 
     navigateBack() {
-        this.router.navigate(['/ministry/minister-reports']);
+        this.router.navigate(["/ministry/minister-reports"]);
     }
 
     showFilters() {
@@ -441,7 +420,7 @@ import { API_ENDPOINT } from '../../app.settings';
 
     checkregion(regionId) {
 
-        if (typeof regionId.value != "undefined")
+        if (typeof regionId.value !== "undefined")
             this.regionSelected = regionId.value;
         this.adminAreaSelected = 0;
         this.schSelected = 0;
@@ -469,7 +448,7 @@ import { API_ENDPOINT } from '../../app.settings';
 
         this.schSelected = 0;
 
-        if (typeof adminId.value != "undefined")
+        if (typeof adminId.value !== "undefined")
             this.adminAreaSelected = adminId.value;
         this.SchoolSelectionsSub = this._hds.getSchoolsPerAdminArea(this.minedu_userName, this.minedu_userPassword, this.adminAreaSelected).subscribe(data => {
             this.SchoolSelections$.next(data);
@@ -498,7 +477,7 @@ import { API_ENDPOINT } from '../../app.settings';
         this.sectorSelected = 0;
         this.courseSelected = 0;
 
-        if (this.classSelected == 2 || this.classSelected == 3 || this.classSelected == 4) {
+        if (this.classSelected === 2 || this.classSelected === 3 || this.classSelected === 4) {
             this.SectorSelectionsSub = this._hds.getSectors(this.minedu_userName, this.minedu_userPassword, this.classSelected).subscribe(data => {
                 this.SectorSelections$.next(data);
                 this.showSectorList.next(true);
@@ -507,7 +486,7 @@ import { API_ENDPOINT } from '../../app.settings';
                     this.SectorSelections$.next([{}]);
                     console.log("Error Getting SectorSelections");
                 });
-        } //end if
+        } // end if
 
 
     }
@@ -535,7 +514,7 @@ import { API_ENDPOINT } from '../../app.settings';
 
 
 
-    onSearch(query: string = '') {
+    onSearch(query: string = "") {
 
         this.csvObj.onSearch(query);
     }
diff --git a/source/components/minister/report-general.ts b/source/components/minister/report-general.ts
index af383fa02f144bbab57764091c6663e3bdeff3da..555e5e7a9f7a98628cddf79866222fc1dfcbc1d7 100644
--- a/source/components/minister/report-general.ts
+++ b/source/components/minister/report-general.ts
@@ -10,10 +10,10 @@ import { Router, ActivatedRoute, Params } from "@angular/router";
 import { BehaviorSubject, Subscription } from "rxjs/Rx";
 import { ILoginInfo } from "../../store/logininfo/logininfo.types";
 import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table";
-import { reportsSchema, TableColumn } from "./reports-schema";
+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 { CsvCreator } from "./csv-creator";
+import { ChartCreator } from "./chart-creator";
 
 import {
     FormBuilder,
@@ -76,26 +76,26 @@ import { API_ENDPOINT } from "../../app.settings";
 
 @Injectable() export default class ReportGeneral implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
-    loginInfoSub: Subscription;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
+    private loginInfoSub: Subscription;
     private generalReport$: BehaviorSubject<any>;
     private generalReportSub: Subscription;
     private apiEndPoint = API_ENDPOINT;
     private minedu_userName: string;
     private minedu_userPassword: string;
     private distStatus = "READY";
-    private data;
+    private data: any;
     private validCreator: number;
     private createGraph: boolean;
 
     private source: LocalDataSource;
     columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
     @Input() settings: any;
-    private reportSchema = new reportsSchema();
-    private csvObj = new csvCreator();
+    private reportSchema = new ReportsSchema();
+    private csvObj = new CsvCreator();
 
-    private chartObj = new chartCreator();
+    private chartObj = new ChartCreator();
     @ViewChild("chart") public chartContainer: ElementRef;
     private d3data: Array<any>;
 
@@ -122,16 +122,18 @@ import { API_ENDPOINT } from "../../app.settings";
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({ }, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({ }, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
     }
 
@@ -141,10 +143,6 @@ import { API_ENDPOINT } from "../../app.settings";
             this.loginInfoSub.unsubscribe();
         if (this.generalReportSub)
             this.generalReportSub.unsubscribe();
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
-        if (this.generalReport$)
-            this.generalReport$.unsubscribe();
 
     }
 
diff --git a/source/components/minister/report-no-capacity.ts b/source/components/minister/report-no-capacity.ts
index 7e91e67d176e43485ea92800e76eb03c3051e438..d81db3a883fac17215192d64e16bdba68ae63886 100644
--- a/source/components/minister/report-no-capacity.ts
+++ b/source/components/minister/report-no-capacity.ts
@@ -1,19 +1,19 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-import { HelperDataService } from '../../services/helper-data-service';
+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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } 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 { 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 { ILoginInfo } 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,
@@ -21,13 +21,13 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 
 
-import { API_ENDPOINT } from '../../app.settings';
+import { API_ENDPOINT } from "../../app.settings";
 
 @Component({
-    selector: 'report-no-capacity',
+    selector: "report-no-capacity",
     template: `
 
   <div>
@@ -77,9 +77,9 @@ import { API_ENDPOINT } from '../../app.settings';
 
 @Injectable() export default class ReportNoCapacity implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
-    loginInfoSub: Subscription;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
+    private loginInfoSub: Subscription;
     private generalReport$: BehaviorSubject<any>;
     private generalReportSub: Subscription;
     private apiEndPoint = API_ENDPOINT;
@@ -95,11 +95,11 @@ import { API_ENDPOINT } from '../../app.settings';
     private source: LocalDataSource;
     columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
     @Input() settings: any;
-    private reportSchema = new reportsSchema();
-    private csvObj = new csvCreator();
+    private reportSchema = new ReportsSchema();
+    private csvObj = new CsvCreator();
 
-    private chartObj = new chartCreator();
-    @ViewChild('chart') public chartContainer: ElementRef;
+    private chartObj = new ChartCreator();
+    @ViewChild("chart") public chartContainer: ElementRef;
     private d3data: Array<any>;
 
 
@@ -110,12 +110,12 @@ import { API_ENDPOINT } from '../../app.settings';
         private router: Router) {
 
         this.formGroup = this.fb.group({
-            capacityEnabled: ['', []],
+            capacityEnabled: ["", []],
         });
 
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
         this.generalReport$ = new BehaviorSubject([{}]);
-        this.minedu_userName = '';
+        this.minedu_userName = "";
         this.validCreator = -1;
         this.enableCapacityFilter = false;
 
@@ -123,19 +123,21 @@ import { API_ENDPOINT } from '../../app.settings';
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
 
         this.routerSub = this.activatedRoute.params.subscribe(params => {
-            this.reportId = +params['reportId'];
+            this.reportId = +params["reportId"];
 
         });
 
@@ -147,11 +149,6 @@ import { API_ENDPOINT } from '../../app.settings';
             this.loginInfoSub.unsubscribe();
         if (this.generalReportSub)
             this.generalReportSub.unsubscribe();
-        if (this.loginInfo$)
-            this.loginInfo$.unsubscribe();
-        if (this.generalReport$)
-            this.generalReport$.unsubscribe();
-
     }
 
 
@@ -174,7 +171,7 @@ import { API_ENDPOINT } from '../../app.settings';
             this.source = new LocalDataSource(this.data);
             this.columnMap = new Map<string, TableColumn>();
 
-            //pass parametes to csv class object
+            // pass parametes to csv class object
             this.csvObj.columnMap = this.columnMap;
             this.csvObj.source = this.source;
             this.csvObj.settings = this.settings;
@@ -195,11 +192,11 @@ import { API_ENDPOINT } from '../../app.settings';
     }
 
     navigateBack() {
-        this.router.navigate(['/ministry/minister-reports']);
+        this.router.navigate(["/ministry/minister-reports"]);
     }
 
 
-    onSearch(query: string = '') {
+    onSearch(query: string = "") {
 
         this.csvObj.onSearch(query);
     }
diff --git a/source/components/minister/report-users.ts b/source/components/minister/report-users.ts
index fec24c4cfb10afdcc5fc87b89571fec9c258c4f6..906a3f6b15e0197dd6fc24ed71d9f07a90db1d9f 100644
--- a/source/components/minister/report-users.ts
+++ b/source/components/minister/report-users.ts
@@ -10,9 +10,9 @@ import { Router, ActivatedRoute, Params} from "@angular/router";
 import { BehaviorSubject, Subscription } from "rxjs/Rx";
 import { ILoginInfo } from "../../store/logininfo/logininfo.types";
 import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table";
-import {reportsSchema, TableColumn} from "./reports-schema";
+import {ReportsSchema, TableColumn} from "./reports-schema";
 import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
-import {csvCreator} from "./csv-creator";
+import {CsvCreator} from "./csv-creator";
 
 import { API_ENDPOINT } from "../../app.settings";
 
@@ -72,8 +72,8 @@ import { API_ENDPOINT } from "../../app.settings";
     private source: LocalDataSource;
     columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
     @Input() settings: any;
-    private reportSchema = new reportsSchema();
-    private csvObj = new csvCreator();
+    private reportSchema = new ReportsSchema();
+    private csvObj = new CsvCreator();
 
     constructor(
         private _ngRedux: NgRedux<IAppState>,
@@ -89,16 +89,18 @@ import { API_ENDPOINT } from "../../app.settings";
 
     ngOnInit() {
 
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.minedu_userName = loginInfoToken.minedu_username;
-                    this.minedu_userPassword = loginInfoToken.minedu_userpassword;
-                    return loginInfoToken;
-                }, {});
-            }
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.minedu_userName = loginInfoToken.minedu_username;
+                        this.minedu_userPassword = loginInfoToken.minedu_userpassword;
+                        return loginInfoToken;
+                    }, {});
+                }
+                this.loginInfo$.next(loginInfo);
+            }, error => console.log("error selecting loginInfo"));
     }
 
     ngOnDestroy() {
diff --git a/source/components/minister/reports-schema.ts b/source/components/minister/reports-schema.ts
index 61f3e3864266430416d64aebf7452db837af5944..1a43794ca770f8c4d47069c92aba4e90613a940f 100644
--- a/source/components/minister/reports-schema.ts
+++ b/source/components/minister/reports-schema.ts
@@ -1,195 +1,195 @@
 
 export class TableColumn {
-  field: string;
-  title: string;
-  type: string;
-  isDisplay: boolean;
-  isExport: boolean;
-  valuePrepareFunction: Function;
+    field: string;
+    title: string;
+    type: string;
+    isDisplay: boolean;
+    isExport: boolean;
+    valuePrepareFunction: Function;
 }
 
-export class reportsSchema  {
-
-  /*
-  defaultSettings = {
-    actions: {
-      columnTitle: 'Actions',
-      add: false,
-      edit: false,
-      delete: false
-    },
-    pager: {
-      display: true,
-      perPage: 50
-    }
-  };
-  */
-  ReportUsersSchema = {
-    actions: false,
-    noDataMessage: 'Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης',
-    columns: {
-      name: {
-        title: 'Περιγραφή',
-        filter: false
+export class ReportsSchema {
+
+    /*
+    defaultSettings = {
+      actions: {
+        columnTitle: "Actions",
+        add: false,
+        edit: false,
+        delete: false
       },
-      numStudents: {
-        title: 'Αριθμός',
-        filter: false
+      pager: {
+        display: true,
+        perPage: 50
       }
-    }
-  };
-
-genReportSchema = {
-  actions: false,
-  noDataMessage: 'Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης',
-  columns: {
-    name: {
-      title: 'Κατηγορία',
-      filter: false
-    },
-    numStudents: {
-      title: 'Αριθμός',
-      filter: false
-    }
-  }
-};
-
-reportAllStatSchema = {
-  actions: false,
-  pager : {
-    display : true,
-    perPage:10
-  },
-  noDataMessage: 'Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης',
-  columns: {
-    name: {
-      title: 'Σχολείο',
-      width: '18%',
-      filter: false
-    },
-    region: {
-      title: 'Περιφερειακή Διεύθυνση',
-      width: '15%',
-      filter: false
-    },
-    admin: {
-      title: 'Διεύθυνση Εκπαίδευσης',
-      width: '15%',
-      filter: false
-    },
-    section: {
-      title: 'Τάξη/Τομέας/Ειδικότητα',
-      width: '18%',
-      filter: false
-    },
-    num: {
-      title: 'Αριθμός Μαθητών',
-      width: '8%',
-      filter: false
-    },
-    capacity: {
-      title: 'Χωρ/κα',
-      width: '8%',
-      filter: false
-    },
-    percentage: {
-      title: 'Ποσοστό (%)',
-      width: '8%',
-      filter: false
-    }
-  }
-};
-
-
-
-
-reportNoCapacity = {
-  actions: false,
-  pager : {
-    display : true,
-    perPage:10
-  },
-  noDataMessage: 'Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης',
-  columns: {
-    name: {
-      title: 'Σχολείο',
-      width: '22%',
-      filter: false
-    },
-    region: {
-      title: 'Περιφερειακή Διεύθυνση',
-      width: '20%',
-      filter: false
-    },
-    admin: {
-      title: 'Διεύθυνση Εκπαίδευσης',
-      width: '20%',
-      filter: false
-    },
-    section: {
-      title: 'Τάξη/Τομέας/Ειδικότητα',
-      width: '22%',
-      filter: false
-    },
-    capacity: {
-      title: 'Χωρητικότητα',
-      width: '15%',
-      filter: false
-    }
-  }
-};
-
-
-
-
-reportCompletenessSchema = {
-  actions: false,
-  noDataMessage: 'Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης',
-  columns: {
-    name: {
-      title: 'Σχολείο',
-      width: '15%',
-      filter: false
-    },
-    region: {
-      title: 'ΠΔΕ',
-      width: '10%',
-      filter: false
-    },
-    admin: {
-      title: 'ΔΙΔΕ',
-      width: '10%',
-      filter: false
-    },
-    percTotal: {
-      title: '% Σχολείου',
-      width: '10%',
-      filter: false
-    },
-    percA: {
-      title: '% Α\' τάξης',
-      width: '10%',
-      filter: false
-    },
-    percB: {
-      title: '% Β\' τάξης',
-      width: '10%',
-      filter: false
-    },
-    percC: {
-      title: '% Γ\' τάξης',
-      width: '10%',
-      filter: false
-    },
-    percD: {
-      title: '% Δ\' τάξης',
-      width: '10%',
-      filter: false
-    }
-  }
-};
-
-
-constructor() {}
+    };
+    */
+    ReportUsersSchema = {
+        actions: false,
+        noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
+        columns: {
+            name: {
+                title: "Περιγραφή",
+                filter: false
+            },
+            numStudents: {
+                title: "Αριθμός",
+                filter: false
+            }
+        }
+    };
+
+    genReportSchema = {
+        actions: false,
+        noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
+        columns: {
+            name: {
+                title: "Κατηγορία",
+                filter: false
+            },
+            numStudents: {
+                title: "Αριθμός",
+                filter: false
+            }
+        }
+    };
+
+    reportAllStatSchema = {
+        actions: false,
+        pager: {
+            display: true,
+            perPage: 10
+        },
+        noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
+        columns: {
+            name: {
+                title: "Σχολείο",
+                width: "18%",
+                filter: false
+            },
+            region: {
+                title: "Περιφερειακή Διεύθυνση",
+                width: "15%",
+                filter: false
+            },
+            admin: {
+                title: "Διεύθυνση Εκπαίδευσης",
+                width: "15%",
+                filter: false
+            },
+            section: {
+                title: "Τάξη/Τομέας/Ειδικότητα",
+                width: "18%",
+                filter: false
+            },
+            num: {
+                title: "Αριθμός Μαθητών",
+                width: "8%",
+                filter: false
+            },
+            capacity: {
+                title: "Χωρ/κα",
+                width: "8%",
+                filter: false
+            },
+            percentage: {
+                title: "Ποσοστό (%)",
+                width: "8%",
+                filter: false
+            }
+        }
+    };
+
+
+
+
+    reportNoCapacity = {
+        actions: false,
+        pager: {
+            display: true,
+            perPage: 10
+        },
+        noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
+        columns: {
+            name: {
+                title: "Σχολείο",
+                width: "22%",
+                filter: false
+            },
+            region: {
+                title: "Περιφερειακή Διεύθυνση",
+                width: "20%",
+                filter: false
+            },
+            admin: {
+                title: "Διεύθυνση Εκπαίδευσης",
+                width: "20%",
+                filter: false
+            },
+            section: {
+                title: "Τάξη/Τομέας/Ειδικότητα",
+                width: "22%",
+                filter: false
+            },
+            capacity: {
+                title: "Χωρητικότητα",
+                width: "15%",
+                filter: false
+            }
+        }
+    };
+
+
+
+
+    reportCompletenessSchema = {
+        actions: false,
+        noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
+        columns: {
+            name: {
+                title: "Σχολείο",
+                width: "15%",
+                filter: false
+            },
+            region: {
+                title: "ΠΔΕ",
+                width: "10%",
+                filter: false
+            },
+            admin: {
+                title: "ΔΙΔΕ",
+                width: "10%",
+                filter: false
+            },
+            percTotal: {
+                title: "% Σχολείου",
+                width: "10%",
+                filter: false
+            },
+            percA: {
+                title: "% Α\" τάξης",
+                width: "10%",
+                filter: false
+            },
+            percB: {
+                title: "% Β\" τάξης",
+                width: "10%",
+                filter: false
+            },
+            percC: {
+                title: "% Γ\" τάξης",
+                width: "10%",
+                filter: false
+            },
+            percD: {
+                title: "% Δ\" τάξης",
+                width: "10%",
+                filter: false
+            }
+        }
+    };
+
+
+    constructor() { }
 
 }
diff --git a/source/components/ministry.home.ts b/source/components/ministry.home.ts
index 7462061cc24d89d67abcbae4be389ad8afb67577..9adcc9bc1e0c3045fc883438ddedbe6598c1fe92 100644
--- a/source/components/ministry.home.ts
+++ b/source/components/ministry.home.ts
@@ -1,12 +1,12 @@
-import { Router, Params} from '@angular/router';
-import { OnInit, OnDestroy, Component} from '@angular/core';
-import { LoginInfoActions } from '../actions/logininfo.actions';
-import { ILoginInfo } 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 {Http, Response, RequestOptions} from '@angular/http';
+import { Router, Params} from "@angular/router";
+import { OnInit, OnDestroy, Component} from "@angular/core";
+import { LoginInfoActions } from "../actions/logininfo.actions";
+import { ILoginInfo } 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 {Http, Response, RequestOptions} from "@angular/http";
 import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state";
 import {
     FormBuilder,
@@ -14,12 +14,12 @@ import {
     FormControl,
     FormArray,
     Validators
-} from '@angular/forms';
+} from "@angular/forms";
 
-import { API_ENDPOINT } from '../app.settings';
+import { API_ENDPOINT } from "../app.settings";
 
 @Component({
-    selector: 'ministry-home',
+    selector: "ministry-home",
     template: `
   <div>
        <form novalidate [formGroup]="userDataGroup"  #form>
@@ -59,11 +59,11 @@ import { API_ENDPOINT } from '../app.settings';
 })
 
 export default class MinistryHome implements OnInit, OnDestroy {
-    public userDataGroup: FormGroup;
+    private userDataGroup: FormGroup;
     private authRole: string;
     private mineduUsername: string;
-    //private mineduPassword: string;
-    //private cuName: string;
+    // private mineduPassword: string;
+    // private cuName: string;
     private validLogin: number;
     private loginInfo$: BehaviorSubject<ILoginInfo>;
     private loginInfoSub: Subscription;
@@ -77,38 +77,35 @@ export default class MinistryHome implements OnInit, OnDestroy {
         private router: Router
     ) {
 
-        this.mineduUsername = '';
-        //this.mineduPassword = '';
-        this.authRole = '';
-        //this.cuName = '';
-        //this.validLogin = true;
+        this.mineduUsername = "";
+        this.authRole = "";
         this.validLogin = 1;
 
 
         this.userDataGroup = this.fb.group({
-          minedu_username: ['', [Validators.required]],
-          minedu_userpassword: ['', [Validators.required]],
-          cu_name: [''],
-          auth_role: [''],
+            minedu_username: ["", [Validators.required]],
+            minedu_userpassword: ["", [Validators.required]],
+            cu_name: [""],
+            auth_role: [""],
         });
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
     };
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({}, loginInfoToken) => {
                         this.mineduUsername = loginInfoToken.minedu_username;
-                        //this.mineduPassword = loginInfoToken.minedu_userpassword;
+                        // this.mineduPassword = loginInfoToken.minedu_userpassword;
                         if (this.mineduUsername && this.mineduUsername.length > 0)
-                            this.router.navigate(['/ministry/minister-settings']);
+                            this.router.navigate(["/ministry/minister-settings"]);
                         return loginInfoToken;
                     }, {});
                 }
                 this.loginInfo$.next(linfo);
-            }, error => {console.log("error selecting loginInfo");});
+            }, error => { console.log("error selecting loginInfo"); });
 
     }
 
@@ -119,20 +116,20 @@ export default class MinistryHome implements OnInit, OnDestroy {
     submitCredentials() {
         this.validLogin = -1;
         let success = true;
-        this._hds.sendMinisrtyCredentials(this.userDataGroup.value['minedu_username'],this.userDataGroup.value['minedu_userpassword'])
-          .catch(err => {console.log(err); success = false; this.validLogin = 0; })
-          .then(msg => {
-            if (success)  {
-              this.authRole = 'supervisor';
-              this._hds.setMineduCurrentUser(this.userDataGroup.value['minedu_username'], this.userDataGroup.value['minedu_userpassword'],   this.authRole);
-
-              this.validLogin = 1;
-              this.userDataGroup.value['cu_name'] = this.userDataGroup.value['minedu_username'];
-              this.userDataGroup.value['auth_role'] = 'supervisor';
-              this._ata.saveMinEduloginInfo([this.userDataGroup.value]);
-          }
-          });
-        }
+        this._hds.sendMinisrtyCredentials(this.userDataGroup.value["minedu_username"], this.userDataGroup.value["minedu_userpassword"])
+            .catch(err => { console.log(err); success = false; this.validLogin = 0; })
+            .then(msg => {
+                if (success) {
+                    this.authRole = "supervisor";
+                    this._hds.setMineduCurrentUser(this.userDataGroup.value["minedu_username"], this.userDataGroup.value["minedu_userpassword"], this.authRole);
+
+                    this.validLogin = 1;
+                    this.userDataGroup.value["cu_name"] = this.userDataGroup.value["minedu_username"];
+                    this.userDataGroup.value["auth_role"] = "supervisor";
+                    this._ata.saveMinEduloginInfo([this.userDataGroup.value]);
+                }
+            });
+    }
 
 
 
diff --git a/source/components/navbar/navbar.component.html b/source/components/navbar/navbar.component.html
index f9c28723d3fabfa2737ebdab70b346e23e7b222a..c8794dd428e0cb25d996cc675334205af2c25649 100644
--- a/source/components/navbar/navbar.component.html
+++ b/source/components/navbar/navbar.component.html
@@ -1,81 +1,81 @@
-<div class="nav-wrapper"  >
-<div class = "content">
-<div class="container">
-<nav class="navbar navbar-toggleable-sm">
-  <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+<div class="nav-wrapper">
+    <div class="content">
+        <div class="container">
+            <nav class="navbar navbar-toggleable-sm">
+                <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-   <img src="../myschool/assets/images/myschool_logo.png" />
-   <div class="collapse navbar-collapse flex-row-reverse" id="navbarNav">
-      <div *ngIf="(loginInfo$ | async).size > 0">
-     <ul class="navbar-nav">
-     <div class="row">
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
-         <li *ngIf="authRole=='student'"class="nav-item" >
-             <a class="nav-link" [routerLink]="['/submited-preview']" [routerLinkActive]="['active']"><b>Υποβληθείσες δηλώσεις</b></a>
-         </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0 && !(lockStudents | async)" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
-     <li *ngIf="authRole=='director'" class="nav-item" >
-           <a class="nav-link" [routerLink]="['/school/director-view']" [routerLinkActive]="['active']"><b>Δηλώσεις Μαθητών στο ΕΠΑΛ</b></a>
-     </li>
-     </div>
-      <div *ngIf="(loginInfo$ | async).size > 0 && !(lockCapacity | async)" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
-         <li *ngIf="authRole=='director'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/school/director-classcapacity']" [routerLinkActive]="['active']"><b>Δυναμική Σχολείου</b></a>
-        </li>
-      </div>
+                <img src="../myschool/assets/images/myschool_logo.png" />
+                <div class="collapse navbar-collapse flex-row-reverse" id="navbarNav">
+                    <div *ngIf="(loginInfo$ | async).size > 0">
+                        <ul class="navbar-nav">
+                            <div class="row">
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
+                                    <li *ngIf="authRole=='student'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/submited-preview']" [routerLinkActive]="['active']"><b>Υποβληθείσες δηλώσεις</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0 && !(lockStudents | async)" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
+                                    <li *ngIf="authRole=='director'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/school/director-view']" [routerLinkActive]="['active']"><b>Δηλώσεις Μαθητών στο ΕΠΑΛ</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0 && !(lockCapacity | async)" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
+                                    <li *ngIf="authRole=='director'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/school/director-classcapacity']" [routerLinkActive]="['active']"><b>Δυναμική Σχολείου</b></a>
+                                    </li>
+                                </div>
 
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='supervisor'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-settings']" [routerLinkActive]="['active']"><b>Ρυθμίσεις</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='supervisor'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-view']" [routerLinkActive]="['active']"><b>Κατανομή</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='supervisor'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='supervisor'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-informstudents']" [routerLinkActive]="['active']"><b>Αποστολή Ειδοποιήσεων</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='pde'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/school/perfecture-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='pde'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='dide'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/school/eduadmin-view']" [routerLinkActive]="['active']" ><b>Πληρότητα Σχολείων</b></a>
-        </li>
-      </div>
-      <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item" >
-         <li *ngIf="authRole=='dide'" class="nav-item" >
-             <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']" ><b>Αναφορές</b></a>
-        </li>
-      </div>
-      
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='supervisor'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-settings']" [routerLinkActive]="['active']"><b>Ρυθμίσεις</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='supervisor'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-view']" [routerLinkActive]="['active']"><b>Κατανομή</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='supervisor'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='supervisor'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-informstudents']" [routerLinkActive]="['active']"><b>Αποστολή Ειδοποιήσεων</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='pde'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/school/perfecture-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='pde'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='dide'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/school/eduadmin-view']" [routerLinkActive]="['active']"><b>Πληρότητα Σχολείων</b></a>
+                                    </li>
+                                </div>
+                                <div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
+                                    <li *ngIf="authRole=='dide'" class="nav-item">
+                                        <a class="nav-link" [routerLink]="['/ministry/minister-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
+                                    </li>
+                                </div>
 
 
-      </div>
-    </ul>
 
-  </div>
-  </div>
+                            </div>
+                        </ul>
 
-</nav>
-</div>
-   </div>
+                    </div>
+                </div>
+
+            </nav>
+        </div>
+    </div>
 </div>
diff --git a/source/components/navbar/navbar.component.ts b/source/components/navbar/navbar.component.ts
index 0b6d477195f59e194dc291264fcbf4c5e55ef426..bec890570a4b7fd40130b3398da3073a227d5b1b 100644
--- a/source/components/navbar/navbar.component.ts
+++ b/source/components/navbar/navbar.component.ts
@@ -1,62 +1,64 @@
-import {Component, OnInit, OnDestroy} from '@angular/core';
-import {Router} from '@angular/router';
+import {Component, OnInit, OnDestroy} from "@angular/core";
+import {Router} from "@angular/router";
 import { Injectable } from "@angular/core";
 
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { NgRedux, select } from '@angular-redux/store';
-import { IAppState } from '../../store/store';
-import { ILoginInfo, ILoginInfoToken } from '../../store/logininfo/logininfo.types';
-import { LoginInfoActions } from '../../actions/logininfo.actions';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { NgRedux, select } from "@angular-redux/store";
+import { IAppState } from "../../store/store";
+import { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types";
+import { LoginInfoActions } from "../../actions/logininfo.actions";
+import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
 
 @Component({
-  selector: 'reg-navbar',
-  templateUrl: 'navbar.component.html',
+    selector: "reg-navbar",
+    templateUrl: "navbar.component.html",
 })
 
-@Injectable() export default class NavbarComponent implements OnInit, OnDestroy{
+@Injectable() export default class NavbarComponent implements OnInit, OnDestroy {
     private authToken: string;
     private authRole: string;
     private lockCapacity: BehaviorSubject<boolean>;
     private lockStudents: BehaviorSubject<boolean>;
     private cuName: string;
     private loginInfo$: BehaviorSubject<ILoginInfo>;
- 	public cuser :any;
+    private cuser: any;
     private loginInfoSub: Subscription;
 
-    constructor( private _ngRedux: NgRedux<IAppState>
-                ) {
+    constructor(private _ngRedux: NgRedux<IAppState>
+    ) {
 
-                        this.authToken = '';
-                        this.authRole = '';
-                        this.lockCapacity = new BehaviorSubject(true);
-                        this.lockStudents = new BehaviorSubject(true);
-                        this.cuName = '';
-                        this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
+        this.authToken = "";
+        this.authRole = "";
+        this.lockCapacity = new BehaviorSubject(true);
+        this.lockStudents = new BehaviorSubject(true);
+        this.cuName = "";
+        this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
 
-        };
+    };
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select(state => {
-            if (state.loginInfo.size > 0) {
-                state.loginInfo.reduce(({}, loginInfoToken) => {
-                    this.authToken = loginInfoToken.auth_token;
-                    this.authRole = loginInfoToken.auth_role;
-                    if (loginInfoToken.lock_capacity === 1)
-                        this.lockCapacity.next(true);
-                    else
-                        this.lockCapacity.next(false);
-                    if (loginInfoToken.lock_students === 1)
-                        this.lockStudents.next(true);
-                    else
-                        this.lockStudents.next(false);
-                    this.cuName = loginInfoToken.cu_name;
-                    return loginInfoToken;
-                }, {})
-            }
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
+            .map(loginInfo => <ILoginInfo>loginInfo)
+            .subscribe(loginInfo => {
+                if (loginInfo.size > 0) {
+                    loginInfo.reduce(({}, loginInfoToken) => {
+                        this.authToken = loginInfoToken.auth_token;
+                        this.authRole = loginInfoToken.auth_role;
+                        if (loginInfoToken.lock_capacity === 1)
+                            this.lockCapacity.next(true);
+                        else
+                            this.lockCapacity.next(false);
+                        if (loginInfoToken.lock_students === 1)
+                            this.lockStudents.next(true);
+                        else
+                            this.lockStudents.next(false);
+                        this.cuName = loginInfoToken.cu_name;
+                        return loginInfoToken;
+                    }, {});
+                }
 
-            return state.loginInfo;
-        }).subscribe(this.loginInfo$);
+                this.loginInfo$.next(loginInfo);
+            });
 
     }
 
diff --git a/source/components/school.home.ts b/source/components/school.home.ts
index 16c44e7b5ff1269ea1b39f6bdf2a972eb8048157..f0ad4d310bf2104dfb710367d489c586a59eb429 100644
--- a/source/components/school.home.ts
+++ b/source/components/school.home.ts
@@ -51,7 +51,7 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from "../app.settings";
 })
 
 export default class SchoolHome implements OnInit, OnDestroy {
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private authToken: string;
     private errorCode$: BehaviorSubject<string>;
     private authRole: string;
@@ -74,7 +74,7 @@ export default class SchoolHome implements OnInit, OnDestroy {
         this.authRole = "";
         this.name = "";
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
-        this.errorCode$ = new BehaviorSubject('');
+        this.errorCode$ = new BehaviorSubject("");
         this.formGroup = this.fb.group({
         });
     };
@@ -87,9 +87,9 @@ export default class SchoolHome implements OnInit, OnDestroy {
     };
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
-                let linfo=<ILoginInfo>loginInfo;
+                let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({ }, loginInfoToken) => {
                         this.authToken = loginInfoToken.auth_token;
@@ -117,7 +117,7 @@ export default class SchoolHome implements OnInit, OnDestroy {
                 this.authRole = params["auth_role"];
                 this.errorCode$.next((params["error_code"] === undefined) ? "" : params["error_code"]);
             }
-            if (this.authToken && this.authRole && this.errorCode$.getValue() == "") {
+            if (this.authToken && this.authRole && this.errorCode$.getValue() === "") {
                 this._ata.getloginInfo({ auth_token: this.authToken, auth_role: this.authRole });
             }
         });
@@ -141,12 +141,11 @@ export default class SchoolHome implements OnInit, OnDestroy {
     casSignOut() {
         this._hds.casSignOut().then(data => {
             this._ata.initLoginInfo();
-            // this.router.navigate(['/school']);
-            this.authToken = '';
-            this.authRole = '';
+            this.authToken = "";
+            this.authRole = "";
             window.location.assign((<any>data).next);
         }).catch(err => {
-            console.log(err)
+            console.log(err);
         });
     }
 }
diff --git a/source/components/student-application-form/after.submit.ts b/source/components/student-application-form/after.submit.ts
index 195975d1df852a6b8f8345ba47f23ed50c184e2a..4c8e786d0daa27f2fadbd816fb7c40072febbd4d 100644
--- a/source/components/student-application-form/after.submit.ts
+++ b/source/components/student-application-form/after.submit.ts
@@ -1,22 +1,21 @@
-import {Router} from '@angular/router';
-import {OnInit, OnDestroy, Component, Injectable} from '@angular/core';
-import { HelperDataService } from '../../services/helper-data-service';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { NgRedux, select } from '@angular-redux/store';
-import { IAppState } from '../../store/store';
-import { ILoginInfo, ILoginInfoToken } 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 { RegionSchoolsActions } from '../../actions/regionschools.actions';
-import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
-import { CriteriaActions } from '../../actions/criteria.actions';
-import { StudentDataFieldsActions } from '../../actions/studentdatafields.actions';
+import {Router} from "@angular/router";
+import {OnInit, OnDestroy, Component, Injectable} from "@angular/core";
+import { HelperDataService } from "../../services/helper-data-service";
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { NgRedux, select } from "@angular-redux/store";
+import { IAppState } from "../../store/store";
+import { ILoginInfo, ILoginInfoToken } 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 { RegionSchoolsActions } from "../../actions/regionschools.actions";
+import { SectorCoursesActions } from "../../actions/sectorcourses.actions";
+import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions";
 
 @Component({
-    selector: 'post-submit',
+    selector: "post-submit",
     template: `
         <div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
            <div class="row" style="margin-top: 130px; margin-bottom: 200px;">
@@ -38,7 +37,7 @@ import { StudentDataFieldsActions } from '../../actions/studentdatafields.action
     private authToken: string;
     private authRole: string;
     private cuName: string;
-    public cuser: any;
+    private cuser: any;
     private showLoader$: BehaviorSubject<boolean>;
     private loginInfoSub: Subscription;
 
@@ -50,7 +49,6 @@ import { StudentDataFieldsActions } from '../../actions/studentdatafields.action
         private _rsa: RegionSchoolsActions,
         private _eca: EpalClassesActions,
         private _sdfa: StudentDataFieldsActions,
-        private _cria: CriteriaActions,
         private _ngRedux: NgRedux<IAppState>,
         private router: Router
     ) {
@@ -58,7 +56,7 @@ import { StudentDataFieldsActions } from '../../actions/studentdatafields.action
     };
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
@@ -69,7 +67,7 @@ import { StudentDataFieldsActions } from '../../actions/studentdatafields.action
                         return loginInfoToken;
                     }, {});
                 }
-            }, error => {console.log("error selecting epalclasses")});
+            }, error => { console.log("error selecting epalclasses"); });
     };
 
     ngOnDestroy() {
@@ -86,20 +84,19 @@ import { StudentDataFieldsActions } from '../../actions/studentdatafields.action
             this._rsa.initRegionSchools();
             this._csa.initSectorCourses();
             this._sdfa.initStudentDataFields();
-            this._cria.initCriteria();
-            this.router.navigate(['']);
-            this.authToken = '';
-            this.authRole = '';
+            this.router.navigate([""]);
+            this.authToken = "";
+            this.authRole = "";
             this.showLoader$.next(false);
         }).catch(err => {
             this.showLoader$.next(false);
-            console.log(err)
+            console.log(err);
         });
 
     }
 
     submittedView() {
-        this.router.navigate(['/submited-preview']);
+        this.router.navigate(["/submited-preview"]);
     }
 
 }
diff --git a/source/components/student-application-form/application.form.main.html b/source/components/student-application-form/application.form.main.html
index 688744494716ad1e4150d63aa07b42b99e307121..01afab054642018eaf9e9d53facb4975ddbffeae 100644
--- a/source/components/student-application-form/application.form.main.html
+++ b/source/components/student-application-form/application.form.main.html
@@ -138,14 +138,8 @@
 
     <div class="form-group">
         <label for="lastschool_schoolname">Σχολείο τελευταίας φοίτησης(<span style="color: #ff0000;">*</span>)</label><br/>
-        <input ngui-auto-complete formControlName="lastschool_schoolname"
-        [source]="observableSource.bind(this)"
-        [list-formatter]="lastSchoolListFormatter"
-        [value-formatter]="lastSchoolValueFormatter"
-        [min-chars]="5"
-        no-match-found-text="Δεν βρέθηκαν σχολεία"
-            (valueChanged)="lastSchoolValueChanged($event)"
-            placeholder="Πληκτρολογήστε τουλάχιστο 5 χαρακτήρες" class="form-control">
+        <input ngui-auto-complete formControlName="lastschool_schoolname" [source]="observableSource.bind(this)" [list-formatter]="lastSchoolListFormatter" [value-formatter]="lastSchoolValueFormatter" [min-chars]="5" no-match-found-text="Δεν βρέθηκαν σχολεία"
+            (valueChanged)="lastSchoolValueChanged($event)" placeholder="Πληκτρολογήστε τουλάχιστο 5 χαρακτήρες" class="form-control">
     </div>
     <div class="alert alert-danger" *ngIf="studentDataGroup.get('lastschool_schoolname').dirty && studentDataGroup.get('lastschool_schoolname').hasError('status')">
         Η επιλογή από αυτή τη λίστα είναι απαραίτητη!
@@ -218,4 +212,4 @@
 
 </form>
 
-  <!-- <pre>{{studentDataGroup.value | json}}</pre> -->
+<!-- <pre>{{studentDataGroup.value | json}}</pre> -->
diff --git a/source/components/student-application-form/application.form.main.ts b/source/components/student-application-form/application.form.main.ts
index 1ad5c46df677378a5d2f5f2691cf2deaba8d1414..62f2c2c1554739597e4d9111c6e8d8c168421117 100644
--- a/source/components/student-application-form/application.form.main.ts
+++ b/source/components/student-application-form/application.form.main.ts
@@ -5,13 +5,10 @@ import { Router } from "@angular/router";
 import { NgRedux, select } from "@angular-redux/store";
 import { StudentDataFieldsActions } from "../../actions/studentdatafields.actions";
 import { IStudentDataFields } from "../../store/studentdatafields/studentdatafields.types";
-import { CriteriaActions } from "../../actions/criteria.actions";
-import { ICriter } from "../../store/criteria/criteria.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 { CRITERIA_INITIAL_STATE } from "../../store/criteria/criteria.initial-state";
 import { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types";
 import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
 import {IMyDpOptions} from "mydatepicker";
@@ -34,14 +31,13 @@ import {
 
     private loginInfo$: BehaviorSubject<ILoginInfo>;
     private studentDataFields$: BehaviorSubject<IStudentDataFields>;
-    private criteria$: BehaviorSubject<ICriter>;
 
     private studentDataFieldsSub: Subscription;
     private loginInfoSub: Subscription;
     private criteriaSub: Subscription;
 
-    public studentDataGroup: FormGroup;
-    public studentCriteriaGroup: FormGroup;
+    private studentDataGroup: FormGroup;
+    private studentCriteriaGroup: FormGroup;
 
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
@@ -78,19 +74,17 @@ import {
     };
 
     constructor(private fb: FormBuilder,
-                private _sdfa: StudentDataFieldsActions,
-                private _sdfb: CriteriaActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private router: Router,
-                private http: Http) {
+        private _sdfa: StudentDataFieldsActions,
+        private _ngRedux: NgRedux<IAppState>,
+        private router: Router,
+        private http: Http) {
         this.populateSchoolyears();
-        this.modalTitle =  new BehaviorSubject("");
-        this.modalText =  new BehaviorSubject("");
-        this.modalHeader =  new BehaviorSubject("");
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+        this.modalHeader = new BehaviorSubject("");
 
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
         this.studentDataFields$ = new BehaviorSubject(STUDENT_DATA_FIELDS_INITIAL_STATE);
-        this.criteria$ = new BehaviorSubject(CRITERIA_INITIAL_STATE);
         this.studentDataGroup = this.fb.group({
             name: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
             studentsurname: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
@@ -101,7 +95,7 @@ import {
             regiontk: ["", [Validators.pattern(VALID_ADDRESSTK_PATTERN), Validators.required]],
             regionarea: ["", [Validators.pattern(VALID_NAMES_PATTERN), Validators.required]],
             relationtostudent: ["", this.checkChoice],
-            telnum:  ["", [Validators.pattern(VALID_TELEPHONE_PATTERN), Validators.required]],
+            telnum: ["", [Validators.pattern(VALID_TELEPHONE_PATTERN), Validators.required]],
             lastschool_schoolname: ["", [Validators.required]],
             lastschool_schoolyear: ["", this.checkChoice],
             lastschool_class: ["", this.checkChoice],
@@ -111,12 +105,12 @@ import {
     ngOnInit() {
         (<any>$("#applicationFormNotice")).appendTo("body");
 
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 this.loginInfo$.next(<ILoginInfo>loginInfo);
-            }, error => {console.log("error selecting loginInfo");});
+            }, error => { console.log("error selecting loginInfo"); });
 
-        this.studentDataFieldsSub = this._ngRedux.select('studentDataFields')
+        this.studentDataFieldsSub = this._ngRedux.select("studentDataFields")
             .subscribe(studentDataFields => {
                 let sdfds = <IStudentDataFields>studentDataFields;
                 if (sdfds.size > 0) {
@@ -139,7 +133,7 @@ import {
                     }, {});
                 }
                 this.studentDataFields$.next(sdfds);
-            }, error => {console.log("error selecting studentDataFields");});
+            }, error => { console.log("error selecting studentDataFields"); });
 
     };
 
@@ -182,29 +176,29 @@ import {
         else if ((new Date().getFullYear()) - d.date.year < 14)
             return 2;
         if (!this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no &&
-            this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id!==38)
+            this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id !== 38)
             return 3;
-        else if (this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id===38)
-            this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no='0000000'
-        if (this.studentDataGroup.controls["telnum"].value.length !== 10 )
+        else if (this.studentDataGroup.controls["lastschool_schoolname"].value.unit_type_id === 38)
+            this.studentDataGroup.controls["lastschool_schoolname"].value.registry_no = "0000000";
+        if (this.studentDataGroup.controls["telnum"].value.length !== 10)
             return 4;
 
         return 0;
     }
 
     checkcriteria(cb, mutual_disabled) {
-      if (mutual_disabled !== "-1" && cb.checked === true) {
-        // this.studentCriteriaGroup.controls["formArray"]["controls"][mutual_disabled-1].setValue(false);
-        let  mutual_ids = mutual_disabled.split(",");
-        for (let i = 0; i < mutual_ids.length; i++) {
-          this.studentCriteriaGroup.controls["formArray"]["controls"][mutual_ids[i] - 1].setValue(false);
-        }
+        if (mutual_disabled !== "-1" && cb.checked === true) {
+            // this.studentCriteriaGroup.controls["formArray"]["controls"][mutual_disabled-1].setValue(false);
+            let mutual_ids = mutual_disabled.split(",");
+            for (let i = 0; i < mutual_ids.length; i++) {
+                this.studentCriteriaGroup.controls["formArray"]["controls"][mutual_ids[i] - 1].setValue(false);
+            }
 
-      }
+        }
     }
 
     checkChoice(c: FormControl) {
-      return (c.value === "" ) ? {status: true} : null;
+        return (c.value === "") ? { status: true } : null;
     }
 
     populateDate(d) {
@@ -233,10 +227,12 @@ import {
 
     setDate() {
         let date = new Date();
-        return { date: {
-            year: date.getFullYear() - 14,
-            month: date.getMonth() + 1,
-            day: date.getDate()}
+        return {
+            date: {
+                year: date.getFullYear() - 14,
+                month: date.getMonth() + 1,
+                day: date.getDate()
+            }
         };
     }
 
@@ -253,11 +249,11 @@ import {
     }
 
     lastSchoolListFormatter(data: any): string {
-      return data.name;
+        return data.name;
     };
 
     lastSchoolValueFormatter(data: any): string {
-      return data.name;
+        return data.name;
     };
 
     lastSchoolValueChanged(e: any): void {
diff --git a/source/components/student-application-form/application.preview.ts b/source/components/student-application-form/application.preview.ts
index 501096cf8a49d93451b2163bb851c644c18ebf96..60bacf17ad653c7fed8a52dd03cd9398679e0c3d 100644
--- a/source/components/student-application-form/application.preview.ts
+++ b/source/components/student-application-form/application.preview.ts
@@ -1,25 +1,25 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy } 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 { ISectorFields } from '../../store/sectorfields/sectorfields.types';
-import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
-import { IRegionRecord, IRegionRecords, IRegionSchoolRecord } from '../../store/regionschools/regionschools.types';
-import { IEpalClasses } 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 { SECTOR_COURSES_INITIAL_STATE } from '../../store/sectorcourses/sectorcourses.initial-state';
-import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfields.initial-state';
+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 { ISectorFields } from "../../store/sectorfields/sectorfields.types";
+import { ISectors } from "../../store/sectorcourses/sectorcourses.types";
+import { IRegionRecord, IRegionRecords, IRegionSchoolRecord } from "../../store/regionschools/regionschools.types";
+import { IEpalClasses } 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 { SECTOR_COURSES_INITIAL_STATE } from "../../store/sectorcourses/sectorcourses.initial-state";
+import { SECTOR_FIELDS_INITIAL_STATE } from "../../store/sectorfields/sectorfields.initial-state";
 
 @Component({
-    selector: 'application-preview-select',
+    selector: "application-preview-select",
     template: `
         <div *ngFor="let epalclass$ of epalclasses$ | async;">
         <h4 style="margin-top: 20px; line-height: 2em; ">Οι επιλογές μου</h4>
@@ -92,7 +92,7 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
     private numSelectedSchools = <number>0;
     private numSelectedOrder = <number>0;
     private classSelected = 0;
-    public currentUrl: string;
+    private currentUrl: string;
 
     constructor(private _ngRedux: NgRedux<IAppState>,
         private router: Router
@@ -107,7 +107,7 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
 
     ngOnInit() {
         this.currentUrl = this.router.url;
-        this.sectorsSub = this._ngRedux.select('sectors')
+        this.sectorsSub = this._ngRedux.select("sectors")
             .subscribe(sectors => {
                 let scs = <ISectors>sectors;
                 scs.reduce((prevSector, sector) => {
@@ -123,7 +123,7 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
                 this.sectors$.next(scs);
             });
 
-        this.regionsSub = this._ngRedux.select('regions')
+        this.regionsSub = this._ngRedux.select("regions")
             .subscribe(regions => {
                 let rgns = <IRegionRecords>regions;
                 let numsel = 0, numsel2 = 0;
@@ -148,12 +148,12 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
                 this.selectedSchools$.next(selectedSchools.sort(this.compareSchools));
             });
 
-        this.sectorFieldsSub = this._ngRedux.select('sectorFields')
+        this.sectorFieldsSub = this._ngRedux.select("sectorFields")
             .subscribe(sectorFields => {
                 this.sectorFields$.next(<ISectorFields>sectorFields);
-            }, error => {console.log("error selecting sectorFields");});
+            }, error => { console.log("error selecting sectorFields"); });
 
-        this.epalclassesSub = this._ngRedux.select('epalclasses')
+        this.epalclassesSub = this._ngRedux.select("epalclasses")
             .subscribe(epalclasses => {
                 let ecs = <IEpalClasses>epalclasses;
                 ecs.reduce(({}, epalclass) => {
@@ -168,11 +168,11 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
                     return epalclass;
                 }, {});
                 this.epalclasses$.next(ecs);
-            }, error => {console.log("error selecting epalclasses");});
+            }, error => { console.log("error selecting epalclasses"); });
 
     }
 
-    compareSchools(a: IRegionSchoolRecord,b: IRegionSchoolRecord) {
+    compareSchools(a: IRegionSchoolRecord, b: IRegionSchoolRecord) {
         if (a.order_id < b.order_id)
             return -1;
         if (a.order_id > b.order_id)
@@ -183,19 +183,19 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
     ngOnDestroy() {
         if (this.regionsSub) {
             this.regionsSub.unsubscribe();
-//            this.regions$.unsubscribe();
+            //            this.regions$.unsubscribe();
         }
         if (this.sectorsSub) {
             this.sectorsSub.unsubscribe();
-//            this.sectors$.unsubscribe();
+            //            this.sectors$.unsubscribe();
         }
         if (this.sectorFieldsSub) {
             this.sectorFieldsSub.unsubscribe();
-//            this.sectorFields$.unsubscribe();
+            //            this.sectorFields$.unsubscribe();
         }
         if (this.epalclassesSub) {
             this.epalclassesSub.unsubscribe();
-//            this.epalclasses$.unsubscribe();
+            //            this.epalclasses$.unsubscribe();
         }
 
     }
diff --git a/source/components/student-application-form/application.submit.ts b/source/components/student-application-form/application.submit.ts
index 6791d89d9fbfda532c5f72a9cc26b0a522702f6b..b433429ce5f0e3a7b001f142fc43e9382e8dd9a8 100644
--- a/source/components/student-application-form/application.submit.ts
+++ b/source/components/student-application-form/application.submit.ts
@@ -137,7 +137,7 @@ import { HelperDataService } from "../../services/helper-data-service";
     private modalHeader: BehaviorSubject<string>;
     public isModalShown: BehaviorSubject<boolean>;
     private showLoader: BehaviorSubject<boolean>;
-    public currentUrl: string;
+    private currentUrl: string;
     private cu_name: string;
     private cu_surname: string;
     private cu_fathername: string;
@@ -156,7 +156,7 @@ import { HelperDataService } from "../../services/helper-data-service";
         private http: Http
     ) {
 
-//        this.regions$ = new BehaviorSubject(REGION_SCHOOLS_INITIAL_STATE);
+        //        this.regions$ = new BehaviorSubject(REGION_SCHOOLS_INITIAL_STATE);
         this.epalclasses$ = new BehaviorSubject(EPALCLASSES_INITIAL_STATE);
         this.studentDataFields$ = new BehaviorSubject(STUDENT_DATA_FIELDS_INITIAL_STATE);
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
@@ -171,7 +171,7 @@ import { HelperDataService } from "../../services/helper-data-service";
     ngOnInit() {
 
         (<any>$("#studentFormSentNotice")).appendTo("body");
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 console.log("SELECTOR5");
@@ -189,9 +189,9 @@ import { HelperDataService } from "../../services/helper-data-service";
                     }, {});
                 }
                 this.loginInfo$.next(linfo);
-            }, error => {console.log("error selecting loginInfo")});
+            }, error => { console.log("error selecting loginInfo"); });
 
-        this.epalclassesSub = this._ngRedux.select('epalclasses').subscribe(epalclasses => {
+        this.epalclassesSub = this._ngRedux.select("epalclasses").subscribe(epalclasses => {
             let ecs = <IEpalClasses>epalclasses;
             console.log("SELECTOR4");
             if (ecs.size > 0) {
@@ -201,56 +201,40 @@ import { HelperDataService } from "../../services/helper-data-service";
                 }, {});
             }
             this.epalclasses$.next(ecs);
-        }, error => {console.log("error selecting epalclasses")});
+        }, error => { console.log("error selecting epalclasses"); });
 
-        this.studentDataFieldsSub = this._ngRedux.select('studentDataFields')
+        this.studentDataFieldsSub = this._ngRedux.select("studentDataFields")
             .subscribe(studentDataFields => {
                 this.studentDataFields$.next(<IStudentDataFields>studentDataFields);
-        }, error => {console.log("error selecting studentDataFields")});
-
-/*        this.regionsSub = this._ngRedux.select((state) => {
-            console.log("SELECTOR3");
-            state.regions.reduce((prevRegion, region) => {
-                region.epals.reduce((prevEpal, epal) => {
-                    if (epal.selected === true) {
-                        this.epalSelected.push(Number(epal.epal_id));
-                        this.epalSelectedOrder.push(epal.order_id);
-                    }
-                    return epal;
-                }, {});
-                return region;
-            }, {});
-            return state.regions;
-        }).subscribe(this.regions$); */
-
+            }, error => { console.log("error selecting studentDataFields"); });
 
-        this.regionsSub = this._ngRedux.select('regions').
+        this.regionsSub = this._ngRedux.select("regions").
             subscribe(regions => {
                 console.log("SELECTOR: REGIONS");
-                    let rgns = <IRegionRecords>regions;
-                    let prevSelected: Array<number> = new Array();
-                    rgns.reduce((prevRgn, rgn) => {
-                        rgn.epals.reduce((prevSchool, school) => {
-                            if (school.selected === true) {
-                                prevSelected = this.epalSelected$.getValue();
-                                prevSelected[prevSelected.length] = <number>parseInt(school.epal_id);
-
-                                this.epalSelected$.next(prevSelected);
-                                this.epalSelectedOrder.push(school.order_id);
-                            }
-                            return school;
-                        }, {});
-                        return rgn;
+                let rgns = <IRegionRecords>regions;
+                let prevSelected: Array<number> = new Array();
+                rgns.reduce((prevRgn, rgn) => {
+                    rgn.epals.reduce((prevSchool, school) => {
+                        if (school.selected === true) {
+                            prevSelected = this.epalSelected$.getValue();
+                            prevSelected[prevSelected.length] = <number>parseInt(school.epal_id);
+
+                            this.epalSelected$.next(prevSelected);
+                            this.epalSelectedOrder.push(school.order_id);
+                        }
+                        return school;
                     }, {});
-//                    this.regions$.next(<IRegionRecords>regions);
-                },
-                error => {
-                    console.log("Error Selecting Regions");
-                }
-                );
+                    return rgn;
+                }, {});
+                //                    this.regions$.next(<IRegionRecords>regions);
+            },
+            error => {
+                console.log("Error Selecting Regions");
+            }
+            );
 
 
-        this.sectorsSub = this._ngRedux.select('sectors')
+        this.sectorsSub = this._ngRedux.select("sectors")
             .subscribe(sectors => {
                 let scs = <ISectors>sectors;
                 console.log("SELECTOR2");
@@ -265,7 +249,7 @@ import { HelperDataService } from "../../services/helper-data-service";
                 }, {});
             });
 
-        this.sectorFieldsSub = this._ngRedux.select('sectorFields')
+        this.sectorFieldsSub = this._ngRedux.select("sectorFields")
             .subscribe(sectorFields => {
                 let sfds = <ISectorFields>sectorFields;
                 console.log("SELECTOR");
@@ -283,33 +267,25 @@ import { HelperDataService } from "../../services/helper-data-service";
         (<any>$("#studentFormSentNotice")).remove();
         if (this.studentDataFieldsSub) {
             this.studentDataFieldsSub.unsubscribe();
-//            this.studentDataFields$.unsubscribe();
         }
         if (this.regionsSub) {
             this.regionsSub.unsubscribe();
-//            this.regions$.unsubscribe();
         }
         if (this.sectorsSub) {
             this.sectorsSub.unsubscribe();
-//            this.sectors$.unsubscribe();
         }
         if (this.sectorFieldsSub) {
             this.sectorFieldsSub.unsubscribe();
-//            this.sectorFields$.unsubscribe();
         }
         if (this.epalclassesSub) {
             this.epalclassesSub.unsubscribe();
-//            this.epalclasses$.unsubscribe();
         }
         if (this.loginInfoSub) {
             this.loginInfoSub.unsubscribe();
-//            this.loginInfo$.unsubscribe();
         }
     }
 
     submitNow() {
-        // αποστολή στοιχείων μαθητή στο entity: epal_student
-        // let aitisiObj: Array<Student | StudentEpalChosen[] | StudentCriteriaChosen[] | StudentCourseChosen | StudentSectorChosen > = [];
 
         if (this.studentDataFields$.getValue().size === 0 || this.epalSelected$.getValue().length === 0 || this.epalclasses$.getValue().size === 0 || this.loginInfo$.getValue().size === 0)
             return;
@@ -518,7 +494,7 @@ import { HelperDataService } from "../../services/helper-data-service";
                 this.showLoader.next(false);
                 console.log("Error HTTP POST Service");
             }
-        );
+            );
 
     }
 
diff --git a/source/components/student-application-form/course.fields.select.ts b/source/components/student-application-form/course.fields.select.ts
deleted file mode 100644
index 2865abc7b01ff0900bbfb8d406ef4afadf89ddc7..0000000000000000000000000000000000000000
--- a/source/components/student-application-form/course.fields.select.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Rx';
-import { Injectable } from "@angular/core";
-import { CourseFieldsActions } from '../../actions/coursefields.actions';
-import { NgRedux, select } from '@angular-redux/store';
-import { ICourseFields } from '../../store/coursefields/coursefields.types';
-import { IAppState } from '../../store/store';
-
-import {
-    FormBuilder,
-    FormGroup,
-    FormControl,
-    FormArray
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
-
-@Component({
-    selector: 'course-fields-select',
-    template: `
-    <div class="row">
-             <breadcrumbs></breadcrumbs>
-    </div>
-     <form [formGroup]="formGroup">
-        <div formArrayName="formArray">
-            <div *ngFor="let courseField$ of courseFields$ | async; let i=index">
-            <div class="row">
-            <div class="col-md-1">
-                <input type="checkbox" formControlName="{{i}}">
-            </div>
-            <div class="col-md-11 pull-left">
-                {{courseField$.name}}
-            </div>
-            </div>
-            </div>
-        </div>
-        <div class="row" style="margin-bottom: 20px;">
-        <div class="col-md-12 col-md-offset-5">
-            <button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveSelected()">
-                <span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
-            </button>
-        </div>
-        </div>
-    </form>
-<!--    <pre>{{formGroup.value | json}}</pre> -->
-  `
-})
-@Injectable() export default class CourseFieldsSelect implements OnInit {
-    private courseFields$: Observable<ICourseFields>;
-
-    public formGroup: FormGroup;
-    public cfs = new FormArray([]);
-
-    constructor(private fb: FormBuilder,
-                private _cfa: CourseFieldsActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private router: Router) {
-        this.formGroup = this.fb.group({
-            formArray: this.cfs
-        });
-    };
-
-    ngOnInit() {
-
-        this._cfa.getCourseFields();
-
-        this.courseFields$ = this._ngRedux.select(state => {
-            state.courseFields.reduce(({}, courseField) =>{
-                this.cfs.push(new FormControl(courseField.selected, []));
-                return courseField;
-            }, {});
-            return state.courseFields;
-        });
-
-    }
-
-    saveSelected() {
-        this._cfa.saveCourseFieldsSelected(this.formGroup.value.formArray);
-        this.router.navigate(['/region-schools-select']);
-    }
-}
diff --git a/source/components/student-application-form/disclaimer.ts b/source/components/student-application-form/disclaimer.ts
index 83e8b35c78a97d0f546fbbfff0c179cf5547353f..eac596c479fd43d02c523002702f6649b26fcb42 100644
--- a/source/components/student-application-form/disclaimer.ts
+++ b/source/components/student-application-form/disclaimer.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit, OnDestroy } 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 { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
-import { LoginInfoActions } from '../../actions/logininfo.actions';
+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 { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
+import { LoginInfoActions } from "../../actions/logininfo.actions";
 
 import {
     FormBuilder,
@@ -16,10 +16,10 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 
 @Component({
-    selector: 'intro-statement',
+    selector: "intro-statement",
     template: `
 
     <div id="disclaimerNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
@@ -127,83 +127,83 @@ import {
 
 @Injectable() export default class Disclaimer implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
-    loginInfo$: BehaviorSubject<ILoginInfo>;
+    private formGroup: FormGroup;
+    private loginInfo$: BehaviorSubject<ILoginInfo>;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
     private modalHeader: BehaviorSubject<string>;
     private disclaimerChecked: BehaviorSubject<number>;
-    loginInfoSub: Subscription;
+    private loginInfoSub: Subscription;
 
     constructor(private fb: FormBuilder,
         private _ngRedux: NgRedux<IAppState>,
         private _lia: LoginInfoActions,
         private router: Router) {
 
-          this.formGroup = this.fb.group({
-              disclaimerChecked: ['', []],
-          });
+        this.formGroup = this.fb.group({
+            disclaimerChecked: ["", []],
+        });
 
-          this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
-          this.modalTitle =  new BehaviorSubject("");
-          this.modalText =  new BehaviorSubject("");
-          this.modalHeader =  new BehaviorSubject("");
-          this.disclaimerChecked = new BehaviorSubject(0);
+        this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+        this.modalHeader = new BehaviorSubject("");
+        this.disclaimerChecked = new BehaviorSubject(0);
 
     }
 
-    public showModal():void {
-        (<any>$('#disclaimerNotice')).modal('show');
+    public showModal(): void {
+        (<any>$("#disclaimerNotice")).modal("show");
     }
 
-    public hideModal():void {
-        (<any>$('#disclaimerNotice')).modal('hide');
+    public hideModal(): void {
+        (<any>$("#disclaimerNotice")).modal("hide");
     }
 
-    public onHidden():void {
-        //this.isModalShown.next(false);
+    public onHidden(): void {
+        // this.isModalShown.next(false);
     }
 
 
     ngOnDestroy() {
 
-      (<any>$('#disclaimerNotice')).remove();
+        (<any>$("#disclaimerNotice")).remove();
 
-      if (this.loginInfoSub)
-        this.loginInfoSub.unsubscribe();
+        if (this.loginInfoSub)
+            this.loginInfoSub.unsubscribe();
     }
 
     ngOnInit() {
 
-      (<any>$('#disclaimerNotice')).appendTo("body");
+        (<any>$("#disclaimerNotice")).appendTo("body");
 
-      this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({}, loginInfoToken) => {
-                        this.formGroup.controls['disclaimerChecked'].setValue(loginInfoToken.disclaimer_checked);
+                        this.formGroup.controls["disclaimerChecked"].setValue(loginInfoToken.disclaimer_checked);
                         this.disclaimerChecked.next(loginInfoToken.disclaimer_checked);
                         return loginInfoToken;
                     }, {});
                 }
                 this.loginInfo$.next(linfo);
-            }, error => {console.log("error selecting loginInfo");});
-  }
-
-  navigateBack() {
-      this.router.navigate(['/parent-form']);
-  }
-
-  saveStatementAgree() {
-      if (!this.formGroup.controls['disclaimerChecked'].value) {
-          this.modalHeader.next("modal-header-danger");
-          this.modalTitle.next("Αποδοχή όρων χρήσης");
-          this.modalText.next("Πρέπει να αποδεχθείτε πρώτα τους όρους χρήσης για να συνεχίσετε");
-          this.showModal();
-      } else {
-          this._lia.saveStatementAgree(this.formGroup.controls['disclaimerChecked'].value);
-          this.router.navigate(['epal-class-select']);
-      }
-  }
+            }, error => { console.log("error selecting loginInfo"); });
+    }
+
+    navigateBack() {
+        this.router.navigate(["/parent-form"]);
+    }
+
+    saveStatementAgree() {
+        if (!this.formGroup.controls["disclaimerChecked"].value) {
+            this.modalHeader.next("modal-header-danger");
+            this.modalTitle.next("Αποδοχή όρων χρήσης");
+            this.modalText.next("Πρέπει να αποδεχθείτε πρώτα τους όρους χρήσης για να συνεχίσετε");
+            this.showModal();
+        } else {
+            this._lia.saveStatementAgree(this.formGroup.controls["disclaimerChecked"].value);
+            this.router.navigate(["epal-class-select"]);
+        }
+    }
 }
diff --git a/source/components/student-application-form/epal.class.select.ts b/source/components/student-application-form/epal.class.select.ts
index 9f44e7f3eb502555e6b86bc0fdcfe46e33ff1db3..a9a5b1b73ec9d0ed0741528dddbc7a4a1b2222a9 100644
--- a/source/components/student-application-form/epal.class.select.ts
+++ b/source/components/student-application-form/epal.class.select.ts
@@ -1,25 +1,25 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy } from "@angular/core";
+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 { IEpalClasses } 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 { EpalClassesActions } from "../../actions/epalclass.actions";
+import { NgRedux, select } from "@angular-redux/store";
+import { IEpalClasses } 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 { EPALCLASSES_INITIAL_STATE } from "../../store/epalclasses/epalclasses.initial-state";
 import {
     FormBuilder,
     FormGroup,
     FormControl,
     FormArray
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
+} from "@angular/forms";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'epal-class-select',
+    selector: "epal-class-select",
     template: `
     <div class="row">
              <breadcrumbs></breadcrumbs>
@@ -51,8 +51,8 @@ import {AppSettings} from '../../app.settings';
               <label for="name"></label><br/>
                     <select class="form-control" formControlName="name" (change)="initializestore()">
                         <option value="">Επιλέξτε Τάξη</option>
-                        <option value="1">Α’ Λυκείου</option>
-                        <option value="2">Β’ Λυκείου</option>
+                        <option value="1">Α' Λυκείου</option>
+                        <option value="2">Β' Λυκείου</option>
                         <option value="3">Γ' Λυκείου</option>
                         <option value="4">Δ' Λυκείου</option>
 
@@ -80,59 +80,59 @@ import {AppSettings} from '../../app.settings';
     private epalclasses$: BehaviorSubject<IEpalClasses>;
     private epalclassesSub: Subscription;
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
     private modalHeader: BehaviorSubject<string>;
     public isModalShown: BehaviorSubject<boolean>;
 
-       constructor(private fb: FormBuilder,
-                private _cfa: EpalClassesActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private _csa: SectorCoursesActions,
-                private _sfa: SectorFieldsActions,
-                private _rsa: RegionSchoolsActions,
-                private router: Router) {
-       this.formGroup = this.fb.group({
+    constructor(private fb: FormBuilder,
+        private _cfa: EpalClassesActions,
+        private _ngRedux: NgRedux<IAppState>,
+        private _csa: SectorCoursesActions,
+        private _sfa: SectorFieldsActions,
+        private _rsa: RegionSchoolsActions,
+        private router: Router) {
+        this.formGroup = this.fb.group({
             name: []
-            });
-            this.modalTitle = new BehaviorSubject("");
-            this.modalText = new BehaviorSubject("");
-            this.modalHeader = new BehaviorSubject("");
-            this.isModalShown = new BehaviorSubject(false);
-            this.epalclasses$ = new BehaviorSubject(EPALCLASSES_INITIAL_STATE);
-        };
+        });
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+        this.modalHeader = new BehaviorSubject("");
+        this.isModalShown = new BehaviorSubject(false);
+        this.epalclasses$ = new BehaviorSubject(EPALCLASSES_INITIAL_STATE);
+    };
 
     ngOnInit() {
-        (<any>$('#epalClassNotice')).appendTo("body");
-          this.epalclassesSub = this._ngRedux.select('epalclasses')
-                .subscribe(epalclasses => {
-                    let ecs = <IEpalClasses>epalclasses;
-                  if (ecs.size > 0) {
-                      ecs.reduce(({}, epalclass) => {
-                          this.formGroup.setValue(epalclass);
-                          return epalclass;
-                      }, {});
-                  } else {
-                      this.formGroup.controls["name"].setValue("");
-                  }
-                  this.epalclasses$.next(ecs);
-              }, error => {console.log("error selecting epalclasses");});
+        (<any>$("#epalClassNotice")).appendTo("body");
+        this.epalclassesSub = this._ngRedux.select("epalclasses")
+            .subscribe(epalclasses => {
+                let ecs = <IEpalClasses>epalclasses;
+                if (ecs.size > 0) {
+                    ecs.reduce(({}, epalclass) => {
+                        this.formGroup.setValue(epalclass);
+                        return epalclass;
+                    }, {});
+                } else {
+                    this.formGroup.controls["name"].setValue("");
+                }
+                this.epalclasses$.next(ecs);
+            }, error => { console.log("error selecting epalclasses"); });
 
     }
 
     ngOnDestroy() {
         if (this.epalclassesSub)
             this.epalclassesSub.unsubscribe();
-        (<any>$('#epalClassNotice')).remove();
+        (<any>$("#epalClassNotice")).remove();
     }
 
     public showModal(): void {
-        (<any>$('#epalClassNotice')).modal('show');
+        (<any>$("#epalClassNotice")).modal("show");
     }
 
     public hideModal(): void {
-        (<any>$('#epalClassNotice')).modal('hide');
+        (<any>$("#epalClassNotice")).modal("hide");
 
     }
 
@@ -148,31 +148,29 @@ import {AppSettings} from '../../app.settings';
             this.modalHeader.next("modal-header-danger");
             this.showModal();
         }
-        else
-        {
+        else {
             this._cfa.saveEpalClassesSelected(this.formGroup.value);
             if (this.formGroup.value.name === "1")
-              this.router.navigate(['/region-schools-select']);
+                this.router.navigate(["/region-schools-select"]);
             else if (this.formGroup.value.name === "2")
-                this.router.navigate(['/sector-fields-select']);
+                this.router.navigate(["/sector-fields-select"]);
             else if (this.formGroup.value.name === "3" || this.formGroup.value.name === "4")
-                this.router.navigate(['/sectorcourses-fields-select']);
+                this.router.navigate(["/sectorcourses-fields-select"]);
 
         }
 
     }
 
     navigateBack() {
-        this.router.navigate(['/intro-statement']);
+        this.router.navigate(["/intro-statement"]);
     }
 
 
-    initializestore()
-    {
-       this._cfa.saveEpalClassesSelected(this.formGroup.value);
-       this._sfa.initSectorFields();
-       this._rsa.initRegionSchools();
-       this._csa.initSectorCourses();
+    initializestore() {
+        this._cfa.saveEpalClassesSelected(this.formGroup.value);
+        this._sfa.initSectorFields();
+        this._rsa.initRegionSchools();
+        this._csa.initSectorCourses();
     }
 
 }
diff --git a/source/components/student-application-form/help-desk.ts b/source/components/student-application-form/help-desk.ts
index 1587c5212cde850c39e172d04e9f11e3b2fbc182..05da4aab0e3ef5e9b5f08cedadceb5f9d9988010 100644
--- a/source/components/student-application-form/help-desk.ts
+++ b/source/components/student-application-form/help-desk.ts
@@ -1,10 +1,10 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import {Location} from '@angular/common';
+import {Location} from "@angular/common";
 import { Injectable } from "@angular/core";
-import { VALID_EMAIL_PATTERN, VALID_NAMES_PATTERN } from '../../constants';
+import { VALID_EMAIL_PATTERN, VALID_NAMES_PATTERN } from "../../constants";
 import {Router} from "@angular/router";
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { HelperDataService } from '../../services/helper-data-service';
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { HelperDataService } from "../../services/helper-data-service";
 import { ILoginInfo, ILoginInfoToken } from "../../store/logininfo/logininfo.types";
 import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state";
 import { NgRedux, select } from "@angular-redux/store";
@@ -15,10 +15,10 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
+} from "@angular/forms";
 
 @Component({
-    selector: 'helpdesk',
+    selector: "helpdesk",
     template: `
         <div class = "loading" *ngIf="(showLoader | async) === true"></div>
         <p align="left"><strong>Ηλεκτρονικές δηλώσεις προτίμησης ΕΠΑΛ για το νέο σχολικό έτος</strong></p>
@@ -159,7 +159,7 @@ import {
 
 @Injectable() export default class HelpDesk implements OnInit, OnDestroy {
 
-    public formGroup: FormGroup;
+    private formGroup: FormGroup;
     private emailSent: BehaviorSubject<boolean>;
     private loginInfo$: BehaviorSubject<ILoginInfo>;
     private loginInfoSub: Subscription;
@@ -172,22 +172,21 @@ import {
         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
         this.showLoader = new BehaviorSubject(false);
         this.formGroup = fb.group({
-            userEmail: ['', [Validators.pattern(VALID_EMAIL_PATTERN), Validators.required]],
-            userName: ['', [Validators.pattern(VALID_NAMES_PATTERN), Validators.required]],
-            userSurname: ['', [Validators.pattern(VALID_NAMES_PATTERN), Validators.required]],
-            userMessage: ['', [Validators.required]],
-
-        })
+            userEmail: ["", [Validators.pattern(VALID_EMAIL_PATTERN), Validators.required]],
+            userName: ["", [Validators.pattern(VALID_NAMES_PATTERN), Validators.required]],
+            userSurname: ["", [Validators.pattern(VALID_NAMES_PATTERN), Validators.required]],
+            userMessage: ["", [Validators.required]],
+        });
         this.emailSent = new BehaviorSubject(false);
     }
 
     public showModal(popupMsgId): void {
-        (<any>$(popupMsgId)).modal('show');
+        (<any>$(popupMsgId)).modal("show");
     }
 
     public hideModal(popupMsgId): void {
 
-        (<any>$(popupMsgId)).modal('hide');
+        (<any>$(popupMsgId)).modal("hide");
     }
 
     public onHidden(popupMsgId): void {
@@ -199,22 +198,22 @@ import {
     }
 
     ngOnInit() {
-        (<any>$('#mailsent')).appendTo("body");
-        (<any>$('#dangermodal')).appendTo("body");
-        (<any>$('#fillfields')).appendTo("body");
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        (<any>$("#mailsent")).appendTo("body");
+        (<any>$("#dangermodal")).appendTo("body");
+        (<any>$("#fillfields")).appendTo("body");
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({}, loginInfoToken) => {
-                        this.formGroup.controls['userEmail'].setValue(loginInfoToken.cu_email);
-                        this.formGroup.controls['userName'].setValue(loginInfoToken.cu_name);
-                        this.formGroup.controls['userSurname'].setValue(loginInfoToken.cu_surname);
+                        this.formGroup.controls["userEmail"].setValue(loginInfoToken.cu_email);
+                        this.formGroup.controls["userName"].setValue(loginInfoToken.cu_name);
+                        this.formGroup.controls["userSurname"].setValue(loginInfoToken.cu_surname);
                         return loginInfoToken;
                     }, {});
                 }
                 this.loginInfo$.next(linfo);
-            }, error => {console.log("error selecting loginInfo");});
+            }, error => { console.log("error selecting loginInfo"); });
     }
 
     sendmail() {
diff --git a/source/components/student-application-form/info.ts b/source/components/student-application-form/info.ts
index f4e03a426f30b7deb376cc03c9ac1e193b13b57e..be3543f68cdcb7fb0c2779ad05d26eb258a6b9b5 100644
--- a/source/components/student-application-form/info.ts
+++ b/source/components/student-application-form/info.ts
@@ -1,16 +1,16 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { Injectable } from "@angular/core";
-import { NgRedux, select } from '@angular-redux/store';
-import { IAppState } from '../../store/store';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state';
+import { NgRedux, select } from "@angular-redux/store";
+import { IAppState } from "../../store/store";
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
+import { ILoginInfo } 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";
 
 @Component({
-    selector: 'info',
+    selector: "info",
     template: `
 
     <div class="loading" *ngIf="(showLoader$ | async) === true"></div>
@@ -52,10 +52,10 @@ import {Router} from "@angular/router";
     }
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .subscribe(loginInfo => {
                 this.loginInfo$.next(<ILoginInfo>loginInfo);
-            }, error => {console.log("error selecting loginInfo");});
+            }, error => { console.log("error selecting loginInfo"); });
     }
 
     signOut() {
diff --git a/source/components/student-application-form/legalinfos.ts b/source/components/student-application-form/legalinfos.ts
index 27e74a3be83cae8353712dcc4e8223b3565b893f..4d9ee5837eb85384590e6af8921ff907b7ac4dac 100644
--- a/source/components/student-application-form/legalinfos.ts
+++ b/source/components/student-application-form/legalinfos.ts
@@ -1,9 +1,9 @@
 import { Component, Injectable } from "@angular/core";
-import { Router } from '@angular/router';
-import {Location} from '@angular/common';
+import { Router } from "@angular/router";
+import {Location} from "@angular/common";
 
 @Component({
-    selector: 'legal-info',
+    selector: "legal-info",
     template: `
         <p align="left"><strong> Νομοθεσία  </strong></p>
         <ul class="list-group">
@@ -74,7 +74,7 @@ import {Location} from '@angular/common';
     }
 
     public goHome(): void {
-        this.router.navigate(['']);
+        this.router.navigate([""]);
     }
 
 }
diff --git a/source/components/student-application-form/parent.form.html b/source/components/student-application-form/parent.form.html
index ef9ad7b9fa257c8f8d61d6064e8a8c40c83f955d..2e241ce0fd02d9fd67363caae6a2bc9c01e248da 100644
--- a/source/components/student-application-form/parent.form.html
+++ b/source/components/student-application-form/parent.form.html
@@ -1,84 +1,84 @@
-<div class = "loading" *ngIf="(showLoader | async) === true"></div>
+<div class="loading" *ngIf="(showLoader | async) === true"></div>
 
 <div id="emailSentNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header modal-header-danger">
-          <h3 class="modal-title pull-left"><i class="fa fa-ban"></i>&nbsp;&nbsp;{{ modalTitle | async }}</h3>
-        <button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header modal-header-danger">
+                <h3 class="modal-title pull-left"><i class="fa fa-ban"></i>&nbsp;&nbsp;{{ modalTitle | async }}</h3>
+                <button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
           <span aria-hidden="true"><i class="fa fa-times"></i></span>
         </button>
-      </div>
-      <div class="modal-body">
-          <p>{{ modalText | async }}</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Κλείσιμο</button>
-      </div>
+            </div>
+            <div class="modal-body">
+                <p>{{ modalText | async }}</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Κλείσιμο</button>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 <div style="min-height: 500px; margin-bottom: 30px;">
     <p style="margin-top: 20px; line-height: 2em;"> <b> Στοιχεία γονέα-κηδεμόνα. Όλα τα πεδία που συνοδεύονται από (*) είναι απαραίτητο να συμπληρωθούν. Στα ονόματα επιτρέπονται μόνο κεφαλαία γράμματα.</b></p>
-<form [formGroup]="formGroup">
-
-    <div class="form-group">
-        <label for="userEmail">Email Επικοινωνίας(<span style="color: #ff0000;">*</span>)</label><input #userEmail class="form-control" type="text" formControlName="userEmail">
-    </div>
-    <div class="alert alert-danger" *ngIf="formGroup.get('userEmail').hasError('required')">
-        Το πεδίο δεν μπορεί να αφεθεί κενό!
-    </div>
-    <div class="alert alert-danger" *ngIf="formGroup.get('userEmail').hasError('pattern')">
-        Πληκτρολογήστε ένα σωστό συντακτικά email!
-    </div>
+    <form [formGroup]="formGroup">
 
-    <div class="form-group">
-        <label for="userName">Όνομα(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userName">
-        <div class="alert alert-danger" *ngIf="formGroup.get('userName').touched && formGroup.get('userName').hasError('required') ">
-            Το πεδίο δεν μπορεί να αφεθεί κενό!
-        </div>
-        <div class="alert alert-danger" *ngIf="formGroup.get('userName').hasError('pattern')">
-            Πληκτρολογήστε το όνομά σας με κεφαλαία γράμματα!
+        <div class="form-group">
+            <label for="userEmail">Email Επικοινωνίας(<span style="color: #ff0000;">*</span>)</label><input #userEmail class="form-control" type="text" formControlName="userEmail">
         </div>
-    </div>
-
-    <div class="form-group">
-        <label for="userSurname">Επώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userSurname">
-        <div class="alert alert-danger" *ngIf="formGroup.get('userSurname').touched && formGroup.get('userSurname').hasError('required') ">
+        <div class="alert alert-danger" *ngIf="formGroup.get('userEmail').hasError('required')">
             Το πεδίο δεν μπορεί να αφεθεί κενό!
         </div>
-        <div class="alert alert-danger" *ngIf="formGroup.get('userSurname').hasError('pattern')">
-            Πληκτρολογήστε το επώνυμό σας με κεφαλαία γράμματα!
+        <div class="alert alert-danger" *ngIf="formGroup.get('userEmail').hasError('pattern')">
+            Πληκτρολογήστε ένα σωστό συντακτικά email!
         </div>
-    </div>
 
-    <div class="form-group">
-        <label for="userFathername">Πατρώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userFathername">
-        <div class="alert alert-danger" *ngIf="formGroup.get('userFathername').touched && formGroup.get('userFathername').hasError('required') ">
-            Το πεδίο δεν μπορεί να αφεθεί κενό!
+        <div class="form-group">
+            <label for="userName">Όνομα(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userName">
+            <div class="alert alert-danger" *ngIf="formGroup.get('userName').touched && formGroup.get('userName').hasError('required') ">
+                Το πεδίο δεν μπορεί να αφεθεί κενό!
+            </div>
+            <div class="alert alert-danger" *ngIf="formGroup.get('userName').hasError('pattern')">
+                Πληκτρολογήστε το όνομά σας με κεφαλαία γράμματα!
+            </div>
         </div>
-        <div class="alert alert-danger" *ngIf="formGroup.get('userFathername').hasError('pattern')">
-            Πληκτρολογήστε το όνομα του πατέρα σας με κεφαλαία γράμματα!
+
+        <div class="form-group">
+            <label for="userSurname">Επώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userSurname">
+            <div class="alert alert-danger" *ngIf="formGroup.get('userSurname').touched && formGroup.get('userSurname').hasError('required') ">
+                Το πεδίο δεν μπορεί να αφεθεί κενό!
+            </div>
+            <div class="alert alert-danger" *ngIf="formGroup.get('userSurname').hasError('pattern')">
+                Πληκτρολογήστε το επώνυμό σας με κεφαλαία γράμματα!
+            </div>
         </div>
-    </div>
 
-    <div class="form-group">
-        <label for="userMothername">Μητρώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userMothername">
-        <div class="alert alert-danger" *ngIf="formGroup.get('userMothername').touched && formGroup.get('userMothername').hasError('required') ">
-            Το πεδίο δεν μπορεί να αφεθεί κενό!
+        <div class="form-group">
+            <label for="userFathername">Πατρώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userFathername">
+            <div class="alert alert-danger" *ngIf="formGroup.get('userFathername').touched && formGroup.get('userFathername').hasError('required') ">
+                Το πεδίο δεν μπορεί να αφεθεί κενό!
+            </div>
+            <div class="alert alert-danger" *ngIf="formGroup.get('userFathername').hasError('pattern')">
+                Πληκτρολογήστε το όνομα του πατέρα σας με κεφαλαία γράμματα!
+            </div>
         </div>
-        <div class="alert alert-danger" *ngIf="formGroup.get('userMothername').hasError('pattern')">
-            Πληκτρολογήστε το όνομα της μητέρας σας με κεφαλαία γράμματα!
+
+        <div class="form-group">
+            <label for="userMothername">Μητρώνυμο(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="userMothername">
+            <div class="alert alert-danger" *ngIf="formGroup.get('userMothername').touched && formGroup.get('userMothername').hasError('required') ">
+                Το πεδίο δεν μπορεί να αφεθεί κενό!
+            </div>
+            <div class="alert alert-danger" *ngIf="formGroup.get('userMothername').hasError('pattern')">
+                Πληκτρολογήστε το όνομα της μητέρας σας με κεφαλαία γράμματα!
+            </div>
         </div>
-    </div>
 
 
-    <div class="row">
-        <div class="col-md-12">
-            <button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveProfileAndContinue()" >
+        <div class="row">
+            <div class="col-md-12">
+                <button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="saveProfileAndContinue()">
                 <span style="font-size: 0.9em; font-weight: bold;">Συνέχεια&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
             </button>
+            </div>
         </div>
-    </div>
- </form>
- </div>
+    </form>
+</div>
diff --git a/source/components/student-application-form/parent.form.ts b/source/components/student-application-form/parent.form.ts
index 6e06805933d4b7a58ddcba4f2fd403463212d34c..ba9ec853d7552507ca1fa9fc48a48a6c04682702 100644
--- a/source/components/student-application-form/parent.form.ts
+++ b/source/components/student-application-form/parent.form.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit, OnDestroy, Injectable, ViewChild, ElementRef, Renderer } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription, Observable } from 'rxjs/Rx';
-import { VALID_EMAIL_PATTERN, VALID_UCASE_NAMES_PATTERN } from '../../constants';
-import { HelperDataService } from '../../services/helper-data-service';
-import { LoginInfoActions } from '../../actions/logininfo.actions'
+import { Component, OnInit, OnDestroy, Injectable, ViewChild, ElementRef, Renderer } from "@angular/core";
+import { Router } from "@angular/router";
+import { BehaviorSubject, Subscription, Observable } from "rxjs/Rx";
+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,
@@ -11,12 +11,12 @@ import {
     FormControl,
     FormArray,
     Validators,
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
+} from "@angular/forms";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'parent-form',
-    templateUrl: 'parent.form.html'
+    selector: "parent-form",
+    templateUrl: "parent.form.html"
 })
 
 @Injectable() export default class ParentForm implements OnInit, OnDestroy {
@@ -30,57 +30,57 @@ import {AppSettings} from '../../app.settings';
     private modalText: BehaviorSubject<string>;
     public isModalShown: BehaviorSubject<boolean>;
 
-       constructor(private fb: FormBuilder,
-                private router: Router,
-                private hds: HelperDataService,
-                private _prfa: LoginInfoActions,
-                private rd: Renderer) {
-            this.isModalShown = new BehaviorSubject(false);
-            this.formGroup = this.fb.group({
-                 userName: ['', [Validators.pattern(VALID_UCASE_NAMES_PATTERN),Validators.required]],
-                 userSurname: ['', [Validators.pattern(VALID_UCASE_NAMES_PATTERN),Validators.required]],
-                 userFathername: ['', [Validators.pattern(VALID_UCASE_NAMES_PATTERN),Validators.required]],
-                 userMothername: ['', [Validators.pattern(VALID_UCASE_NAMES_PATTERN),Validators.required]],
-                 userEmail: ['', [Validators.pattern(VALID_EMAIL_PATTERN),Validators.required]],
-                 });
-            this.epalUserData$ = new BehaviorSubject(<any>{userEmail: '', userName: '', userSurname: '', userFathername: '', userMothername: ''});
-            this.showLoader = new BehaviorSubject(false);
-            this.modalTitle =  new BehaviorSubject("");
-            this.modalText =  new BehaviorSubject("");
-        }
+    constructor(private fb: FormBuilder,
+        private router: Router,
+        private hds: HelperDataService,
+        private _prfa: LoginInfoActions,
+        private rd: Renderer) {
+        this.isModalShown = new BehaviorSubject(false);
+        this.formGroup = this.fb.group({
+            userName: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
+            userSurname: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
+            userFathername: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
+            userMothername: ["", [Validators.pattern(VALID_UCASE_NAMES_PATTERN), Validators.required]],
+            userEmail: ["", [Validators.pattern(VALID_EMAIL_PATTERN), Validators.required]],
+        });
+        this.epalUserData$ = new BehaviorSubject(<any>{ userEmail: "", userName: "", userSurname: "", userFathername: "", userMothername: "" });
+        this.showLoader = new BehaviorSubject(false);
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+    }
 
-    public showModal():void {
-        (<any>$('#emailSentNotice')).modal('show');
+    public showModal(): void {
+        (<any>$("#emailSentNotice")).modal("show");
     }
 
-    public hideModal():void {
-        (<any>$('#emailSentNotice')).modal('hide');
+    public hideModal(): void {
+        (<any>$("#emailSentNotice")).modal("hide");
     }
 
-    public onHidden():void {
+    public onHidden(): void {
         this.isModalShown.next(false);
     }
 
     ngOnInit() {
-        (<any>$('#emailSentNotice')).appendTo("body");
+        (<any>$("#emailSentNotice")).appendTo("body");
         this.showLoader.next(true);
         this.epalUserDataSub = this.hds.getEpalUserData().subscribe(x => {
             this.showLoader.next(false);
             this.epalUserData$.next(x);
-            this.formGroup.get('userEmail').setValue(x.userEmail);
-            this.formGroup.get('userName').setValue(x.userName);
-            this.formGroup.get('userSurname').setValue(x.userSurname);
-            this.formGroup.get('userFathername').setValue(x.userFathername);
-            this.formGroup.get('userMothername').setValue(x.userMothername);
+            this.formGroup.get("userEmail").setValue(x.userEmail);
+            this.formGroup.get("userName").setValue(x.userName);
+            this.formGroup.get("userSurname").setValue(x.userSurname);
+            this.formGroup.get("userFathername").setValue(x.userFathername);
+            this.formGroup.get("userMothername").setValue(x.userMothername);
         });
     }
 
     ngOnDestroy() {
-        (<any>$('#emailSentNotice')).remove();
+        (<any>$("#emailSentNotice")).remove();
         if (this.epalUserDataSub) this.epalUserDataSub.unsubscribe();
     }
 
-    saveProfileAndContinue() : void {
+    saveProfileAndContinue(): void {
         if (!this.formGroup.valid) {
             this.modalTitle.next("Αποτυχία αποθήκευσης");
             this.modalText.next("Δεν συμπληρώσατε κάποιο πεδίο");
@@ -91,10 +91,11 @@ import {AppSettings} from '../../app.settings';
                 .then(res => {
                     this._prfa.saveProfile(this.formGroup.value);
                     this.showLoader.next(false);
-                    this.router.navigate(['/intro-statement']);})
+                    this.router.navigate(["/intro-statement"]);
+                })
                 .catch(err => {
                     this.showLoader.next(false);
-                    console.log(err)
+                    console.log(err);
                 });
         }
     }
diff --git a/source/components/student-application-form/region.schools.select.ts b/source/components/student-application-form/region.schools.select.ts
index 9eb85308a35a06dd27c0e87edd080211e4565fab..3a6a8e8aba6cf5be5fec77be781f0f88d7b9e9b9 100644
--- a/source/components/student-application-form/region.schools.select.ts
+++ b/source/components/student-application-form/region.schools.select.ts
@@ -1,16 +1,16 @@
-import { Component, OnInit, OnDestroy} from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy} from "@angular/core";
+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 { REGION_SCHOOLS_INITIAL_STATE } from '../../store/regionschools/regionschools.initial-state';
-import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
-import { IAppState } from '../../store/store';
-import { RemoveSpaces } from '../../pipes/removespaces';
-import { IEpalClasses } from '../../store/epalclasses/epalclasses.types';
-import { ISectorFields } from '../../store/sectorfields/sectorfields.types';
+import { RegionSchoolsActions } from "../../actions/regionschools.actions";
+import { NgRedux, select } from "@angular-redux/store";
+import { IRegionRecord, IRegionRecords } from "../../store/regionschools/regionschools.types";
+import { REGION_SCHOOLS_INITIAL_STATE } from "../../store/regionschools/regionschools.initial-state";
+import { ISectors } from "../../store/sectorcourses/sectorcourses.types";
+import { IAppState } from "../../store/store";
+import { RemoveSpaces } from "../../pipes/removespaces";
+import { IEpalClasses } from "../../store/epalclasses/epalclasses.types";
+import { ISectorFields } from "../../store/sectorfields/sectorfields.types";
 
 
 import {
@@ -18,11 +18,11 @@ import {
     FormGroup,
     FormControl,
     FormArray
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
+} from "@angular/forms";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'region-schools-select',
+    selector: "region-schools-select",
     template: `
     <div class="row">
              <breadcrumbs></breadcrumbs>
@@ -126,11 +126,11 @@ import {AppSettings} from '../../app.settings';
 
 
     constructor(private fb: FormBuilder,
-                private _rsa: RegionSchoolsActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private router: Router
+        private _rsa: RegionSchoolsActions,
+        private _ngRedux: NgRedux<IAppState>,
+        private router: Router
 
-            ) {
+    ) {
         this.regions$ = new BehaviorSubject(REGION_SCHOOLS_INITIAL_STATE);
         this.formGroup = this.fb.group({
             formArray: this.rss
@@ -142,15 +142,15 @@ import {AppSettings} from '../../app.settings';
         this.selectionLimitOptional = new BehaviorSubject(false);
         this.classNight = new BehaviorSubject(false);
 
-        this.modalTitle =  new BehaviorSubject("");
-        this.modalText =  new BehaviorSubject("");
-        this.modalHeader =  new BehaviorSubject("");
+        this.modalTitle = new BehaviorSubject("");
+        this.modalText = new BehaviorSubject("");
+        this.modalHeader = new BehaviorSubject("");
 
     };
 
     ngOnInit() {
 
-        (<any>$('#choiceSentNotice')).appendTo("body");
+        (<any>$("#choiceSentNotice")).appendTo("body");
 
         this.selectEpalClasses();
 
@@ -159,7 +159,7 @@ import {AppSettings} from '../../app.settings';
 
     ngOnDestroy() {
 
-        (<any>$('#choiceSentNotice')).remove();
+        (<any>$("#choiceSentNotice")).remove();
 
         if (this.epalclassesSub) {
             this.epalclassesSub.unsubscribe();
@@ -176,63 +176,63 @@ import {AppSettings} from '../../app.settings';
 
     }
 
-    public showModal():void {
-        (<any>$('#choiceSentNotice')).modal('show');
+    public showModal(): void {
+        (<any>$("#choiceSentNotice")).modal("show");
     }
 
-    public hideModal():void {
-        (<any>$('#choiceSentNotice')).modal('hide');
+    public hideModal(): void {
+        (<any>$("#choiceSentNotice")).modal("hide");
     }
 
-    public onHidden():void {
-        //this.isModalShown.next(false);
+    public onHidden(): void {
+        // this.isModalShown.next(false);
     }
 
     selectEpalClasses() {
-      this.epalclassesSub = this._ngRedux.select('epalclasses')
-                .subscribe(epalclasses => {
-                    let ecs = <IEpalClasses>epalclasses;
-                      if (ecs.size > 0) {
-                          ecs.reduce(({}, epalclass, i) => {
-                              this.setClassActive(epalclass.name);
-                              if (epalclass.name === "4") {
-                                this.classNight.next(true);
-                              }
-                              this.getAppropriateSchools(epalclass.name);
-                              return epalclass;
-                          }, {});
-                      }
-                  }, error => {console.log("error selecting epalclasses");});
+        this.epalclassesSub = this._ngRedux.select("epalclasses")
+            .subscribe(epalclasses => {
+                let ecs = <IEpalClasses>epalclasses;
+                if (ecs.size > 0) {
+                    ecs.reduce(({}, epalclass, i) => {
+                        this.setClassActive(epalclass.name);
+                        if (epalclass.name === "4") {
+                            this.classNight.next(true);
+                        }
+                        this.getAppropriateSchools(epalclass.name);
+                        return epalclass;
+                    }, {});
+                }
+            }, error => { console.log("error selecting epalclasses"); });
     }
 
     selectRegionSchools() {
 
-        this.regionsSub = this._ngRedux.select('regions')
+        this.regionsSub = this._ngRedux.select("regions")
             .subscribe(regions => {
                 let rgns = <IRegionRecords>regions;
                 let numsel = 0;
-                let numreg = 0;   //count reduced regions in order to set activeRegion when user comes back to his choices
+                let numreg = 0;   // count reduced regions in order to set activeRegion when user comes back to his choices
                 console.log("selectRegionSchools");
                 this.selectionLimitOptional.next(false);
 
                 if (rgns.size === 0)
                     return;
 
-                rgns.reduce((prevRegion, region) =>{
+                rgns.reduce((prevRegion, region) => {
                     numreg++;
-                    region.get("epals").reduce((prevEpal, epal) =>{
-                        this.rss.push( new FormControl(epal.get("selected"), []));
+                    region.get("epals").reduce((prevEpal, epal) => {
+                        this.rss.push(new FormControl(epal.get("selected"), []));
                         if (epal.get("selected") === true) {
-                          numsel++;
-                          if ( epal.get("epal_special_case") === "1") {
-                            this.selectionLimitOptional.next(true);
-                          }
-                          this.regionActiveId = Number(region.region_id);
-                          this.regionActive = numreg - 1;
+                            numsel++;
+                            if (epal.get("epal_special_case") === "1") {
+                                this.selectionLimitOptional.next(true);
+                            }
+                            this.regionActiveId = Number(region.region_id);
+                            this.regionActive = numreg - 1;
                         }
-                        if (Number(region.region_id) ===  this.regionActiveId)  {
-                          if (region.get("epals").length < this.regionSizeLimit)
-                            this.selectionLimitOptional.next(true);
+                        if (Number(region.region_id) === this.regionActiveId) {
+                            if (region.get("epals").length < this.regionSizeLimit)
+                                this.selectionLimitOptional.next(true);
                         }
                         return epal;
                     }, {});
@@ -242,7 +242,7 @@ import {AppSettings} from '../../app.settings';
 
                 this.numSelected.next(numsel);
                 this.regions$.next(rgns);
-            }, error => {console.log("error selecting regions")});
+            }, error => { console.log("error selecting regions"); });
 
     }
 
@@ -252,32 +252,19 @@ import {AppSettings} from '../../app.settings';
 
     getAppropriateSchools(epalClass) {
 
-        if (epalClass === "1")  {
+        if (epalClass === "1") {
             console.log("getRegionSchools");
-            this._rsa.getRegionSchools(1,"-1", false);
+            this._rsa.getRegionSchools(1, "-1", false);
         }
-/*        else if (epalClass === "2") {
-            this.sectorFieldsSub = this._ngRedux.select(state => {
-                console.log("sectorFieldsSub");
-                state.sectorFields.reduce(({}, sectorField) =>{
-                    if (sectorField.selected === true) {
-                        this.courseActive = sectorField.id;
-                        this._rsa.getRegionSchools(2,this.courseActive, false);
-                    }
-                    return sectorField;
-                }, {});
-                return state.sectorFields;
-            }).subscribe(this.sectorFields$);
-        } */
         else if (epalClass === "2") {
-            this.sectorFieldsSub = this._ngRedux.select('sectorFields')
+            this.sectorFieldsSub = this._ngRedux.select("sectorFields")
                 .subscribe(sectorFields => {
                     let sfds = <ISectorFields>sectorFields;
                     console.log("sectorFieldsSub");
-                    sfds.reduce(({}, sectorField) =>{
+                    sfds.reduce(({}, sectorField) => {
                         if (sectorField.selected === true) {
                             this.courseActive = sectorField.id;
-                            this._rsa.getRegionSchools(2,this.courseActive, false);
+                            this._rsa.getRegionSchools(2, this.courseActive, false);
                         }
                         return sectorField;
                     }, {});
@@ -286,74 +273,62 @@ import {AppSettings} from '../../app.settings';
                     console.log("Error Selecting Sector Fields");
                 });
         }
-        else if (epalClass === "3" || epalClass === "4")  {
+        else if (epalClass === "3" || epalClass === "4") {
 
-            this.sectorsSub = this._ngRedux.select('sectors')
+            this.sectorsSub = this._ngRedux.select("sectors")
                 .map(sectors => <ISectors>sectors)
                 .subscribe(sectors => {
                     console.log("sectorsSub");
-                    sectors.reduce((prevSector, sector) =>{
-                          if (sector.sector_selected === true) {
-                              sector.courses.reduce((prevCourse, course) =>{
-                                  if (course.selected === true) {
-                                      this.courseActive = parseInt(course.course_id);
-                                      //this._rsa.getRegionSchools(3,this.courseActive, false);
-                                      this._rsa.getRegionSchools(Number(epalClass),this.courseActive, false);
-                                  }
-                                  return course;
-                              }, {});
-                          }
+                    sectors.reduce((prevSector, sector) => {
+                        if (sector.sector_selected === true) {
+                            sector.courses.reduce((prevCourse, course) => {
+                                if (course.selected === true) {
+                                    this.courseActive = parseInt(course.course_id);
+                                    // this._rsa.getRegionSchools(3,this.courseActive, false);
+                                    this._rsa.getRegionSchools(Number(epalClass), this.courseActive, false);
+                                }
+                                return course;
+                            }, {});
+                        }
                         return sector;
                     }, {});
-                });
+                }, error => console.log("error selecting loginInfo"));
         }
     }
 
     navigateBack() {
-//        this.router.navigate(['/epal-class-select']);
-        if (this.classActive === "1")  {
-            this.router.navigate(['/epal-class-select']);
+        if (this.classActive === "1") {
+            this.router.navigate(["/epal-class-select"]);
         }
         else if (this.classActive === "2") {
-            this.router.navigate(['/sector-fields-select']);
+            this.router.navigate(["/sector-fields-select"]);
         }
-        else if (this.classActive === "3" || this.classActive === "4")  {
-            this.router.navigate(['/sectorcourses-fields-select']);
+        else if (this.classActive === "3" || this.classActive === "4") {
+            this.router.navigate(["/sectorcourses-fields-select"]);
         }
     }
 
     setActiveRegion(ind) {
-      if (ind === this.regionActive)
-        ind = -1;
-      this.regionActive = ind;
+        if (ind === this.regionActive)
+            ind = -1;
+        this.regionActive = ind;
     }
 
-    saveSelected(checked,i,j) {
+    saveSelected(checked, i, j) {
         this._rsa.saveRegionSchoolsSelected(checked, i, j);
     }
 
     navigateToApplication() {
-      //  if ( (this.selectionLimitOptional.value === false /*&& this.classNight.value === false */  && this.numSelected.value < this.selectionLimit.value )
-      //        || (this.numSelected.value === 0) )    {
-
-      if ( this.numSelected.getValue() === 0)     {
-
-          //this.modalHeader = "modal-header-success";
-          this.modalHeader.next("modal-header-danger");
-          this.modalTitle.next("Επιλογή αριθμού σχολείων");
-          if (this.numSelected.getValue() === 0)
-            this.modalText.next("Δεν έχετε επιλέξει κανένα σχολείο!");
-          /*
-          else
-            this.modalText.next("Παρακαλώ επιλέξτε ΤΡΙΑ σχολεία. "
-                              + "Μπορείτε να επιλέξετε ή να αφαιρέσετε μια επιλογή, κάνωντας κλικ στο αντίστοιχο κουτάκι που βρίσκεται μπροστά στο όνομα κάθε σχολείου. "
-                              + "Θα έχετε τη δυνατότητα να καθορίσετε την επιθυμητή σειρά προτίμησής των επιλεγμένων σχολείων στην επόμενη οθόνη.");
-            */
-
-          this.showModal();
+        if (this.numSelected.getValue() === 0) {
+            this.modalHeader.next("modal-header-danger");
+            this.modalTitle.next("Επιλογή αριθμού σχολείων");
+            if (this.numSelected.getValue() === 0)
+                this.modalText.next("Δεν έχετε επιλέξει κανένα σχολείο!");
+
+            this.showModal();
         }
         else
-          this.router.navigate(['/schools-order-select']);
+            this.router.navigate(["/schools-order-select"]);
 
     }
 }
diff --git a/source/components/student-application-form/schools-order-select.ts b/source/components/student-application-form/schools-order-select.ts
index 584cd9f830e561df5109070c39ff1a2ebed3716b..d1770514953c53730f22a7eaa14bea5d37fae449 100644
--- a/source/components/student-application-form/schools-order-select.ts
+++ b/source/components/student-application-form/schools-order-select.ts
@@ -1,16 +1,16 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy } 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 { IAppState } from '../../store/store';
-import {AppSettings} from '../../app.settings';
+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 { IAppState } from "../../store/store";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'schools-order-select',
+    selector: "schools-order-select",
     template: `
     <div class="row">
              <breadcrumbs></breadcrumbs>
@@ -50,7 +50,6 @@ import {AppSettings} from '../../app.settings';
 
 })
 @Injectable() export default class SchoolsOrderSelect implements OnInit, OnDestroy {
-    //    public formGroup: FormGroup;
     private regionsSub: Subscription;
     private selectedSchools$: BehaviorSubject<Array<IRegionSchoolRecord>> = new BehaviorSubject(Array());
 
@@ -61,7 +60,7 @@ import {AppSettings} from '../../app.settings';
     };
 
     ngOnInit() {
-        this.regionsSub = this._ngRedux.select('regions')
+        this.regionsSub = this._ngRedux.select("regions")
             .subscribe(regions => {
                 let rgns = <IRegionRecords>regions;
                 let selectedSchools = Array<IRegionSchoolRecord>();
@@ -79,11 +78,11 @@ import {AppSettings} from '../../app.settings';
                 }, {});
 
                 selectedSchools.sort(this.compareSchools);
-                for (let i=0; i < selectedSchools.length; i++)
-                    selectedSchools[i].order_id = i+1;
+                for (let i = 0; i < selectedSchools.length; i++)
+                    selectedSchools[i].order_id = i + 1;
                 this.selectedSchools$.next(selectedSchools);
 
-            }, error => {console.log("error selecting regions");});
+            }, error => { console.log("error selecting regions"); });
     }
 
     ngOnDestroy() {
@@ -105,20 +104,10 @@ import {AppSettings} from '../../app.settings';
         selectedSchools = this.selectedSchools$.getValue();
 
         if (i === 1) {
-          //selectedSchools[0].order_id = 2;
-          //selectedSchools[1].order_id = 1;
-          //selectedSchools[2].order_id = 3;
-
-          //swap selectedSchools[0].order_id <-> selectedSchools[1].order_id
-          [ selectedSchools[0].order_id, selectedSchools[1].order_id ] = [ selectedSchools[1].order_id, selectedSchools[0].order_id ];
+            [selectedSchools[0].order_id, selectedSchools[1].order_id] = [selectedSchools[1].order_id, selectedSchools[0].order_id];
         }
         else if (i === 2) {
-          //selectedSchools[0].order_id = 1;
-          //selectedSchools[1].order_id = 3;
-          //selectedSchools[2].order_id = 2;
-
-          //swap selectedSchools[1].order_id <-> selectedSchools[2].order_id
-          [ selectedSchools[1].order_id, selectedSchools[2].order_id ] = [ selectedSchools[2].order_id, selectedSchools[1].order_id ];
+            [selectedSchools[1].order_id, selectedSchools[2].order_id] = [selectedSchools[2].order_id, selectedSchools[1].order_id];
         }
 
         this._cfa.saveRegionSchoolsOrder(selectedSchools);
@@ -126,11 +115,11 @@ import {AppSettings} from '../../app.settings';
 
     navigateToStudentForm() {
         this._cfa.saveRegionSchoolsOrder(this.selectedSchools$.getValue());
-        this.router.navigate(['/student-application-form-main']);
+        this.router.navigate(["/student-application-form-main"]);
     }
 
     navigateBack() {
         this._cfa.saveRegionSchoolsOrder(this.selectedSchools$.getValue());
-        this.router.navigate(['/region-schools-select']);
+        this.router.navigate(["/region-schools-select"]);
     }
 }
diff --git a/source/components/student-application-form/sector.courses.select.ts b/source/components/student-application-form/sector.courses.select.ts
index 732581eca3241b84b09e64a3d42656ee5f792af6..4419951456198e34c17719a7ebafae0f7c3c243c 100644
--- a/source/components/student-application-form/sector.courses.select.ts
+++ b/source/components/student-application-form/sector.courses.select.ts
@@ -1,26 +1,26 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy } from "@angular/core";
+import { Router } from "@angular/router";
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
 import { Injectable } from "@angular/core";
-import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
-import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
-import { SECTOR_COURSES_INITIAL_STATE } from '../../store/sectorcourses/sectorcourses.initial-state';
-import { NgRedux, select } from '@angular-redux/store';
-import { IAppState } from '../../store/store';
-import {RemoveSpaces} from '../../pipes/removespaces';
+import { SectorCoursesActions } from "../../actions/sectorcourses.actions";
+import { ISectors } from "../../store/sectorcourses/sectorcourses.types";
+import { SECTOR_COURSES_INITIAL_STATE } from "../../store/sectorcourses/sectorcourses.initial-state";
+import { NgRedux, select } from "@angular-redux/store";
+import { IAppState } from "../../store/store";
+import {RemoveSpaces} from "../../pipes/removespaces";
 
-import { RegionSchoolsActions } from '../../actions/regionschools.actions';
+import { RegionSchoolsActions } from "../../actions/regionschools.actions";
 
 import {
     FormBuilder,
     FormGroup,
     FormControl,
     FormArray
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
+} from "@angular/forms";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'sectorcourses-fields-select',
+    selector: "sectorcourses-fields-select",
     template: `
     <div id="sectorCourseNotice" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
       <div class="modal-dialog modal-lg">
@@ -100,11 +100,11 @@ import {AppSettings} from '../../app.settings';
     public isModalShown: BehaviorSubject<boolean>;
 
     constructor(private fb: FormBuilder,
-                private _sca: SectorCoursesActions,
-                private _rsa: RegionSchoolsActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private router: Router
-            ) {
+        private _sca: SectorCoursesActions,
+        private _rsa: RegionSchoolsActions,
+        private _ngRedux: NgRedux<IAppState>,
+        private router: Router
+    ) {
 
         this.sectors$ = new BehaviorSubject(SECTOR_COURSES_INITIAL_STATE);
         this.formGroup = this.fb.group({
@@ -117,23 +117,23 @@ import {AppSettings} from '../../app.settings';
     };
 
     ngOnInit() {
-        (<any>$('#sectorCourseNotice')).appendTo("body");
+        (<any>$("#sectorCourseNotice")).appendTo("body");
         this._sca.getSectorCourses(false);
         let ids = 0;
-        this.sectorsSub = this._ngRedux.select('sectors').subscribe(sectors => {
+        this.sectorsSub = this._ngRedux.select("sectors").subscribe(sectors => {
             let scs = <ISectors>sectors;
-            scs.reduce((prevSector, sector) =>{
+            scs.reduce((prevSector, sector) => {
                 this.sectorsList[ids] = sector.sector_selected;
                 ids++;
-                //In case we want to preserve last checked option when we revisit the form
+                // In case we want to preserve last checked option when we revisit the form
                 if (sector.sector_selected === true)
-                    this.sectorActive = ids-1;
-                sector.courses.reduce((prevCourse, course) =>{
-                    this.rss.push( new FormControl(course.selected, []));
-                    //this.retrieveCheck();
+                    this.sectorActive = ids - 1;
+                sector.courses.reduce((prevCourse, course) => {
+                    this.rss.push(new FormControl(course.selected, []));
+                    // this.retrieveCheck();
                     if (course.selected === true) {
-                      //In case we want to preserve last checked option when we revisit the form
-                      this.idx = course.globalIndex;
+                        // In case we want to preserve last checked option when we revisit the form
+                        this.idx = course.globalIndex;
                     }
                     return course;
                 }, {});
@@ -141,21 +141,21 @@ import {AppSettings} from '../../app.settings';
             }, {});
             ids = 0;
             this.sectors$.next(scs);
-        }, error => {console.log("error selecting sectors");});
+        }, error => { console.log("error selecting sectors"); });
 
     }
 
     ngOnDestroy() {
-        (<any>$('#sectorCourseNotice')).remove();
+        (<any>$("#sectorCourseNotice")).remove();
         if (this.sectorsSub) this.sectorsSub.unsubscribe();
     }
 
     public showModal(): void {
-        (<any>$('#sectorCourseNotice')).modal('show');
+        (<any>$("#sectorCourseNotice")).modal("show");
     }
 
     public hideModal(): void {
-        (<any>$('#sectorCourseNotice')).modal('hide');
+        (<any>$("#sectorCourseNotice")).modal("hide");
 
     }
 
@@ -164,9 +164,9 @@ import {AppSettings} from '../../app.settings';
     }
 
     setActiveSector(ind) {
-      if (ind === this.sectorActive)
-        ind = -1;
-      this.sectorActive = ind;
+        if (ind === this.sectorActive)
+            ind = -1;
+        this.sectorActive = ind;
     }
 
     saveSelected() {
@@ -183,23 +183,23 @@ import {AppSettings} from '../../app.settings';
             this.modalHeader.next("modal-header-danger");
             this.showModal();
         } else {
-            this.router.navigate(['/region-schools-select']);
+            this.router.navigate(["/region-schools-select"]);
         }
     }
 
-    updateCheckedOptions(globalIndex, cb){
-      this.idx = globalIndex;
-      for (let i = 0; i < this.formGroup.value.formArray.length; i++)
-        this.formGroup.value.formArray[i] = false;
-      this.formGroup.value.formArray[globalIndex] = cb.checked;
-      if (cb.checked === false)
-        this.idx = -1;
+    updateCheckedOptions(globalIndex, cb) {
+        this.idx = globalIndex;
+        for (let i = 0; i < this.formGroup.value.formArray.length; i++)
+            this.formGroup.value.formArray[i] = false;
+        this.formGroup.value.formArray[globalIndex] = cb.checked;
+        if (cb.checked === false)
+            this.idx = -1;
 
-      for (let i = 0; i < this.sectorsList.length; i++)
-          this.sectorsList[i] = false;
-      this.sectorsList[this.sectorActive] = true;
+        for (let i = 0; i < this.sectorsList.length; i++)
+            this.sectorsList[i] = false;
+        this.sectorsList[this.sectorActive] = true;
 
-      this.saveSelected();
-  }
+        this.saveSelected();
+    }
 
 }
diff --git a/source/components/student-application-form/sector.fields.select.ts b/source/components/student-application-form/sector.fields.select.ts
index 31a85f6c397db9fa5d85b2b1ff42407243e0f678..a6ddd362572f1df95bdf37ac28e07498267ab931 100644
--- a/source/components/student-application-form/sector.fields.select.ts
+++ b/source/components/student-application-form/sector.fields.select.ts
@@ -1,25 +1,25 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+import { Component, OnInit, OnDestroy } 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 { ISectorFields } from '../../store/sectorfields/sectorfields.types';
-import { IAppState } from '../../store/store';
-import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfields.initial-state';
+import { SectorFieldsActions } from "../../actions/sectorfields.actions";
+import { NgRedux, select } from "@angular-redux/store";
+import { ISectorFields } 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 { RegionSchoolsActions } from "../../actions/regionschools.actions";
 
 import {
     FormBuilder,
     FormGroup,
     FormControl,
     FormArray
-} from '@angular/forms';
-import {AppSettings} from '../../app.settings';
+} from "@angular/forms";
+import {AppSettings} from "../../app.settings";
 
 @Component({
-    selector: 'sector-fields-select',
+    selector: "sector-fields-select",
     template: `
     <div id="sectorFieldsNotice" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
       <div class="modal-dialog modal-lg">
@@ -78,8 +78,8 @@ import {AppSettings} from '../../app.settings';
 @Injectable() export default class SectorFieldsSelect implements OnInit, OnDestroy {
     private sectorFields$: BehaviorSubject<ISectorFields>;
     private sectorFieldsSub: Subscription;
-    public formGroup: FormGroup;
-    public cfs = new FormArray([]);
+    private formGroup: FormGroup;
+    private cfs = new FormArray([]);
     private sectorActive = <number>-1;
     private modalTitle: BehaviorSubject<string>;
     private modalText: BehaviorSubject<string>;
@@ -87,10 +87,10 @@ import {AppSettings} from '../../app.settings';
     public isModalShown: BehaviorSubject<boolean>;
 
     constructor(private fb: FormBuilder,
-                private _cfa: SectorFieldsActions,
-                private _rsa: RegionSchoolsActions,
-                private _ngRedux: NgRedux<IAppState>,
-                private router: Router) {
+        private _cfa: SectorFieldsActions,
+        private _rsa: RegionSchoolsActions,
+        private _ngRedux: NgRedux<IAppState>,
+        private router: Router) {
         this.sectorFields$ = new BehaviorSubject(SECTOR_FIELDS_INITIAL_STATE);
 
         this.formGroup = this.fb.group({
@@ -103,14 +103,14 @@ import {AppSettings} from '../../app.settings';
     };
 
     ngOnInit() {
-        (<any>$('#sectorFieldsNotice')).appendTo("body");
+        (<any>$("#sectorFieldsNotice")).appendTo("body");
         this._cfa.getSectorFields(false);
-        this.sectorFieldsSub = this._ngRedux.select('sectorFields')
+        this.sectorFieldsSub = this._ngRedux.select("sectorFields")
             .subscribe(sectorFields => {
                 let sfds = <ISectorFields>sectorFields;
-                sfds.reduce(({}, sectorField) =>{
+                sfds.reduce(({}, sectorField) => {
                     this.cfs.push(new FormControl(sectorField.selected, []));
-                    //in case we want to retrieve last check when we return to the form
+                    // in case we want to retrieve last check when we return to the form
 
                     if (sectorField.selected === true) {
                         this.sectorActive = sectorField.id - 1;
@@ -119,20 +119,20 @@ import {AppSettings} from '../../app.settings';
                     return sectorField;
                 }, {});
                 this.sectorFields$.next(sfds);
-            }, error => {console.log("error selecting sectorFields");});
+            }, error => { console.log("error selecting sectorFields"); });
     }
 
     ngOnDestroy() {
-        (<any>$('#sectorFieldsNotice')).remove();
+        (<any>$("#sectorFieldsNotice")).remove();
         if (this.sectorFieldsSub) this.sectorFieldsSub.unsubscribe();
     }
 
     public showModal(): void {
-        (<any>$('#sectorFieldsNotice')).modal('show');
+        (<any>$("#sectorFieldsNotice")).modal("show");
     }
 
     public hideModal(): void {
-        (<any>$('#sectorFieldsNotice')).modal('hide');
+        (<any>$("#sectorFieldsNotice")).modal("hide");
     }
 
     public onHidden(): void {
@@ -147,24 +147,24 @@ import {AppSettings} from '../../app.settings';
             this.showModal();
         }
         else {
-            this.router.navigate(['/region-schools-select']);
+            this.router.navigate(["/region-schools-select"]);
         }
     }
 
     saveSelected() {
-      for (let i = 0; i < this.formGroup.value.formArray.length; i++)
-        this.formGroup.value.formArray[i] = false;
-      if (this.sectorActive != -1)
-        this.formGroup.value.formArray[this.sectorActive] = true;
+        for (let i = 0; i < this.formGroup.value.formArray.length; i++)
+            this.formGroup.value.formArray[i] = false;
+        if (this.sectorActive !== -1)
+            this.formGroup.value.formArray[this.sectorActive] = true;
 
-      this._cfa.saveSectorFieldsSelected(this.formGroup.value.formArray);
+        this._cfa.saveSectorFieldsSelected(this.formGroup.value.formArray);
 
-      this._rsa.initRegionSchools();
+        this._rsa.initRegionSchools();
     }
 
     setActiveSectorAndSave(ind) {
         if (ind === this.sectorActive)
-          ind = -1;
+            ind = -1;
         this.sectorActive = ind;
         this.saveSelected();
     }
diff --git a/source/components/student-application-form/submited.aplication.preview.ts b/source/components/student-application-form/submited.aplication.preview.ts
index 6fbbc760e985af7b524a4091ef16c85c511976cd..d4c98298e1484c0d5349a24c1ea89acacee9c5c6 100644
--- a/source/components/student-application-form/submited.aplication.preview.ts
+++ b/source/components/student-application-form/submited.aplication.preview.ts
@@ -1,17 +1,17 @@
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild} from "@angular/core";
 import { Injectable } from "@angular/core";
-import { AppSettings } from '../../app.settings';
-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 { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import {Router, ActivatedRoute, Params} from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-import {Location} from '@angular/common';
+import { AppSettings } from "../../app.settings";
+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 { ILoginInfo } from "../../store/logininfo/logininfo.types";
+import {Router, ActivatedRoute, Params} from "@angular/router";
+import { BehaviorSubject, Subscription } from "rxjs/Rx";
+import {Location} from "@angular/common";
 
 @Component({
-    selector: 'submited-preview',
+    selector: "submited-preview",
     template: `
     <div id="applicationDeleteConfirm" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
       <div class="modal-dialog modal-lg">
@@ -206,13 +206,6 @@ import {Location} from '@angular/common';
                     </div>
 
                     <div class="row" style="margin-top: 20px; margin-bottom: 20px;">
-                        <!--
-                        <div class="col-md-6">
-                            <button type="button" class="btn-primary btn-lg pull-left isclickable" style="width: 10em;" (click)="showResults()" [hidden] = "StudentDetails$.applicantsResultsDisabled == '0'">
-                                <span style="font-size: 0.9em; font-weight: bold;">Αποτελέσματα</span>
-                            </button>
-                        </div>
-                        -->
                         <div class="col-md-12">
                             <button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 10em;" (click)="createPdfServerSide()">
                                 <span style="font-size: 0.9em; font-weight: bold;">Εκτύπωση(PDF)&nbsp;&nbsp;&nbsp;</span>
@@ -251,13 +244,12 @@ import {Location} from '@angular/common';
     private SubmitedDetails$: BehaviorSubject<any>;
     private SubmitedDetailsSub: Subscription;
     private showLoader$: BehaviorSubject<boolean>;
-    public isModalShown: BehaviorSubject<boolean>;
+    private isModalShown: BehaviorSubject<boolean>;
     private applicationIdActive = <number>-1;
 
-    public StudentId;
     private applicationId = <number>0;
 
-    @ViewChild('target') element: ElementRef;
+    @ViewChild("target") element: ElementRef;
 
     constructor(private _ngRedux: NgRedux<IAppState>,
         private _hds: HelperDataService,
@@ -272,8 +264,8 @@ import {Location} from '@angular/common';
     }
 
     ngOnDestroy() {
-        (<any>jQuery('#applicationDeleteConfirm')).remove();
-        (<any>jQuery('#applicationDeleteError')).remove();
+        (<any>jQuery("#applicationDeleteConfirm")).remove();
+        (<any>jQuery("#applicationDeleteError")).remove();
         if (this.SubmitedUsersSub)
             this.SubmitedUsersSub.unsubscribe();
         if (this.SubmitedDetailsSub)
@@ -284,8 +276,8 @@ import {Location} from '@angular/common';
 
     ngOnInit() {
 
-        (<any>jQuery('#applicationDeleteConfirm')).appendTo("body");
-        (<any>jQuery('#applicationDeleteError')).appendTo("body");
+        (<any>jQuery("#applicationDeleteConfirm")).appendTo("body");
+        (<any>jQuery("#applicationDeleteError")).appendTo("body");
         this.showLoader$.next(true);
 
         this.SubmitedUsersSub = this._hds.getSubmittedPreviw().subscribe(
@@ -356,18 +348,18 @@ import {Location} from '@angular/common';
     }
 
     public showConfirmModal(): void {
-        (<any>jQuery('#applicationDeleteConfirm')).modal('show');
+        (<any>jQuery("#applicationDeleteConfirm")).modal("show");
     }
 
     public showErrorModal(): void {
-        (<any>jQuery('#applicationDeleteError')).modal('show');
+        (<any>jQuery("#applicationDeleteError")).modal("show");
     }
 
     public hideConfirmModal(): void {
-        (<any>jQuery('#applicationDeleteConfirm')).modal('hide');
+        (<any>jQuery("#applicationDeleteConfirm")).modal("hide");
     }
     public hideErrorModal(): void {
-        (<any>jQuery('#applicationDeleteError')).modal('hide');
+        (<any>jQuery("#applicationDeleteError")).modal("hide");
     }
 
     public onHidden(): void {
@@ -380,7 +372,7 @@ import {Location} from '@angular/common';
     }
 
     public goHome(): void {
-        this.router.navigate(['']);
+        this.router.navigate([""]);
     }
 
 }
diff --git a/source/components/student-application-form/submitedstudent.preview.ts b/source/components/student-application-form/submitedstudent.preview.ts
deleted file mode 100644
index e7930262bed0c2c00819d23dcf8d04a1439bb8b5..0000000000000000000000000000000000000000
--- a/source/components/student-application-form/submitedstudent.preview.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Component, OnInit, OnDestroy,ElementRef, ViewChild} 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 {IStudentDataFields, IStudentDataField} from '../../store/studentdatafields';
-import {Http, Headers, RequestOptions} from '@angular/http';
-import {Removetags} from '../../pipes/removehtmltags';
-import { NgRedux, select } from '@angular-redux/store';
-import { IAppState } from '../../store/store';
-import { ILoginInfo } from '../../store/logininfo/logininfo.types';
-import {Router, ActivatedRoute, Params} from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs/Rx';
-
-@Component({
-    selector: 'submited-student',
-    template: `
-            <div id = "target">
-            <div *ngFor="let StudentDetails$  of SubmitedDetails$ | async">
-                 Όνομα:         {{StudentDetails$.name}} <br>
-                 Επώνυμο:       {{StudentDetails$.studentsurname}}<br>
-                 Όνομα Πατέρα:  {{StudentDetails$.fatherfirstname}}<br>
-                 Επώνυμο Πατέρα:{{StudentDetails$.fathersurname}}<br>
-                 Όνομα Μητέρας: {{StudentDetails$.motherfirstname}}<br>
-                 Επώνυμο Μητέρας:{{StudentDetails$.mothersurname}}<br>
-                 Ημερομηνία Γέννησης: {{StudentDetails$.birthdate}}<br>
-             </div>
-                <b>Επιλογές ΕΠΑΛ</b>
-                <div *ngFor="let epalChoices$  of EpalChosen$ | async">
-                     Σχολείο: {{epalChoices$.epal_id}}
-                     Σειρά Προτίμισης:{{epalChoices$.choice_no}}
-                </div>
-
-            </div>
-            <button type="button" (click)="createPdfServerSide()">Εξαγωγή σε PDF</button>
-   `
-})
-
-@Injectable() export default class SubmitedStudentDetails implements OnInit , OnDestroy{
-
-
-    private SubmitedDetails$: BehaviorSubject<any>;
-    private SubmitedDetailsSub: Subscription;
-
-    private EpalChosen$: BehaviorSubject<any>;
-    private EpalChosenSub: Subscription;
-    public StudentId: Number;
-
-    constructor(private _hds: HelperDataService,
-                private route: ActivatedRoute,
-                private router: Router )
-    {
-       this.SubmitedDetails$ = new BehaviorSubject([{}]);
-       this.EpalChosen$ = new BehaviorSubject([{}]);
-    }
-
-    ngOnDestroy()
-    {
-        if (this.SubmitedDetailsSub)
-            this.SubmitedDetailsSub.unsubscribe();
-        if (this.EpalChosenSub)
-            this.EpalChosenSub.unsubscribe();
-        this.SubmitedDetails$.unsubscribe();
-        this.EpalChosen$.unsubscribe();
-    }
-
-    ngOnInit() {
-
-
-        this.getApplicationId();
-        this.SubmitedDetailsSub = this._hds.getStudentDetails(this.StudentId).subscribe(this.SubmitedDetails$);
-        this.EpalChosenSub = this._hds.getEpalchosen(this.StudentId).subscribe(this.EpalChosen$);
-
-
-    }
-
-    getApplicationId()
-    {
-            this.route.params.subscribe(params => {this.StudentId = params['id'];});
-    }
-
-    createPdfServerSide()
-    {
-        this._hds.createPdfServerSide(this.StudentId);
-
-    }
-
-
-}
diff --git a/source/components/students/student.ts b/source/components/students/student.ts
index 52f8a45c0dd649cb36ac4d101c64819029c0ca46..9efc1eaffaccf9785ee0f7a5603f4ce0758c2db1 100644
--- a/source/components/students/student.ts
+++ b/source/components/students/student.ts
@@ -1,66 +1,22 @@
-
-//used only for demo form3.ts
-export class Student {
+// used by dubmit component
+export class StudentEpalChosen {
     constructor(
-        //public user_id: number,
-        public epaluser_id: number,
-        public name: string,
-        public studentsurname: string,
-        //public studentbirthdate: Date,
-        public regionaddress: string,
-        public regiontk: string,
-        public regionarea: string,
-        public relationtostudent: string,
-        public studentamka: string,
-        public currentclass: string,
-        ){}
-}
-
-//used by dubmit component
-export class StudentEpalChosen  {
-  constructor(
-    //public user_id: number,
-    public student_id: number,
-    public epal_id: number,
-    public choice_no: number,
-  ) {}
-}
-
-export class StudentCourseChosen  {
-  constructor(
-    public student_id: number,
-    public coursefield_id: number,
-  ) {}
+        public student_id: number,
+        public epal_id: number,
+        public choice_no: number,
+    ) { }
 }
 
-export class StudentSectorChosen  {
-  constructor(
-    public student_id: number,
-    public sectorfield_id: number,
-  ) {}
-}
-
-export class StudentCriteriaChosen  {
-  constructor(
-    public student_id: number,
-    public income: number,
-    public criterio_id: number,
-  ) {}
+export class StudentCourseChosen {
+    constructor(
+        public student_id: number,
+        public coursefield_id: number,
+    ) { }
 }
 
-
-/*
-export class StudentCriteria  {
-  constructor(
-    public student_id: number,
-    public orphanmono: boolean,
-    public orphantwice: boolean,
-    public threechildren: boolean,
-    public manychildren: boolean,
-    public twins: boolean,
-    public disability: boolean,
-    public studies: boolean,
-    public income: number,
-  ) {}
+export class StudentSectorChosen {
+    constructor(
+        public student_id: number,
+        public sectorfield_id: number,
+    ) { }
 }
-*/
diff --git a/source/constants.ts b/source/constants.ts
index 6da52350714d78aeafa3ac9faa9d659f1a7965e8..0f8ad6c7a7734198b40545d2fb22a00692064375 100644
--- a/source/constants.ts
+++ b/source/constants.ts
@@ -1,82 +1,82 @@
 
-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';
+export const COURSEFIELDS_RECEIVED = "COURSEFIELDS_RECEIVED";
+export const COURSEFIELDS_SELECTED_SAVE = "COURSEFIELDS_SELECTED_SAVE";
 
-export const SECTORFIELDS_RECEIVED = 'SECTORFIELDS_RECEIVED';
-export const SECTORFIELDS_SELECTED_SAVE = 'SECTORFIELDS_SELECTED_SAVE';
-export const SECTORFIELDS_INIT = 'SECTORFIELDS_INIT';
+export const SECTORFIELDS_RECEIVED = "SECTORFIELDS_RECEIVED";
+export const SECTORFIELDS_SELECTED_SAVE = "SECTORFIELDS_SELECTED_SAVE";
+export const SECTORFIELDS_INIT = "SECTORFIELDS_INIT";
 
-export const REGIONSCHOOLS_RECEIVED = 'REGIONSCHOOLS_RECEIVED';
-export const REGIONSCHOOLS_SELECTED_SAVE = 'REGIONSCHOOLS_SELECTED_SAVE';
-export const REGIONSCHOOLS_ORDER_SAVE = 'REGIONSCHOOLS_ORDER_SAVE';
-export const REGIONSCHOOLS_INIT = 'REGIONSCHOOLS_INIT';
+export const REGIONSCHOOLS_RECEIVED = "REGIONSCHOOLS_RECEIVED";
+export const REGIONSCHOOLS_SELECTED_SAVE = "REGIONSCHOOLS_SELECTED_SAVE";
+export const REGIONSCHOOLS_ORDER_SAVE = "REGIONSCHOOLS_ORDER_SAVE";
+export const REGIONSCHOOLS_INIT = "REGIONSCHOOLS_INIT";
 
-export const SECTORCOURSES_RECEIVED = 'SECTORCOURSES_RECEIVED';
-export const SECTORCOURSES_SELECTED_SAVE = 'SECTORCOURSES_SELECTED_SAVE';
-export const SECTORCOURSES_INIT = 'SECTORCOURSES_INIT';
+export const SECTORCOURSES_RECEIVED = "SECTORCOURSES_RECEIVED";
+export const SECTORCOURSES_SELECTED_SAVE = "SECTORCOURSES_SELECTED_SAVE";
+export const SECTORCOURSES_INIT = "SECTORCOURSES_INIT";
 
-export const STUDENTDATAFIELDS_SAVE = 'STUDENTDATAFIELDS_SAVE';
-export const STUDENTDATAFIELDS_INIT = 'STUDENTDATAFIELDS_INIT';
+export const STUDENTDATAFIELDS_SAVE = "STUDENTDATAFIELDS_SAVE";
+export const STUDENTDATAFIELDS_INIT = "STUDENTDATAFIELDS_INIT";
 
-export const EPALCLASSES_SAVE = 'EPALCLASSES_SAVE';
-export const EPALCLASSES_INIT = 'EPALCLASSES_INIT';
+export const EPALCLASSES_SAVE = "EPALCLASSES_SAVE";
+export const EPALCLASSES_INIT = "EPALCLASSES_INIT";
 
-export const LOGININFO_SAVE = 'LOGININFO_SAVE';
-export const PROFILE_SAVE = 'PROFILE_SAVE';
-export const STATEMENTAGREE_SAVE = 'STATEMENTAGREE_SAVE';
+export const LOGININFO_SAVE = "LOGININFO_SAVE";
+export const PROFILE_SAVE = "PROFILE_SAVE";
+export const STATEMENTAGREE_SAVE = "STATEMENTAGREE_SAVE";
 
-export const LOGININFO_RECEIVED = 'LOGININFO_RECEIVED';
+export const LOGININFO_RECEIVED = "LOGININFO_RECEIVED";
 
-export const USERINFOS_RECEIVED = 'USERINFOS_RECEIVED';
-export const USERINFO_SELECTED_SAVE = 'USERINFO_SELECTED_SAVE';
+export const USERINFOS_RECEIVED = "USERINFOS_RECEIVED";
+export const USERINFO_SELECTED_SAVE = "USERINFO_SELECTED_SAVE";
 
-export const LOGININFO_INIT = 'LOGININFO_INIT';
+export const LOGININFO_INIT = "LOGININFO_INIT";
 
-export const CRITERIA_RECEIVED = 'CRITERIA_RECEIVED';
-export const CRITERIA_SAVE = 'CRITERIA_SAVE';
-export const CRITERIA_INIT = 'CRITERIA_INIT';
+export const CRITERIA_RECEIVED = "CRITERIA_RECEIVED";
+export const CRITERIA_SAVE = "CRITERIA_SAVE";
+export const CRITERIA_INIT = "CRITERIA_INIT";
 
-export const VALID_NAMES_PATTERN = '^[A-Za-zΑ-ΩΆΈΉΊΙΎΌΏα-ωάέήίΐύόώ -]*$';
-export const VALID_UCASE_NAMES_PATTERN = '^[A-ZΑ-Ω -]*$';
-export const VALID_ADDRESS_PATTERN = '^[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ\/. -]*$';
-export const VALID_ADDRESSTK_PATTERN = '^[0-9]{1,5}$';
-export const VALID_DIGITS_PATTERN = '^[0-9]*$';
-export const VALID_TELEPHONE_PATTERN = '^2[0-9]{0,10}$';
-export const VALID_YEAR_PATTERN = '^(19[6789][0-9]|20[0-1][0-9])$';
-export const VALID_CAPACITY_PATTERN = '[0-9]*$';
+export const VALID_NAMES_PATTERN = "^[A-Za-zΑ-ΩΆΈΉΊΙΎΌΏα-ωάέήίΐύόώ -]*$";
+export const VALID_UCASE_NAMES_PATTERN = "^[A-ZΑ-Ω -]*$";
+export const VALID_ADDRESS_PATTERN = "^[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ\/. -]*$";
+export const VALID_ADDRESSTK_PATTERN = "^[0-9]{1,5}$";
+export const VALID_DIGITS_PATTERN = "^[0-9]*$";
+export const VALID_TELEPHONE_PATTERN = "^2[0-9]{0,10}$";
+export const VALID_YEAR_PATTERN = "^(19[6789][0-9]|20[0-1][0-9])$";
+export const VALID_CAPACITY_PATTERN = "[0-9]*$";
 
-export const VALID_EMAIL_PATTERN = '[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}';
+export const VALID_EMAIL_PATTERN = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}";
 
-export const VALID_DATE_PATTERN = '([1-9]|0[1-9]|[12][0-9]|3[01])[- /.]([1-9]|0[1-9]|1[012])[- /.](19|20)[0-9][0-9]';
+export const VALID_DATE_PATTERN = "([1-9]|0[1-9]|[12][0-9]|3[01])[- /.]([1-9]|0[1-9]|1[012])[- /.](19|20)[0-9][0-9]";
 
-export const SCHOOL_ROLE = 'director';
-export const STUDENT_ROLE = 'student';
-export const PDE_ROLE = 'pde';
-export const DIDE_ROLE = 'dide';
-export const MINISTRY_ROLE = 'supervisor';
+export const SCHOOL_ROLE = "director";
+export const STUDENT_ROLE = "student";
+export const PDE_ROLE = "pde";
+export const DIDE_ROLE = "dide";
+export const MINISTRY_ROLE = "supervisor";
 export const FIRST_SCHOOL_YEAR = 1950;
 
 export function maxValue(max: Number): ValidatorFn {
-  return (control: AbstractControl): {[key: string]: any} => {
-    const input = control.value,
-          isValid = input > 99;
-    if(isValid)
-        return { 'maxValue': {max} }
-    else
-        return null;
-  };
+    return (control: AbstractControl): { [key: string]: any } => {
+        const input = control.value,
+            isValid = input > 99;
+        if (isValid)
+            return { "maxValue": { max } };
+        else
+            return null;
+    };
 }
 
 export function minValue(min: Number): ValidatorFn {
-  return (control: AbstractControl): {[key: string]: any} => {
-    const input = control.value,
-          isValid = input < 1;
-    if(isValid)
-        return { 'minValue': {min} }
-    else
-        return null;
-  };
+    return (control: AbstractControl): { [key: string]: any } => {
+        const input = control.value,
+            isValid = input < 1;
+        if (isValid)
+            return { "minValue": { min } };
+        else
+            return null;
+    };
 }
diff --git a/source/containers/globalstyles.css b/source/containers/globalstyles.css
index 68b2e5bcdee6a2e3505a5d6015bef1dd7a6eec80..bdf9ea271bbf5de3ca8ed800adf0b09e1ee0fc54 100644
--- a/source/containers/globalstyles.css
+++ b/source/containers/globalstyles.css
@@ -1,4 +1,5 @@
 /* Absolute Center Spinner */
+
 .loading {
     position: fixed;
     z-index: 999;
@@ -16,7 +17,7 @@
 /* Transparent Overlay */
 
 .loading:before {
-    content: '';
+    content: "";
     display: block;
     position: fixed;
     top: 0;
@@ -40,7 +41,7 @@
 }
 
 .loading:not(:required):after {
-    content: '';
+    content: "";
     display: block;
     font-size: 10px;
     width: 1em;
@@ -131,25 +132,27 @@
     display: none;
 }
 
-.form-group input[type="checkbox"] + .btn-group > label span {
+.form-group input[type="checkbox"]+.btn-group>label span {
     width: 7px;
 }
 
-.form-group input[type="checkbox"] + .btn-group > label span:first-child {
+.form-group input[type="checkbox"]+.btn-group>label span:first-child {
     display: none;
 }
-.form-group input[type="checkbox"] + .btn-group > label span:last-child {
+
+.form-group input[type="checkbox"]+.btn-group>label span:last-child {
     display: inline-block;
 }
 
-.form-group input[type="checkbox"]:checked + .btn-group > label span:first-child {
+.form-group input[type="checkbox"]:checked+.btn-group>label span:first-child {
     display: inline-block;
 }
-.form-group input[type="checkbox"]:checked + .btn-group > label span:last-child {
+
+.form-group input[type="checkbox"]:checked+.btn-group>label span:last-child {
     display: none;
 }
 
-.left-side-view > li.active {
+.left-side-view>li.active {
     background-color: #fd9665;
     border-color: #fd9665;
 }
@@ -160,43 +163,43 @@
 
 .oddin {
     background-color: #f2f9ff;
-
 }
+
 .evenin {
     background-color: #eceff3;
 }
 
 .oddout {
     background-color: #dddddd;
-
 }
+
 .evenout {
     background-color: #eeeeee;
 }
+
 .selectedout {
     background-color: #fd9665;
 }
+
 .selectedappout {
-/*   background-color: #a38d82; */
+    /*   background-color: #a38d82; */
     background-color: #b5b0a5;
 }
 
-div.changecolor 
-{
+div.changecolor {
     color: red!important;
 }
 
-div.changecolorbalck{
- color: black!important;   
+div.changecolorbalck {
+    color: black!important;
 }
 
-.changelistcolor 
-{
-    color:red!important ;
+.changelistcolor {
+    color: red!important;
 }
 
-.aastyle{
-    color:black!important ;
+.aastyle {
+    color: black!important;
 }
 
 .notchecked {
@@ -211,14 +214,12 @@ div.changecolorbalck{
     color: red!important;
 }
 
-
-
-.roundedNumber{
+.roundedNumber {
     width: 2em;
     background-color: coral;
     color: white;
     font-weight: bold;
-    border:1px;
+    border: 1px;
     border-radius: 10px;
     -webkit-border-radius: 10px;
     /* Prevent background color leak outs */
@@ -230,93 +231,99 @@ div.changecolorbalck{
 }
 
 .reportScroll {
-overflow-x: scroll;
+    overflow-x: scroll;
 }
 
 .d3-chart {
-  width: 100%;
-  height: 400px;
+    width: 100%;
+    height: 400px;
 }
 
-.d3-chart .axis path,
-.d3-chart .axis line {
-  stroke: #999;
+.d3-chart .axis path, .d3-chart .axis line {
+    stroke: #999;
 }
 
 .d3-chart .axis text {
-  fill: #999;
+    fill: #999;
 }
 
 .modal-header-success {
-    color:#fff;
-    padding:9px 15px;
-    border-bottom:1px solid #eee;
+    color: #fff;
+    padding: 9px 15px;
+    border-bottom: 1px solid #eee;
     background-color: #5cb85c;
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
     -moz-border-radius-topright: 5px;
-     border-top-left-radius: 5px;
-     border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
+
 .modal-header-warning {
-	color:#fff;
-    padding:9px 15px;
-    border-bottom:1px solid #eee;
+    color: #fff;
+    padding: 9px 15px;
+    border-bottom: 1px solid #eee;
     background-color: #f0ad4e;
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
     -moz-border-radius-topright: 5px;
-     border-top-left-radius: 5px;
-     border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
+
 .modal-header-danger {
-	color:#fff;
-    padding:9px 15px;
-    border-bottom:1px solid #eee;
+    color: #fff;
+    padding: 9px 15px;
+    border-bottom: 1px solid #eee;
     background-color: #d9534f;
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
     -moz-border-radius-topright: 5px;
-     border-top-left-radius: 5px;
-     border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
+
 .modal-header-info {
-    color:#fff;
-    padding:9px 15px;
-    border-bottom:1px solid #eee;
+    color: #fff;
+    padding: 9px 15px;
+    border-bottom: 1px solid #eee;
     background-color: #5bc0de;
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
     -moz-border-radius-topright: 5px;
-     border-top-left-radius: 5px;
-     border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
+
 .modal-header-primary {
-	color:#fff;
-    padding:9px 15px;
-    border-bottom:1px solid #eee;
+    color: #fff;
+    padding: 9px 15px;
+    border-bottom: 1px solid #eee;
     background-color: #428bca;
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
     -moz-border-radius-topright: 5px;
-     border-top-left-radius: 5px;
-     border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
+
 .btn-lg.round {
-	border-radius: 24px;
+    border-radius: 24px;
 }
 
 .btn.sharp {
-  border-radius:0;
+    border-radius: 0;
 }
+
 .username {
     font-size: 0.8em;
 }
+
 .signout {
     font-size: 0.8em;
 }
diff --git a/source/containers/main.routes.ts b/source/containers/main.routes.ts
index 3647d67335cd7f3f03cc24db43a62fbe59c0950f..afeb09f709b65a2c1e6168abc0de9dc6d7fccd11 100644
--- a/source/containers/main.routes.ts
+++ b/source/containers/main.routes.ts
@@ -1,128 +1,122 @@
 import {
-  Routes,
-  RouterModule,
-} from '@angular/router';
+    Routes,
+    RouterModule,
+} 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 CourseFieldsSelect from '../components/student-application-form/course.fields.select';
-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 SubmitedPerson from '../components/student-application-form/submitedstudent.preview';
-import AfterSubmit from '../components/student-application-form/after.submit';
-import DirectorView from '../components/director/director-view';
-import DirectorButtons from '../components/director/director.buttons';
-import PerfectureView from '../components/infoviews/perfecture-view';
-import EduadminView from '../components/infoviews/eduadmin-view';
-import DirectorClassCapacity from '../components/director/director-classcapacity';
-import MinisterView from '../components/minister/minister-view';
-import MinisterReports from '../components/minister/minister-reports';
-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 SchoolAuthGuard from '../guards/school.auth.guard';
-import SchoolStudentsLockedGuard from '../guards/school.students.locked.guard';
-import SchoolCapacityLockedGuard from '../guards/school.capacity.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";
+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 DirectorView from "../components/director/director-view";
+import DirectorButtons from "../components/director/director.buttons";
+import PerfectureView from "../components/infoviews/perfecture-view";
+import EduadminView from "../components/infoviews/eduadmin-view";
+import DirectorClassCapacity from "../components/director/director-classcapacity";
+import MinisterView from "../components/minister/minister-view";
+import MinisterReports from "../components/minister/minister-reports";
+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 SchoolAuthGuard from "../guards/school.auth.guard";
+import SchoolStudentsLockedGuard from "../guards/school.students.locked.guard";
+import SchoolCapacityLockedGuard from "../guards/school.capacity.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";
 
 export const MainRoutes: Routes = [
-  { path: '', component: Home },
-  { path: 'info', component: Info, canActivate: [StudentAuthGuard] },
-  { path: 'logout', component: Home },
-  { path: 'school', component: SchoolHome },
-  { path: 'school/logout', component: SchoolHome },
-  { path: 'ministry', component: MinistryHome },
-  { path: 'ministry/logout', component: MinistryHome },
-  { path: 'parent-form', component: ParentForm, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'student-application-form-main', component: StudentApplicationMain, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'course-fields-select', component: CourseFieldsSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'intro-statement', component: Disclaimer, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'legal-info', component: LegalInfo},
-  { path: 'epal-class-select', component: EpalClassesSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'sector-fields-select', component: SectorFieldsSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'region-schools-select', component: RegionSchoolsSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'sectorcourses-fields-select', component: SectorCoursesSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'application-preview', component: ApplicationPreview, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'schools-order-select', component: SchoolsOrderSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'application-submit', component: ApplicationSubmit, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'submited-preview', component: SubmitedPreview, canActivate: [StudentAuthGuard] },
-  { path: 'submited-person', component: SubmitedPerson, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'post-submit', component: AfterSubmit, canActivate: [StudentAuthGuard, StudentLockGuard] },
-  { path: 'school/director-view', component: DirectorView, canActivate: [SchoolAuthGuard, SchoolStudentsLockedGuard] },
-  { path: 'school/director-buttons', component: DirectorButtons, canActivate: [SchoolAuthGuard]  },
-  { path: 'school/director-classcapacity', component: DirectorClassCapacity, canActivate: [SchoolAuthGuard, SchoolCapacityLockedGuard] },
-  { path: 'ministry/minister-view', component: MinisterView, canActivate: [MinistryAuthGuard]  },
-  { path: 'ministry/minister-reports', component: MinisterReports, canActivate: [ReportsAuthGuard] },
-  { path: 'ministry/report-all-stat/:reportId', component: ReportAllStat, canActivate: [ReportsAuthGuard] },
-  { path: 'ministry/report-general', component: ReportGeneral, canActivate: [MinistryAuthGuard]  },
-  { path: 'ministry/report-users/:reportId', component: ReportUsers, canActivate: [MinistryAuthGuard]  },
-  { path: 'ministry/report-no-capacity/:reportId', component: ReportNoCapacity, canActivate: [MinistryAuthGuard]  },
-  { path: 'ministry/minister-informstudents', component: InformStudents, canActivate: [MinistryAuthGuard]  },
-  { path: 'ministry/minister-settings', component: MinisterSettings, canActivate: [MinistryAuthGuard] },
-  { path: 'school/perfecture-view', component: PerfectureView, canActivate: [RegionEduAuthGuard] },
-  { path: 'school/eduadmin-view', component: EduadminView, canActivate: [EduAdminAuthGuard] },
-  { path: 'help-desk', component: HelpDesk, canActivate: [StudentAuthGuard] },
+    { path: "", component: Home },
+    { path: "info", component: Info, canActivate: [StudentAuthGuard] },
+    { path: "logout", component: Home },
+    { path: "school", component: SchoolHome },
+    { path: "school/logout", component: SchoolHome },
+    { path: "ministry", component: MinistryHome },
+    { path: "ministry/logout", component: MinistryHome },
+    { path: "parent-form", component: ParentForm, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "student-application-form-main", component: StudentApplicationMain, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "intro-statement", component: Disclaimer, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "legal-info", component: LegalInfo },
+    { path: "epal-class-select", component: EpalClassesSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "sector-fields-select", component: SectorFieldsSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "region-schools-select", component: RegionSchoolsSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "sectorcourses-fields-select", component: SectorCoursesSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "application-preview", component: ApplicationPreview, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "schools-order-select", component: SchoolsOrderSelect, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "application-submit", component: ApplicationSubmit, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "submited-preview", component: SubmitedPreview, canActivate: [StudentAuthGuard] },
+    { path: "post-submit", component: AfterSubmit, canActivate: [StudentAuthGuard, StudentLockGuard] },
+    { path: "school/director-view", component: DirectorView, canActivate: [SchoolAuthGuard, SchoolStudentsLockedGuard] },
+    { path: "school/director-buttons", component: DirectorButtons, canActivate: [SchoolAuthGuard] },
+    { path: "school/director-classcapacity", component: DirectorClassCapacity, canActivate: [SchoolAuthGuard, SchoolCapacityLockedGuard] },
+    { path: "ministry/minister-view", component: MinisterView, canActivate: [MinistryAuthGuard] },
+    { path: "ministry/minister-reports", component: MinisterReports, canActivate: [ReportsAuthGuard] },
+    { path: "ministry/report-all-stat/:reportId", component: ReportAllStat, canActivate: [ReportsAuthGuard] },
+    { path: "ministry/report-general", component: ReportGeneral, canActivate: [MinistryAuthGuard] },
+    { path: "ministry/report-users/:reportId", component: ReportUsers, canActivate: [MinistryAuthGuard] },
+    { path: "ministry/report-no-capacity/:reportId", component: ReportNoCapacity, canActivate: [MinistryAuthGuard] },
+    { path: "ministry/minister-informstudents", component: InformStudents, canActivate: [MinistryAuthGuard] },
+    { path: "ministry/minister-settings", component: MinisterSettings, canActivate: [MinistryAuthGuard] },
+    { path: "school/perfecture-view", component: PerfectureView, canActivate: [RegionEduAuthGuard] },
+    { path: "school/eduadmin-view", component: EduadminView, canActivate: [EduAdminAuthGuard] },
+    { path: "help-desk", component: HelpDesk, canActivate: [StudentAuthGuard] },
 ];
 
 export const MainDeclarations = [
-  CamelCasePipe,
-  RemoveSpaces,
-  Home,
-  SchoolHome,
-  MinistryHome,
-  CourseFieldsSelect,
-  Disclaimer,
-  EpalClassesSelect,
-  SectorFieldsSelect,
-  RegionSchoolsSelect,
-  SectorCoursesSelect,
-  ParentForm,
-  Info,
-  StudentApplicationMain,
-  ApplicationPreview,
-  SchoolsOrderSelect,
-  ApplicationSubmit,
-  SubmitedPreview,
-  SubmitedPerson,
-  AfterSubmit,
-  DirectorView,
-  DirectorClassCapacity,
-  MinisterView,
-  MinisterReports,
-  ReportAllStat,
-  ReportGeneral,
-  ReportUsers,
-  ReportNoCapacity,
-  InformStudents,
-  MinisterSettings,
-  PerfectureView,
-  Breadcrumbs,
-  DirectorButtons,
-  EduadminView,
-  HelpDesk,
-  LegalInfo
+    CamelCasePipe,
+    RemoveSpaces,
+    Home,
+    SchoolHome,
+    MinistryHome,
+    Disclaimer,
+    EpalClassesSelect,
+    SectorFieldsSelect,
+    RegionSchoolsSelect,
+    SectorCoursesSelect,
+    ParentForm,
+    Info,
+    StudentApplicationMain,
+    ApplicationPreview,
+    SchoolsOrderSelect,
+    ApplicationSubmit,
+    SubmitedPreview,
+    AfterSubmit,
+    DirectorView,
+    DirectorClassCapacity,
+    MinisterView,
+    MinisterReports,
+    ReportAllStat,
+    ReportGeneral,
+    ReportUsers,
+    ReportNoCapacity,
+    InformStudents,
+    MinisterSettings,
+    PerfectureView,
+    Breadcrumbs,
+    DirectorButtons,
+    EduadminView,
+    HelpDesk,
+    LegalInfo
 ];
diff --git a/source/containers/main.ts b/source/containers/main.ts
index 6d7078e6586d499d5563d9a56aed78b2a9e9fc29..6021bc89936b0e6dcbc43c70bca1cdc0246cce0d 100644
--- a/source/containers/main.ts
+++ b/source/containers/main.ts
@@ -1,34 +1,32 @@
 import { Component, Inject, OnInit, OnDestroy }
- from '@angular/core';
+from "@angular/core";
 import {
-  Router,
-  ActivatedRoute,
-  NavigationStart
+    Router,
+    ActivatedRoute,
+    NavigationStart
 }
- from '@angular/router';
-import './globalstyles.css';
-//import '../../myschool/main.scss';
-import { DevToolsExtension, NgRedux, select } from '@angular-redux/store';
-// import createLogger from 'redux-logger';
+from "@angular/router";
+import "./globalstyles.css";
+import { DevToolsExtension, NgRedux, select } from "@angular-redux/store";
 
 import {
-  IAppState,
-  rootReducer,
-  middleware,
-//  enhancers,
-} from '../store';
+    IAppState,
+    rootReducer,
+    middleware,
+    //  enhancers,
+} from "../store";
 
 import {
-  applyMiddleware,
-  Store,
-  combineReducers,
-  compose,
-  createStore
-} from 'redux';
+    applyMiddleware,
+    Store,
+    combineReducers,
+    compose,
+    createStore
+} from "redux";
 
 @Component({
-  selector: 'main',
-  template: `
+    selector: "main",
+    template: `
   <reg-header></reg-header>
   <reg-navbar></reg-navbar>
   <reg-main></reg-main>
@@ -36,39 +34,25 @@ import {
   `
 })
 export default class Main {
-  public path: string = '';
-  public pathSchool: string = 'school';
+    private path: string = "";
+    private pathSchool: string = "school";
 
-  constructor(
-    private router: Router,
-    private activatedRoute: ActivatedRoute,
-    private _ngRedux: NgRedux<IAppState>,
-    private _devTools: DevToolsExtension
-  ) {
-/*      router.events
-      .filter((e: Event) => e instanceof NavigationStart)
-      .subscribe((e: NavigationStart) => {
-            console.log(e.url);
-            console.log(e.toString());
-            this.path = e.url.substr(1);
-            this.pathSchool = e.url.substr(1);
-        }); */
-/*    router.events.subscribe((data) => {
-      this.path = data.url.substr(1);
-      this.pathSchool = data.url.substr(1);
-  }); */
+    constructor(
+        private router: Router,
+        private activatedRoute: ActivatedRoute,
+        private _ngRedux: NgRedux<IAppState>,
+        private _devTools: DevToolsExtension
+    ) {
 
-
-
-    const tools = _devTools.enhancer({
-//      deserializeState: reimmutify,
-  });
-    _ngRedux.configureStore(
-      rootReducer,
-      {},
-      middleware,
-//      tools ? [ ...enhancers, tools ] : enhancers);
-      tools);
-//      );
-  }
+        const tools = _devTools.enhancer({
+            //      deserializeState: reimmutify,
+        });
+        _ngRedux.configureStore(
+            rootReducer,
+            {},
+            middleware,
+            //      tools ? [ ...enhancers, tools ] : enhancers);
+            tools);
+        //      );
+    }
 }
diff --git a/source/guards/eduadmin.auth.guard.ts b/source/guards/eduadmin.auth.guard.ts
index 65109590cbf7addd5dea271832844e93576dbaef..f6be941a25314ba92360c143267719ed95fcdd29 100644
--- a/source/guards/eduadmin.auth.guard.ts
+++ b/source/guards/eduadmin.auth.guard.ts
@@ -1,22 +1,22 @@
-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 { 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";
 
 @Injectable()
 export default class EduAdminAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isLoggedIn(DIDE_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/school/logout']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        return false;
-    });
-  }
+    canActivate() {
+        return this.authService.isLoggedIn(DIDE_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/school/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            return false;
+        });
+    }
 }
diff --git a/source/guards/ministry.auth.guard.ts b/source/guards/ministry.auth.guard.ts
index 13b33dbf7a4b7a8cd763c0853487dd2331545a96..6f7e220f959a4933a984f0e8a2d66a118208a6ac 100644
--- a/source/guards/ministry.auth.guard.ts
+++ b/source/guards/ministry.auth.guard.ts
@@ -1,22 +1,22 @@
-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 { 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";
 
 @Injectable()
 export default class MinistryAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isLoggedIn(MINISTRY_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/ministry/logout']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        return false;
-    });
-  }
+    canActivate() {
+        return this.authService.isLoggedIn(MINISTRY_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/ministry/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            return false;
+        });
+    }
 }
diff --git a/source/guards/regionedu.auth.guard.ts b/source/guards/regionedu.auth.guard.ts
index fd504c20642c94fd2ec3f50ec04b8f2ebca15f19..ef711002d5b9732dea18391f3df1c3829b0de7e6 100644
--- a/source/guards/regionedu.auth.guard.ts
+++ b/source/guards/regionedu.auth.guard.ts
@@ -1,22 +1,22 @@
-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 { 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";
 
 @Injectable()
 export default class RegionEduAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isLoggedIn(PDE_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/school/logout']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        return false;
-    });
-  }
+    canActivate() {
+        return this.authService.isLoggedIn(PDE_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/school/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            return false;
+        });
+    }
 }
diff --git a/source/guards/reports.auth.guard.ts b/source/guards/reports.auth.guard.ts
index eb67b0a33a55c641efb3baef3d9c724f9f84312f..14d87f042082fe6df3e6cf75d443dfd53de48e8f 100644
--- a/source/guards/reports.auth.guard.ts
+++ b/source/guards/reports.auth.guard.ts
@@ -1,23 +1,22 @@
-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 { 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";
 
 @Injectable()
 export default class ReportsAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isLoggedInForReports(DIDE_ROLE, PDE_ROLE, MINISTRY_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/ministry/logout']);
-            //this.router.navigate(['/ministy/minister-settings']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        return false;
-    });
-  }
+    canActivate() {
+        return this.authService.isLoggedInForReports(DIDE_ROLE, PDE_ROLE, MINISTRY_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/ministry/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            return false;
+        });
+    }
 }
diff --git a/source/guards/school.auth.guard.ts b/source/guards/school.auth.guard.ts
index d928dc5bca493d8bae4da5f9d69c539cf11627ef..6b2c3e2b5f584a72e00e0d1f9632395b4808325e 100644
--- a/source/guards/school.auth.guard.ts
+++ b/source/guards/school.auth.guard.ts
@@ -1,22 +1,22 @@
-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 { 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";
 
 @Injectable()
 export default class SchoolAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isLoggedIn(SCHOOL_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/school/logout']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        return false;
-    });
-  }
+    canActivate() {
+        return this.authService.isLoggedIn(SCHOOL_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/school/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            return false;
+        });
+    }
 }
diff --git a/source/guards/school.capacity.locked.guard.ts b/source/guards/school.capacity.locked.guard.ts
index fa93ba21e90b7a1fbde7102921bcdd01a1efe8e7..e98f9311b559daafa3a3beec53b7c7e3d1351ae9 100644
--- a/source/guards/school.capacity.locked.guard.ts
+++ b/source/guards/school.capacity.locked.guard.ts
@@ -1,23 +1,23 @@
-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 { 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";
 
 @Injectable()
 export default class SchoolCapacityLockedGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isCapacityLocked(SCHOOL_ROLE).then(isLocked => {
-        if (isLocked) {
-            this.router.navigate(['/school']);
+    canActivate() {
+        return this.authService.isCapacityLocked(SCHOOL_ROLE).then(isLocked => {
+            if (isLocked) {
+                this.router.navigate(["/school"]);
+                return false;
+            } else
+                return true;
+        }).catch(err => {
             return false;
-        } else
-            return true;
-    }).catch(err => {
-        return false;
-    });
-  }
+        });
+    }
 }
diff --git a/source/guards/school.students.locked.guard.ts b/source/guards/school.students.locked.guard.ts
index cdb43a268201ab10c380cb1fd5812476e8937f3b..a6464d24251ef542eae47bf99255ad23f8fdf274 100644
--- a/source/guards/school.students.locked.guard.ts
+++ b/source/guards/school.students.locked.guard.ts
@@ -1,23 +1,23 @@
-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 { 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";
 
 @Injectable()
 export default class SchoolStudentsLockedGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isStudentsLocked(SCHOOL_ROLE).then(isLocked => {
-        if (isLocked) {
-            this.router.navigate(['/school']);
+    canActivate() {
+        return this.authService.isStudentsLocked(SCHOOL_ROLE).then(isLocked => {
+            if (isLocked) {
+                this.router.navigate(["/school"]);
+                return false;
+            } else
+                return true;
+        }).catch(err => {
             return false;
-        } else
-            return true;
-    }).catch(err => {
-        return false;
-    });
-  }
+        });
+    }
 }
diff --git a/source/guards/student.auth.guard.ts b/source/guards/student.auth.guard.ts
index bcdf39237e33f5dfa1da348ad21b1650c038f031..ad925d6b16fbf2bcd7708dc4c2faa02283e13044 100644
--- a/source/guards/student.auth.guard.ts
+++ b/source/guards/student.auth.guard.ts
@@ -1,24 +1,24 @@
-import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { AuthService } from '../services/auth.service';
-import { STUDENT_ROLE } from '../constants';
-import { Router } from '@angular/router';
+import { Injectable } from "@angular/core";
+import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
+import { AuthService } from "../services/auth.service";
+import { STUDENT_ROLE } from "../constants";
+import { Router } from "@angular/router";
 
 @Injectable()
 export default class StudentAuthGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate(route: ActivatedRouteSnapshot,
-  state: RouterStateSnapshot) {
-    return this.authService.isLoggedIn(STUDENT_ROLE).then(loggedIn => {
-        if (!loggedIn) {
-            this.router.navigate(['/logout']);
-        }
-        return loggedIn;
-    }).catch(err => {
-        console.log("exception");
-        return false;
-    });
-  }
+    canActivate(route: ActivatedRouteSnapshot,
+        state: RouterStateSnapshot) {
+        return this.authService.isLoggedIn(STUDENT_ROLE).then(loggedIn => {
+            if (!loggedIn) {
+                this.router.navigate(["/logout"]);
+            }
+            return loggedIn;
+        }).catch(err => {
+            console.log("exception");
+            return false;
+        });
+    }
 }
diff --git a/source/guards/student.lock.guard.ts b/source/guards/student.lock.guard.ts
index e3aebb99337f3d72a2e9a1566f39b52eaff017e4..fd146e1b11d2a986634b4482bd3a9b59823b8559 100644
--- a/source/guards/student.lock.guard.ts
+++ b/source/guards/student.lock.guard.ts
@@ -1,24 +1,24 @@
-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 { 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";
 
 @Injectable()
 export default class StudentLockGuard implements CanActivate {
 
-  constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AuthService, private router: Router) { }
 
-  canActivate() {
-    return this.authService.isApplicationLocked(STUDENT_ROLE).then(isLocked => {
-        if (isLocked) {
-            this.router.navigate(['']);
+    canActivate() {
+        return this.authService.isApplicationLocked(STUDENT_ROLE).then(isLocked => {
+            if (isLocked) {
+                this.router.navigate([""]);
+                return false;
+            } else
+                return true;
+        }).catch(err => {
+            console.log("exception");
             return false;
-        } else
-            return true;
-    }).catch(err => {
-        console.log("exception");
-        return false;
-    });
-  }
+        });
+    }
 }
diff --git a/source/index.html b/source/index.html
index 85d3471cbf8e9a92d6cb710b01e245f5ef22e5e1..82abe98dbccbc3200959eb22e0b10cb4cc875183 100644
--- a/source/index.html
+++ b/source/index.html
@@ -1,10 +1,13 @@
 <!doctype html>
 <html lang="en" data-framework="angular2">
-  <head>
+
+<head>
     <meta charset="utf-8">
     <title>Σύστημα υποβολής ηλεκτρονικών δηλώσεων προτίμησης ΕΠΑΛ για το νέο σχολικό έτος</title>
-  </head>
-  <body>
-      <main></main>
-  </body>
+</head>
+
+<body>
+    <main></main>
+</body>
+
 </html>
diff --git a/source/pipes/camelcase.ts b/source/pipes/camelcase.ts
index b5ed9051444db0c315d5157307c7a09e3e3475fc..8fa89bff5211efd2a53929132e34aae6eac97388 100644
--- a/source/pipes/camelcase.ts
+++ b/source/pipes/camelcase.ts
@@ -1,11 +1,11 @@
-import {Pipe, PipeTransform} from '@angular/core';
+import {Pipe, PipeTransform} from "@angular/core";
 
-@Pipe({name: 'camelcase'})
+@Pipe({ name: "camelcase" })
 export class CamelCasePipe implements PipeTransform {
-  transform(value: string) : any {
-    return value
+    transform(value: string): any {
+        return value
             .replace(/\s(.)/g, function($1) { return $1.toUpperCase(); })
-            .replace(/\s/g, '')
+            .replace(/\s/g, "")
             .replace(/^(.)/, function($1) { return $1.toLowerCase(); });
-  }
+    }
 }
diff --git a/source/pipes/removehtmltags.ts b/source/pipes/removehtmltags.ts
index 4606f38532fdb2e461fcb29b3a36c156c58c9c26..37217c0bba39f4600b5103ef82961b498d70b193 100644
--- a/source/pipes/removehtmltags.ts
+++ b/source/pipes/removehtmltags.ts
@@ -1,8 +1,8 @@
-import {Pipe, PipeTransform} from '@angular/core';
+import {Pipe, PipeTransform} from "@angular/core";
 
-@Pipe({name: 'removetags'})
+@Pipe({ name: "removetags" })
 export class Removetags implements PipeTransform {
-  transform(text: string) : any {
-   	return text ? String(text).replace(/<[^>]+>/gm, '') : ''
-  }
+    transform(text: string): any {
+        return text ? String(text).replace(/<[^>]+>/gm, "") : ""
+    }
 }
diff --git a/source/pipes/removespaces.ts b/source/pipes/removespaces.ts
index 326a17fe01ac8b145bf21d42bfa623cab6508da1..b7f997ab83279b9010db923e55048e1ee376e702 100644
--- a/source/pipes/removespaces.ts
+++ b/source/pipes/removespaces.ts
@@ -1,17 +1,11 @@
-import {Pipe, PipeTransform} from '@angular/core';
- 
+import {Pipe, PipeTransform} from "@angular/core";
+
 @Pipe({
-	name : "removeSpaces"
+    name: "removeSpaces"
 })
- 
+
 export class RemoveSpaces implements PipeTransform {
-	transform(value: string) : any {
-    	return value.replace(/^[ ]+|[ ]+$/g,'');
-	}
+    transform(value: string): any {
+        return value.replace(/^[ ]+|[ ]+$/g, "");
+    }
 }
-
-
-
-
-
-
diff --git a/source/services/Spinner.service.ts b/source/services/Spinner.service.ts
index 83dc0041702fafa27cba0057d33337a1f74a10a7..97ce1cf9759e5f536a0bc5e2c24c08a853100bef 100644
--- a/source/services/Spinner.service.ts
+++ b/source/services/Spinner.service.ts
@@ -1,11 +1,11 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { Injectable } from "@angular/core";
+import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
 @Injectable()
 export class LoaderService {
-    public loaderStatus: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+    private loaderStatus: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
     displayLoader(value: boolean) {
         this.loaderStatus.next(value);
     }
-}
\ No newline at end of file
+}
diff --git a/source/services/auth.service.ts b/source/services/auth.service.ts
index 91cc96e668b00840c89317760069cb85101a244c..f95fad3f3c74e20e17983a7c4962388dbfb5658a 100644
--- a/source/services/auth.service.ts
+++ b/source/services/auth.service.ts
@@ -1,12 +1,12 @@
-import {Injectable} from '@angular/core';
+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 { ILoginInfo, ILoginInfoToken } from '../store/logininfo/logininfo.types';
-import { LOGININFO_INITIAL_STATE } from '../store/logininfo/logininfo.initial-state';
-import { MINISTRY_ROLE } from '../constants';
+import "rxjs/add/operator/map";
+import { AppSettings } from "../app.settings";
+import { NgRedux, select } from "@angular-redux/store";
+import { IAppState } from "../store/store";
+import { ILoginInfo, ILoginInfoToken } from "../store/logininfo/logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state";
+import { MINISTRY_ROLE } from "../constants";
 
 @Injectable()
 export class AuthService {
@@ -18,13 +18,13 @@ export class AuthService {
 
     isLoggedIn(role) {
         return new Promise<boolean>((resolve, reject) => {
-            this._ngRedux.select('loginInfo').subscribe(loginInfo => {
+            this._ngRedux.select("loginInfo").subscribe(loginInfo => {
                 let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({}, loginInfoToken) => {
                         if ((loginInfoToken.auth_token && loginInfoToken.auth_token.length > 0 && loginInfoToken.auth_role === role) ||
-                        (loginInfoToken.minedu_username && loginInfoToken.minedu_username.length > 0 && loginInfoToken.auth_role === MINISTRY_ROLE && role === MINISTRY_ROLE)
-                    ) {
+                            (loginInfoToken.minedu_username && loginInfoToken.minedu_username.length > 0 && loginInfoToken.auth_role === MINISTRY_ROLE && role === MINISTRY_ROLE)
+                        ) {
                             resolve(true);
                         }
                         else {
@@ -42,7 +42,7 @@ export class AuthService {
         });
     }
 
-    isLoggedInForReports(role1,role2,role3) {
+    isLoggedInForReports(role1, role2, role3) {
         return new Promise<boolean>((resolve, reject) => {
             this._ngRedux.select(state => {
                 return state.loginInfo;
@@ -50,8 +50,8 @@ export class AuthService {
                 if (loginInfo.size > 0) {
                     loginInfo.reduce(({}, loginInfoToken) => {
                         if ((loginInfoToken.auth_token && loginInfoToken.auth_token.length > 0 && (loginInfoToken.auth_role === role1 || loginInfoToken.auth_role === role2)) ||
-                        (loginInfoToken.minedu_username && loginInfoToken.minedu_username.length > 0 && loginInfoToken.auth_role === MINISTRY_ROLE && role3 === MINISTRY_ROLE)
-                    ) {
+                            (loginInfoToken.minedu_username && loginInfoToken.minedu_username.length > 0 && loginInfoToken.auth_role === MINISTRY_ROLE && role3 === MINISTRY_ROLE)
+                        ) {
                             resolve(true);
                         }
                         else {
@@ -71,8 +71,8 @@ export class AuthService {
 
     isApplicationLocked(role) {
         return new Promise<boolean>((resolve, reject) => {
-            this._ngRedux.select('loginInfo').subscribe(loginInfo => {
-                let linfo=<ILoginInfo>loginInfo;
+            this._ngRedux.select("loginInfo").subscribe(loginInfo => {
+                let linfo = <ILoginInfo>loginInfo;
                 if (linfo.size > 0) {
                     linfo.reduce(({}, loginInfoToken) => {
                         if ((loginInfoToken.lock_application && loginInfoToken.lock_application === 1 && loginInfoToken.auth_role === role)) {
@@ -95,22 +95,22 @@ export class AuthService {
 
     isStudentsLocked(role) {
         return new Promise<boolean>((resolve, reject) => {
-            this._ngRedux.select('loginInfo')
+            this._ngRedux.select("loginInfo")
                 .map(loginInfo => <ILoginInfo>loginInfo)
                 .subscribe(loginInfo => {
-                if (loginInfo.size > 0) {
-                    loginInfo.reduce(({}, loginInfoToken) => {
-                        if ((loginInfoToken.lock_students && loginInfoToken.lock_students === 1 && loginInfoToken.auth_role === role)) {
-                            resolve(true);
-                        }
-                        else {
-                            resolve(false);
-                        }
-                        return loginInfoToken;
-                    }, {});
-                } else
-                    resolve(false);
-            },
+                    if (loginInfo.size > 0) {
+                        loginInfo.reduce(({}, loginInfoToken) => {
+                            if ((loginInfoToken.lock_students && loginInfoToken.lock_students === 1 && loginInfoToken.auth_role === role)) {
+                                resolve(true);
+                            }
+                            else {
+                                resolve(false);
+                            }
+                            return loginInfoToken;
+                        }, {});
+                    } else
+                        resolve(false);
+                },
                 error => {
                     console.log("Error Getting Auth Data");
                     reject("Error Getting Auth Data");
@@ -120,22 +120,22 @@ export class AuthService {
 
     isCapacityLocked(role) {
         return new Promise<boolean>((resolve, reject) => {
-            this._ngRedux.select('loginInfo')
+            this._ngRedux.select("loginInfo")
                 .map(loginInfo => <ILoginInfo>loginInfo)
                 .subscribe(loginInfo => {
-                if (loginInfo.size > 0) {
-                    loginInfo.reduce(({}, loginInfoToken) => {
-                        if ((loginInfoToken.lock_capacity && loginInfoToken.lock_capacity === 1 && loginInfoToken.auth_role === role)) {
-                            resolve(true);
-                        }
-                        else {
-                            resolve(false);
-                        }
-                        return loginInfoToken;
-                    }, {});
-                } else
-                    resolve(false);
-            },
+                    if (loginInfo.size > 0) {
+                        loginInfo.reduce(({}, loginInfoToken) => {
+                            if ((loginInfoToken.lock_capacity && loginInfoToken.lock_capacity === 1 && loginInfoToken.auth_role === role)) {
+                                resolve(true);
+                            }
+                            else {
+                                resolve(false);
+                            }
+                            return loginInfoToken;
+                        }, {});
+                    } else
+                        resolve(false);
+                },
                 error => {
                     console.log("Error Getting Auth Data");
                     reject("Error Getting Auth Data");
diff --git a/source/services/helper-data-service.ts b/source/services/helper-data-service.ts
index 226878e2156006f6f7682fed8d947832bf9173d8..128ec5bd294e80d7cad318b0f81d8d2cd45e91cd 100644
--- a/source/services/helper-data-service.ts
+++ b/source/services/helper-data-service.ts
@@ -2,7 +2,6 @@ import { Http, Headers, RequestOptions, ResponseContentType, Response } from "@a
 import { Injectable, OnInit, OnDestroy } from "@angular/core";
 import { BehaviorSubject, Subscription } from "rxjs/Rx";
 import "rxjs/add/operator/map";
-import { ICourseField } from "../store/coursefields/coursefields.types";
 import { ISectorField } from "../store/sectorfields/sectorfields.types";
 import { IRegionRecord, IRegionSchoolRecord, IRRegion, IRRegionSchool } from "../store/regionschools/regionschools.types";
 import { ISector, ISectors, ISectorCourse } from "../store/sectorcourses/sectorcourses.types";
@@ -36,7 +35,7 @@ export class HelperDataService implements OnInit, OnDestroy {
     };
 
     ngOnInit() {
-        this.loginInfoSub = this._ngRedux.select('loginInfo')
+        this.loginInfoSub = this._ngRedux.select("loginInfo")
             .map(loginInfo => <ILoginInfo>loginInfo)
             .subscribe(loginInfo => {
                 if (loginInfo.size > 0) {
@@ -175,30 +174,6 @@ export class HelperDataService implements OnInit, OnDestroy {
         });
     }
 
-    getCourseFields() {
-
-        this.loginInfo$.getValue().forEach(loginInfoToken => {
-            this.authToken = loginInfoToken.auth_token;
-            this.authRole = loginInfoToken.auth_role;
-        });
-        let headers = new Headers({
-            "Content-Type": "application/json",
-        });
-        this.createAuthorizationHeader(headers);
-        let options = new RequestOptions({ headers: headers });
-        return new Promise((resolve, reject) => {
-            this.http.get(`${AppSettings.API_ENDPOINT}/coursefields/list`, options)
-                .map(response => <ICourseField[]>response.json())
-                .subscribe(data => {
-                    resolve(data);
-                },
-                error => {
-                    console.log("Error HTTP GET Service");
-                    reject("Error HTTP GET Service");
-                });
-        });
-    };
-
     getSectorFields() {
         this.loginInfo$.getValue().forEach(loginInfoToken => {
             this.authToken = loginInfoToken.auth_token;
@@ -321,31 +296,6 @@ export class HelperDataService implements OnInit, OnDestroy {
         return rsa;
     }
 
-    getCriteria() {
-
-        this.loginInfo$.getValue().forEach(loginInfoToken => {
-            this.authToken = loginInfoToken.auth_token;
-            this.authRole = loginInfoToken.auth_role;
-        });
-        let headers = new Headers({
-            "Content-Type": "application/json",
-        });
-        this.createAuthorizationHeader(headers);
-        let options = new RequestOptions({ headers: headers });
-        return new Promise((resolve, reject) => {
-            this.http.get(`${AppSettings.API_ENDPOINT}/criteria/list`, options)
-                //this.http.get(`${AppSettings.API_ENDPOINT}/criteria/list?category=${category}`, options)
-                .map(response => <ISectorField[]>response.json())
-                .subscribe(data => {
-                    resolve(data);
-                },
-                error => {
-                    console.log("Error HTTP GET Service");
-                    reject("Error HTTP GET Service");
-                });
-        });
-    };
-
     getCurrentUser(oauthtoken, oauthrole) {
 
         this.authToken = oauthtoken;
@@ -433,7 +383,7 @@ export class HelperDataService implements OnInit, OnDestroy {
                 .map(response => response.json())
                 .subscribe(data => {
                     this._cookieService.removeAll();
-                    window.onbeforeunload = function() { console.log("unloading") };
+                    window.onbeforeunload = function() { console.log("unloading"); };
                     resolve(data);
                 },
                 error => {
@@ -452,7 +402,7 @@ export class HelperDataService implements OnInit, OnDestroy {
                 .map(response => response.json())
                 .subscribe(data => {
                     this._cookieService.removeAll();
-                    window.onbeforeunload = function() { console.log("unloading") };
+                    window.onbeforeunload = function() { console.log("unloading"); };
                     resolve(data);
                 },
                 error => {
@@ -593,7 +543,7 @@ export class HelperDataService implements OnInit, OnDestroy {
         let options = new RequestOptions({ headers: headers });
 
         return new Promise((resolve, reject) => {
-            this.http.post(`${AppSettings.API_ENDPOINT}/epal/distribution`, { }, options)
+            this.http.post(`${AppSettings.API_ENDPOINT}/epal/distribution`, {}, options)
                 .map(response => response.json())
                 .subscribe(data => {
                     resolve(data);
@@ -615,7 +565,7 @@ export class HelperDataService implements OnInit, OnDestroy {
         let options = new RequestOptions({ headers: headers });
 
         return new Promise((resolve, reject) => {
-            this.http.post(`${AppSettings.API_ENDPOINT}/epal/distribution-secondperiod`, { }, options)
+            this.http.post(`${AppSettings.API_ENDPOINT}/epal/distribution-secondperiod`, {}, options)
                 .map(response => response.json())
                 .subscribe(data => {
                     resolve(data);
@@ -637,24 +587,24 @@ export class HelperDataService implements OnInit, OnDestroy {
         this.createMinistryAuthorizationHeader(headers, username, userpassword);
         let options = new RequestOptions({ headers: headers });
 
-        if (routepath == "/ministry/report-users/") {
+        if (routepath === "/ministry/report-users/") {
             return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath, options)
                 .map(response => response.json());
         }
-        else if (routepath == "/ministry/general-report/") {
+        else if (routepath === "/ministry/general-report/") {
             return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath, options)
                 .map(response => response.json());
         }
-        else if (routepath == "/ministry/report-completeness/") {
+        else if (routepath === "/ministry/report-completeness/") {
             return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel, options)
                 .map(response => response.json());
         }
-        else if (routepath == "/ministry/report-all-stat/") {
+        else if (routepath === "/ministry/report-all-stat/") {
             return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
                 clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
                 .map(response => response.json());
         }
-        else if (routepath == "/ministry/report-no-capacity/") {
+        else if (routepath === "/ministry/report-no-capacity/") {
             let capacityFilter = 0;
             if (regionsel)
                 capacityFilter = 1;
@@ -673,11 +623,11 @@ export class HelperDataService implements OnInit, OnDestroy {
         let options = new RequestOptions({ headers: headers });
 
         let route = "";
-        if (unallocated == 1) {
+        if (unallocated === 1) {
             route = "ministry/send-unallocated-massive-mail/" + period;
-        } else if (unallocated == 2) {
+        } else if (unallocated === 2) {
             route = "ministry/send-unallocated-sc-massive-mail/" + period;
-        } else if (unallocated == 3) {
+        } else if (unallocated === 3) {
             route = "ministry/send-located-massive-mail/" + period;
         }
 
@@ -969,7 +919,7 @@ export class HelperDataService implements OnInit, OnDestroy {
         let headerIdStr = headerid.toString();
         return this.http.get(`${AppSettings.API_ENDPOINT}/epal/pdf-application/` + headerIdStr, options)
             .map((res) => {
-                return new Blob([res['_body']], { type: "application/octet-stream" })
+                return new Blob([res["_body"]], { type: "application/octet-stream" });
             })
             .subscribe(
             data => {
@@ -980,13 +930,13 @@ export class HelperDataService implements OnInit, OnDestroy {
 
 
     sendmail(email, name, surname, message) {
-         let headers = new Headers({
+        let headers = new Headers({
             "Content-Type": "application/json",
         });
         this.createAuthorizationHeader(headers);
         let options = new RequestOptions({ headers: headers });
         return new Promise((resolve, reject) => {
-            this.http.post(`${AppSettings.API_ENDPOINT}/epal/user/sendmail`, { userEmail: email, userName : name, userSurname : surname, userMessage : message }, options)
+            this.http.post(`${AppSettings.API_ENDPOINT}/epal/user/sendmail`, { userEmail: email, userName: name, userSurname: surname, userMessage: message }, options)
                 .map(response => response.json())
                 .subscribe(data => {
                     resolve(data);
@@ -998,18 +948,18 @@ export class HelperDataService implements OnInit, OnDestroy {
         });
     }
 
-/*    showResults(headerid) {
+    /*    showResults(headerid) {
 
-      let headers = new Headers({
-          "Content-Type": "application/json",
-      });
-      this.createAuthorizationHeader(headers);
-      let options = new RequestOptions({ headers: headers });
-      let headerIdStr = headerid.toString();
-      return this.http.get(`${AppSettings.API_ENDPOINT}/epal/showresults/` + headerIdStr, options)
-          .map(response => response.json());
+          let headers = new Headers({
+              "Content-Type": "application/json",
+          });
+          this.createAuthorizationHeader(headers);
+          let options = new RequestOptions({ headers: headers });
+          let headerIdStr = headerid.toString();
+          return this.http.get(`${AppSettings.API_ENDPOINT}/epal/showresults/` + headerIdStr, options)
+              .map(response => response.json());
 
-    } */
+        } */
 
 
     findTotalStudents() {
@@ -1026,12 +976,12 @@ export class HelperDataService implements OnInit, OnDestroy {
         return this.http.get(`${AppSettings.API_ENDPOINT}/epal/totalstudent`, options)
 
             .map(response => response.json());
-        }
+    }
 
 
 
 
-deleteApplicationforDirector(appId) {
+    deleteApplicationforDirector(appId) {
         this.loginInfo$.getValue().forEach(loginInfoToken => {
             this.authToken = loginInfoToken.auth_token;
             this.authRole = loginInfoToken.auth_role;
diff --git a/source/store/coursefields/coursefields.initial-state.ts b/source/store/coursefields/coursefields.initial-state.ts
deleted file mode 100644
index f80146648fb304cc90933714b0d105e5edb58859..0000000000000000000000000000000000000000
--- a/source/store/coursefields/coursefields.initial-state.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { List } from 'immutable';
-import { ICourseField } from './coursefields.types';
-
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
-export const INITIAL_STATE = List<ICourseField>();
diff --git a/source/store/coursefields/coursefields.reducer.ts b/source/store/coursefields/coursefields.reducer.ts
deleted file mode 100644
index 68bf82324a32070fb71a293bbe9dc4c576229dc7..0000000000000000000000000000000000000000
--- a/source/store/coursefields/coursefields.reducer.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ICourseFields, ICourseField } from './coursefields.types';
-import { INITIAL_STATE } from './coursefields.initial-state';
-import { Seq } from 'immutable';
-
-import {
-  COURSEFIELDS_RECEIVED,
-  COURSEFIELDS_SELECTED_SAVE
-} from '../../constants';
-
-export function courseFieldsReducer(state: ICourseFields = INITIAL_STATE, action): ICourseFields {
-  switch (action.type) {
-    case COURSEFIELDS_RECEIVED:
-        let newCourseFields = Array<ICourseField>();
-        let i=0;
-        action.payload.courseFields.forEach(courseField => {
-            newCourseFields.push(<ICourseField>{id: courseField.id, name: courseField.name, selected: false});
-            i++;
-        });
-        return Seq(newCourseFields).map(n => n).toList();
-    case COURSEFIELDS_SELECTED_SAVE:
-        let selectedCourseFields = Array<ICourseField>();
-        let ind=0;
-        state.forEach(courseField => {
-            selectedCourseFields.push(<ICourseField>{id: courseField.id, name: courseField.name, selected: action.payload.courseFieldsSelected[ind]});
-            ind++;
-        });
-        return Seq(selectedCourseFields).map(n => n).toList();
-    default: return state;
-  }
-};
diff --git a/source/store/coursefields/coursefields.transformers.ts b/source/store/coursefields/coursefields.transformers.ts
deleted file mode 100644
index c64c94f43b828b11f99a0ebe6855dd70f47b9b4b..0000000000000000000000000000000000000000
--- a/source/store/coursefields/coursefields.transformers.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ICourseFields, ICourseField } from './coursefields.types';
-
-export function deimmutifyCourseFields(state: ICourseFields): ICourseField[] {
-    let fetchedCourseFields = new Array();
-    state.forEach(courseField => {
-        fetchedCourseFields.push(<ICourseField>{id: courseField.id, name: courseField.name, selected: courseField.selected});
-    });
-    return fetchedCourseFields;
-};
-
-/* export function reimmutifyCourseFields(plain): ICourseFields {
-  return List<ICourseField>(plain ? plain.map(CourseFieldRecord) : []);
-} */
diff --git a/source/store/coursefields/coursefields.types.ts b/source/store/coursefields/coursefields.types.ts
deleted file mode 100644
index 8df808b467f8929e7e2b9cc68992c96f46d7afd0..0000000000000000000000000000000000000000
--- a/source/store/coursefields/coursefields.types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { List } from 'immutable';
-
-export interface ICourseField {
-    id: number;
-    name: string;
-    selected: boolean;
-}
-
-export type ICourseFields = List<ICourseField>;
diff --git a/source/store/coursefields/index.ts b/source/store/coursefields/index.ts
deleted file mode 100644
index ddeab8ff24b8768629eaf9f1dd15dea8903e2a72..0000000000000000000000000000000000000000
--- a/source/store/coursefields/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ICourseField, ICourseFields } from './coursefields.types';
-import { courseFieldsReducer } from './coursefields.reducer';
-import { deimmutifyCourseFields } from './coursefields.transformers';
-
-export {
-  ICourseField,
-  ICourseFields,
-  courseFieldsReducer,
-  deimmutifyCourseFields,
-};
diff --git a/source/store/criteria/criteria.initial-state.ts b/source/store/criteria/criteria.initial-state.ts
deleted file mode 100644
index 23194f25aaf507c2460851d73b9a0196df399e41..0000000000000000000000000000000000000000
--- a/source/store/criteria/criteria.initial-state.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { List } from 'immutable';
-import { ICriteria } from './criteria.types';
-
-
-export const CRITERIA_INITIAL_STATE = List<ICriteria>();
diff --git a/source/store/criteria/criteria.reducer.ts b/source/store/criteria/criteria.reducer.ts
deleted file mode 100644
index e7e400228eabcea68049425440ab406b4398d052..0000000000000000000000000000000000000000
--- a/source/store/criteria/criteria.reducer.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ICriteria, ICriter } from './criteria.types';
-import { CRITERIA_INITIAL_STATE } from './criteria.initial-state';
-import { Seq } from 'immutable';
-
-import {
-  CRITERIA_RECEIVED,
-  CRITERIA_SAVE,
-  CRITERIA_INIT
-} from '../../constants';
-
-export function criteriaReducer(state: ICriter = CRITERIA_INITIAL_STATE, action): ICriter {
-  switch (action.type) {
-    case CRITERIA_RECEIVED:
-        let newCriter = Array<ICriteria>();
-        let i=0;
-        action.payload.criteria.forEach(criteria => {
-            newCriter.push(<ICriteria>{id: criteria.id, name: criteria.name, category: criteria.category,
-              points: criteria.points, mutual_disabled_id: criteria.mutual_disabled_id, selected:  false});
-            i++;
-        });
-        return Seq(newCriter).map(n => n).toList();
-
-    case CRITERIA_SAVE:
-        let criter = Array<ICriteria>();
-        let ind=0;
-        state.forEach(criteria => {
-            criter.push(<ICriteria>{id: criteria.id, name: criteria.name, category: criteria.category,
-              points: criteria.points, mutual_disabled_id: criteria.mutual_disabled_id, selected: action.payload.criter[0][ind]});
-            ind++;
-        });
-
-        return Seq(criter).map(n => n).toList();
-    case CRITERIA_INIT:
-        return CRITERIA_INITIAL_STATE;
-    default: return state;
-  }
-};
-/*
-case COURSEFIELDS_SELECTED_SAVE:
-    let selectedCourseFields = Array<ICourseField>();
-    let ind=0;
-    state.forEach(courseField => {
-        selectedCourseFields.push(<ICourseField>{id: courseField.id, name: courseField.name, selected: action.payload.courseFieldsSelected[ind]});
-        ind++;
-    });
-    return Seq(selectedCourseFields).map(n => n).toList();
-default: return state;
-*/
diff --git a/source/store/criteria/criteria.transformers.ts b/source/store/criteria/criteria.transformers.ts
deleted file mode 100644
index 42b5327295585a3e3ee1bf89bd5954cf5352a9ae..0000000000000000000000000000000000000000
--- a/source/store/criteria/criteria.transformers.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ICriteria, ICriter } from './criteria.types';
-
-export function deimmutifyCriteria(state: ICriter): ICriteria[] {
-    let fetchedCriteria = new Array();
-
-    state.forEach(criteria => {
-        fetchedCriteria.push(<ICriteria>{id: criteria.id, name: criteria.name, category: criteria.category,
-          mutual_disabled_id: criteria.mutual_disabled_id, points: criteria.points, selected: criteria.selected,
-        });
-    });
-    return fetchedCriteria;
-};
diff --git a/source/store/criteria/criteria.types.ts b/source/store/criteria/criteria.types.ts
deleted file mode 100644
index 00797e1efa909917e99163388e5cb652f062b926..0000000000000000000000000000000000000000
--- a/source/store/criteria/criteria.types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { List } from 'immutable';
-
-export interface ICriteria {
-  id: string;
-  name: string;
-  category: string;
-  mutual_disabled_id: string;
-  points: string;
-  selected: boolean;
-}
-
-export type ICriter = List<ICriteria>;
diff --git a/source/store/criteria/index.ts b/source/store/criteria/index.ts
deleted file mode 100644
index e72285654eda37e849ea644637281abbd0391232..0000000000000000000000000000000000000000
--- a/source/store/criteria/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ICriter, ICriteria } from './criteria.types';
-import { criteriaReducer } from './criteria.reducer';
-import { deimmutifyCriteria } from './criteria.transformers';
-
-export {
-  ICriter,
-  ICriteria,
-  criteriaReducer,
-  deimmutifyCriteria,
-};
diff --git a/source/store/epalclasses/epalclasses.initial-state.ts b/source/store/epalclasses/epalclasses.initial-state.ts
index 2f06b5f2b49caf55c61f4c78978e5f97f69a17b3..1d918de0a960230de316dc8db3c72d914c7cd600 100644
--- a/source/store/epalclasses/epalclasses.initial-state.ts
+++ b/source/store/epalclasses/epalclasses.initial-state.ts
@@ -1,5 +1,5 @@
-import { List } from 'immutable';
-import { IEpalClass} from './epalclasses.types';
+import { List } from "immutable";
+import { IEpalClass} from "./epalclasses.types";
 
 
 export const EPALCLASSES_INITIAL_STATE = List<IEpalClass>();
diff --git a/source/store/epalclasses/epalclasses.reducer.ts b/source/store/epalclasses/epalclasses.reducer.ts
index 2bc66ecaa2fc90eca98450760aea1933dabb5c1c..2c19cc2f9a9fbf89fbd8e7421b23dabfcc98214a 100644
--- a/source/store/epalclasses/epalclasses.reducer.ts
+++ b/source/store/epalclasses/epalclasses.reducer.ts
@@ -1,21 +1,18 @@
-import { IEpalClasses, IEpalClass } from './epalclasses.types';
-import { EPALCLASSES_INITIAL_STATE } from './epalclasses.initial-state';
-import { Seq } from 'immutable';
+import { IEpalClasses, IEpalClass } from "./epalclasses.types";
+import { EPALCLASSES_INITIAL_STATE } from "./epalclasses.initial-state";
+import { Seq } from "immutable";
 
-import {  EPALCLASSES_SAVE, EPALCLASSES_INIT } from '../../constants';
+import {  EPALCLASSES_SAVE, EPALCLASSES_INIT } from "../../constants";
 
 export function epalclassesReducer(state: IEpalClasses = EPALCLASSES_INITIAL_STATE, action): IEpalClasses {
 
-
-  switch (action.type) {
-
-
-    case EPALCLASSES_SAVE:
-        let selectedEpalClasses = Array<IEpalClass>();
-        selectedEpalClasses.push(<IEpalClass>{ name: action.payload.epalClasses.name});
-        return Seq(selectedEpalClasses).map(n => n).toList();
-    case EPALCLASSES_INIT:
-        return EPALCLASSES_INITIAL_STATE;
-    default: return state;
-  }
+    switch (action.type) {
+        case EPALCLASSES_SAVE:
+            let selectedEpalClasses = Array<IEpalClass>();
+            selectedEpalClasses.push(<IEpalClass>{ name: action.payload.epalClasses.name });
+            return Seq(selectedEpalClasses).map(n => n).toList();
+        case EPALCLASSES_INIT:
+            return EPALCLASSES_INITIAL_STATE;
+        default: return state;
+    }
 };
diff --git a/source/store/epalclasses/epalclasses.transformers.ts b/source/store/epalclasses/epalclasses.transformers.ts
index b5957c072ec5245369e82df7c9dd8a1723612632..6d57322faae443c24fc7284f6dbe5544deff6638 100644
--- a/source/store/epalclasses/epalclasses.transformers.ts
+++ b/source/store/epalclasses/epalclasses.transformers.ts
@@ -1,12 +1,9 @@
-import { IEpalClasses, IEpalClass } from './epalclasses.types';
+import { IEpalClasses, IEpalClass } from "./epalclasses.types";
 
 export function deimmutifyEpalClasses(state: IEpalClasses): IEpalClass[] {
     let fetchedEpalClasses = new Array();
     state.forEach(epalclass => {
-        fetchedEpalClasses.push(<IEpalClass>{name: epalclass.name});
+        fetchedEpalClasses.push(<IEpalClass>{ name: epalclass.name });
     });
     return fetchedEpalClasses;
 };
-
-
-
diff --git a/source/store/epalclasses/epalclasses.types.ts b/source/store/epalclasses/epalclasses.types.ts
index 7625d86d0b7fe34639d682aeac08c5d23de750a9..63b4f1a110a2d266d53c5f5c34e43bce411eaea5 100644
--- a/source/store/epalclasses/epalclasses.types.ts
+++ b/source/store/epalclasses/epalclasses.types.ts
@@ -1,11 +1,8 @@
-import { List } from 'immutable';
+import { List } from "immutable";
 
 export interface IEpalClass {
-   // id: number;
+    // id: number;
     name: string;
-    
-}
 
+}
 export type IEpalClasses = List<IEpalClass>;
-
-
diff --git a/source/store/epalclasses/index.ts b/source/store/epalclasses/index.ts
index a7f7f73be0cc2a3ae8659581f7644b18d826819c..9c851c4135735540abb39183561df1554d20ab71 100644
--- a/source/store/epalclasses/index.ts
+++ b/source/store/epalclasses/index.ts
@@ -1,10 +1,10 @@
-import { IEpalClass, IEpalClasses } from './epalclasses.types';
-import { epalclassesReducer } from './epalclasses.reducer';
-import { deimmutifyEpalClasses } from './epalclasses.transformers';
+import { IEpalClass, IEpalClasses } from "./epalclasses.types";
+import { epalclassesReducer } from "./epalclasses.reducer";
+import { deimmutifyEpalClasses } from "./epalclasses.transformers";
 
 export {
-  IEpalClass,
-  IEpalClasses,
-  epalclassesReducer,
-  deimmutifyEpalClasses,
+IEpalClass,
+IEpalClasses,
+epalclassesReducer,
+deimmutifyEpalClasses,
 };
diff --git a/source/store/index.ts b/source/store/index.ts
index 2935f64c6a151926319efd793af2b0d954e342b0..a2a49ae09fe0eabb4a15225b4af88c9853a2f131 100644
--- a/source/store/index.ts
+++ b/source/store/index.ts
@@ -1,57 +1,39 @@
-// import * as persistState from 'redux-localstorage';
-import {createLogger} from 'redux-logger';
-// import logger = require("redux-logger");
-// import {applyMiddleware} from 'redux';
-import { IAppState, rootReducer, deimmutify } from './store';
-import { ICourseField, ICourseFields } from './coursefields/coursefields.types';
-import { ISectorField, ISectorFields } from './sectorfields/sectorfields.types';
-import { IRRegion, IRRegionSchool, IRegionRecord, IRegionRecords, IRegionSchoolRecord, IRegionSchoolRecords } from './regionschools/regionschools.types';
-import { ISectors, ISector, ISectorCourse } from './sectorcourses/sectorcourses.types';
-import { IStudentDataField, IStudentDataFields } from './studentdatafields/studentdatafields.types';
-import { IEpalClass, IEpalClasses } from './epalclasses/epalclasses.types';
-import { ILoginInfoToken, ILoginInfo } from './logininfo/logininfo.types';
-import { ICriter, ICriteria } from './criteria/criteria.types';
+import {createLogger} from "redux-logger";
+
+import { IAppState, rootReducer, deimmutify } from "./store";
+import { ISectorField, ISectorFields } from "./sectorfields/sectorfields.types";
+import { IRRegion, IRRegionSchool, IRegionRecord, IRegionRecords, IRegionSchoolRecord, IRegionSchoolRecords } from "./regionschools/regionschools.types";
+import { ISectors, ISector, ISectorCourse } from "./sectorcourses/sectorcourses.types";
+import { IStudentDataField, IStudentDataFields } from "./studentdatafields/studentdatafields.types";
+import { IEpalClass, IEpalClasses } from "./epalclasses/epalclasses.types";
+import { ILoginInfoToken, ILoginInfo } from "./logininfo/logininfo.types";
 
 export {
-  IAppState,
-  rootReducer,
-  ICourseField,
-  ICourseFields,
-  ISectorField,
-  ISectorFields,
-  IRRegion,
-  IRegionRecord,
-  IRegionRecords,
-  IRegionSchoolRecord,
-  IRegionSchoolRecords,
-  IRRegionSchool,
-  ISectors,
-  ISector,
-  ISectorCourse,
-  IStudentDataField,
-  IStudentDataFields,
-  IEpalClass,
-  IEpalClasses,
-  ILoginInfo,
-  ICriter,
-  ICriteria
+IAppState,
+rootReducer,
+ISectorField,
+ISectorFields,
+IRRegion,
+IRegionRecord,
+IRegionRecords,
+IRegionSchoolRecord,
+IRegionSchoolRecords,
+IRRegionSchool,
+ISectors,
+ISector,
+ISectorCourse,
+IStudentDataField,
+IStudentDataFields,
+IEpalClass,
+IEpalClasses,
+ILoginInfo,
 };
 
-
 const myLogger = createLogger({
-    level: 'info',
+    level: "info",
     collapsed: true,
     stateTransformer: deimmutify
-})
-// const logger2 = logger();
+});
 export const middleware = [
-  myLogger
+    myLogger
 ];
-
-/* export const middleware = [
-  Logger({
-    level: 'info',
-    collapsed: true,
-    stateTransformer: deimmutify
-  })
-]; */
diff --git a/source/store/logininfo/index.ts b/source/store/logininfo/index.ts
index b5b2917400bc55db733a33cca819fad02fc70bcd..00b3c5fe749a106d1c970186179de7153853f409 100644
--- a/source/store/logininfo/index.ts
+++ b/source/store/logininfo/index.ts
@@ -1,10 +1,10 @@
-import { ILoginInfoToken, ILoginInfo } from './logininfo.types';
-import { loginInfoReducer } from './logininfo.reducer';
-import { deimmutifyLoginInfo } from './logininfo.transformers';
+import { ILoginInfoToken, ILoginInfo } from "./logininfo.types";
+import { loginInfoReducer } from "./logininfo.reducer";
+import { deimmutifyLoginInfo } from "./logininfo.transformers";
 
 export {
-  ILoginInfoToken,
-  ILoginInfo,
-  loginInfoReducer,
-  deimmutifyLoginInfo,
+ILoginInfoToken,
+ILoginInfo,
+loginInfoReducer,
+deimmutifyLoginInfo,
 };
diff --git a/source/store/logininfo/logininfo.initial-state.ts b/source/store/logininfo/logininfo.initial-state.ts
index 5ef74d49463e3283f9c8f58cd40c12b70105c5ff..7229f22708d7db39711d59ce3fdfc9c58029855e 100644
--- a/source/store/logininfo/logininfo.initial-state.ts
+++ b/source/store/logininfo/logininfo.initial-state.ts
@@ -1,5 +1,4 @@
-import { List } from 'immutable';
-import { ILoginInfoToken } from './logininfo.types';
+import { List } from "immutable";
+import { ILoginInfoToken } from "./logininfo.types";
 
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
 export const LOGININFO_INITIAL_STATE = List<ILoginInfoToken>();
diff --git a/source/store/logininfo/logininfo.reducer.ts b/source/store/logininfo/logininfo.reducer.ts
index 001a9e7bd0f150247824dcc3094221e26f32e8e6..7cbd09a6f13ee81e3b22a1317add3b8b71c919c4 100644
--- a/source/store/logininfo/logininfo.reducer.ts
+++ b/source/store/logininfo/logininfo.reducer.ts
@@ -1,38 +1,38 @@
-import { ILoginInfo, ILoginInfoToken } from './logininfo.types';
-import { LOGININFO_INITIAL_STATE } from './logininfo.initial-state';
-import { Seq } from 'immutable';
+import { ILoginInfo, ILoginInfoToken } from "./logininfo.types";
+import { LOGININFO_INITIAL_STATE } from "./logininfo.initial-state";
+import { Seq } from "immutable";
 
 import {
-  LOGININFO_SAVE,
-  LOGININFO_INIT,
-  PROFILE_SAVE,
-  STATEMENTAGREE_SAVE
-} from '../../constants';
+    LOGININFO_SAVE,
+    LOGININFO_INIT,
+    PROFILE_SAVE,
+    STATEMENTAGREE_SAVE
+} from "../../constants";
 
 export function loginInfoReducer(state: ILoginInfo = LOGININFO_INITIAL_STATE, action): ILoginInfo {
-  switch (action.type) {
-    case LOGININFO_SAVE:
-		let loginInfoTokens = Array<ILoginInfoToken>();
-        let i=0;
-        action.payload.loginInfos.forEach(loginInfo => {
-            loginInfoTokens.push(<ILoginInfoToken>{
-                auth_token: loginInfo.auth_token,
-                auth_role: loginInfo.auth_role,
-                cu_name: loginInfo.cu_name,
-                cu_surname: loginInfo.cu_surname,
-                cu_fathername: loginInfo.cu_fathername,
-                cu_mothername: loginInfo.cu_mothername,
-                cu_email: loginInfo.cu_email,
-                minedu_username: loginInfo.minedu_username,
-                minedu_userpassword: loginInfo.minedu_userpassword,
-                lock_capacity: loginInfo.lock_capacity,
-                lock_students: loginInfo.lock_students,
-                lock_application: loginInfo.lock_application,
-                disclaimer_checked: loginInfo.disclaimer_checked
+    switch (action.type) {
+        case LOGININFO_SAVE:
+            let loginInfoTokens = Array<ILoginInfoToken>();
+            let i = 0;
+            action.payload.loginInfos.forEach(loginInfo => {
+                loginInfoTokens.push(<ILoginInfoToken>{
+                    auth_token: loginInfo.auth_token,
+                    auth_role: loginInfo.auth_role,
+                    cu_name: loginInfo.cu_name,
+                    cu_surname: loginInfo.cu_surname,
+                    cu_fathername: loginInfo.cu_fathername,
+                    cu_mothername: loginInfo.cu_mothername,
+                    cu_email: loginInfo.cu_email,
+                    minedu_username: loginInfo.minedu_username,
+                    minedu_userpassword: loginInfo.minedu_userpassword,
+                    lock_capacity: loginInfo.lock_capacity,
+                    lock_students: loginInfo.lock_students,
+                    lock_application: loginInfo.lock_application,
+                    disclaimer_checked: loginInfo.disclaimer_checked
+                });
+                i++;
             });
-            i++;
-        });
-        return Seq(loginInfoTokens).map(n => n).toList();
+            return Seq(loginInfoTokens).map(n => n).toList();
 
         case PROFILE_SAVE:
             state.forEach(loginInfoToken => {
@@ -40,7 +40,7 @@ export function loginInfoReducer(state: ILoginInfo = LOGININFO_INITIAL_STATE, ac
                 loginInfoToken.cu_surname = action.payload.profile.userSurname;
                 loginInfoToken.cu_fathername = action.payload.profile.userFathername;
                 loginInfoToken.cu_mothername = action.payload.profile.userMothername;
-                return state.withMutations(function (list) {
+                return state.withMutations(function(list) {
                     list.set(0, loginInfoToken);
                 });
             });
@@ -48,16 +48,16 @@ export function loginInfoReducer(state: ILoginInfo = LOGININFO_INITIAL_STATE, ac
 
         case STATEMENTAGREE_SAVE:
             state.forEach(loginInfoToken => {
-                    loginInfoToken.disclaimer_checked = action.payload.disclaimer_checked;
-                    return state.withMutations(function (list) {
-                        list.set(0, loginInfoToken);
-                    });
+                loginInfoToken.disclaimer_checked = action.payload.disclaimer_checked;
+                return state.withMutations(function(list) {
+                    list.set(0, loginInfoToken);
                 });
-                return state;
+            });
+            return state;
 
-    case LOGININFO_INIT:
-        return LOGININFO_INITIAL_STATE;
-    default:
-        return state;
-  }
+        case LOGININFO_INIT:
+            return LOGININFO_INITIAL_STATE;
+        default:
+            return state;
+    }
 };
diff --git a/source/store/logininfo/logininfo.transformers.ts b/source/store/logininfo/logininfo.transformers.ts
index 23ce5a7a07761e47aae3a080aa305d8dab05285e..ee97ef0fbb002a196c0612ffb9eb79518bc53cb6 100644
--- a/source/store/logininfo/logininfo.transformers.ts
+++ b/source/store/logininfo/logininfo.transformers.ts
@@ -1,4 +1,4 @@
-import { ILoginInfo, ILoginInfoToken } from './logininfo.types';
+import { ILoginInfo, ILoginInfoToken } from "./logininfo.types";
 
 export function deimmutifyLoginInfo(state: ILoginInfo): ILoginInfoToken[] {
     let fetchedLoginInfoTokens = new Array();
diff --git a/source/store/logininfo/logininfo.types.ts b/source/store/logininfo/logininfo.types.ts
index e1636882b2098219c7a3b269b47792210d136edc..cc3d9ddbf5847490326b8897e95aba4ac64428e7 100644
--- a/source/store/logininfo/logininfo.types.ts
+++ b/source/store/logininfo/logininfo.types.ts
@@ -1,4 +1,4 @@
-import { List } from 'immutable';
+import { List } from "immutable";
 
 export interface ILoginInfoToken {
     auth_token: string;
diff --git a/source/store/regionschools/index.ts b/source/store/regionschools/index.ts
index 03f7e19cd987fea4b1994e8f1635450df0782b5f..ab575c8c67700a8337144e3e3b382ff4ea0c8f53 100644
--- a/source/store/regionschools/index.ts
+++ b/source/store/regionschools/index.ts
@@ -1,14 +1,14 @@
-import { IRegionRecord, IRegionRecords, IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords } from './regionschools.types';
-import { regionSchoolsReducer } from './regionschools.reducer';
-import { deimmutifyRegionSchools } from './regionschools.transformers';
+import { IRegionRecord, IRegionRecords, IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords } from "./regionschools.types";
+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 8668aac01a2fb22cb888786a0c05f5c2409c9f7f..cc75582f16b95f7cba4ee768fc333c648a782ad1 100644
--- a/source/store/regionschools/regionschools.initial-state.ts
+++ b/source/store/regionschools/regionschools.initial-state.ts
@@ -1,7 +1,5 @@
-import { List } from 'immutable';
-import { IRegionRecord, IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords } from './regionschools.types';
-import {recordify} from 'typed-immutable-record';
+import { List } from "immutable";
+import { IRegionRecord, IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords } from "./regionschools.types";
+import {recordify} from "typed-immutable-record";
 
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
 export const REGION_SCHOOLS_INITIAL_STATE = List<IRegionRecord>();
-// export const REGION_SCHOOLS_INITIAL_STATE = new Array(recordify<IRRegion, IRegionRecord>({region_id: null, region_name: null, epals: new Array(recordify<IRRegionSchool, IRegionSchoolRecord>({epal_id: null, epal_name: null, epal_special_case: null, globalIndex: -1, selected: false, order_id: -1 })) }));
diff --git a/source/store/regionschools/regionschools.reducer.ts b/source/store/regionschools/regionschools.reducer.ts
index 0e4a270837afc0e5fa2cfd494d01ebd759805524..b699738c15be8c394254c1cdc12de67839d25efc 100644
--- a/source/store/regionschools/regionschools.reducer.ts
+++ b/source/store/regionschools/regionschools.reducer.ts
@@ -1,70 +1,70 @@
-import { IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords, IRegionRecord, IRegionRecords } from './regionschools.types';
-import { REGION_SCHOOLS_INITIAL_STATE } from './regionschools.initial-state';
-import { Seq, Map, fromJS, List } from 'immutable';
-import {recordify} from 'typed-immutable-record';
+import { IRRegion, IRRegionSchool, IRegionSchoolRecord, IRegionSchoolRecords, IRegionRecord, IRegionRecords } from "./regionschools.types";
+import { REGION_SCHOOLS_INITIAL_STATE } from "./regionschools.initial-state";
+import { Seq, Map, fromJS, List } from "immutable";
+import {recordify} from "typed-immutable-record";
 
 import {
-  REGIONSCHOOLS_RECEIVED,
-  REGIONSCHOOLS_SELECTED_SAVE,
-  REGIONSCHOOLS_ORDER_SAVE,
-  REGIONSCHOOLS_INIT
-} from '../../constants';
+    REGIONSCHOOLS_RECEIVED,
+    REGIONSCHOOLS_SELECTED_SAVE,
+    REGIONSCHOOLS_ORDER_SAVE,
+    REGIONSCHOOLS_INIT
+} from "../../constants";
 
 export function regionSchoolsReducer(state: IRegionRecords = REGION_SCHOOLS_INITIAL_STATE, action): IRegionRecords {
-  switch (action.type) {
-    case REGIONSCHOOLS_RECEIVED:
-        let newRegions = Array<IRegionRecord>();
-        let newEpals = Array<IRegionSchoolRecord>();
-        let i=0, j=0;
-        let ii=0;
+    switch (action.type) {
+        case REGIONSCHOOLS_RECEIVED:
+            let newRegions = Array<IRegionRecord>();
+            let newEpals = Array<IRegionSchoolRecord>();
+            let i = 0, j = 0;
+            let ii = 0;
 
-        action.payload.regions.forEach(region => {
-            region.epals.forEach(epal => {
-                newEpals.push(recordify<IRRegionSchool, IRegionSchoolRecord>({epal_id: epal.epal_id, epal_name: epal.epal_name, epal_special_case: epal.epal_special_case, globalIndex: epal.globalIndex, selected: epal.selected, order_id: epal.order_id }));
-                ii++;
-            })
-            newRegions.push(recordify<IRRegion, IRegionRecord>({region_id: region.region_id, region_name: region.region_name, epals: List(newEpals) }));
-            newEpals = Array<IRegionSchoolRecord>();
-            i++;
-        });
-        return List(newRegions);
-    case REGIONSCHOOLS_SELECTED_SAVE:
-
-        let ind=0;
-        return state.withMutations(function (list) {
-                    list.setIn([action.payload.rIndex, "epals"], state.get(action.payload.rIndex).get("epals").setIn([action.payload.sIndex, "selected"], action.payload.checked));
+            action.payload.regions.forEach(region => {
+                region.epals.forEach(epal => {
+                    newEpals.push(recordify<IRRegionSchool, IRegionSchoolRecord>({ epal_id: epal.epal_id, epal_name: epal.epal_name, epal_special_case: epal.epal_special_case, globalIndex: epal.globalIndex, selected: epal.selected, order_id: epal.order_id }));
+                    ii++;
                 });
+                newRegions.push(recordify<IRRegion, IRegionRecord>({ region_id: region.region_id, region_name: region.region_name, epals: List(newEpals) }));
+                newEpals = Array<IRegionSchoolRecord>();
+                i++;
+            });
+            return List(newRegions);
+        case REGIONSCHOOLS_SELECTED_SAVE:
+
+            let ind = 0;
+            return state.withMutations(function(list) {
+                list.setIn([action.payload.rIndex, "epals"], state.get(action.payload.rIndex).get("epals").setIn([action.payload.sIndex, "selected"], action.payload.checked));
+            });
 
-    case REGIONSCHOOLS_ORDER_SAVE:
-        let newState2 = Array<IRegionRecord>();
-        newEpals = Array<IRegionSchoolRecord>();
+        case REGIONSCHOOLS_ORDER_SAVE:
+            let newState2 = Array<IRegionRecord>();
+            newEpals = Array<IRegionSchoolRecord>();
 
-        i=0, j=0;
-        let ind2=0;
-        state.forEach(region => {
-            let epals: IRegionSchoolRecords;
+            i = 0, j = 0;
+            let ind2 = 0;
+            state.forEach(region => {
+                let epals: IRegionSchoolRecords;
 
-            epals = region.get("epals");
-            epals.forEach(epal => {
-                let newOrderId = epal.order_id;
-                for (let jjj=0; jjj<3; jjj++) {
-                    if (typeof action.payload.selectedSchools[jjj] !== 'undefined' &&
+                epals = region.get("epals");
+                epals.forEach(epal => {
+                    let newOrderId = epal.order_id;
+                    for (let jjj = 0; jjj < 3; jjj++) {
+                        if (typeof action.payload.selectedSchools[jjj] !== "undefined" &&
                             epal.globalIndex === action.payload.selectedSchools[jjj].globalIndex) {
-                        newOrderId = action.payload.selectedSchools[jjj].order_id;
-                        break;
+                            newOrderId = action.payload.selectedSchools[jjj].order_id;
+                            break;
+                        }
                     }
-                }
-                newEpals.push(recordify<IRRegionSchool, IRegionSchoolRecord>({epal_id: epal.epal_id, epal_name: epal.epal_name, epal_special_case: epal.epal_special_case, globalIndex: epal.globalIndex, selected: epal.selected, order_id: newOrderId }));
-            });
-            newState2.push(recordify<IRRegion, IRegionRecord>({region_id: region.region_id, region_name: region.region_name, epals: List(newEpals) }));
-            newEpals = Array<IRegionSchoolRecord>();
-            i++;
+                    newEpals.push(recordify<IRRegionSchool, IRegionSchoolRecord>({ epal_id: epal.epal_id, epal_name: epal.epal_name, epal_special_case: epal.epal_special_case, globalIndex: epal.globalIndex, selected: epal.selected, order_id: newOrderId }));
+                });
+                newState2.push(recordify<IRRegion, IRegionRecord>({ region_id: region.region_id, region_name: region.region_name, epals: List(newEpals) }));
+                newEpals = Array<IRegionSchoolRecord>();
+                i++;
 
-        });
+            });
 
-        return List(newState2);
-    case REGIONSCHOOLS_INIT:
-        return REGION_SCHOOLS_INITIAL_STATE;
-    default: return state;
-  }
+            return List(newState2);
+        case REGIONSCHOOLS_INIT:
+            return REGION_SCHOOLS_INITIAL_STATE;
+        default: return state;
+    }
 };
diff --git a/source/store/regionschools/regionschools.transformers.ts b/source/store/regionschools/regionschools.transformers.ts
index 8635f13e72678b0ecb32916a4b30134a1a566c9b..866b61baadf9e69e3edae4a288e9073b316f263a 100644
--- a/source/store/regionschools/regionschools.transformers.ts
+++ b/source/store/regionschools/regionschools.transformers.ts
@@ -1,17 +1,5 @@
-import { IRegionRecord, IRegionRecords } from './regionschools.types';
+import { IRegionRecord, IRegionRecords } from "./regionschools.types";
 
 export function deimmutifyRegionSchools(state: IRegionRecords): IRegionRecords {
-//    let fetchedRegions =  new Array<IRegion>();
-//    let i = 0;
-
-/*    state.forEach(region => {
-        fetchedRegions.push(<IRegion>{region_id: region.region_id, region_name: region.region_name, epals: Array<IRegionSchool>()});
-        region.epals.forEach(epal => {
-            fetchedRegions[i].epals.push(<IRegionSchool>{epal_id: epal.epal_id, epal_name: epal.epal_name, epal_special_case: epal.epal_special_case, globalIndex: epal.globalIndex, selected: epal.selected, order_id: epal.order_id })
-        });
-        i++;
-    }); */
-    // return state.toJS();
     return state;
-//    return fetchedRegions;
 };
diff --git a/source/store/regionschools/regionschools.types.ts b/source/store/regionschools/regionschools.types.ts
index 16178a667e16a0094ed547671585af35f5287a73..37df4216c9f7dd7fef687c47dbda212fe8b86408 100644
--- a/source/store/regionschools/regionschools.types.ts
+++ b/source/store/regionschools/regionschools.types.ts
@@ -1,5 +1,5 @@
-import { List, Map } from 'immutable';
-import {TypedRecord} from 'typed-immutable-record';
+import { List, Map } from "immutable";
+import {TypedRecord} from "typed-immutable-record";
 
 export interface IRRegion {
     region_id: string;
@@ -16,7 +16,7 @@ export interface IRRegionSchool {
     order_id: number;
 }
 
-export interface IRegionRecord extends TypedRecord<IRegionRecord>, IRRegion {};
+export interface IRegionRecord extends TypedRecord<IRegionRecord>, IRRegion { };
 export type IRegionRecords = List<IRegionRecord>;
-export interface IRegionSchoolRecord extends TypedRecord<IRegionSchoolRecord>, IRRegionSchool {};
+export interface IRegionSchoolRecord extends TypedRecord<IRegionSchoolRecord>, IRRegionSchool { };
 export type IRegionSchoolRecords = List<IRegionSchoolRecord>;
diff --git a/source/store/sectorcourses/index.ts b/source/store/sectorcourses/index.ts
index 2357035753dc2b7809ed9403b4cdb9c73bcd557d..17b12ab8bf7b10732d7aef3b7c199deeaab8bd84 100644
--- a/source/store/sectorcourses/index.ts
+++ b/source/store/sectorcourses/index.ts
@@ -1,11 +1,11 @@
-import { ISectors, ISector, ISectorCourse } from './sectorcourses.types';
-import { sectorCoursesReducer } from './sectorcourses.reducer';
-import { deimmutifySectorCourses } from './sectorcourses.transformers';
+import { ISectors, ISector, ISectorCourse } from "./sectorcourses.types";
+import { sectorCoursesReducer } from "./sectorcourses.reducer";
+import { deimmutifySectorCourses } from "./sectorcourses.transformers";
 
 export {
-  ISector,
-  ISectors,
-  ISectorCourse,
-  sectorCoursesReducer,
-  deimmutifySectorCourses,
+ISector,
+ISectors,
+ISectorCourse,
+sectorCoursesReducer,
+deimmutifySectorCourses,
 };
diff --git a/source/store/sectorcourses/sectorcourses.initial-state.ts b/source/store/sectorcourses/sectorcourses.initial-state.ts
index b1e1c698d55621e50fc5f1b5a3f8359f870eafd0..ed898a43b1508e59a9cee5fe5a844e0867d1fd35 100644
--- a/source/store/sectorcourses/sectorcourses.initial-state.ts
+++ b/source/store/sectorcourses/sectorcourses.initial-state.ts
@@ -1,5 +1,4 @@
-import { List } from 'immutable';
-import { ISector } from './sectorcourses.types';
+import { List } from "immutable";
+import { ISector } from "./sectorcourses.types";
 
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
 export const SECTOR_COURSES_INITIAL_STATE = List<ISector>();
diff --git a/source/store/sectorcourses/sectorcourses.reducer.ts b/source/store/sectorcourses/sectorcourses.reducer.ts
index 0f639d119e6459a1942cb95a400bd608cc4f09a2..1020e9f3809eebe611ca8f7def5eda297172b28f 100644
--- a/source/store/sectorcourses/sectorcourses.reducer.ts
+++ b/source/store/sectorcourses/sectorcourses.reducer.ts
@@ -1,41 +1,41 @@
-import { ISectors, ISector, ISectorCourse } from './sectorcourses.types';
-import { SECTOR_COURSES_INITIAL_STATE } from './sectorcourses.initial-state';
-import { Seq } from 'immutable';
+import { ISectors, ISector, ISectorCourse } from "./sectorcourses.types";
+import { SECTOR_COURSES_INITIAL_STATE } from "./sectorcourses.initial-state";
+import { Seq } from "immutable";
 
 import {
-  SECTORCOURSES_RECEIVED,
-  SECTORCOURSES_SELECTED_SAVE,
-  SECTORCOURSES_INIT
-} from '../../constants';
+    SECTORCOURSES_RECEIVED,
+    SECTORCOURSES_SELECTED_SAVE,
+    SECTORCOURSES_INIT
+} from "../../constants";
 
 export function sectorCoursesReducer(state: ISectors = SECTOR_COURSES_INITIAL_STATE, action): ISectors {
-  switch (action.type) {
-    case SECTORCOURSES_RECEIVED:
-        let newSectors = Array<ISector>();
-        let i=0;
-        action.payload.sectors.forEach(sector => {
-            newSectors.push(<ISector>{sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: sector.sector_selected, courses: Array<ISectorCourse>() });
-            sector.courses.forEach(course => {
-                newSectors[i].courses.push(<ISectorCourse>{course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: course.selected });
-            })
-            i++;
-        });
-        return Seq(newSectors).map(n => n).toList();
+    switch (action.type) {
+        case SECTORCOURSES_RECEIVED:
+            let newSectors = Array<ISector>();
+            let i = 0;
+            action.payload.sectors.forEach(sector => {
+                newSectors.push(<ISector>{ sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: sector.sector_selected, courses: Array<ISectorCourse>() });
+                sector.courses.forEach(course => {
+                    newSectors[i].courses.push(<ISectorCourse>{ course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: course.selected });
+                });
+                i++;
+            });
+            return Seq(newSectors).map(n => n).toList();
 
-    case SECTORCOURSES_SELECTED_SAVE:
-        let sectorsWithSelections = Array<ISector>();
-        let ind=0, j = 0;
-        state.forEach(sector => {
-            sectorsWithSelections.push(<ISector>{sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: action.payload.sectorSelected[ind], courses: Array<ISectorCourse>()});
-            sector.courses.forEach(course => {
-                sectorsWithSelections[ind].courses.push(<ISectorCourse>{course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: action.payload.sectorCoursesSelected[j]});
-                j++;
-            })
-            ind++;
-        });
-        return Seq(sectorsWithSelections).map(n => n).toList();
-    case SECTORCOURSES_INIT:
-        return SECTOR_COURSES_INITIAL_STATE;
-    default: return state;
-  }
+        case SECTORCOURSES_SELECTED_SAVE:
+            let sectorsWithSelections = Array<ISector>();
+            let ind = 0, j = 0;
+            state.forEach(sector => {
+                sectorsWithSelections.push(<ISector>{ sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: action.payload.sectorSelected[ind], courses: Array<ISectorCourse>() });
+                sector.courses.forEach(course => {
+                    sectorsWithSelections[ind].courses.push(<ISectorCourse>{ course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: action.payload.sectorCoursesSelected[j] });
+                    j++;
+                });
+                ind++;
+            });
+            return Seq(sectorsWithSelections).map(n => n).toList();
+        case SECTORCOURSES_INIT:
+            return SECTOR_COURSES_INITIAL_STATE;
+        default: return state;
+    }
 };
diff --git a/source/store/sectorcourses/sectorcourses.transformers.ts b/source/store/sectorcourses/sectorcourses.transformers.ts
index de36d25f271b2540e42c7b3a2271fb7e45aeb5c7..3eea67088482ba03f97b842efa08d1afa9d7e213 100644
--- a/source/store/sectorcourses/sectorcourses.transformers.ts
+++ b/source/store/sectorcourses/sectorcourses.transformers.ts
@@ -1,12 +1,12 @@
-import { ISectors, ISector, ISectorCourse } from './sectorcourses.types';
+import { ISectors, ISector, ISectorCourse } from "./sectorcourses.types";
 
 export function deimmutifySectorCourses(state: ISectors): ISector[] {
-    let fetchedSectors =  new Array<ISector>();
+    let fetchedSectors = new Array<ISector>();
     let i = 0;
     state.forEach(sector => {
-        fetchedSectors.push(<ISector>{sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: sector.sector_selected, courses: Array<ISectorCourse>()});
+        fetchedSectors.push(<ISector>{ sector_id: sector.sector_id, sector_name: sector.sector_name, sector_selected: sector.sector_selected, courses: Array<ISectorCourse>() });
         sector.courses.forEach(course => {
-            fetchedSectors[i].courses.push(<ISectorCourse>{course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: course.selected})
+            fetchedSectors[i].courses.push(<ISectorCourse>{ course_id: course.course_id, course_name: course.course_name, globalIndex: course.globalIndex, selected: course.selected });
         });
         i++;
     });
diff --git a/source/store/sectorcourses/sectorcourses.types.ts b/source/store/sectorcourses/sectorcourses.types.ts
index 39fe62a4fa3993acee818fc79de8373b3294200e..806d6ccdaa38b050c643bbc770d179c3396fc10a 100644
--- a/source/store/sectorcourses/sectorcourses.types.ts
+++ b/source/store/sectorcourses/sectorcourses.types.ts
@@ -1,4 +1,4 @@
-import { List } from 'immutable';
+import { List } from "immutable";
 
 export interface ISector {
     sector_id: string;
diff --git a/source/store/sectorfields/index.ts b/source/store/sectorfields/index.ts
index 15122f6f50fe4b6b26de1066cdad4ccdba9b3798..126b8223503c1f446b55dd65c2b7ee2d9623b6d8 100644
--- a/source/store/sectorfields/index.ts
+++ b/source/store/sectorfields/index.ts
@@ -1,10 +1,10 @@
-import { ISectorField, ISectorFields } from './sectorfields.types';
-import { sectorFieldsReducer } from './sectorfields.reducer';
-import { deimmutifySectorFields } from './sectorfields.transformers';
+import { ISectorField, ISectorFields } from "./sectorfields.types";
+import { sectorFieldsReducer } from "./sectorfields.reducer";
+import { deimmutifySectorFields } from "./sectorfields.transformers";
 
 export {
-  ISectorField,
-  ISectorFields,
-  sectorFieldsReducer,
-  deimmutifySectorFields,
+ISectorField,
+ISectorFields,
+sectorFieldsReducer,
+deimmutifySectorFields,
 };
diff --git a/source/store/sectorfields/sectorfields.initial-state.ts b/source/store/sectorfields/sectorfields.initial-state.ts
index a4c5cc1808436f253b36fdeb1ec75f7658fa48ab..0a46c0faef9e8485cde7b0e5d40cd1de8e76255d 100644
--- a/source/store/sectorfields/sectorfields.initial-state.ts
+++ b/source/store/sectorfields/sectorfields.initial-state.ts
@@ -1,5 +1,4 @@
-import { List } from 'immutable';
-import { ISectorField } from './sectorfields.types';
+import { List } from "immutable";
+import { ISectorField } from "./sectorfields.types";
 
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
 export const SECTOR_FIELDS_INITIAL_STATE = List<ISectorField>();
diff --git a/source/store/sectorfields/sectorfields.reducer.ts b/source/store/sectorfields/sectorfields.reducer.ts
index 34a56140b9108762dc8fe852a60e01a1ecf0a78b..c52f2b9de4a1d0abcf23c29c2e73b5dec8cc4cc9 100644
--- a/source/store/sectorfields/sectorfields.reducer.ts
+++ b/source/store/sectorfields/sectorfields.reducer.ts
@@ -1,33 +1,33 @@
-import { ISectorFields, ISectorField } from './sectorfields.types';
-import { SECTOR_FIELDS_INITIAL_STATE } from './sectorfields.initial-state';
-import { Seq } from 'immutable';
+import { ISectorFields, ISectorField } from "./sectorfields.types";
+import { SECTOR_FIELDS_INITIAL_STATE } from "./sectorfields.initial-state";
+import { Seq } from "immutable";
 
 import {
-  SECTORFIELDS_RECEIVED,
-  SECTORFIELDS_SELECTED_SAVE,
-  SECTORFIELDS_INIT
-} from '../../constants';
+    SECTORFIELDS_RECEIVED,
+    SECTORFIELDS_SELECTED_SAVE,
+    SECTORFIELDS_INIT
+} from "../../constants";
 
 export function sectorFieldsReducer(state: ISectorFields = SECTOR_FIELDS_INITIAL_STATE, action): ISectorFields {
-  switch (action.type) {
-    case SECTORFIELDS_RECEIVED:
-        let newSectorFields = Array<ISectorField>();
-        let i=0;
-        action.payload.sectorFields.forEach(sectorField => {
-            newSectorFields.push(<ISectorField>{id: sectorField.id, name: sectorField.name, selected: false});
-            i++;
-        });
-        return Seq(newSectorFields).map(n => n).toList();
-    case SECTORFIELDS_SELECTED_SAVE:
-        let selectedSectorFields = Array<ISectorField>();
-        let ind=0;
-        state.forEach(sectorField => {
-            selectedSectorFields.push(<ISectorField>{id: sectorField.id, name: sectorField.name, selected: action.payload.sectorFieldsSelected[ind]});
-            ind++;
-        });
-        return Seq(selectedSectorFields).map(n => n).toList();
-    case SECTORFIELDS_INIT:
-        return SECTOR_FIELDS_INITIAL_STATE;
-    default: return state;
-  }
+    switch (action.type) {
+        case SECTORFIELDS_RECEIVED:
+            let newSectorFields = Array<ISectorField>();
+            let i = 0;
+            action.payload.sectorFields.forEach(sectorField => {
+                newSectorFields.push(<ISectorField>{ id: sectorField.id, name: sectorField.name, selected: false });
+                i++;
+            });
+            return Seq(newSectorFields).map(n => n).toList();
+        case SECTORFIELDS_SELECTED_SAVE:
+            let selectedSectorFields = Array<ISectorField>();
+            let ind = 0;
+            state.forEach(sectorField => {
+                selectedSectorFields.push(<ISectorField>{ id: sectorField.id, name: sectorField.name, selected: action.payload.sectorFieldsSelected[ind] });
+                ind++;
+            });
+            return Seq(selectedSectorFields).map(n => n).toList();
+        case SECTORFIELDS_INIT:
+            return SECTOR_FIELDS_INITIAL_STATE;
+        default: return state;
+    }
 };
diff --git a/source/store/sectorfields/sectorfields.transformers.ts b/source/store/sectorfields/sectorfields.transformers.ts
index 71d1a8da4ad0019534d669cf2dfc03bcffab3896..60b8ce1e0a6ef8d596fc17d3297055d76081d24f 100644
--- a/source/store/sectorfields/sectorfields.transformers.ts
+++ b/source/store/sectorfields/sectorfields.transformers.ts
@@ -1,13 +1,9 @@
-import { ISectorFields, ISectorField } from './sectorfields.types';
+import { ISectorFields, ISectorField } from "./sectorfields.types";
 
 export function deimmutifySectorFields(state: ISectorFields): ISectorField[] {
     let fetchedSectorFields = new Array();
     state.forEach(sectorField => {
-        fetchedSectorFields.push(<ISectorField>{id: sectorField.id, name: sectorField.name, selected: sectorField.selected});
+        fetchedSectorFields.push(<ISectorField>{ id: sectorField.id, name: sectorField.name, selected: sectorField.selected });
     });
     return fetchedSectorFields;
 };
-
-/* export function reimmutifyCourseFields(plain): ICourseFields {
-  return List<ICourseField>(plain ? plain.map(CourseFieldRecord) : []);
-} */
diff --git a/source/store/sectorfields/sectorfields.types.ts b/source/store/sectorfields/sectorfields.types.ts
index fcf891edb22a7ae12d98eaf37c6ada772db4d8b0..b417655a6e77ffd8ad21450068166353c77e5e6e 100644
--- a/source/store/sectorfields/sectorfields.types.ts
+++ b/source/store/sectorfields/sectorfields.types.ts
@@ -1,4 +1,4 @@
-import { List } from 'immutable';
+import { List } from "immutable";
 
 export interface ISectorField {
     id: number;
diff --git a/source/store/store.ts b/source/store/store.ts
index 16cd94c70b64813fb057004fb432e0b3b89311e9..a4676ed3b721b52bf5c4bdef7bd58ea5f47b4cfa 100644
--- a/source/store/store.ts
+++ b/source/store/store.ts
@@ -1,49 +1,36 @@
-import { combineReducers } from 'redux';
-import * as courseFields from './coursefields';
-import * as sectorFields from './sectorfields';
-import * as regions from './regionschools';
-import * as sectors from './sectorcourses';
-import * as studentDataFields from './studentdatafields';
-import * as epalclasses from './epalclasses';
-import * as loginInfo from './logininfo';
-import * as criter from './criteria';
-
-/*
- * This is where we 'assemble' the full store out of its modules.
- */
+import { combineReducers } from "redux";
+import * as sectorFields from "./sectorfields";
+import * as regions from "./regionschools";
+import * as sectors from "./sectorcourses";
+import * as studentDataFields from "./studentdatafields";
+import * as epalclasses from "./epalclasses";
+import * as loginInfo from "./logininfo";
 
 export interface IAppState {
-    courseFields?: courseFields.ICourseFields;
     sectorFields?: sectorFields.ISectorFields;
     regions?: regions.IRegionRecords;
     sectors?: sectors.ISectors;
     studentDataFields?: studentDataFields.IStudentDataFields;
     epalclasses?: epalclasses.IEpalClasses;
     loginInfo?: loginInfo.ILoginInfo;
-    criter?: criter.ICriter;
 };
 
 export const rootReducer = combineReducers<IAppState>({
-   courseFields: courseFields.courseFieldsReducer,
-   sectorFields: sectorFields.sectorFieldsReducer,
-   regions: regions.regionSchoolsReducer,
-   sectors: sectors.sectorCoursesReducer,
-   studentDataFields: studentDataFields.studentDataFieldsReducer,
-   epalclasses: epalclasses.epalclassesReducer,
-   loginInfo: loginInfo.loginInfoReducer,
-   criter: criter.criteriaReducer,
-
+    sectorFields: sectorFields.sectorFieldsReducer,
+    regions: regions.regionSchoolsReducer,
+    sectors: sectors.sectorCoursesReducer,
+    studentDataFields: studentDataFields.studentDataFieldsReducer,
+    epalclasses: epalclasses.epalclassesReducer,
+    loginInfo: loginInfo.loginInfoReducer,
 });
 
 export function deimmutify(state: IAppState): Object {
-  return {
-    courseFields: courseFields.deimmutifyCourseFields(state.courseFields),
-    sectorFields: sectorFields.deimmutifySectorFields(state.sectorFields),
-    regions: regions.deimmutifyRegionSchools(state.regions),
-    sectors: sectors.deimmutifySectorCourses(state.sectors),
-    studentdataFields: studentDataFields.deimmutifyStudentDataFields(state.studentDataFields),
-    epalclasses: epalclasses.deimmutifyEpalClasses(state.epalclasses),
-    loginInfo: loginInfo.deimmutifyLoginInfo(state.loginInfo),
-    criter: criter.deimmutifyCriteria(state.criter)
-  };
+    return {
+        sectorFields: sectorFields.deimmutifySectorFields(state.sectorFields),
+        regions: regions.deimmutifyRegionSchools(state.regions),
+        sectors: sectors.deimmutifySectorCourses(state.sectors),
+        studentdataFields: studentDataFields.deimmutifyStudentDataFields(state.studentDataFields),
+        epalclasses: epalclasses.deimmutifyEpalClasses(state.epalclasses),
+        loginInfo: loginInfo.deimmutifyLoginInfo(state.loginInfo),
+    };
 }
diff --git a/source/store/studentdatafields/index.ts b/source/store/studentdatafields/index.ts
index 1968e5463134ea4c2ff36a0c2f01062f19e52285..e22eab180e889d0a8ac966f4bab842227035506a 100644
--- a/source/store/studentdatafields/index.ts
+++ b/source/store/studentdatafields/index.ts
@@ -1,10 +1,10 @@
-import { IStudentDataField, IStudentDataFields } from './studentdatafields.types';
-import { studentDataFieldsReducer } from './studentdatafields.reducer';
-import { deimmutifyStudentDataFields } from './studentdatafields.transformers';
+import { IStudentDataField, IStudentDataFields } from "./studentdatafields.types";
+import { studentDataFieldsReducer } from "./studentdatafields.reducer";
+import { deimmutifyStudentDataFields } from "./studentdatafields.transformers";
 
 export {
-  IStudentDataField,
-  IStudentDataFields,
-  studentDataFieldsReducer,
-  deimmutifyStudentDataFields,
+IStudentDataField,
+IStudentDataFields,
+studentDataFieldsReducer,
+deimmutifyStudentDataFields,
 };
diff --git a/source/store/studentdatafields/studentdatafields.initial-state.ts b/source/store/studentdatafields/studentdatafields.initial-state.ts
index 7fc0b2fa7497c674e9663c5b5f77fd29096f68c2..f1c887c7b08012fe6de0464a506e2891df5ffa67 100644
--- a/source/store/studentdatafields/studentdatafields.initial-state.ts
+++ b/source/store/studentdatafields/studentdatafields.initial-state.ts
@@ -1,5 +1,4 @@
-import { List } from 'immutable';
-import { IStudentDataField } from './studentdatafields.types';
+import { List } from "immutable";
+import { IStudentDataField } from "./studentdatafields.types";
 
-// export const INITIAL_STATE = List<ICourseField>([new CourseFieldRecord({})]);
 export const STUDENT_DATA_FIELDS_INITIAL_STATE = List<IStudentDataField>();
diff --git a/source/store/studentdatafields/studentdatafields.reducer.ts b/source/store/studentdatafields/studentdatafields.reducer.ts
index 23a9ea5948dd62230019852f86b56010418d33b1..b17f8ede76796bdcdba32d3c5fbd69b1c1f84031 100644
--- a/source/store/studentdatafields/studentdatafields.reducer.ts
+++ b/source/store/studentdatafields/studentdatafields.reducer.ts
@@ -1,33 +1,33 @@
-import { IStudentDataFields, IStudentDataField } from './studentdatafields.types';
-import { STUDENT_DATA_FIELDS_INITIAL_STATE } from './studentdatafields.initial-state';
-import { Seq } from 'immutable';
-import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from '../../constants';
+import { IStudentDataFields, IStudentDataField } from "./studentdatafields.types";
+import { STUDENT_DATA_FIELDS_INITIAL_STATE } from "./studentdatafields.initial-state";
+import { Seq } from "immutable";
+import { STUDENTDATAFIELDS_SAVE, STUDENTDATAFIELDS_INIT } from "../../constants";
 
 export function studentDataFieldsReducer(state: IStudentDataFields = STUDENT_DATA_FIELDS_INITIAL_STATE, action): IStudentDataFields {
-  switch (action.type) {
-    case STUDENTDATAFIELDS_SAVE:
-        let studentDataFields = Array<IStudentDataField>();
-        let ind=0;
+    switch (action.type) {
+        case STUDENTDATAFIELDS_SAVE:
+            let studentDataFields = Array<IStudentDataField>();
+            let ind = 0;
 
-        action.payload.studentDataFields.forEach(studentDataField => {
-            let transformedDate = "";
-            if (studentDataField.studentbirthdate && studentDataField.studentbirthdate.date) {
-                transformedDate = studentDataField.studentbirthdate.date.year + "-";
-                transformedDate += studentDataField.studentbirthdate.date.month < 10 ? "0" + studentDataField.studentbirthdate.date.month + "-" : studentDataField.studentbirthdate.date.month + "-";
-                transformedDate += studentDataField.studentbirthdate.date.day < 10 ? "0" + studentDataField.studentbirthdate.date.day : studentDataField.studentbirthdate.date.day;
-            }
-            // transformedDate = studentDataField.studentbirthdate.jsDate;
+            action.payload.studentDataFields.forEach(studentDataField => {
+                let transformedDate = "";
+                if (studentDataField.studentbirthdate && studentDataField.studentbirthdate.date) {
+                    transformedDate = studentDataField.studentbirthdate.date.year + "-";
+                    transformedDate += studentDataField.studentbirthdate.date.month < 10 ? "0" + studentDataField.studentbirthdate.date.month + "-" : studentDataField.studentbirthdate.date.month + "-";
+                    transformedDate += studentDataField.studentbirthdate.date.day < 10 ? "0" + studentDataField.studentbirthdate.date.day : studentDataField.studentbirthdate.date.day;
+                }
+                // transformedDate = studentDataField.studentbirthdate.jsDate;
 
-            studentDataField.studentbirthdate = transformedDate;
+                studentDataField.studentbirthdate = transformedDate;
 
 
-            studentDataFields.push(<IStudentDataField>studentDataField);
-            ind++;
-        });
+                studentDataFields.push(<IStudentDataField>studentDataField);
+                ind++;
+            });
 
-        return Seq(studentDataFields).map(n => n).toList();
-    case STUDENTDATAFIELDS_INIT:
-        return STUDENT_DATA_FIELDS_INITIAL_STATE;
-    default: return state;
-  }
+            return Seq(studentDataFields).map(n => n).toList();
+        case STUDENTDATAFIELDS_INIT:
+            return STUDENT_DATA_FIELDS_INITIAL_STATE;
+        default: return state;
+    }
 };
diff --git a/source/store/studentdatafields/studentdatafields.transformers.ts b/source/store/studentdatafields/studentdatafields.transformers.ts
index 38057feceb03140ce1ff467802943a78ca4357c5..bd2e3e2eea79ae5a4c6dde897cd9eef1abd9c385 100644
--- a/source/store/studentdatafields/studentdatafields.transformers.ts
+++ b/source/store/studentdatafields/studentdatafields.transformers.ts
@@ -1,19 +1,20 @@
-import { IStudentDataFields, IStudentDataField } from './studentdatafields.types';
+import { IStudentDataFields, IStudentDataField } from "./studentdatafields.types";
 
 export function deimmutifyStudentDataFields(state: IStudentDataFields): IStudentDataField[] {
     let fetchedStudentDataFields = new Array();
     state.forEach(studentdataField => {
-        fetchedStudentDataFields.push(<IStudentDataField>{epaluser_id:studentdataField.epaluser_id,
-          name: studentdataField.name, studentsurname: studentdataField.studentsurname, studentbirthdate: studentdataField.studentbirthdate,
-          fatherfirstname: studentdataField.fatherfirstname, fathersurname: studentdataField.fathersurname,
-          motherfirstname: studentdataField.motherfirstname, mothersurname: studentdataField.mothersurname,
-          studentamka: studentdataField.studentamka, regionaddress: studentdataField.regionaddress,
-          regiontk: studentdataField.regiontk,regionarea: studentdataField.regionarea,
-          lastschool_schoolname: studentdataField.lastschool_schoolname,
-          lastschool_schoolyear: studentdataField.lastschool_schoolyear,
-          lastschool_class: studentdataField.lastschool_class,
-          relationtostudent: studentdataField.relationtostudent,
-          currentclass: studentdataField.currentclass, points: studentdataField.points
+        fetchedStudentDataFields.push(<IStudentDataField>{
+            epaluser_id: studentdataField.epaluser_id,
+            name: studentdataField.name, studentsurname: studentdataField.studentsurname, studentbirthdate: studentdataField.studentbirthdate,
+            fatherfirstname: studentdataField.fatherfirstname, fathersurname: studentdataField.fathersurname,
+            motherfirstname: studentdataField.motherfirstname, mothersurname: studentdataField.mothersurname,
+            studentamka: studentdataField.studentamka, regionaddress: studentdataField.regionaddress,
+            regiontk: studentdataField.regiontk, regionarea: studentdataField.regionarea,
+            lastschool_schoolname: studentdataField.lastschool_schoolname,
+            lastschool_schoolyear: studentdataField.lastschool_schoolyear,
+            lastschool_class: studentdataField.lastschool_class,
+            relationtostudent: studentdataField.relationtostudent,
+            currentclass: studentdataField.currentclass, points: studentdataField.points
         });
     });
     return fetchedStudentDataFields;
diff --git a/source/store/studentdatafields/studentdatafields.types.ts b/source/store/studentdatafields/studentdatafields.types.ts
index b43adda5b2cad2b81357ee0a1a794b461a4350db..405f889e82af2ad93670d65936a952d64fba4fe4 100644
--- a/source/store/studentdatafields/studentdatafields.types.ts
+++ b/source/store/studentdatafields/studentdatafields.types.ts
@@ -1,25 +1,25 @@
-import { List } from 'immutable';
+import { List } from "immutable";
 
 export interface IStudentDataField {
-  epaluser_id: number;
-  name: string;
-  studentsurname: string;
-  fatherfirstname:string;
-  fathersurname:string;
-  motherfirstname:string;
-  mothersurname:string;
-  studentbirthdate: Date;
-  studentamka: string;
-  regionaddress: string;
-  regiontk: string;
-  regionarea: string;
-  lastschool_schoolname: any;
-  lastschool_schoolyear: string;
-  lastschool_class: string;
-  relationtostudent: string;
-  currentclass: string;
-  points: number;
-  telnum: string;
+    epaluser_id: number;
+    name: string;
+    studentsurname: string;
+    fatherfirstname: string;
+    fathersurname: string;
+    motherfirstname: string;
+    mothersurname: string;
+    studentbirthdate: Date;
+    studentamka: string;
+    regionaddress: string;
+    regiontk: string;
+    regionarea: string;
+    lastschool_schoolname: any;
+    lastschool_schoolyear: string;
+    lastschool_class: string;
+    relationtostudent: string;
+    currentclass: string;
+    points: number;
+    telnum: string;
 }
 
 export type IStudentDataFields = List<IStudentDataField>;
diff --git a/webpack.config.js b/webpack.config.js
index 9e319c24704f2ba72fdce6ae3a88ff4ffd609f4a..5f906b6bc3ca36b59d0f4cb095c1e6e34106b6fd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,119 +1,156 @@
-'use strict';
+"use strict";
 
 const path = require("path");
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const DashboardPlugin = require('webpack-dashboard/plugin');
-const autoprefixer = require('autoprefixer');
-const ProvidePlugin = require('webpack/lib/ProvidePlugin');
-const WebpackCleanupPlugin = require('webpack-cleanup-plugin');
+const webpack = require("webpack");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const DashboardPlugin = require("webpack-dashboard/plugin");
+const autoprefixer = require("autoprefixer");
+const ProvidePlugin = require("webpack/lib/ProvidePlugin");
+const WebpackCleanupPlugin = require("webpack-cleanup-plugin");
 
 module.exports = {
-  stats: {
-    colors: true,
-    reasons: true
-  },
+    stats: {
+        colors: true,
+        reasons: true
+    },
 
-  entry: {
-    app: './source/app.ts',
-    vendor: [
-      'core-js',
-      'reflect-metadata',
-      'zone.js/dist/zone',
-      '@angular/platform-browser-dynamic',
-      '@angular/core',
-      '@angular/common',
-      '@angular/router',
-      '@angular/http',
-      'jquery',
-      'bootstrap-loader'
-  ],
-  },
+    entry: {
+        app: "./source/app.ts",
+        vendor: [
+            "core-js",
+            "reflect-metadata",
+            "zone.js/dist/zone",
+            "@angular/platform-browser-dynamic",
+            "@angular/core",
+            "@angular/common",
+            "@angular/router",
+            "@angular/http",
+            "jquery",
+            "bootstrap-loader"
+        ],
+    },
 
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name].[hash].bundle.js',
-    publicPath: "",
-    sourceMapFilename: '[name].[hash].bundle.js.map',
-    chunkFilename: '[id].chunk.js'
-  },
+    output: {
+        path: path.resolve(__dirname, "dist"),
+        filename: "[name].[hash].bundle.js",
+        publicPath: "",
+        sourceMapFilename: "[name].[hash].bundle.js.map",
+        chunkFilename: "[id].chunk.js"
+    },
 
-//  output: {
-//    path: root('build'),
-//    filename: '[name].js',
-//    sourceMapFilename: '[name].js.map',
-//    chunkFilename: '[id].chunk.js'
-//    path: path.resolve(__dirname, 'dist'),
-//    filename: 'eepal.1.0.bundle.js',
-//    publicPath: "",
-//    sourceMapFilename: 'eepal.1.0.bundle.js.map',
-//    chunkFilename: '1.0.chunk.js'
-//  },
+    //  output: {
+    //    path: root("build"),
+    //    filename: "[name].js",
+    //    sourceMapFilename: "[name].js.map",
+    //    chunkFilename: "[id].chunk.js"
+    //    path: path.resolve(__dirname, "dist"),
+    //    filename: "eepal.1.0.bundle.js",
+    //    publicPath: "",
+    //    sourceMapFilename: "eepal.1.0.bundle.js.map",
+    //    chunkFilename: "1.0.chunk.js"
+    //  },
 
-  devtool: 'source-map',
+    devtool: "source-map",
 
-  resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.ts', '.js']
-  },
+    resolve: {
+        extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"]
+    },
 
-  plugins: [
-      new WebpackCleanupPlugin(),
-    new webpack.optimize.CommonsChunkPlugin('vendor', '[name].[hash].bundle.js'),
-//    new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.bundle.js'),
-    new ProvidePlugin({
-        jQuery: 'jquery',
-        $: 'jquery',
-        jquery: 'jquery',
-        "Tether": 'tether',
-        "window.Tether": "tether",
-        Tooltip: "exports-loader?Tooltip!bootstrap/js/dist/tooltip",
-        Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
-        Button: "exports-loader?Button!bootstrap/js/dist/button",
-        Carousel: "exports-loader?Carousel!bootstrap/js/dist/carousel",
-        Collapse: "exports-loader?Collapse!bootstrap/js/dist/collapse",
-        Dropdown: "exports-loader?Dropdown!bootstrap/js/dist/dropdown",
-        Modal: "exports-loader?Modal!bootstrap/js/dist/modal",
-        Popover: "exports-loader?Popover!bootstrap/js/dist/popover",
-        Scrollspy: "exports-loader?Scrollspy!bootstrap/js/dist/scrollspy",
-        Tab: "exports-loader?Tab!bootstrap/js/dist/tab",
-        Util: "exports-loader?Util!bootstrap/js/dist/util"
-    }),
-    new HtmlWebpackPlugin({
-      template: './source/index.html',
-      inject: 'body',
-      minify: false
-    }),
-    new DashboardPlugin()
-  ],
-
-  module: {
-    preLoaders: [{
-      test: /\.ts$/,
-      loader: 'tslint'
-    }],
-    loaders: [
-      { test: /\.ts$/, loaders: ['ts', 'angular2-router-loader', 'angular2-template-loader'], exclude: /node_modules/ },
-      { test: /\.js$/, exclude: [/bower_components/, /node_modules\/@angular\/compiler\/bundles\/.+/], loader: 'babel-loader', query: {presets: ['es2015']} },
-      { test: /\.html$/, loader: 'raw' },
-//      { test: /\.css$/, loader: 'style-loader!css-loader?sourceMap' },
-      { test: /\.css$/, loaders: ['to-string-loader', "style-loader", 'css-loader'] },
-      { test: /.scss$/, loaders: ['raw-loader','sass-loader'] },
-      { test: /\.svg/, loader: 'url' },
-      { test: /\.eot/, loader: 'url' },
-      { test: /\.woff/, loader: 'url' },
-      { test: /\.woff2/, loader: 'url' },
-      { test: /\.ttf/, loader: 'url' },
-      { test: /bootstrap\/dist\/js\/umd\//, loader: 'imports?jQuery=jquery' },
+    plugins: [
+        new WebpackCleanupPlugin(),
+        new webpack.optimize.CommonsChunkPlugin("vendor", "[name].[hash].bundle.js"),
+        //    new webpack.optimize.CommonsChunkPlugin("vendor", "vendor.bundle.js"),
+        new ProvidePlugin({
+            jQuery: "jquery",
+            $: "jquery",
+            jquery: "jquery",
+            "Tether": "tether",
+            "window.Tether": "tether",
+            Tooltip: "exports-loader?Tooltip!bootstrap/js/dist/tooltip",
+            Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
+            Button: "exports-loader?Button!bootstrap/js/dist/button",
+            Carousel: "exports-loader?Carousel!bootstrap/js/dist/carousel",
+            Collapse: "exports-loader?Collapse!bootstrap/js/dist/collapse",
+            Dropdown: "exports-loader?Dropdown!bootstrap/js/dist/dropdown",
+            Modal: "exports-loader?Modal!bootstrap/js/dist/modal",
+            Popover: "exports-loader?Popover!bootstrap/js/dist/popover",
+            Scrollspy: "exports-loader?Scrollspy!bootstrap/js/dist/scrollspy",
+            Tab: "exports-loader?Tab!bootstrap/js/dist/tab",
+            Util: "exports-loader?Util!bootstrap/js/dist/util"
+        }),
+        new HtmlWebpackPlugin({
+            template: "./source/index.html",
+            inject: "body",
+            minify: false
+        }),
+        new DashboardPlugin()
     ],
-    noParse: [ /zone\.js\/dist\/.+/, /angular2\/bundles\/.+/ ]
-  },
 
-  devServer: {
-    inline: true,
-    colors: true,
-    contentBase: './dist',
-    publicPath: '/'
-  }
+    module: {
+        preLoaders: [{
+            test: /\.ts$/,
+            loader: "tslint"
+        }],
+        loaders: [{
+                test: /\.ts$/,
+                loaders: ["ts", "angular2-router-loader", "angular2-template-loader"],
+                exclude: /node_modules/
+            },
+            {
+                test: /\.js$/,
+                exclude: [/bower_components/, /node_modules\/@angular\/compiler\/bundles\/.+/],
+                loader: "babel-loader",
+                query: {
+                    presets: ["es2015"]
+                }
+            },
+            {
+                test: /\.html$/,
+                loader: "raw"
+            },
+            //      { test: /\.css$/, loader: "style-loader!css-loader?sourceMap" },
+            {
+                test: /\.css$/,
+                loaders: ["to-string-loader", "style-loader", "css-loader"]
+            },
+            {
+                test: /.scss$/,
+                loaders: ["raw-loader", "sass-loader"]
+            },
+            {
+                test: /\.svg/,
+                loader: "url"
+            },
+            {
+                test: /\.eot/,
+                loader: "url"
+            },
+            {
+                test: /\.woff/,
+                loader: "url"
+            },
+            {
+                test: /\.woff2/,
+                loader: "url"
+            },
+            {
+                test: /\.ttf/,
+                loader: "url"
+            },
+            {
+                test: /bootstrap\/dist\/js\/umd\//,
+                loader: "imports?jQuery=jquery"
+            },
+        ],
+        noParse: [/zone\.js\/dist\/.+/, /angular2\/bundles\/.+/]
+    },
+
+    devServer: {
+        inline: true,
+        colors: true,
+        contentBase: "./dist",
+        publicPath: "/"
+    }
 
 
 }
diff --git a/webpack.prod.js b/webpack.prod.js
index dd6f91bb48eade06557c6ce34e9ccce8daf48ca3..bd4f175e68686f9b436c8686d72826c51a15c7b1 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -7,122 +7,160 @@ const DashboardPlugin = require('webpack-dashboard/plugin');
 const autoprefixer = require('autoprefixer');
 const ProvidePlugin = require('webpack/lib/ProvidePlugin');
 const WebpackCleanupPlugin = require('webpack-cleanup-plugin');
-// const BabiliPlugin = require('babili-webpack-plugin');
-// const ClosureCompilerPlugin = require('webpack-closure-compiler');
+
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 
 module.exports = {
-  stats: {
-    colors: true,
-    reasons: true
-  },
-
-  entry: {
-    app: './source/app.ts',
-    vendor: [
-      'core-js',
-      'reflect-metadata',
-      '@angular/platform-browser-dynamic',
-      '@angular/core',
-      '@angular/common',
-      '@angular/router',
-      '@angular/http',
-      'jquery',
-      'bootstrap-loader',
-     'zone.js/dist/zone'
-  ],
-  },
+    stats: {
+        colors: true,
+        reasons: true
+    },
 
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name].[hash].bundle.js',
-    publicPath: "",
-    sourceMapFilename: '[name].[hash].bundle.js.map',
-    chunkFilename: '[id].chunk.js'
-  },
+    entry: {
+        app: './source/app.ts',
+        vendor: [
+            'core-js',
+            'reflect-metadata',
+            '@angular/platform-browser-dynamic',
+            '@angular/core',
+            '@angular/common',
+            '@angular/router',
+            '@angular/http',
+            'jquery',
+            'bootstrap-loader',
+            'zone.js/dist/zone'
+        ],
+    },
 
-//  output: {
-//    path: root('build'),
-//    filename: '[name].js',
-//    sourceMapFilename: '[name].js.map',
-//    chunkFilename: '[id].chunk.js'
-//    path: path.resolve(__dirname, 'dist'),
-//    filename: 'eepal.1.0.bundle.js',
-//    publicPath: "",
-//    sourceMapFilename: 'eepal.1.0.bundle.js.map',
-//    chunkFilename: '1.0.chunk.js'
-//  },
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: '[name].[hash].bundle.js',
+        publicPath: "",
+        sourceMapFilename: '[name].[hash].bundle.js.map',
+        chunkFilename: '[id].chunk.js'
+    },
 
-  devtool: 'source-map',
+    //  output: {
+    //    path: root('build'),
+    //    filename: '[name].js',
+    //    sourceMapFilename: '[name].js.map',
+    //    chunkFilename: '[id].chunk.js'
+    //    path: path.resolve(__dirname, 'dist'),
+    //    filename: 'eepal.1.0.bundle.js',
+    //    publicPath: "",
+    //    sourceMapFilename: 'eepal.1.0.bundle.js.map',
+    //    chunkFilename: '1.0.chunk.js'
+    //  },
 
-  resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.ts', '.js']
-  },
+    devtool: 'source-map',
 
-  plugins: [
-/*      new ClosureCompilerPlugin({
-          compiler: {
-            language_in: 'ECMASCRIPT6',
-            language_out: 'ECMASCRIPT5',
-            compilation_level: 'ADVANCED',
-            warning_level: 'VERBOSE',
-          },
-          concurrency: 3,
-      }), */
-      new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify('production')
-  }),
-      new WebpackCleanupPlugin(),
-      new UglifyJSPlugin({mangle: false}),
-//      new BabiliPlugin(),
-//    new webpack.optimize.CommonsChunkPlugin('vendor', '[name].[hash].bundle.js'),
-//    new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.bundle.js'),
-    new ProvidePlugin({
-        jQuery: 'jquery',
-        $: 'jquery',
-        jquery: 'jquery',
-        "Tether": 'tether',
-        "window.Tether": "tether",
-        Tooltip: "exports-loader?Tooltip!bootstrap/js/dist/tooltip",
-        Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
-        Button: "exports-loader?Button!bootstrap/js/dist/button",
-        Carousel: "exports-loader?Carousel!bootstrap/js/dist/carousel",
-        Collapse: "exports-loader?Collapse!bootstrap/js/dist/collapse",
-        Dropdown: "exports-loader?Dropdown!bootstrap/js/dist/dropdown",
-        Modal: "exports-loader?Modal!bootstrap/js/dist/modal",
-        Popover: "exports-loader?Popover!bootstrap/js/dist/popover",
-        Scrollspy: "exports-loader?Scrollspy!bootstrap/js/dist/scrollspy",
-        Tab: "exports-loader?Tab!bootstrap/js/dist/tab",
-        Util: "exports-loader?Util!bootstrap/js/dist/util"
-    }),
-    new HtmlWebpackPlugin({
-      template: './source/index.html',
-      inject: 'body',
-      minify: false
-    }),
-    new DashboardPlugin()
-  ],
+    resolve: {
+        extensions: ['', '.webpack.js', '.web.js', '.ts', '.js']
+    },
 
-  module: {
-    preLoaders: [{
-      test: /\.ts$/,
-      loader: 'tslint'
-    }],
-    loaders: [
-      { test: /\.ts$/, loaders: ['ts', 'angular2-router-loader', 'angular2-template-loader'], exclude: /node_modules/ },
-      { test: /\.js$/, exclude: [/bower_components/, /node_modules\/@angular\/compiler\/bundles\/.+/], loader: 'babel-loader', query: {presets: ['es2015']} },
-      { test: /\.html$/, loader: 'raw' },
-//      { test: /\.css$/, loader: 'style-loader!css-loader?sourceMap' },
-      { test: /\.css$/, loaders: ['to-string-loader', "style-loader", 'css-loader'] },
-      { test: /.scss$/, loaders: ['raw-loader','sass-loader'] },
-      { test: /\.svg/, loader: 'url' },
-      { test: /\.eot/, loader: 'url' },
-      { test: /\.woff/, loader: 'url' },
-      { test: /\.woff2/, loader: 'url' },
-      { test: /\.ttf/, loader: 'url' },
-      { test: /bootstrap\/dist\/js\/umd\//, loader: 'imports?jQuery=jquery' },
+    plugins: [
+        /*      new ClosureCompilerPlugin({
+                  compiler: {
+                    language_in: 'ECMASCRIPT6',
+                    language_out: 'ECMASCRIPT5',
+                    compilation_level: 'ADVANCED',
+                    warning_level: 'VERBOSE',
+                  },
+                  concurrency: 3,
+              }), */
+        new webpack.DefinePlugin({
+            'process.env.NODE_ENV': JSON.stringify('production')
+        }),
+        new WebpackCleanupPlugin(),
+        new UglifyJSPlugin({
+            mangle: false
+        }),
+        //      new BabiliPlugin(),
+        //    new webpack.optimize.CommonsChunkPlugin('vendor', '[name].[hash].bundle.js'),
+        //    new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.bundle.js'),
+        new ProvidePlugin({
+            jQuery: 'jquery',
+            $: 'jquery',
+            jquery: 'jquery',
+            "Tether": 'tether',
+            "window.Tether": "tether",
+            Tooltip: "exports-loader?Tooltip!bootstrap/js/dist/tooltip",
+            Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
+            Button: "exports-loader?Button!bootstrap/js/dist/button",
+            Carousel: "exports-loader?Carousel!bootstrap/js/dist/carousel",
+            Collapse: "exports-loader?Collapse!bootstrap/js/dist/collapse",
+            Dropdown: "exports-loader?Dropdown!bootstrap/js/dist/dropdown",
+            Modal: "exports-loader?Modal!bootstrap/js/dist/modal",
+            Popover: "exports-loader?Popover!bootstrap/js/dist/popover",
+            Scrollspy: "exports-loader?Scrollspy!bootstrap/js/dist/scrollspy",
+            Tab: "exports-loader?Tab!bootstrap/js/dist/tab",
+            Util: "exports-loader?Util!bootstrap/js/dist/util"
+        }),
+        new HtmlWebpackPlugin({
+            template: './source/index.html',
+            inject: 'body',
+            minify: false
+        }),
+        new DashboardPlugin()
     ],
-    noParse: [ /zone\.js\/dist\/.+/, /angular2\/bundles\/.+/ ]
-  },
+
+    module: {
+        preLoaders: [{
+            test: /\.ts$/,
+            loader: 'tslint'
+        }],
+        loaders: [{
+                test: /\.ts$/,
+                loaders: ['ts', 'angular2-router-loader', 'angular2-template-loader'],
+                exclude: /node_modules/
+            },
+            {
+                test: /\.js$/,
+                exclude: [/bower_components/, /node_modules\/@angular\/compiler\/bundles\/.+/],
+                loader: 'babel-loader',
+                query: {
+                    presets: ['es2015']
+                }
+            },
+            {
+                test: /\.html$/,
+                loader: 'raw'
+            },
+            //      { test: /\.css$/, loader: 'style-loader!css-loader?sourceMap' },
+            {
+                test: /\.css$/,
+                loaders: ['to-string-loader', "style-loader", 'css-loader']
+            },
+            {
+                test: /.scss$/,
+                loaders: ['raw-loader', 'sass-loader']
+            },
+            {
+                test: /\.svg/,
+                loader: 'url'
+            },
+            {
+                test: /\.eot/,
+                loader: 'url'
+            },
+            {
+                test: /\.woff/,
+                loader: 'url'
+            },
+            {
+                test: /\.woff2/,
+                loader: 'url'
+            },
+            {
+                test: /\.ttf/,
+                loader: 'url'
+            },
+            {
+                test: /bootstrap\/dist\/js\/umd\//,
+                loader: 'imports?jQuery=jquery'
+            },
+        ],
+        noParse: [/zone\.js\/dist\/.+/, /angular2\/bundles\/.+/]
+    },
 
 }