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
7e658bc2
Commit
7e658bc2
authored
May 26, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stylesandmenus' into 'develop'
Stylesandmenus See merge request !105
parents
df04a646
8b180c9e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
21 deletions
+32
-21
drupal/modules/casost/src/Controller/CASLogout.php
drupal/modules/casost/src/Controller/CASLogout.php
+1
-1
drupal/modules/epal/src/Controller/DirectorView.php
drupal/modules/epal/src/Controller/DirectorView.php
+3
-1
source/components/director/director-view.ts
source/components/director/director-view.ts
+24
-6
source/services/helper-data-service.ts
source/services/helper-data-service.ts
+4
-13
No files found.
drupal/modules/casost/src/Controller/CASLogout.php
View file @
7e658bc2
...
@@ -93,7 +93,7 @@ class CASLogout extends ControllerBase
...
@@ -93,7 +93,7 @@ class CASLogout extends ControllerBase
// Enable debugging
// Enable debugging
phpCAS
::
setDebug
(
"phpcas.log"
);
phpCAS
::
setDebug
(
"phpcas.log"
);
// Enable verbose error messages. Disable in production!
// Enable verbose error messages. Disable in production!
phpCAS
::
setVerbose
(
true
);
//
phpCAS::setVerbose(true);
// Initialize phpCAS
// Initialize phpCAS
phpCAS
::
client
(
$this
->
serverVersion
,
phpCAS
::
client
(
$this
->
serverVersion
,
...
...
drupal/modules/epal/src/Controller/DirectorView.php
View file @
7e658bc2
...
@@ -199,7 +199,9 @@ public function getStudentPerSchool(Request $request , $selectId, $classId, $lim
...
@@ -199,7 +199,9 @@ public function getStudentPerSchool(Request $request , $selectId, $classId, $lim
if
(
$limitdown
==
$limitup
&&
$limitup
==
0
)
if
(
$limitdown
==
$limitup
&&
$limitup
==
0
)
{
{
$list
=
array
(
$list
=
array
(
'id'
=>
sizeof
(
$studentPerSchool
)
'id'
=>
sizeof
(
$studentPerSchool
),
'up'
=>
$limitup
,
'down'
=>
$limitdown
);
);
}
}
...
...
source/components/director/director-view.ts
View file @
7e658bc2
...
@@ -62,9 +62,9 @@ import {
...
@@ -62,9 +62,9 @@ import {
<p style="margin-top: 20px; line-height: 2em;"> Παρακαλώ αφού γίνει ο έλεγχος των στοιχείων του μαθητή επιβεβαιώστε τη δυνατότητα εγγραφής του.</p>
<p style="margin-top: 20px; line-height: 2em;"> Παρακαλώ αφού γίνει ο έλεγχος των στοιχείων του μαθητή επιβεβαιώστε τη δυνατότητα εγγραφής του.</p>
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<select #cb name="{{StudentDetails$.id}}" (change)="updateCheckedOptions(StudentDetails$.id, cb)" >
<select #cb name="{{StudentDetails$.id}}" (change)="updateCheckedOptions(StudentDetails$.id, cb)" >
<option value=1>Ναι</option>
<option value=1
[selected]="StudentDetails$.checkstatus === '1' "
>Ναι</option>
<option value=2>Όχι</option>
<option value=2
[selected]="StudentDetails$.checkstatus === '0' "
>Όχι</option>
<option value=3
selected
></option>
<option value=3
[selected]="StudentDetails$.checkstatus != '0' && StudentDetails$.checkstatus != '1'"
></option>
</select>
</select>
<button type="button" class="btn-primary btn-sm pull-right" (click)="confirmStudent(txoption)">
<button type="button" class="btn-primary btn-sm pull-right" (click)="confirmStudent(txoption)">
Επιβεβαίωση Εγγραφής
Επιβεβαίωση Εγγραφής
...
@@ -164,6 +164,8 @@ import {
...
@@ -164,6 +164,8 @@ import {
private
StudentInfo$
:
BehaviorSubject
<
any
>
;
private
StudentInfo$
:
BehaviorSubject
<
any
>
;
private
StudentInfoSub
:
Subscription
;
private
StudentInfoSub
:
Subscription
;
private
StudentsSize$
:
BehaviorSubject
<
any
>
;
private
StudentsSize$
:
BehaviorSubject
<
any
>
;
private
SavedStudentsSub
:
Subscription
;
private
SavedStudents$
:
BehaviorSubject
<
any
>
;
private
StudentsSizeSub
:
Subscription
;
private
StudentsSizeSub
:
Subscription
;
private
StudentSelectedSpecial$
:
BehaviorSubject
<
any
>
;
private
StudentSelectedSpecial$
:
BehaviorSubject
<
any
>
;
private
StudentSelectedSpecialSub
:
Subscription
;
private
StudentSelectedSpecialSub
:
Subscription
;
...
@@ -194,6 +196,7 @@ import {
...
@@ -194,6 +196,7 @@ import {
this
.
StudentSelectedSpecial$
=
new
BehaviorSubject
([{}]);
this
.
StudentSelectedSpecial$
=
new
BehaviorSubject
([{}]);
this
.
StudentInfo$
=
new
BehaviorSubject
([{}]);
this
.
StudentInfo$
=
new
BehaviorSubject
([{}]);
this
.
StudentsSize$
=
new
BehaviorSubject
({});
this
.
StudentsSize$
=
new
BehaviorSubject
({});
this
.
SavedStudents$
=
new
BehaviorSubject
({});
this
.
SubmitedDetails$
=
new
BehaviorSubject
([{}]);
this
.
SubmitedDetails$
=
new
BehaviorSubject
([{}]);
this
.
retrievedStudent
=
new
BehaviorSubject
(
false
);
this
.
retrievedStudent
=
new
BehaviorSubject
(
false
);
this
.
selectionBClass
=
new
BehaviorSubject
(
false
);
this
.
selectionBClass
=
new
BehaviorSubject
(
false
);
...
@@ -251,6 +254,8 @@ import {
...
@@ -251,6 +254,8 @@ import {
verifyclass
(
txop
)
{
verifyclass
(
txop
)
{
this
.
limitdown
=
0
;
this
.
limitup
=
5
;
console
.
log
(
this
.
SchoolId
,
"
schoolida
"
);
console
.
log
(
this
.
SchoolId
,
"
schoolida
"
);
this
.
pageno
=
1
;
this
.
pageno
=
1
;
this
.
retrievedStudent
.
next
(
false
);
this
.
retrievedStudent
.
next
(
false
);
...
@@ -356,7 +361,7 @@ import {
...
@@ -356,7 +361,7 @@ import {
});
});
}
}
console
.
log
(
this
.
limitdown
,
this
.
limitup
,
"
mits
"
);
this
.
StudentInfoSub
=
this
.
_hds
.
getStudentPerSchool
(
sectorint
,
this
.
currentclass
,
this
.
limitdown
,
this
.
limitup
).
subscribe
(
data
=>
{
this
.
StudentInfoSub
=
this
.
_hds
.
getStudentPerSchool
(
sectorint
,
this
.
currentclass
,
this
.
limitdown
,
this
.
limitup
).
subscribe
(
data
=>
{
this
.
StudentInfo$
.
next
(
data
);
this
.
StudentInfo$
.
next
(
data
);
if
(
tot_pages
===
0
){
if
(
tot_pages
===
0
){
...
@@ -399,8 +404,21 @@ import {
...
@@ -399,8 +404,21 @@ import {
confirmStudent
(
txop
)
{
confirmStudent
(
txop
)
{
this
.
_hds
.
saveConfirmStudents
(
this
.
saved
,
this
.
type
);
this
.
findstudent
(
txop
,
this
.
pageno
);
this
.
SavedStudentsSub
=
this
.
_hds
.
saveConfirmStudents
(
this
.
saved
,
this
.
type
).
subscribe
(
data
=>
{
this
.
SavedStudents$
.
next
(
data
);
},
error
=>
{
this
.
SavedStudents$
.
next
([{}]);
console
.
log
(
"
Error saving Students
"
);
},
()
=>
{
console
.
log
(
"
saved Students
"
);
this
.
findstudent
(
txop
,
this
.
pageno
);
});
}
}
...
...
source/services/helper-data-service.ts
View file @
7e658bc2
...
@@ -541,19 +541,10 @@ export class HelperDataService implements OnInit, OnDestroy {
...
@@ -541,19 +541,10 @@ export class HelperDataService implements OnInit, OnDestroy {
});
});
this
.
createAuthorizationHeader
(
headers
);
this
.
createAuthorizationHeader
(
headers
);
let
options
=
new
RequestOptions
({
headers
:
headers
});
let
options
=
new
RequestOptions
({
headers
:
headers
});
return
new
Promise
((
resolve
,
reject
)
=>
{
return
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/confirmstudent`
,
{
students
,
type
},
options
)
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/confirmstudent`
,
{
students
,
type
},
options
)
.
map
(
response
=>
response
.
json
());
.
map
(
response
=>
response
.
json
())
.
subscribe
(
data
=>
{
resolve
(
data
);
},
error
=>
{
console
.
log
(
"
Error Saving Profile
"
);
reject
(
"
Error Saving Profile
"
);
},
()
=>
console
.
log
(
"
Saving Profile
"
));
});
}
}
...
...
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