Merge branch 'lock_actions' into 'develop'

Profile now is saved to store on updates. Various fixes. application.submit restructured etc

See merge request !104

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

@@ -83,6 +83,12 @@ class ApplicationSubmit extends ControllerBase {
 				'certificatetype' => $applicationForm[0][certificatetype],
 				//'lastam' => $applicationForm[0][lastam],
 				'currentclass' => $applicationForm[0][currentclass],
+                'guardian_name' => $applicationForm[0][cu_name],
+                'guardian_surname' => $applicationForm[0][cu_surname],
+                'guardian_fathername' => $applicationForm[0][cu_fathername],
+                'guardian_mothername' => $applicationForm[0][cu_mothername],
+                'agreement' => $applicationForm[0][disclaimer_checked],
+
 				//'currentepal' => $applicationForm[0][currentepal],
 				//'currentsector' => $applicationForm[0][currentsector],
         'points' => $applicationForm[0][points],

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

@@ -50,12 +50,30 @@ class CurrentUser extends ControllerBase
                 ], Response::HTTP_FORBIDDEN);
         }
 
+        $epalConfigs = $this->entityTypeManager->getStorage('epal_config')->loadByProperties(array('name' => 'epal_config'));
+        $epalConfig = reset($epalConfigs);
+        if (!$epalConfig) {
+            return $this->respondWithStatus([
+                    'message' => t("Configuration not found"),
+                ], Response::HTTP_FORBIDDEN);
+        }
+
         $userRoles = $user->getRoles();
         foreach ($userRoles as $userRole) {
             if (($userRole === 'epal') || ($userRole === 'regioneduadmin') || ($userRole === 'eduadmin')) {
                 return $this->respondWithStatus([
-                        'name' => $user->mail->value,
-                        'title' => $user->init->value,
+                        'cu_name' => $user->mail->value,
+                        'cu_surname' => '',
+                        'cu_fathername' => '',
+                        'cu_mothername' => '',
+                        'cu_email' => '',
+                        'minedu_username' => '',
+                        'minedu_userpassword' => '',
+                        'lock_capacity' => $epalConfig->lock_school_capacity->value,
+                        'lock_students' => $epalConfig->lock_school_students_view->value,
+                        'lock_application' => $epalConfig->lock_application->value,
+                        'disclaimer_checked' => "0",
+                        'title' => $user->init->value
                     ], Response::HTTP_OK);
             } else if ($userRole === 'applicant') {
                 break;
@@ -66,8 +84,24 @@ class CurrentUser extends ControllerBase
         $epalUsers = $this->entityTypeManager->getStorage('epal_users')->loadByProperties(array('authtoken' => $authToken));
         $epalUser = reset($epalUsers);
         if ($epalUser) {
+            $userName = $epalUser->name->value;
+            $userSurname = $epalUser->surname->value;
+            $userFathername = $epalUser->fathername->value;
+            $userMothername = $epalUser->mothername->value;
+            $userEmail = $user->mail->value;
             return $this->respondWithStatus([
-                    'name' => $epalUser->name->value,
+                    'cu_name' => mb_substr($epalUser->name->value,0,4,'UTF-8') !== "####" ? $epalUser->name->value : '',
+                    'cu_surname' => mb_substr($epalUser->surname->value,0,4,'UTF-8') !== "####" ? $epalUser->surname->value : '',
+                    'cu_fathername' => mb_substr($epalUser->fathername->value,0,4,'UTF-8') !== "####" ? $epalUser->fathername->value : '',
+                    'cu_mothername' => mb_substr($epalUser->mothername->value,0,4,'UTF-8') !== "####" ? $epalUser->mothername->value : '',
+                    'cu_email' => mb_substr($user->mail->value,0,4,'UTF-8') !== "####" ? $user->mail->value : '',
+                    'minedu_username' => '',
+                    'minedu_userpassword' => '',
+                    'lock_capacity' => $epalConfig->lock_school_capacity->value,
+                    'lock_students' => $epalConfig->lock_school_students_view->value,
+                    'lock_application' => $epalConfig->lock_application->value,
+                    'disclaimer_checked' => "0",
+                    'verificationCodeVerified' => $epalUser->verificationcodeverified->value,
                 ], Response::HTTP_OK);
         } else {
             return $this->respondWithStatus([

drupal/modules/epal/src/Entity/EpalConfig.php

@@ -206,7 +206,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
           ->setSettings(array(
             'text_processing' => 0,
           ))
-          ->setRequired(TRUE)
+          ->setRequired(FALSE)
           ->setDefaultValue(FALSE)
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -226,7 +226,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
           ->setSettings(array(
             'text_processing' => 0,
           ))
-          ->setRequired(TRUE)
+          ->setRequired(FALSE)
           ->setDefaultValue(FALSE)
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -246,7 +246,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
           ->setSettings(array(
             'text_processing' => 0,
           ))
-          ->setRequired(TRUE)
+          ->setRequired(FALSE)
           ->setDefaultValue(FALSE)
           ->setDisplayOptions('view', array(
             'label' => 'above',

drupal/modules/epal/src/Entity/EpalStudent.php

@@ -505,7 +505,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
         ->setLabel(t('Ημερομηνία γέννησης μαθητή'))
         ->setDescription(t('Δώσε την Ημερομηνία γέννησης μαθητή.'))
         ->setSetting('datetime_type', 'date')
-        ->setRequired(false)
+        ->setRequired(true)
         ->setDisplayOptions('view', array(
           'label' => 'above',
           'type' => 'string',
@@ -543,7 +543,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
-		  ->setRequired(false)
+		  ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -564,7 +564,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
-		  ->setRequired(false)
+		  ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -585,7 +585,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
-		  ->setRequired(false)
+		  ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -606,7 +606,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
-		  ->setRequired(false)
+		  ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -627,6 +627,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 20,
             'text_processing' => 0,
           ))
+          ->setRequired(false)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -647,6 +648,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 100,
             'text_processing' => 0,
           ))
+          ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -667,27 +669,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 10,
             'text_processing' => 0,
           ))
-          ->setDefaultValue('')
-          ->setDisplayOptions('view', array(
-            'label' => 'above',
-            'type' => 'string',
-            'weight' => -4,
-          ))
-          ->setDisplayOptions('form', array(
-            'type' => 'string_textfield',
-            'weight' => -4,
-          ))
-          ->setDisplayConfigurable('form', TRUE)
-          ->setDisplayConfigurable('view', TRUE);
-
-	  $fields['regionarea'] = BaseFieldDefinition::create('string')
-          ->setLabel(t('Πόλη-Κοινότητα'))
-          ->setDescription(t('Δώσε την πόλη ή κοινότητα που διαμένεις.'))
-          ->setSettings(array(
-            'max_length' => 100,
-            'text_processing' => 0,
-          ))
-          ->setDefaultValue('')
+          ->setRequired(true)
           ->setDisplayOptions('view', array(
             'label' => 'above',
             'type' => 'string',
@@ -707,6 +689,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 100,
             'text_processing' => 0,
           ))
+          ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -727,6 +710,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
+          ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -747,6 +731,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 10,
             'text_processing' => 0,
           ))
+          ->setRequired(false)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -912,6 +897,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
+          ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -932,6 +918,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             'max_length' => 50,
             'text_processing' => 0,
           ))
+          ->setRequired(true)
           ->setDefaultValue('')
           ->setDisplayOptions('view', array(
             'label' => 'above',
@@ -969,7 +956,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
         ->setSettings(array(
           'text_processing' => 0,
         ))
-        ->setRequired(false)
+        ->setRequired(true)
         ->setDisplayOptions('view', array(
           'label' => 'above',
           'type' => 'boolean',
@@ -982,6 +969,90 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
         ->setDisplayConfigurable('form', TRUE)
         ->setDisplayConfigurable('view', TRUE);
 
+        $fields['guardian_name'] = BaseFieldDefinition::create('string')
+            ->setLabel(t('Όνομα κηδεμόνα'))
+            ->setDescription(t('Δώσε το όνομα κηδεμόνα.'))
+            ->setSettings(array(
+              'max_length' => 50,
+              'text_processing' => 0,
+            ))
+      	  ->setRequired(true)
+            ->setDefaultValue('')
+            ->setDisplayOptions('view', array(
+              'label' => 'above',
+              'type' => 'string',
+              'weight' => -4,
+            ))
+            ->setDisplayOptions('form', array(
+              'type' => 'string_textfield',
+              'weight' => -4,
+            ))
+            ->setDisplayConfigurable('form', TRUE)
+            ->setDisplayConfigurable('view', TRUE);
+
+            $fields['guardian_surname'] = BaseFieldDefinition::create('string')
+                ->setLabel(t('Επώνυμο κηδεμόνα'))
+                ->setDescription(t('Δώσε το επώνυμο κηδεμόνα.'))
+                ->setSettings(array(
+                  'max_length' => 50,
+                  'text_processing' => 0,
+                ))
+              ->setRequired(true)
+                ->setDefaultValue('')
+                ->setDisplayOptions('view', array(
+                  'label' => 'above',
+                  'type' => 'string',
+                  'weight' => -4,
+                ))
+                ->setDisplayOptions('form', array(
+                  'type' => 'string_textfield',
+                  'weight' => -4,
+                ))
+                ->setDisplayConfigurable('form', TRUE)
+                ->setDisplayConfigurable('view', TRUE);
+
+                $fields['guardian_fathername'] = BaseFieldDefinition::create('string')
+                    ->setLabel(t('Όνομα πατέρα κηδεμόνα'))
+                    ->setDescription(t('Δώσε το όνομα πατέρα του κηδεμόνα.'))
+                    ->setSettings(array(
+                      'max_length' => 50,
+                      'text_processing' => 0,
+                    ))
+                  ->setRequired(true)
+                    ->setDefaultValue('')
+                    ->setDisplayOptions('view', array(
+                      'label' => 'above',
+                      'type' => 'string',
+                      'weight' => -4,
+                    ))
+                    ->setDisplayOptions('form', array(
+                      'type' => 'string_textfield',
+                      'weight' => -4,
+                    ))
+                    ->setDisplayConfigurable('form', TRUE)
+                    ->setDisplayConfigurable('view', TRUE);
+
+                    $fields['guardian_mothername'] = BaseFieldDefinition::create('string')
+                        ->setLabel(t('Όνομα μητέρας κηδεμόνα'))
+                        ->setDescription(t('Δώσε το όνομα μητέρας του κηδεμόνα.'))
+                        ->setSettings(array(
+                          'max_length' => 50,
+                          'text_processing' => 0,
+                        ))
+                      ->setRequired(true)
+                        ->setDefaultValue('')
+                        ->setDisplayOptions('view', array(
+                          'label' => 'above',
+                          'type' => 'string',
+                          'weight' => -4,
+                        ))
+                        ->setDisplayOptions('form', array(
+                          'type' => 'string_textfield',
+                          'weight' => -4,
+                        ))
+                        ->setDisplayConfigurable('form', TRUE)
+                        ->setDisplayConfigurable('view', TRUE);
+
    $fields['status'] = BaseFieldDefinition::create('boolean')
 		  ->setLabel(t('Publishing status'))
 		  ->setDescription(t('A boolean indicating whether the EPAL Student is published.'))

package.json

@@ -66,6 +66,7 @@
     "immutable": "^3.8.1",
     "jquery": "^3.1.1",
     "jspdf": "^1.3.3",
+    "mydatepicker": "^2.0.13",
     "ng2-redux": "^5.1.0",
     "ng2-smart-table": "^0.4.0-5",
     "ngx-cookie": "^1.0.0",

source/actions/logininfo.actions.ts

-import { LOGININFO_SAVE, LOGININFO_RECEIVED } from '../constants';
+import { LOGININFO_SAVE, PROFILE_SAVE, LOGININFO_RECEIVED } from '../constants';
 import { LOGININFO_INIT } from '../constants';
 import { Injectable } from '@angular/core';
 import { NgRedux } from 'ng2-redux';
@@ -32,6 +32,15 @@ export class LoginInfoActions {
   });
 };
 
+saveProfile = (profile) => {
+  return this._ngRedux.dispatch({
+   type: PROFILE_SAVE,
+   payload: {
+     profile
+   }
+ });
+};
+
 
   initLoginInfo = () => {
       return this._ngRedux.dispatch({

source/app.ts

@@ -6,6 +6,7 @@ import { NgModule } from '@angular/core';
 import { NgReduxModule, DevToolsExtension, NgRedux } from 'ng2-redux';
 import {BrowserModule} from '@angular/platform-browser';
 import { CookieModule } from 'ngx-cookie';
+import { MyDatePickerModule } from 'mydatepicker';
 import {
   FormsModule,
   ReactiveFormsModule,
@@ -32,6 +33,8 @@ import {AuthService} from './services/auth.service';
 import SchoolAuthGuard from './guards/school.auth.guard';
 import StudentAuthGuard from './guards/student.auth.guard';
 import RegionEduAuthGuard from './guards/regionedu.auth.guard';
+import EduAdminAuthGuard from './guards/eduadmin.auth.guard';
+import MinistryAuthGuard from './guards/ministry.auth.guard';
 
 import { ACTION_PROVIDERS } from './actions';
 import Home from './components/home';
@@ -55,6 +58,7 @@ class MyLocalization extends NgLocalization {
 @NgModule({
   imports:      [
     BrowserModule,
+    MyDatePickerModule,
     FormsModule,
     RouterModule,
     ReactiveFormsModule,
@@ -81,7 +85,9 @@ class MyLocalization extends NgLocalization {
     AuthService,
     SchoolAuthGuard,
     StudentAuthGuard,
-    RegionEduAuthGuard
+    RegionEduAuthGuard,
+    EduAdminAuthGuard,
+    MinistryAuthGuard
 
   ]
 })

source/components/header/header.component.html

 <div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
+<div id="headerNotice" (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 {{modalHeader | async}}" >
+          <h3 class="modal-title pull-left"><i class="fa fa-check-square-o"></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>
+</div>
 <div class="header-wrapper">
 <header id="navbar" role="banner" class="navbar navbar-default">
 

source/components/header/header.component.ts

@@ -28,6 +28,9 @@ export default class HeaderComponent implements OnInit, OnDestroy {
     private loginInfo$: BehaviorSubject<ILoginInfo>;
     public cuser :any;
     private showLoader$: BehaviorSubject<boolean>;
+    private modalTitle: BehaviorSubject<string>;
+    private modalText: BehaviorSubject<string>;
+    private modalHeader: BehaviorSubject<string>;
 
     constructor( private _ata: LoginInfoActions,
                 private _hds: HelperDataService,
@@ -46,10 +49,14 @@ export default class HeaderComponent implements OnInit, OnDestroy {
                         this.cuName = '';
                         this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
                         this.showLoader$ = new BehaviorSubject(false);
+                        this.modalTitle =  new BehaviorSubject("");
+                        this.modalText =  new BehaviorSubject("");
+                        this.modalHeader =  new BehaviorSubject("");
 
         };
 
     ngOnInit() {
+        (<any>$('#headerNotice')).appendTo("body");
         this._ngRedux.select(state => {
             if (state.loginInfo.size > 0) {
                 state.loginInfo.reduce(({}, loginInfoToken) => {
@@ -66,6 +73,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
     }
 
     ngOnDestroy() {
+        (<any>$('#headerNotice')).remove();
         this.loginInfo$.unsubscribe();
 
     }
@@ -104,4 +112,12 @@ export default class HeaderComponent implements OnInit, OnDestroy {
         });
     }
 
+    public showModal():void {
+        (<any>$('#headerNotice')).modal('show');
+    }
+
+    public hideModal():void {
+        (<any>$('#headerNotice')).modal('hide');
+    }
+
 }

source/components/home.ts

@@ -32,6 +32,7 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings';
                 </button>
             </div>
             </div>
+
      </form>
   </div>
   `

source/components/ministry.home.ts

@@ -116,8 +116,7 @@ export default class MinistryHome implements OnInit {
             if (success)  {
               this.authRole = 'supervisor';
               this._hds.setMineduCurrentUser(this.userDataGroup.value['minedu_username'], this.userDataGroup.value['minedu_userpassword'],   this.authRole);
-              console.log("MPHKA");
-              //this.validLogin = true;
+
               this.validLogin = 1;
               this.userDataGroup.value['cu_name'] = this.userDataGroup.value['minedu_username'];
               this.userDataGroup.value['auth_role'] = 'supervisor';

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

@@ -173,7 +173,6 @@ import { CRITERIA_INITIAL_STATE } from '../../store/criteria/criteria.initial-st
 
     ngOnInit() {
         this.currentUrl = this.router.url;
-        console.log(this.currentUrl,"url");
         this.sectorsSub = this._ngRedux.select(state => {
             state.sectors.reduce((prevSector, sector) => {
                 sector.courses.reduce((prevCourse, course) => {

source/components/student-application-form/application.submit.ts

@@ -55,8 +55,92 @@ import { HelperDataService } from '../../services/helper-data-service';
              <breadcrumbs></breadcrumbs>
         </div>
 
-        <application-preview-select></application-preview-select>
-        <button type="button button-lg pull-right" *ngIf="(studentDataFields$ | async).size > 0 && (criteria$ | async).size > 0 && (regions$ | async).size > 0 && (epalclasses$ | async).size > 0 && (loginInfo$ | async).size > 0" class="btn-primary btn-lg pull-right" (click)="submitNow()">Υποβολή</button>
+<!--        <application-preview-select></application-preview-select>   -->
+
+        <div *ngFor="let loginInfoRow$ of loginInfo$ | async; let i=index;" style = "margin-bottom: 20px;" >
+            <div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
+                <div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία αιτούμενου</div>
+            </div>
+            <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
+                <div class="col-md-3" style="font-size: 0.8em;">Όνομα</div>
+                <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{ loginInfoRow$.cu_name }}</div>
+                <div class="col-md-3" style="font-size: 0.8em;">Επώνυμο</div>
+                <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{ loginInfoRow$.cu_surname }}</div>
+            </div>
+            <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
+                <div class="col-md-3" style="font-size: 0.8em;">Όνομα πατέρα</div>
+                <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{ loginInfoRow$.cu_fathername }}</div>
+                <div class="col-md-3" style="font-size: 0.8em;">Όνομα μητέρας</div>
+                <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{ loginInfoRow$.cu_mothername }}</div>
+            </div>
+        </div>
+
+        <div *ngFor="let studentDataField$ of studentDataFields$ | async;">
+
+        <ul class="list-group left-side-view" style="margin-bottom: 20px;">
+        <li class="list-group-item active">
+            Στοιχεία μαθητή
+        </li>
+        </ul>
+        <div><label for="name">Όνομα μαθητή</label> <p class="form-control" id="name" style="border:1px solid #eceeef;">   {{studentDataField$.name}} </p> </div>
+        <div><label for="studentsurname">Επώνυμο μαθητή</label> <p class="form-control" id = "studentsurname" style="border:1px solid #eceeef;"> {{studentDataField$.studentsurname}} </p></div>
+        <div><label for="fatherfirstname">Όνομα Πατέρα</label> <p class="form-control" id = "fatherfirstname" style="border:1px solid #eceeef;"> {{studentDataField$.fatherfirstname}} </p></div>
+        <div><label for="fathersurname">Επώνυμο Πατέρα</label> <p class="form-control" id = "fathersurname" style="border:1px solid #eceeef;"> {{studentDataField$.fathersurname}} </p></div>
+        <div><label for="motherfirstname">Όνομα Μητέρας</label> <p class="form-control" id = "motherfirstname" style="border:1px solid #eceeef;"> {{studentDataField$.motherfirstname}} </p></div>
+        <div><label for="mothersurname">Επώνυμο Μητέρας</label> <p class="form-control" id = "mothersurname" style="border:1px solid #eceeef;"> {{studentDataField$.mothersurname}} </p></div>
+        <div><label for="birthdate">Ημερομηνία Γέννησης</label> <p class="form-control" id = "birthdate" style="border:1px solid #eceeef;"> {{studentDataField$.studentbirthdate}} </p></div>
+                <table>
+                        <tr>
+                            <td>
+                                <div class="form-group">
+                                    <label for="regionaddress">Διεύθυνση κατοικίας</label><p class="form-control" id = "regionaddress" style="border:1px solid #eceeef;"> {{studentDataField$.regionaddress}} </p>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <label for="regiontk">TK </label><p class="form-control" id = "regiontk" style="border:1px solid #eceeef;"> {{studentDataField$.regiontk}} </p>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <label for="regionarea">Πόλη/Περιοχή</label><p class="form-control" id = "regionarea" style="border:1px solid #eceeef;"> {{studentDataField$.regionarea}} </p>
+                                </div>
+                            </td>
+                       </tr>
+                </table>
+                <div><label for="certificatetype">Τύπος απολυτηρίου</label> <p class="form-control" id = "certificatetype" style="border:1px solid #eceeef;"> {{studentDataField$.certificatetype}} </p></div>
+                <div><label for="telnum">Τηλέφωνο επικοινωνίας</label> <p class="form-control" id = "telnum" style="border:1px solid #eceeef;"> {{studentDataField$.telnum}} </p></div>
+                <div><label for="relationtostudent">Η αίτηση γίνεται από</label> <p class="form-control" id = "relationtostudent" style="border:1px solid #eceeef;"> {{studentDataField$.relationtostudent}} </p></div>
+
+                <ul class="list-group left-side-view" style="margin-bottom: 20px;">
+                <li class="list-group-item active">
+                            <div *ngIf="currentUrl === '/application-submit'">
+                                   Κοινωνικά/Εισοδηματικά Κριτήρια
+                            </div>
+                </li>
+                </ul>
+        </div>
+
+            <div *ngFor="let criteriaField$ of criteriaFields$ | async;">
+            <div *ngIf="criteriaField$.selected === true">
+                  {{criteriaField$.name}}
+            </div>
+            </div>
+
+            <div class="row" style="margin-top: 20px; margin-bottom: 20px;" *ngIf="(criteria$ | async).size > 0">
+                <div class="col-md-6">
+                    <button type="button" class="btn-primary btn-lg pull-left" (click)="navigateBack()">
+                        <i class="fa fa-backward"></i>
+                    </button>
+                </div>
+                <div class="col-md-6">
+                    <button type="button"  *ngIf="(studentDataFields$ | async).size > 0 && (criteria$ | async).size > 0 && (regions$ | async).size > 0 && (epalclasses$ | async).size > 0 && (loginInfo$ | async).size > 0" class="btn-primary btn-lg pull-right isclickable" style="width: 9em;" (click)="submitNow()">
+                        <span style="font-size: 0.9em; font-weight: bold;">Υποβολή&nbsp;&nbsp;&nbsp;</span><i class="fa fa-forward"></i>
+                    </button>
+                </div>
+
+            </div>
+
   `
 })
 
@@ -90,6 +174,11 @@ import { HelperDataService } from '../../services/helper-data-service';
     public isModalShown: BehaviorSubject<boolean>;
     private showLoader: BehaviorSubject<boolean>;
     public currentUrl: string;
+    private cu_name: string;
+    private cu_surname: string;
+    private cu_fathername: string;
+    private cu_mothername: string;
+    private disclaimer_checked: number;
 
     constructor(
                 private _hds: HelperDataService,
@@ -123,14 +212,18 @@ import { HelperDataService } from '../../services/helper-data-service';
 
     ngOnInit() {
 
-
-
-
         (<any>$('#studentFormSentNotice')).appendTo("body");
       this.loginInfoSub = this._ngRedux.select(state => {
           if (state.loginInfo.size > 0) {
               state.loginInfo.reduce(({}, loginInfoToken) => {
                   this.authToken = loginInfoToken.auth_token;
+
+                  this.cu_name = loginInfoToken.cu_name;
+                  this.cu_surname = loginInfoToken.cu_surname;
+                  this.cu_fathername = loginInfoToken.cu_fathername;
+                  this.cu_mothername = loginInfoToken.cu_mothername;
+                  this.disclaimer_checked = loginInfoToken.disclaimer_checked;
+