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
8b180c9e
Commit
8b180c9e
authored
May 25, 2017
by
Open Source Developer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugs fixed
parent
e0927eb6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
20 deletions
+31
-20
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/epal/src/Controller/DirectorView.php
View file @
8b180c9e
...
...
@@ -199,7 +199,9 @@ public function getStudentPerSchool(Request $request , $selectId, $classId, $lim
if
(
$limitdown
==
$limitup
&&
$limitup
==
0
)
{
$list
=
array
(
'id'
=>
sizeof
(
$studentPerSchool
)
'id'
=>
sizeof
(
$studentPerSchool
),
'up'
=>
$limitup
,
'down'
=>
$limitdown
);
}
...
...
source/components/director/director-view.ts
View file @
8b180c9e
...
...
@@ -62,9 +62,9 @@ import {
<p style="margin-top: 20px; line-height: 2em;"> Παρακαλώ αφού γίνει ο έλεγχος των στοιχείων του μαθητή επιβεβαιώστε τη δυνατότητα εγγραφής του.</p>
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<select #cb name="{{StudentDetails$.id}}" (change)="updateCheckedOptions(StudentDetails$.id, cb)" >
<option value=1>Ναι</option>
<option value=2>Όχι</option>
<option value=3
selected
></option>
<option value=1
[selected]="StudentDetails$.checkstatus === '1' "
>Ναι</option>
<option value=2
[selected]="StudentDetails$.checkstatus === '0' "
>Όχι</option>
<option value=3
[selected]="StudentDetails$.checkstatus != '0' && StudentDetails$.checkstatus != '1'"
></option>
</select>
<button type="button" class="btn-primary btn-sm pull-right" (click)="confirmStudent(txoption)">
Επιβεβαίωση Εγγραφής
...
...
@@ -164,6 +164,8 @@ import {
private
StudentInfo$
:
BehaviorSubject
<
any
>
;
private
StudentInfoSub
:
Subscription
;
private
StudentsSize$
:
BehaviorSubject
<
any
>
;
private
SavedStudentsSub
:
Subscription
;
private
SavedStudents$
:
BehaviorSubject
<
any
>
;
private
StudentsSizeSub
:
Subscription
;
private
StudentSelectedSpecial$
:
BehaviorSubject
<
any
>
;
private
StudentSelectedSpecialSub
:
Subscription
;
...
...
@@ -194,6 +196,7 @@ import {
this
.
StudentSelectedSpecial$
=
new
BehaviorSubject
([{}]);
this
.
StudentInfo$
=
new
BehaviorSubject
([{}]);
this
.
StudentsSize$
=
new
BehaviorSubject
({});
this
.
SavedStudents$
=
new
BehaviorSubject
({});
this
.
SubmitedDetails$
=
new
BehaviorSubject
([{}]);
this
.
retrievedStudent
=
new
BehaviorSubject
(
false
);
this
.
selectionBClass
=
new
BehaviorSubject
(
false
);
...
...
@@ -251,6 +254,8 @@ import {
verifyclass
(
txop
)
{
this
.
limitdown
=
0
;
this
.
limitup
=
5
;
console
.
log
(
this
.
SchoolId
,
"
schoolida
"
);
this
.
pageno
=
1
;
this
.
retrievedStudent
.
next
(
false
);
...
...
@@ -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
.
StudentInfo$
.
next
(
data
);
if
(
tot_pages
===
0
){
...
...
@@ -399,8 +404,21 @@ import {
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 @
8b180c9e
...
...
@@ -541,19 +541,10 @@ export class HelperDataService implements OnInit, OnDestroy {
});
this
.
createAuthorizationHeader
(
headers
);
let
options
=
new
RequestOptions
({
headers
:
headers
});
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/confirmstudent`
,
{
students
,
type
},
options
)
.
map
(
response
=>
response
.
json
())
.
subscribe
(
data
=>
{
resolve
(
data
);
},
error
=>
{
console
.
log
(
"
Error Saving Profile
"
);
reject
(
"
Error Saving Profile
"
);
},
()
=>
console
.
log
(
"
Saving Profile
"
));
});
return
this
.
http
.
post
(
`
${
AppSettings
.
API_ENDPOINT
}
/epal/confirmstudent`
,
{
students
,
type
},
options
)
.
map
(
response
=>
response
.
json
());
}
...
...
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