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
70e9508f
Commit
70e9508f
authored
Jun 26, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'report-fix' into 'develop'
Fix total numbers See merge request !215
parents
07184b44
a2328a8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
drupal/modules/epal/src/Controller/ReportsCreator.php
drupal/modules/epal/src/Controller/ReportsCreator.php
+6
-2
No files found.
drupal/modules/epal/src/Controller/ReportsCreator.php
View file @
70e9508f
...
...
@@ -363,7 +363,9 @@ class ReportsCreator extends ControllerBase
}
//χωρητικότητα για όλο το σχολείο
$capacityTotal
=
array_sum
(
$capacity
);
$capacityTotal
=
array_reduce
(
$capacity
,
function
(
$sum
,
$v
)
{
return
$sum
+=
(
$v
>
0
)
?
intval
(
$v
)
:
0
;
},
0
);
//βρες αριθμό μαθητών γισ κάθε τάξη
$num
=
array
();
...
...
@@ -379,11 +381,13 @@ class ReportsCreator extends ControllerBase
//βρες ποσοστά συμπλήρωσης
if
(
isset
(
$capacity
[
$classId
-
1
])
&&
$capacity
[
$classId
-
1
]
>
0
)
{
$perc_str
=
number_format
(
$num
[
$classId
-
1
]
/
$capacity
[
$classId
-
1
]
*
100
,
2
);
}
elseif
(
isset
(
$capacity
[
$classId
-
1
])
&&
$capacity
[
$classId
-
1
]
==
-
1
)
{
$perc_str
=
'-'
;
}
else
{
$perc_str
=
'-'
;
$stat_complete
=
false
;
}
array_push
(
$perc
,
$perc_str
);
array_push
(
$perc
,
$perc_str
);
}
if
(
$stat_complete
===
true
&&
$capacityTotal
>
0
)
{
...
...
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