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
64f0a4b0
Commit
64f0a4b0
authored
May 25, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stylesandmenus' into 'develop'
paging bug See merge request !101
parents
24da0be3
f3f98fa8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
9 deletions
+30
-9
source/components/director/director-view.ts
source/components/director/director-view.ts
+30
-9
No files found.
source/components/director/director-view.ts
View file @
64f0a4b0
...
@@ -30,7 +30,7 @@ import {
...
@@ -30,7 +30,7 @@ import {
<option value="1" >Α' Λυκείου</option>
<option value="1" >Α' Λυκείου</option>
<option value="2" >Β' Λυκείου</option>
<option value="2" >Β' Λυκείου</option>
<option value="3" >Γ' Λυκείου</option>
<option value="3" >Γ' Λυκείου</option>
<option value="4" >Δ' Λυκείου</option>
<option
*ngIf="(selectiontype | async)"
value="4" >Δ' Λυκείου</option>
</select>
</select>
</div>
</div>
<div class="form-group">
<div class="form-group">
...
@@ -121,6 +121,7 @@ import {
...
@@ -121,6 +121,7 @@ import {
<br>
<br>
<br>
<br>
<div *ngIf="(retrievedStudent | async)">
<div class="form-group" class="row">
<div class="form-group" class="row">
Βρίσκεστε στη σελίδα:
Βρίσκεστε στη σελίδα:
<div class="col-1">
<div class="col-1">
...
@@ -144,6 +145,7 @@ import {
...
@@ -144,6 +145,7 @@ import {
</ul>
</ul>
</nav>
</nav>
</div>
</form>
</form>
</div>
</div>
...
@@ -169,6 +171,7 @@ import {
...
@@ -169,6 +171,7 @@ import {
private
SubmitedDetailsSub
:
Subscription
;
private
SubmitedDetailsSub
:
Subscription
;
private
retrievedStudent
:
BehaviorSubject
<
boolean
>
;
private
retrievedStudent
:
BehaviorSubject
<
boolean
>
;
private
selectionBClass
:
BehaviorSubject
<
boolean
>
;
private
selectionBClass
:
BehaviorSubject
<
boolean
>
;
private
selectiontype
:
BehaviorSubject
<
boolean
>
;
private
selectionCClass
:
BehaviorSubject
<
boolean
>
;
private
selectionCClass
:
BehaviorSubject
<
boolean
>
;
private
SchoolId
;
private
SchoolId
;
private
currentclass
:
Number
;
private
currentclass
:
Number
;
...
@@ -196,6 +199,7 @@ import {
...
@@ -196,6 +199,7 @@ import {
this
.
selectionBClass
=
new
BehaviorSubject
(
false
);
this
.
selectionBClass
=
new
BehaviorSubject
(
false
);
this
.
selectionCClass
=
new
BehaviorSubject
(
false
);
this
.
selectionCClass
=
new
BehaviorSubject
(
false
);
this
.
School$
=
new
BehaviorSubject
([{}]);
this
.
School$
=
new
BehaviorSubject
([{}]);
this
.
selectiontype
=
new
BehaviorSubject
(
true
);
this
.
formGroup
=
this
.
fb
.
group
({
this
.
formGroup
=
this
.
fb
.
group
({
...
@@ -226,11 +230,14 @@ import {
...
@@ -226,11 +230,14 @@ import {
ngOnInit
()
{
ngOnInit
()
{
this
.
SchoolSub
=
this
.
_hds
.
getSchoolId
().
subscribe
(
x
=>
{
this
.
School$
.
next
(
x
);
console
.
log
(
x
[
0
].
id
,
"
schoolid!
"
);
this
.
SchoolId
=
x
[
0
].
id
;
this
.
SchoolSub
=
this
.
_hds
.
gettypeofschool
().
subscribe
(
x
=>
{
this
.
School$
.
next
(
x
);
console
.
log
(
x
[
0
].
type
,
"
schoolid!
"
);
this
.
SchoolId
=
x
[
0
].
type
;
if
(
this
.
SchoolId
==
'
ΗΜΕΡΗΣΙΟ
'
){
this
.
selectiontype
.
next
(
false
);
}
},
},
error
=>
{
error
=>
{
...
@@ -239,6 +246,7 @@ import {
...
@@ -239,6 +246,7 @@ import {
},
},
()
=>
console
.
log
(
"
Getting School
"
));
()
=>
console
.
log
(
"
Getting School
"
));
}
}
...
@@ -315,7 +323,7 @@ import {
...
@@ -315,7 +323,7 @@ import {
findstudent
(
txop
,
pageno
)
{
findstudent
(
txop
,
pageno
)
{
var
tot_pages
:
N
umber
;
var
tot_pages
:
n
umber
;
var
sectorint
=
+
this
.
formGroup
.
value
.
tomeas
;
var
sectorint
=
+
this
.
formGroup
.
value
.
tomeas
;
if
(
txop
.
value
===
"
1
"
)
{
if
(
txop
.
value
===
"
1
"
)
{
this
.
currentclass
=
1
;
this
.
currentclass
=
1
;
...
@@ -339,6 +347,11 @@ import {
...
@@ -339,6 +347,11 @@ import {
if
(
x
.
id
%
5
>
0
)
{
if
(
x
.
id
%
5
>
0
)
{
tot_pages
=
(
x
.
id
-
(
x
.
id
%
5
))
/
5
+
1
;
tot_pages
=
(
x
.
id
-
(
x
.
id
%
5
))
/
5
+
1
;
}
}
console
.
log
(
tot_pages
,
"
totpages
"
)
if
(
isNaN
(
tot_pages
)){
this
.
retrievedStudent
.
next
(
false
);
tot_pages
=
0
;
}
this
.
formGroup
.
get
(
'
maxpage
'
).
setValue
(
tot_pages
);
this
.
formGroup
.
get
(
'
maxpage
'
).
setValue
(
tot_pages
);
});
});
...
@@ -346,7 +359,15 @@ import {
...
@@ -346,7 +359,15 @@ import {
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
){
console
.
log
(
"
tot.pages
"
,
this
.
formGroup
.
value
.
maxpage
);
this
.
retrievedStudent
.
next
(
false
);
}
else
{
console
.
log
(
"
tot.pages
"
,
this
.
formGroup
.
value
.
maxpage
,
"
max
"
,
tot_pages
);
this
.
retrievedStudent
.
next
(
true
);
this
.
retrievedStudent
.
next
(
true
);
}
},
},
error
=>
{
error
=>
{
this
.
StudentInfo$
.
next
([{}]);
this
.
StudentInfo$
.
next
([{}]);
...
@@ -379,8 +400,8 @@ import {
...
@@ -379,8 +400,8 @@ import {
confirmStudent
(
txop
)
{
confirmStudent
(
txop
)
{
this
.
_hds
.
saveConfirmStudents
(
this
.
saved
,
this
.
type
);
this
.
_hds
.
saveConfirmStudents
(
this
.
saved
,
this
.
type
);
this
.
findstudent
(
txop
,
this
.
pageno
)
this
.
findstudent
(
txop
,
this
.
pageno
)
;
console
.
log
(
txop
,
this
.
pageno
,
"
aaaaaaa
"
);
}
}
checkcclass
()
{
checkcclass
()
{
...
...
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