resolved conflicts

parents be16673c a9417f9a
......@@ -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'
<?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;
}
}
......@@ -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) {
}
}
......@@ -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',
......
......@@ -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',
......
......@@ -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',
......
......@@ -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',
......
......@@ -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',
......
......@@ -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',
......
<?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.
}
<?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.
}
<?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.
}
<?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.
}
<?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.
}
<?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.
}
......@@ -66,6 +66,7 @@
border: none!important;
}
.btn-primary {
background-color:#fd9665;
border: none!important;
......
......@@ -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,
......
......@@ -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,
]
})
......
......@@ -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>
......
......@@ -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>
......
import {Component} from '@angular/core';
import {Component, OnInit} from '@angular/core';
import { Injectable } from "@angular/core";
import { HelperDataService } from '../../services/helper-data-service';
@Component({
selector: 'reg-navbar',
templateUrl: 'navbar.component.html',
})
export default class NavbarComponent {
@Injectable() export default class NavbarComponent implements OnInit{
public cuser :any;
constructor( private _hds: HelperDataService) {
};
ngOnInit() {
this._hds.getCurrentUser().then( cuser => this.cuser= cuser );
}
}
......@@ -38,7 +38,7 @@ import {AppSettings} from '../../app.settings';
<div class="row">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια </button>
<i class="fa fa-forward"></i> </button>
</div>
<div *ngIf="emptyselection==true">
Παρακαλώ συμπληρώστε το ΑΜΚΑ του μαθητή
......
......@@ -132,12 +132,12 @@
<div class="row">
<div class="col-md-2 col-md-offset-4">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()">
<span class="glyphicon glyphicon-menu-left"></span>Πίσω
<i class="fa fa-backward"></i>
</button>
</div>
<div class="col-md-8">
<button type="button" class="btn-primary btn-lg pull-right" (click)="submitSelected()" [disabled]="studentDataGroup.invalid">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
<i class="fa fa-forward"></i>
</button>
</div>
</div>
......
......@@ -34,7 +34,7 @@ import {AppSettings} from '../../app.settings';
<div class="row">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
<i class="fa fa-forward"></i>
</button>
</div>
</div>
......
import { Component, OnInit } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs/Rx';
import { Injectable } from "@angular/core";
import { EpalClassesActions } from '../../actions/epalclass.actions';
import { NgRedux, select } from 'ng2-redux';
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 {
FormBuilder,
......@@ -17,12 +20,12 @@ import {AppSettings} from '../../app.settings';
@Component({
selector: 'epal-class-select',
template: `
<form [formGroup]="formGroup">
<form [formGroup]="formGroup">
<div *ngFor="let epalclass$ of epalclasses$ | async;"> </div>
<div class="form-group">
<label for="name">Παρακαλώ επιλέξτε την τάξη εισαγωγής του μαθητή στην Επαγγελματική Εκπαίδευση</label><br/>
<select class="form-control" formControlName="name">
<select class="form-control" formControlName="name" (change)="initializestore()">
<option value="Α' Λυκείου">Α' Λυκείου</option>
<option value="Β' Λυκείου">Β' Λυκείου</option>
<option value="Γ' Λυκείου">Γ' Λυκείου</option>
......@@ -32,7 +35,7 @@ import {AppSettings} from '../../app.settings';
<div class="row">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
<i class="fa fa-forward"></i>
</button>
</div>
</div>
......@@ -54,6 +57,9 @@ import {AppSettings} from '../../app.settings';
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: []
......@@ -92,4 +98,15 @@ import {AppSettings} from '../../app.settings';
}
}
initializestore()
{
this._cfa.saveEpalClassesSelected(this.formGroup.value);
this._sfa.getSectorFields(true);
this._rsa.getRegionSchools(1,"-1", true);
this._csa.getSectorCourses(true);
}
}
......@@ -5,11 +5,11 @@ import { Injectable } from "@angular/core";
import { RegionSchoolsActions } from '../../actions/regionschools.actions';
import { NgRedux, select } from 'ng2-redux';
import { IRegions } from '../../store/regionschools/regionschools.types';
import { SectorCoursesActions } from '../../actions/sectorcourses.actions';
import { ISectors } from '../../store/sectorcourses/sectorcourses.types';
import { IAppState } from '../../store/store';
import { LoaderService } from '../../services/Spinner.service';
import {RemoveSpaces} from '../../pipes/removespaces';
import {
......@@ -23,6 +23,8 @@ import {AppSettings} from '../../app.settings';
@Component({
selector: 'course-fields-select',
template: `
<div class = "loading" *ngIf="objLoaderStatus">
</div>
<div class="row equal">
<div class="col-md-12">
<form [formGroup]="formGroup">
......@@ -32,29 +34,30 @@ import {AppSettings} from '../../app.settings';
<li class="list-group-item" (click)="setActiveRegion(i)" [style.background-color]="toggleBackgroundColor(i)">
<h5>{{region$.region_name}}</h5>
</li>
<div *ngFor="let epal$ of region$.epals; let j=index;" [hidden]="i !== regionActive">
<li class="list-group-item" >
<div class="row">
<div class="col-md-2">
<div class="col-md-2 col-md-offset-1">
<input #cb type="checkbox" formControlName="{{ epal$.globalIndex }}"
(change)="saveSelected(cb,j)"
[hidden] = "numSelected === 3 && cb.checked === false"
>
</div>
<div class="col-md-10">
{{epal$.epal_name}}
</div>
<div class="col-md-8 col-md-offset-1">
{{epal$.epal_name | removeSpaces}}
</div>
</div>
</li>
</div>
</div>
</ul>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToApplication()" [disabled] = "numSelected === 0" >
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
<button [hidden] = "objLoaderStatus == true" type="button" class="btn-primary btn-lg pull-right" (click)="navigateToApplication()" [disabled] = "numSelected === 0" >
<i class="fa fa-forward"></i>
</button>
</div>
</div>
......@@ -74,6 +77,8 @@ import {AppSettings} from '../../app.settings';
private regionActive = <number>-1;
private courseActive = -1;
private numSelected = <number>0;
objLoaderStatus: boolean;
//private schoolArray: Array<boolean> = new Array();
......@@ -81,14 +86,30 @@ import {AppSettings} from '../../app.settings';
private _rsa: RegionSchoolsActions,
private _rsb: SectorCoursesActions,
private _ngRedux: NgRedux<IAppState>,
private router: Router
private router: Router,
private loaderService: LoaderService
) {
this.formGroup = this.fb.group({
formArray: this.rss
});