Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
c929d5ae
Commit
c929d5ae
authored
Jun 19, 2017
by
Χάρης Παπαδόπουλος
Browse files
Fixed modal rendering in submited.aplication.preview. Updated footer. Typo fix in help-desk
parent
2385051a
Changes
4
Hide whitespace changes
Inline
Side-by-side
source/components/footer/footer.component.html
View file @
c929d5ae
...
...
@@ -4,13 +4,14 @@
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"col-xs-12 col-md-3"
><span
class=
"ft-text"
>
Copyright (c) ΥΠ.Π.Ε.Θ. 2017
</span></div>
<div
class=
"cols-xs-12 col-md-7 text-center"
>
<span
class=
"ft-text align-middle"
>
Η εφαρμογή σχεδιάστηκε και υλοποιήθηκε από την Ομάδα Ανοιχτού Λογισμικού του ΥΠΠΕΘ
<span
class=
"ft-text align-middle"
>
Η εφαρμογή σχεδιάστηκε και υλοποιήθηκε από την
<a
href=
"http://ostmgmt.minedu.gov.gr/"
target=
"_blank"
>
Ομάδα Ανοιχτού Λογισμικού του ΥΠΠΕΘ
</a>
<br></span>
<span
class=
"ft-text align-middle"
>
<a
href=
"https://creativecommons.org/licenses/by-sa/4.0/deed.el"
target=
"_blank"
>
Άδεια χρήσης περιεχομένου: CC-BY-SA
</a>
</span>
</div>
<div
class=
"col-xs-12 col-md-2"
><span
class=
"ft-text"
style=
"text-align: right;"
>
Version 1.0
</span></div>
...
...
source/components/student-application-form/application.form.main.html
View file @
c929d5ae
...
...
@@ -138,8 +138,14 @@
<div
class=
"form-group"
>
<label
for=
"lastschool_schoolname"
>
Σχολείο τελευταίας φοίτησης(
<span
style=
"color: #ff0000;"
>
*
</span>
)
</label><br/>
<input
ngui-auto-complete
formControlName=
"lastschool_schoolname"
[source]=
"observableSource.bind(this)"
[list-formatter]=
"lastSchoolListFormatter"
[value-formatter]=
"lastSchoolValueFormatter"
[min-chars]=
"5"
no-match-found-text=
"Δεν βρέθηκαν σχολεία"
(valueChanged)=
"lastSchoolValueChanged($event)"
placeholder=
"Πληκτρολογήστε τουλάχιστο 5 χαρακτήρες"
class=
"form-control"
>
<input
ngui-auto-complete
formControlName=
"lastschool_schoolname"
[source]=
"observableSource.bind(this)"
[list-formatter]=
"lastSchoolListFormatter"
[value-formatter]=
"lastSchoolValueFormatter"
[min-chars]=
"5"
no-match-found-text=
"Δεν βρέθηκαν σχολεία"
(valueChanged)=
"lastSchoolValueChanged($event)"
placeholder=
"Πληκτρολογήστε τουλάχιστο 5 χαρακτήρες"
class=
"form-control"
>
</div>
<div
class=
"alert alert-danger"
*ngIf=
"studentDataGroup.get('lastschool_schoolname').dirty && studentDataGroup.get('lastschool_schoolname').hasError('status')"
>
Η επιλογή από αυτή τη λίστα είναι απαραίτητη!
...
...
source/components/student-application-form/help-desk.ts
View file @
c929d5ae
...
...
@@ -68,7 +68,7 @@ import {
</div>
<div class="form-group">
<label for="userMessage">Μ
ύνη
μα(<span style="color: #ff0000;">*</span>)</label>
<label for="userMessage">Μ
ήνυ
μα(<span style="color: #ff0000;">*</span>)</label>
<textarea style="height: 150px;" class="form-control" type="text" formControlName="userMessage"></textarea>
<div class="alert alert-danger" *ngIf="formGroup.get('userMessage').touched && formGroup.get('userMessage').hasError('required') ">
Το πεδίο δεν μπορεί να αφεθεί κενό!
...
...
@@ -93,7 +93,7 @@ import {
</div>
<p style="text-align: left, font-size: 0.9em;">
<strong>Τηλ. Επικοινωνίας:</strong> 2103443014, 2103442231,
2103443359,
2103442034, 2103443309 (ώρες: 8:00 - 16:00)</p>
<strong>Τηλ. Επικοινωνίας:</strong> 2103443014, 2103442231, 2103442034, 2103443309 (ώρες: 8:00 - 16:00)</p>
<div id="mailsent" (onHidden)="onHidden('#mailsent')"
...
...
source/components/student-application-form/submited.aplication.preview.ts
View file @
c929d5ae
...
...
@@ -16,22 +16,41 @@ import {Location} from '@angular/common';
<div id="applicationDeleteConfirm" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header
{{
modal
H
eader
| async}}
">
<h3 class="modal-title pull-left"><i class="fa
{{modalHeaderIcon | async}}"></i> {{ modalTitle | async }}
</h3>
<div class="modal-header modal
-h
eader
-danger
">
<h3 class="modal-title pull-left"><i class="fa
fa-close"></i> Διαγραφή Δήλωσης Προτίμησης ΕΠΑΛ
</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>
<p>
Επιλέξατε να διαγράψετε τη δήλωση προτίμησης ΕΠΑΛ. Παρακαλούμε επιλέξτε Επιβεβαίωση
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" (click)="hideModal()">Ακύρωση</button>
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" (click)="hide
Confirm
Modal()">Ακύρωση</button>
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" (click)="deleteApplicationDo()">Επιβεβαίωση</button>
</div>
</div>
</div>
</div>
<div id="applicationDeleteError" (onHidden)="onHidden()" class="modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-ban"></i> Αποτυχία Διαγραφής Δήλωσης Προτίμησης ΕΠΑΛ</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>Η δήλωσή σας δεν διαγράφηκε. Δεν μπορείτε να διαγράψετε τη δήλωσή σας αυτή την περίοδο</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-right" data-dismiss="modal" (click)="hideErrorModal()">Κλείσιμο</button>
</div>
</div>
</div>
</div>
<div style="min-height: 500px; margin-bottom: 20px;">
<div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
<div class="row">
...
...
@@ -214,10 +233,6 @@ import {Location} from '@angular/common';
private
CritirioChosen$
:
BehaviorSubject
<
any
>
;
private
CritirioChosenSub
:
Subscription
;
private
showLoader$
:
BehaviorSubject
<
boolean
>
;
private
modalTitle
:
BehaviorSubject
<
string
>
;
private
modalText
:
BehaviorSubject
<
string
>
;
private
modalHeader
:
BehaviorSubject
<
string
>
;
private
modalHeaderIcon
:
BehaviorSubject
<
string
>
;
public
isModalShown
:
BehaviorSubject
<
boolean
>
;
private
applicationIdActive
=
<
number
>-
1
;
...
...
@@ -238,16 +253,13 @@ import {Location} from '@angular/common';
this
.
CritirioChosen$
=
new
BehaviorSubject
([{}]);
this
.
incomeChosen$
=
new
BehaviorSubject
([{}]);
this
.
showLoader$
=
new
BehaviorSubject
(
false
);
this
.
modalTitle
=
new
BehaviorSubject
(
""
);
this
.
modalText
=
new
BehaviorSubject
(
""
);
this
.
modalHeader
=
new
BehaviorSubject
(
""
);
this
.
modalHeaderIcon
=
new
BehaviorSubject
(
""
);
this
.
isModalShown
=
new
BehaviorSubject
(
false
);
}
ngOnDestroy
()
{
(
<
any
>
$
(
'
#studentFormSentNotice
'
)).
remove
();
(
<
any
>
$
(
'
#applicationDeleteConfirm
'
)).
remove
();
(
<
any
>
$
(
'
#applicationDeleteError
'
)).
remove
();
if
(
this
.
SubmitedUsersSub
)
this
.
SubmitedUsersSub
.
unsubscribe
();
if
(
this
.
SubmitedDetailsSub
)
...
...
@@ -268,6 +280,7 @@ import {Location} from '@angular/common';
ngOnInit
()
{
(
<
any
>
$
(
'
#applicationDeleteConfirm
'
)).
appendTo
(
"
body
"
);
(
<
any
>
$
(
'
#applicationDeleteError
'
)).
appendTo
(
"
body
"
);
this
.
showLoader$
.
next
(
true
);
this
.
SubmitedUsersSub
=
this
.
_hds
.
getSubmittedPreviw
().
subscribe
(
...
...
@@ -317,16 +330,12 @@ import {Location} from '@angular/common';
}
deleteApplication
(
appId
:
number
):
void
{
this
.
modalTitle
.
next
(
"
Διαγραφή Δήλωσης Προτίμησης ΕΠΑΛ
"
);
this
.
modalText
.
next
(
"
Επιλέξατε να διαγράψετε τη δήλωση προτίμησης ΕΠΑΛ. Παρακαλούμε επιλέξτε Επιβεβαίωση
"
);
this
.
modalHeader
.
next
(
"
modal-header-danger
"
);
this
.
modalHeaderIcon
.
next
(
"
fa-close
"
);
this
.
applicationId
=
appId
;
this
.
showModal
();
this
.
show
Confirm
Modal
();
}
deleteApplicationDo
():
void
{
this
.
hideModal
();
this
.
hide
Confirm
Modal
();
this
.
showLoader$
.
next
(
true
);
this
.
_hds
.
deleteApplication
(
this
.
applicationId
).
then
(
data
=>
{
this
.
SubmitedUsersSub
.
unsubscribe
();
...
...
@@ -344,22 +353,25 @@ import {Location} from '@angular/common';
}).
catch
(
err
=>
{
this
.
showLoader$
.
next
(
false
);
this
.
modalTitle
.
next
(
"
Αποτυχία Διαγραφής Δήλωσης Προτίμησης ΕΠΑΛ
"
);
this
.
modalText
.
next
(
"
Η δήλωσή σας δεν διαγράφηκε. Δεν μπορείτε να διαγράψετε τη δήλωσή σας αυτή την περίοδο
"
);
this
.
modalHeader
.
next
(
"
modal-header-danger
"
);
this
.
modalHeaderIcon
.
next
(
"
fa-ban
"
);
this
.
showModal
();
this
.
showErrorModal
();
console
.
log
(
err
);
});
}
public
showModal
():
void
{
public
show
Confirm
Modal
():
void
{
(
<
any
>
$
(
'
#applicationDeleteConfirm
'
)).
modal
(
'
show
'
);
}
public
hideModal
():
void
{
public
showErrorModal
():
void
{
(
<
any
>
$
(
'
#applicationDeleteError
'
)).
modal
(
'
show
'
);
}
public
hideConfirmModal
():
void
{
(
<
any
>
$
(
'
#applicationDeleteConfirm
'
)).
modal
(
'
hide
'
);
}
public
hideErrorModal
():
void
{
(
<
any
>
$
(
'
#applicationDeleteError
'
)).
modal
(
'
hide
'
);
}
public
onHidden
():
void
{
this
.
isModalShown
.
next
(
false
);
...
...
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