resolved conflicts

drupal/modules/epal/epal.routing.yml

@@ -22,3 +22,9 @@ epal_auth_test:
   requirements:
     _permission: 'access content'
     _user_is_logged_in: 'TRUE'
+current_user:
+  path: '/epal/curuser'
+  defaults:
+    _controller: '\Drupal\epal\Controller\CurrentUser::content'
+  requirements:
+    _access: 'TRUE'

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

+<?php
+/**
+ * @file
+ * Contains \Drupal\query_example\Controller\QueryExampleController.
+ */
+
+namespace Drupal\epal\Controller;
+
+use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Drupal\Core\Controller\ControllerBase;
+
+
+class CurrentUser extends ControllerBase {
+
+ 
+  public function content() {
+  
+     
+
+//  	$name = \Drupal\user\Entity\User::load(\Drupal::currentUser()->id());
+  	$name = "LALALA";
+    $authToken = "no authToken";
+    $accessKey = "no accessKey";
+
+    if (\Drupal::request()->headers->has('X-AUTH-TOKEN')) {
+        $authToken = \Drupal::request()->headers->get( 'X-AUTH-TOKEN' );
+    }
+    if (\Drupal::request()->headers->has('X-ACCESS-KEY')) {
+        $accessKey = \Drupal::request()->headers->get( 'X-ACCESS-KEY' );
+    }
+    $response = new JsonResponse([$name]);
+    $response->headers->set('X-AUTH-TOKEN', 'HELLOTOKEN');
+    return $response;
+
+  }
+
+}

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

@@ -17,7 +17,7 @@ use Drupal\Core\Entity\EntityFieldManagerInterface;
  * Controller routines for page example routes.
  */
 class Login extends ControllerBase {
-
+ 
   protected $query_factory;
   protected $entityTypeManager;
   protected $entityFieldManager;
@@ -185,3 +185,6 @@ public function object_2_array($result) {
   }
 
 }
+
+
+

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

@@ -21,7 +21,6 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalStudentListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalStudentViewsData",
- *     "translation" = "Drupal\epal\EpalStudentTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalStudentForm",
@@ -35,8 +34,6 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_student",
- *   data_table = "epal_student_field_data",
- *   translatable = TRUE,
  *   admin_permission = "administer epal student entities",
  *   entity_keys = {
  *     "id" = "id",
@@ -422,7 +419,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
       ->setSetting('target_type', 'epal_users')
       ->setSetting('handler', 'default')
 	  ->setRequired(true)
-      ->setTranslatable(TRUE)
+ //     ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',
@@ -754,7 +751,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
             ->setDescription(t('Δώσε το τρέχον ΕΠΑΛ παρακολούθησης.'))
             ->setSetting('target_type', 'eepal_school')
             ->setSetting('handler', 'default')
-            ->setTranslatable(TRUE)
+         //   ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',

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

@@ -21,7 +21,7 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalStudentClassListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalStudentClassViewsData",
- *     "translation" = "Drupal\epal\EpalStudentClassTranslationHandler",
+ *  
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalStudentClassForm",
@@ -35,8 +35,6 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_student_class",
- *   data_table = "epal_student_class_field_data",
- *   translatable = TRUE,
  *   admin_permission = "administer epal student class entities",
  *   entity_keys = {
  *     "id" = "id",
@@ -191,7 +189,7 @@ class EpalStudentClass extends ContentEntityBase implements EpalStudentClassInte
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
-      ->setTranslatable(TRUE)
+     // ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
         'label' => 'hidden',
         'type' => 'author',

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

@@ -21,7 +21,6 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalStudentCourseFieldListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalStudentCourseFieldViewsData",
- *     "translation" = "Drupal\epal\EpalStudentCourseFieldTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalStudentCourseFieldForm",
@@ -35,8 +34,6 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_student_course_field",
- *   data_table = "epal_student_course_field_field_data",
- *   translatable = TRUE,
  *   admin_permission = "administer epal student course field entities",
  *   entity_keys = {
  *     "id" = "id",
@@ -235,7 +232,7 @@ class EpalStudentCourseField extends ContentEntityBase implements EpalStudentCou
       ->setDescription(t('Δώσε το id μαθητή.'))
       ->setSetting('target_type', 'epal_student')
             ->setSetting('handler', 'default')
-            ->setTranslatable(TRUE)
+     //       ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',
@@ -262,7 +259,7 @@ class EpalStudentCourseField extends ContentEntityBase implements EpalStudentCou
             ->setSetting('target_type', 'eepal_specialty')
             ->setSetting('handler', 'default')
 			->setRequired(true)
-            ->setTranslatable(TRUE)
+         //   ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',

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

@@ -21,7 +21,6 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalStudentEpalChosenListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalStudentEpalChosenViewsData",
- *     "translation" = "Drupal\epal\EpalStudentEpalChosenTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalStudentEpalChosenForm",
@@ -35,8 +34,6 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_student_epal_chosen",
- *   data_table = "epal_student_epal_chosen_field_data",
- *   translatable = TRUE,
  *   admin_permission = "administer epal student epal chosen entities",
  *   entity_keys = {
   *    "id" = "id",
@@ -265,7 +262,7 @@ class EpalStudentEpalChosen extends ContentEntityBase implements EpalStudentEpal
       ->setSetting('target_type', 'epal_student')
             ->setSetting('handler', 'default')
 			->setRequired(true)
-            ->setTranslatable(TRUE)
+          //  ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',
@@ -290,7 +287,7 @@ class EpalStudentEpalChosen extends ContentEntityBase implements EpalStudentEpal
             ->setSetting('target_type', 'eepal_school')
             ->setSetting('handler', 'default')
 			->setRequired(true)
-            ->setTranslatable(TRUE)
+        //    ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',

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

@@ -21,7 +21,6 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalStudentSectorFieldListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalStudentSectorFieldViewsData",
- *     "translation" = "Drupal\epal\EpalStudentSectorFieldTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalStudentSectorFieldForm",
@@ -35,9 +34,7 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_student_sector_field",
- *   data_table = "epal_student_sector_field_field_data",
- *   translatable = TRUE,
- *   admin_permission = "administer epal student sector field entities",
+*   admin_permission = "administer epal student sector field entities",
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "name",
@@ -231,7 +228,7 @@ class EpalStudentSectorField extends ContentEntityBase implements EpalStudentSec
       ->setDescription(t('Δώσε το id μαθητή.'))
       ->setSetting('target_type', 'epal_student')
             ->setSetting('handler', 'default')
-            ->setTranslatable(TRUE)
+           // ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',
@@ -257,7 +254,7 @@ class EpalStudentSectorField extends ContentEntityBase implements EpalStudentSec
             ->setSetting('target_type', 'eepal_sectors')
             ->setSetting('handler', 'default')
 			->setRequired(true)
-            ->setTranslatable(TRUE)
+         //   ->setTranslatable(TRUE)
             ->setDisplayOptions('view', array(
               'label' => 'above',
               'type' => 'author',

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

@@ -21,7 +21,6 @@ use Drupal\user\UserInterface;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\epal\EpalUsersListBuilder",
  *     "views_data" = "Drupal\epal\Entity\EpalUsersViewsData",
- *     "translation" = "Drupal\epal\EpalUsersTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\epal\Form\EpalUsersForm",
@@ -35,8 +34,6 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "epal_users",
- *   data_table = "epal_users_field_data",
- *   translatable = TRUE,
  *   admin_permission = "administer epal users entities",
  *   entity_keys = {
  *     "id" = "id",
@@ -333,7 +330,7 @@ class EpalUsers extends ContentEntityBase implements EpalUsersInterface {
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
 	  ->setRequired(true)
-      ->setTranslatable(TRUE)
+   //   ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'author',

drupal/modules/epal/src/EpalStudentClassTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_student_class.
- */
-class EpalStudentClassTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

drupal/modules/epal/src/EpalStudentCourseFieldTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_student_course_field.
- */
-class EpalStudentCourseFieldTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

drupal/modules/epal/src/EpalStudentEpalChosenTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_student_epal_chosen.
- */
-class EpalStudentEpalChosenTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

drupal/modules/epal/src/EpalStudentSectorFieldTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_student_sector_field.
- */
-class EpalStudentSectorFieldTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

drupal/modules/epal/src/EpalStudentTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_student.
- */
-class EpalStudentTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

drupal/modules/epal/src/EpalUsersTranslationHandler.php

-<?php
-
-namespace Drupal\epal;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for epal_users.
- */
-class EpalUsersTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-
-}

myschool/main.scss

@@ -66,6 +66,7 @@
 	        	border: none!important;
 			}
 
+
 			.btn-primary {
 	        	background-color:#fd9665;
 	        	border: none!important;

source/actions/regionschools.actions.ts

@@ -13,6 +13,7 @@ export class RegionSchoolsActions {
   getRegionSchools = (classActive,courseActive, reload) => {
     const { regions } = this._ngRedux.getState();
     if (reload === true || (reload === false && regions.size === 0)) {
+        console.log("test1", classActive,courseActive, reload);
         return this._hds.getRegionsWithSchools(classActive,courseActive).then(regions => {
             return this._ngRedux.dispatch({
                 type: REGIONSCHOOLS_RECEIVED,

source/app.ts

@@ -29,6 +29,7 @@ import {HelperDataService} from './services/helper-data-service';
 
 //import {UserDataService} from './services/user-data-service';
 import {AmkaCheckService} from './services/amkacheck-service';
+import {LoaderService} from './services/Spinner.service';
 
 
 //import {UserDataService} from './services/user-data-service';
@@ -82,6 +83,7 @@ class MyLocalization extends NgLocalization {
     HelperDataService,
 
     AmkaCheckService,
+    LoaderService,
 
   ]
 })

source/components/main/main.component.html

@@ -19,9 +19,6 @@
         <div class="col-sm-12 col-md-9">
           <div class="main-content">
            <div class="panel panel-primary">
-            <div class="panel-heading">
-              <h3 class="panel-title">{{path || 'home' | camelcase }}</h3>
-            </div>
             <div class="panel-body">
               <router-outlet></router-outlet>
             </div>

source/components/navbar/navbar.component.html

@@ -9,6 +9,9 @@
   </a>
   <div class="collapse navbar-collapse flex-row-reverse" id="navbarNav">
     <ul class="navbar-nav">
+       <b>Όνομα Χρήστη:</b> {{this.cuser}}
+
+    <!--
       <li class="nav-item" [ngClass]="{active: path=='application-preview'}">
         <a class="nav-link" [routerLink]="['/application-preview']" [routerLinkActive]="['active']">Προεπισκόπηση</a>
       </li>
@@ -30,6 +33,8 @@
       <li class="nav-item" [ngClass]="{active: path=='student-application-form-main'}">
         <a class="nav-link" [routerLink]="['/student-application-form-main']" [routerLinkActive]="['active']">Αιτηση</a>
       </li>
+        -->
+
       <!--
       <li class="nav-item" [ngClass]="{active: path=='schools-order-select'}">
         <a class="nav-link" [routerLink]="['/schools-order-select']" [routerLinkActive]="['active']">Σειρά επιλογής</a>