Merge branch 'viewdirector' of https://git.minedu.gov.gr/akatsi/e-epal into viewdirector

Conflicts:
	source/app.settings.ts

drupal/modules/epal/src/Controller/CreateDemoData.php

@@ -70,7 +70,7 @@ class CreateDemoData extends ControllerBase {
 
 			$epaluserid = \Drupal::currentUser()->id();
 
-			for ($i = 1; $i <= 1100; $i++) {
+			for ($i = 1; $i <= 10000; $i++) {
 				//srand($this->make_seed());
 
 				//$curclass = rand(1,3);

source/app.settings.ts

 export const API_ENDPOINT = 'http://localhost/angular/eepal-front/drupal';
 export class AppSettings {
    public static get API_ENDPOINT(): string {
-         return 'http://localhost/angular/eepal-front/drupal';
+     return 'http://localhost/angular/eepal-front/drupal';
    }
 }

source/components/director/director-view.ts

+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 {Http, Headers, RequestOptions} from '@angular/http';
+import { NgRedux, select } from 'ng2-redux';
+import { IAppState } from '../../store/store';
+import {Router, ActivatedRoute, Params} from '@angular/router';
+import { BehaviorSubject, Subscription } from 'rxjs/Rx';
+
+@Component({
+    selector: 'director-view',
+    template: `
+          
+    
+    
+              <label for="name">Παρακαλώ επιλέξτε τάξη </label><br/>
+                    <select>
+                        <option value=1>Α' Λυκείου</option>
+                        <option value=2>Β' Λυκείου</option>
+                        <option value=3>Γ' Λυκείου</option>
+                    </select>
+
+           
+   `
+})
+
+@Injectable() export default class DirectorView implements OnInit , OnDestroy{
+
+   
+    private StudentSelected$: BehaviorSubject<any>;
+    private StudentSelectedSub: Subscription;
+       
+    constructor(private _hds: HelperDataService, 
+                private activatedRoute: ActivatedRoute,
+                private router: Router )
+    {
+       this.StudentSelected$ = new BehaviorSubject([{}]);
+    }
+
+    ngOnDestroy()
+    {
+        if (this.StudentSelectedSub)
+            this.StudentSelectedSub.unsubscribe();
+
+    }
+ 
+    ngOnInit() {
+     
+   
+           
+
+    }
+
+
+
+}
\ No newline at end of file

source/components/navbar/navbar.component.html

@@ -21,17 +21,21 @@
                <i class="fa fa-sign-out"></i>
                 </button>
         </div>
-        
+        <div class="pull-right" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
+             <a class="nav-link" [routerLink]="['/submited-preview']" [routerLinkActive]="['active']"><b>Υποβληθείσες αιτήσεις</b></a>
+        </div>
+        <div class="pull-right" class="nav-item" [ngClass]="{active: path=='director-view'}">
+             <a class="nav-link" [routerLink]="['/director-view']" [routerLinkActive]="['active']"><b>Επιλεχθέντες Μαθητές</b></a>
+        </div>
 
     </div>
-   
+        
+     
 
     </ul>
     
   </div>
-<div class="pull-right" class="nav-item" [ngClass]="{active: path=='submited-preview'}">
-             <a class="nav-link" [routerLink]="['/submited-preview']" [routerLinkActive]="['active']"><b>Υποβληθείσες αιτήσεις</b></a>
-        </div>
+
 </nav>
    </div>
 </div>

source/components/student-application-form/submited.aplication.preview.ts

@@ -55,7 +55,7 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
             this.SubmitedUsersSub.unsubscribe();
 
     }
-
+ 
     ngOnInit() {
      
 
@@ -66,9 +66,6 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
 
     }
 
-
-    
-
     studentpreview(StudentId)
     {
       this.router.navigate(['/submited-person', {'id':StudentId}]);

source/containers/main.routes.ts

@@ -19,6 +19,7 @@ import SchoolsOrderSelect from '../components/student-application-form/schools-o
 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 DirectorView from '../components/director/director-view';
 
 export const MainRoutes: Routes = [
   { path: '', component: Home },
@@ -35,6 +36,7 @@ export const MainRoutes: Routes = [
   { path: 'application-submit', component: ApplicationSubmit },
   { path: 'submited-preview', component: SubmitedPreview },
   { path: 'submited-person', component: SubmitedPerson },
+  { path: 'director-view', component: DirectorView },
 ];
 
 export const MainDeclarations = [
@@ -53,5 +55,6 @@ export const MainDeclarations = [
   SchoolsOrderSelect,
   ApplicationSubmit,
   SubmitedPreview,
-  SubmitedPerson
+  SubmitedPerson,
+  DirectorView
 ];