Skip to content

E
e-epal
Commit 0208cd57 authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files
Options

Merge branch 'interface' into 'develop' 

Interface

See merge request !20
parents 830874b9 1203a4fb
Hide whitespace changes
Inline Side-by-side
Showing with 292 additions and 92 deletions
drupal/modules/oauthost/src/Authentication/Provider/OAuthOSTConsumer.php
View file @ 0208cd57
......@@ -23,13 +23,13 @@ class OAuthOSTConsumer implements AuthenticationProviderInterface
protected $request_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/request_token';
protected $user_authorization_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/confirm_access';
protected $access_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/access_token';
protected $signature_method = 'PLAINTEXT';
protected $signature_method = 'PLAINTEXT';
protected $api_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/gsisdemoservice/resource_one';
protected $callback_url = 'http://eepal.dev/drupal/oauth/cb';
protected $callback_url = 'http://localhost/angular/eepal-front/drupal/oauth/cb';
protected $logout_url = 'https://www1.gsis.gr/testgsisapps/gsisdemo/logout.htm?logout_token=';
/**
* The config factory.
* The config factory.
*
* @var \Drupal\Core\Config\ConfigFactoryInterface
*/
......
myschool/main.scss
View file @ 0208cd57
......@@ -37,9 +37,57 @@
p {
margin-bottom: 0;
}
.left-choices {
h4{
font-weight: bold;
font-size: 1rem;
}
}
.btn-primary {
background-color:#fd9665;
border: none!important;
width: 200px;
padding:5px 10px;
}
}
.main-content{
.btn {
background-color:#fd9665;
border: none!important;
}
.btn-primary {
background-color:#fd9665;
border: none!important;
width: 120px;
}
li.list-group-item{
color: black;
background-color: white;
border: none!important;
padding: 0.3rem 0.3rem!important;
h5{
font-size: 1rem;
}
}
}
}
}
}
......
source/app.settings.ts
View file @ 0208cd57
export class AppSettings {
public static get API_ENDPOINT(): string {
return 'http://localhost/drupal';
return 'http://localhost/angular/eepal-front/drupal';
// return 'http://localhost/drupal';
// return 'http://eepal.dev/drupal';
// return 'http://eduslim2.minedu.gov.gr/drupal';
}
......
source/components/footer/footer.component.html
View file @ 0208cd57
<div class="subfooter">
<div class="container">
<div class="text-center hidden-md-down">
<a><img class="img-fluid" src="../myschool/assets/images/footer-logos.png" alt="" /></a>
</div>
</div>
</div>
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2012-2013</span></div>
<div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2017</span></div>
<div class="cols-xs-12 col-md-6 text-center">
<span class="ft-text"><a href="#">ΟΡΟΙ ΧΡΗΣΗΣ – ΕΜΠΙΣΤΕΥΤΙΚΟΤΗΤΑ</a></span>
<span class="ft-text"><a href="#">ΠΡΟΣΩΠΙΚΑ ΔΕΔΟΜΕΝΑ</a></span>
</div>
<div class="col-xs-12 col-md-3"><span class="ft-text">Version 0.58.2013.430</span></div>
<div class="col-xs-12 col-md-3"><span class="ft-text">Version 1</span></div>
</div>
</div>
</footer>
source/components/home.ts.save 0 → 100644
View file @ 0208cd57
import {Component} from '@angular/core';
import { Router } from '@angular/router';
import {Router, ActivatedRoute, Params} from '@angular/router';
import {OnInit, Component} from '@angular/core';
import { LoginInfoActions } from '../actions/logininfo.actions';
import {
FormBuilder,
FormsModule,
FormGroup,
FormControl,
FormArray
} from '@angular/forms';
import {GlobalEventsManager} from "../services/login-service";
=======
import { AppSettings } from '../app.settings';
@Component({
selector: 'home',
template: `
<div>
<h4>Στοιχεία Σύνδεσης</h4>
<form [formGroup]="formGroup">
<div class="form-group">
<div *ngIf = "loginerror " class = "alert alert-danger">Λάθος στοιχεία εισόδου</div>
<label for="UserName">Όνομα Χρήστη</label>
<input class="form-control" type="text" formControlName="UserName" cols="10" required>
</div>
<div *ngIf = "usernamevalidation " class = "alert alert-danger">Απαιτείται το όνομα χρήστη</div>
<div class="form-group">
<label for="Paswd">Κωδικός Ασφαλείας</label>
<input class="form-control" type="password" formControlName="Paswd" cols="10" required>
</div>
<div *ngIf = "passvalidation " class = "alert alert-danger">Απαιτείται ο κωδικός πρόσβασης</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="onLoginSuccessfully()">
Συνέχεια
</button>
</div>
</div>
<form [formGroup]="formGroup" method = "POST" action="http://eepal.dev/drupal/oauth/login" #form>
<input type="hidden" name="X-oauth-enabled" value="true">
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="submit" class="btn-primary btn-lg pull-center" (click)="form.submit()">
Είσοδος μέσω TaxisNet<span class="glyphicon glyphicon-menu-right"></span>
</button>
</div>
</div>
</form>
</div>
`
})
export default class Home {
public logined = false;
public formGroup: FormGroup;
usernamevalidation = false;
passvalidation = false;
loginerror = false;
constructor(private fb: FormBuilder,
private router: Router,
private globalEventsManager: GlobalEventsManager) {
=======
export default class Home implements OnInit{
public formGroup: FormGroup;
constructor(private fb: FormBuilder,
private _ata: LoginInfoActions,
private activatedRoute: ActivatedRoute) {
>>>>>>> 830874b9f9533be54e9e43e3c3229884b3eeb119
this.formGroup = this.fb.group({
UserName: [],
Paswd : []
});
};
ngOnInit() {
// subscribe to router event
this.activatedRoute.queryParams.subscribe((params: Params) => {
let authToken = params['auth_token'];
let authRole = params['auth_role'];
this._ata.saveLoginInfo({auth_token: authToken, auth_role: authRole});
console.log(authToken);
});
}
private onLoginSuccessfully(data : any) : void {
if (this.formGroup.value.UserName == null)
{
this.usernamevalidation = true;
}
else
{
this.usernamevalidation = false;
}
if (this.formGroup.value.Paswd == null)
{
this.passvalidation = true;
}
else
{
this.passvalidation = false;
}
if ((this.formGroup.value.UserName == "admin") && (this.formGroup.value.Paswd == "admin"))
{
this.globalEventsManager.showNavBar(true);
this.router.navigate(['/amka-fill']);
}
else
{
this.loginerror = true;
}
}
}
source/components/main/main.component.html
View file @ 0208cd57
<div class="main-wrapper">
<div class="container" id="content">
<div class="row">
<div class="col-sm-12"><p class="crumb">Αρχική σελίδα</p></div>
</div>
<div class="row">
<div class="col-sm-12 col-md-2 hidden-md-down">
<div class="left-sidebar">
<div class="navig-left-img">
<img src="../myschool/assets/images/default.png" alt="">
</div>
<div style="bottom:25px;padding-top:50px" class="help">
<p class="small-text">Ομάδα Υποστήριξης</p>
<p class="small-text"><i class="fa fa-phone fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;801 200 8040</p><br><p></p><p class="small-text">Ομάδα Υποστήριξης Πανελληνίων Εξ.</p><p class="small-text"><i class="fa fa-phone fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;801 300 3021</p><br>
<p class="small-text">Καταγραφή Προβλημάτων</p>
</div>
<div class="main-wrapper">
<div class="container" id="content">
<div class="row">
<div class="col-sm-12"><p class="crumb">Αρχική σελίδα</p></div>
</div>
</div>
<div class="col-sm-12 col-md-10">
<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 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>
<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 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>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
source/components/navbar/navbar.component.ts.save 0 → 100644
View file @ 0208cd57
import {Component} from '@angular/core';
import {GlobalEventsManager} from "../../services/login-service";
@Component({
selector: 'reg-navbar',
templateUrl: 'navbar.component.html',
})
export default class NavbarComponent {
showNavBar: boolean = false;
constructor(private globalEventsManager: GlobalEventsManager) {
this.globalEventsManager.showNavBarEmitter.subscribe((mode)=>{
if (mode !== null) {
this.showNavBar = mode;
}
});
}
}
>>>>>>> 830874b9f9533be54e9e43e3c3229884b3eeb119
source/components/student-application-form/amka-fill.ts
View file @ 0208cd57
......@@ -36,10 +36,9 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button>
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια </button>
</div>
<div *ngIf="emptyselection==true">
Παρακαλώ συμπληρώστε το ΑΜΚΑ του μαθητή
......
source/components/student-application-form/application.form.main.html
View file @ 0208cd57
<div class="row equal">
<div class="col-md-8">
<div class="col-md-12">
<form novalidate (ngSubmit)="onSubmit(studentDataGroup)" [formGroup]="studentDataGroup">
<div *ngFor="let studentDataField$ of studentDataFields$ | async; "> </div>
<!--
......@@ -135,8 +135,8 @@
<span class="glyphicon glyphicon-menu-left"></span>Πίσω
</button>
</div>
<div class="col-md-2">
<button type="button" class="btn-primary btn-lg pull-center" (click)="submitSelected()" [disabled]="studentDataGroup.invalid">
<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>
</button>
</div>
......@@ -145,6 +145,3 @@
</form>
</div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
source/components/student-application-form/application.preview.ts
View file @ 0208cd57
......@@ -18,6 +18,7 @@ import { IEpalClasses } from '../../store/epalclasses/epalclasses.types';
import { IAmkaFills } from '../../store/amkafill/amkafills.types';
import {AppSettings} from '../../app.settings';
@Component({
selector: 'application-preview-select',
template: `
......@@ -33,7 +34,7 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let epalclass$ of epalclasses$ | async;">
<li class="list-group-item">
Τάξη εισαγωγής: {{epalclass$.name}}
Τάξη εισαγωγής: {{epalclass$.name }}
</li>
</div>
</ul>
......@@ -48,13 +49,13 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let sectorField$ of sectorFields$ | async;">
<li class="list-group-item" *ngIf="sectorField$.selected === true" >
{{sectorField$.name}}
{{sectorField$.name }}
</li>
</div>
<div *ngFor="let sector$ of sectors$ | async;">
<li class="list-group-item" *ngIf="sector$.sector_selected === true" >
{{sector$.sector_name}}
{{sector$.sector_name }}
</li>
</div>
</ul>
......@@ -70,7 +71,7 @@ import {AppSettings} from '../../app.settings';
<div *ngFor="let sector$ of sectors$ | async;">
<div *ngFor="let course$ of sector$.courses;" >
<li class="list-group-item" *ngIf="course$.selected === true">
{{course$.course_name}}
{{course$.course_name }}
</li>
</div>
</div>
......@@ -90,7 +91,7 @@ import {AppSettings} from '../../app.settings';
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}}
</li>
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 0">
{{epal$.epal_name}}
{{epal$.epal_name }}
</li>
</div>
</div>
......@@ -98,14 +99,14 @@ import {AppSettings} from '../../app.settings';
<div *ngFor="let region$ of regions$ | async;">
<div *ngFor="let epal$ of region$.epals; " >
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 2">
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}}
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name }}
</li>
</div>
</div>
<div *ngFor="let region$ of regions$ | async;">
<div *ngFor="let epal$ of region$.epals; " >
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 3">
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}}
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name }}
</li>
</div>
</div>
......@@ -126,10 +127,10 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let studentDataField$ of studentDataFields$ | async;">
<li class="list-group-item">
Όνομα μαθητή: {{studentDataField$.name}}
Όνομα μαθητή: {{studentDataField$.name }}
</li>
<li class="list-group-item">
Επώνυμο μαθητή: {{studentDataField$.studentsurname}}
Επώνυμο μαθητή: {{studentDataField$.studentsurname }}
</li>
</div>
<div *ngFor="let selectedAmkaFill$ of selectedAmkaFills$ | async;">
......
source/components/student-application-form/course.fields.select.ts
View file @ 0208cd57
......@@ -32,8 +32,8 @@ import {AppSettings} from '../../app.settings';
</div>
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()">
<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>
</button>
</div>
......
source/components/student-application-form/epal.class.select.ts
View file @ 0208cd57
......@@ -30,8 +30,8 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()">
<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>
</button>
</div>
......
source/components/student-application-form/region.schools.select.ts
View file @ 0208cd57
......@@ -24,7 +24,7 @@ import {AppSettings} from '../../app.settings';
selector: 'course-fields-select',
template: `
<div class="row equal">
<div class="col-md-8">
<div class="col-md-12">
<form [formGroup]="formGroup">
<div formArrayName="formArray">
<ul class="list-group">
......@@ -52,8 +52,8 @@ import {AppSettings} from '../../app.settings';
</ul>
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="navigateToApplication()" [disabled] = "numSelected === 0" >
<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>
</div>
......@@ -62,11 +62,6 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
</div>
`
})
......@@ -137,7 +132,7 @@ import {AppSettings} from '../../app.settings';
}
toggleBackgroundColor(ind) {
return ((this.regionActive === ind) ? "cyan" : "#eeeeee");
return ((this.regionActive === ind) ? "#fd9665" : "white");
}
saveSelected(cb,j) {
......
source/components/student-application-form/schools-order-select.ts
View file @ 0208cd57
......@@ -24,7 +24,7 @@ import {AppSettings} from '../../app.settings';
Αν συμφωνείτε με την υπάρχουσα σειρά προτίμησης, πατήστε <i>Συνέχεια</i>.</p>
<div class="row equal">
<div class="col-md-8">
<div class="col-md-12">
<form [formGroup]="formGroup">
<div *ngFor="let schoolField$ of schoolNames; let i=index">
<button type="button" class="btn btn-info btn-sm pull-right" style="width:120px;margin-bottom:4px;white-space: normal;word-wrap:break-word;"
......@@ -40,13 +40,12 @@ import {AppSettings} from '../../app.settings';
Προτίμηση {{i+1}}: {{schoolField$}}
</li>
</div>
<button type="button" class="btn btn-primary btn-lg pull-center" (click)="navigateToStudentForm()" >Συνέχεια</button>
<div class="col-md-12">
<button type="button" class="btn btn-primary btn-lg pull-right" (click)="navigateToStudentForm()" >Συνέχεια</button>
</div>
</form>
</div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
</div>
`
......
source/components/student-application-form/sector.courses.select.ts
View file @ 0208cd57
......@@ -8,6 +8,7 @@ import { RegionSchoolsActions } from '../../actions/regionschools.actions';
import { IRegions } from '../../store/regionschools/regionschools.types';
import { NgRedux, select } from 'ng2-redux';
import { IAppState } from '../../store/store';
import {RemoveSpaces} from '../../pipes/removespaces';
import {
FormBuilder,
......@@ -21,7 +22,7 @@ import {AppSettings} from '../../app.settings';
selector: 'sectorcourses-fields-select',
template: `
<div class="row equal">
<div class="col-md-8">
<div class="col-md-12">
<form [formGroup]="formGroup">
<div formArrayName="formArray">
<ul class="list-group">
......@@ -39,7 +40,7 @@ import {AppSettings} from '../../app.settings';
>
</div>
<div class="col-md-10">
{{course$.course_name}}
{{course$.course_name | removeSpaces}}
</div>
</div>
</li>
......@@ -49,8 +50,8 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="navigateToSchools()" [disabled]="idx === -1" >
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToSchools()" [disabled]="idx === -1" >
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button>
</div>
......@@ -58,9 +59,6 @@ import {AppSettings} from '../../app.settings';
</form>
</div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
</div>
`
})
......@@ -121,7 +119,7 @@ import {AppSettings} from '../../app.settings';
}
toggleBackgroundColor(ind) {
return ((this.sectorActive === ind) ? "cyan" : "#eeeeee");
return ((this.sectorActive === ind) ? "#fd9665" : "white");
}
saveSelected() {
......
source/components/student-application-form/sector.fields.select.ts
View file @ 0208cd57
......@@ -23,7 +23,7 @@ import {AppSettings} from '../../app.settings';
<div class="row equal">
<div class="col-md-8">
<div class="col-md-12">
<form [formGroup]="formGroup">
<div formArrayName="formArray">
......@@ -52,18 +52,15 @@ import {AppSettings} from '../../app.settings';
</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="navigateToSchools()" [disabled]="sectorActive === -1" >
<div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToSchools()" [disabled]="sectorActive === -1" >
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button>
</div>
</div>
</form>
</div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
</div>
`
......@@ -128,7 +125,7 @@ import {AppSettings} from '../../app.settings';
}
toggleBackgroundColor(ind) {
return ((this.sectorActive === ind) ? "cyan" : "#eeeeee");
return ((this.sectorActive === ind) ? "#fd9665" : "white");
}
getAllSchools() {
......
source/containers/main.routes.ts
View file @ 0208cd57
......@@ -4,6 +4,7 @@ import {
} from '@angular/router';
import {CamelCasePipe} from '../pipes/camelcase';
import {RemoveSpaces} from '../pipes/removespaces';
import Form3 from '../components/form-controls/form3';
import StudentApplicationMain from '../components/student-application-form/application.form.main';
import StudentsList from '../components/students/students-list';
......@@ -36,6 +37,7 @@ export const MainRoutes: Routes = [
export const MainDeclarations = [
CamelCasePipe,
RemoveSpaces,
Form3,
StudentsList,
Home,
......
source/pipes/removespaces.ts 0 → 100644
View file @ 0208cd57
import {Pipe, PipeTransform} from '@angular/core';
@Pipe({
name : "removeSpaces"
})
export class RemoveSpaces implements PipeTransform {
transform(value: string) : any {
return value.replace(/[\s]/g, '');
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment