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
60dab793
Commit
60dab793
authored
Aug 02, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'edge_v4' into 'develop_v4'
Handled some more subscriptions See merge request !249
parents
1e3793d5
cfb7efb7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
10 deletions
+31
-10
drupal/modules/epal/src/Controller/DirectorView.php
drupal/modules/epal/src/Controller/DirectorView.php
+26
-0
source/components/minister/report-users.ts
source/components/minister/report-users.ts
+0
-4
source/components/school.home.ts
source/components/school.home.ts
+4
-3
source/components/student-application-form/help-desk.ts
source/components/student-application-form/help-desk.ts
+1
-1
source/components/student-application-form/submited.aplication.preview.ts
...s/student-application-form/submited.aplication.preview.ts
+0
-2
No files found.
drupal/modules/epal/src/Controller/DirectorView.php
View file @
60dab793
...
...
@@ -611,8 +611,10 @@ class DirectorView extends ControllerBase
$SchoolCat
=
reset
(
$SchoolCats
);
if
(
$SchoolCat
)
{
$categ
=
$SchoolCat
->
metathesis_region
->
value
;
$operation_shift
=
$school
->
operation_shift
->
value
;
}
else
{
$categ
=
'-'
;
$operation_shift
=
'-'
;
}
$CourseA
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student'
)
->
loadByProperties
(
array
(
'id'
=>
$schoolid
));
...
...
@@ -668,6 +670,30 @@ class DirectorView extends ControllerBase
}
}
if
(
$operation_shift
==
'ΕΣΠΕΡΙΝΟ'
)
{
$limit
=
$this
->
getLimit
(
4
,
$categ
);
$sCon
=
$this
->
connection
->
select
(
'eepal_specialties_in_epal_field_data'
,
'eSchool'
);
$sCon
->
leftJoin
(
'epal_student_class'
,
'eStudent'
,
'eStudent.epal_id = '
.
$schoolid
.
' '
.
'AND eStudent.specialization_id = eSchool.specialty_id '
.
'AND eStudent.currentclass = 4'
);
$sCon
->
fields
(
'eSchool'
,
array
(
'specialty_id'
))
->
fields
(
'eStudent'
,
array
(
'specialization_id'
))
->
groupBy
(
'specialization_id'
)
->
groupBy
(
'specialty_id'
)
->
condition
(
'eSchool.epal_id'
,
$schoolid
,
'='
);
$sCon
->
addExpression
(
'count(eStudent.id)'
,
'eStudent_count'
);
$results
=
$sCon
->
execute
()
->
fetchAll
(
\
PDO
::
FETCH_OBJ
);
foreach
(
$results
as
$result
)
{
if
(
$result
->
eStudent_count
<
$limit
)
{
return
false
;
}
}
}
return
true
;
}
...
...
source/components/minister/report-users.ts
View file @
60dab793
...
...
@@ -104,10 +104,6 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
this
.
loginInfoSub
.
unsubscribe
();
if
(
this
.
generalReportSub
)
this
.
generalReportSub
.
unsubscribe
();
if
(
this
.
loginInfo$
)
this
.
loginInfo$
.
unsubscribe
();
if
(
this
.
generalReport$
)
this
.
generalReport$
.
unsubscribe
();
}
createReport
()
{
...
...
source/components/school.home.ts
View file @
60dab793
...
...
@@ -60,6 +60,7 @@ export default class SchoolHome implements OnInit, OnDestroy {
private
xcsrftoken
:
any
;
private
loginInfo$
:
BehaviorSubject
<
ILoginInfoRecords
>
;
private
loginInfoSub
:
Subscription
;
private
queryParamSub
:
Subscription
;
private
apiEndPoint
=
API_ENDPOINT
;
private
apiEndPointParams
=
API_ENDPOINT_PARAMS
;
...
...
@@ -83,8 +84,8 @@ export default class SchoolHome implements OnInit, OnDestroy {
ngOnDestroy
()
{
if
(
this
.
loginInfoSub
)
this
.
loginInfoSub
.
unsubscribe
();
this
.
loginInfo$
.
unsubscribe
();
this
.
errorCode$
.
unsubscribe
();
if
(
this
.
queryParamSub
)
this
.
queryParamSub
.
unsubscribe
();
};
ngOnInit
()
{
...
...
@@ -112,7 +113,7 @@ export default class SchoolHome implements OnInit, OnDestroy {
});
// subscribe to router event
this
.
activatedRoute
.
queryParams
.
subscribe
((
params
:
Params
)
=>
{
this
.
queryParamSub
=
this
.
activatedRoute
.
queryParams
.
subscribe
((
params
:
Params
)
=>
{
if
(
params
)
{
this
.
authToken
=
params
[
"
auth_token
"
];
this
.
authRole
=
params
[
"
auth_role
"
];
...
...
source/components/student-application-form/help-desk.ts
View file @
60dab793
...
...
@@ -188,7 +188,7 @@ import { IAppState } from "../../store/store";
}
ngOnDestroy
()
{
if
(
this
.
loginInfo
$
)
this
.
loginInfo$
.
unsubscribe
();
if
(
this
.
loginInfo
Sub
)
this
.
loginInfoSub
.
unsubscribe
();
}
ngOnInit
()
{
...
...
source/components/student-application-form/submited.aplication.preview.ts
View file @
60dab793
...
...
@@ -268,8 +268,6 @@ import { IAppState } from "../../store/store";
this
.
SubmitedUsersSub
.
unsubscribe
();
if
(
this
.
SubmitedDetailsSub
)
this
.
SubmitedDetailsSub
.
unsubscribe
();
this
.
SubmitedDetails$
.
unsubscribe
();
this
.
SubmitedApplic$
.
unsubscribe
();
}
ngOnInit
()
{
...
...
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