Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
e-epal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
ef693530
Commit
ef693530
authored
Feb 21, 2017
by
Open Source Developer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI
parent
036f923a
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
269 additions
and
72 deletions
+269
-72
myschool/main.scss
myschool/main.scss
+48
-1
source/components/footer/footer.component.html
source/components/footer/footer.component.html
+2
-7
source/components/home.ts.save
source/components/home.ts.save
+129
-0
source/components/main/main.component.html
source/components/main/main.component.html
+27
-27
source/components/navbar/navbar.component.ts.save
source/components/navbar/navbar.component.ts.save
+22
-0
source/components/student-application-form/amka-fill.ts
source/components/student-application-form/amka-fill.ts
+1
-1
source/components/student-application-form/application.form.main.html
...nents/student-application-form/application.form.main.html
+1
-4
source/components/student-application-form/application.preview.ts
...omponents/student-application-form/application.preview.ts
+10
-9
source/components/student-application-form/region.schools.select.ts
...ponents/student-application-form/region.schools.select.ts
+2
-7
source/components/student-application-form/schools-order-select.ts
...mponents/student-application-form/schools-order-select.ts
+1
-4
source/components/student-application-form/sector.courses.select.ts
...ponents/student-application-form/sector.courses.select.ts
+4
-6
source/components/student-application-form/sector.fields.select.ts
...mponents/student-application-form/sector.fields.select.ts
+3
-6
source/containers/main.routes.ts
source/containers/main.routes.ts
+2
-0
source/pipes/removespaces.ts
source/pipes/removespaces.ts
+17
-0
No files found.
myschool/main.scss
View file @
ef693530
...
...
@@ -37,9 +37,56 @@
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/components/footer/footer.component.html
View file @
ef693530
<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) ΥΠ.Π.Ε.Θ. 201
2-2013
</span></div>
<div
class=
"col-xs-12 col-md-3"
><span
class=
"ft-text"
>
Copyright (c) ΥΠ.Π.Ε.Θ. 201
7
</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 @
ef693530
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 @
ef693530
<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>
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>
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 @
ef693530
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 @
ef693530
...
...
@@ -37,7 +37,7 @@ import {AppSettings} from '../../app.settings';
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-
center
" (click)="saveSelected()">
<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/application.form.main.html
View file @
ef693530
<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>
<!--
...
...
@@ -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 @
ef693530
...
...
@@ -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/region.schools.select.ts
View file @
ef693530
...
...
@@ -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">
...
...
@@ -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
"
:
"
#eeeee
e
"
);
return
((
this
.
regionActive
===
ind
)
?
"
#fd9665
"
:
"
whit
e
"
);
}
saveSelected
(
cb
,
j
)
{
...
...
source/components/student-application-form/schools-order-select.ts
View file @
ef693530
...
...
@@ -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;"
...
...
@@ -44,9 +44,6 @@ import {AppSettings} from '../../app.settings';
</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 @
ef693530
...
...
@@ -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>
...
...
@@ -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
"
:
"
#eeeee
e
"
);
return
((
this
.
sectorActive
===
ind
)
?
"
#fd9665
"
:
"
whit
e
"
);
}
saveSelected
()
{
...
...
source/components/student-application-form/sector.fields.select.ts
View file @
ef693530
...
...
@@ -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">
...
...
@@ -60,10 +60,7 @@ import {AppSettings} from '../../app.settings';
</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
"
:
"
#eeeee
e
"
);
return
((
this
.
sectorActive
===
ind
)
?
"
#fd9665
"
:
"
whit
e
"
);
}
getAllSchools
()
{
...
...
source/containers/main.routes.ts
View file @
ef693530
...
...
@@ -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 @
ef693530
import
{
Pipe
,
PipeTransform
}
from
'
@angular/core
'
;
@
Pipe
({
name
:
"
removeSpaces
"
})
export
class
RemoveSpaces
implements
PipeTransform
{
transform
(
value
:
string
)
:
any
{
return
value
.
replace
(
/^
(\s
*
([
a-zA-Z0-9_
\-\.]
+
)
@
([
a-zA-Z0-9_
\-\.]
+
)\.([
a-zA-Z
]{2,5}){1,25})
+
([
,.
](([
a-zA-Z0-9_
\-\.]
+
)
@
([
a-zA-Z0-9_
\-\.]
+
)\.([
a-zA-Z
]{2,5}){1,25})
+
\s
*
)
*$/
,
''
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment