ILB
/
moodle-mod_attendance
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Replacing attendance_format_float by format_float

MOODLE_31_STABLE
Antonio Carlos Mariani 9 years ago
parent
768c3b848e
commit
f85d346188
4 changed files with 27 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      export.php
  2. 11
      locallib.php
  3. 24
      renderer.php
  4. 21
      renderhelpers.php

6
export.php
View File

@ -160,9 +160,9 @@ if ($formdata = $mform->get_data()) {
$usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id); $usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id);
$data->table[$i][] = $usersummary->numtakensessions; $data->table[$i][] = $usersummary->numtakensessions;
$data->table[$i][] = attendance_format_float($usersummary->takensessionspoints) . ' / ' . $data->table[$i][] = format_float($usersummary->takensessionspoints, 1, true, true) . ' / ' .
attendance_format_float($usersummary->takensessionsmaxpoints); format_float($usersummary->takensessionsmaxpoints, 1, true, true);
$data->table[$i][] = attendance_format_float($usersummary->takensessionspercentage * 100, false); $data->table[$i][] = format_float($usersummary->takensessionspercentage * 100);
$i++; $i++;
} }

11
locallib.php
View File

@ -239,14 +239,3 @@ function attendance_update_users_grade($attendance, $userids=array()) {
return grade_update('mod/attendance', $course->id, 'mod', 'attendance', $attendance->id, 0, $grades); return grade_update('mod/attendance', $course->id, 'mod', 'attendance', $attendance->id, 0, $grades);
} }
/**
* Given a float, prints it nicely.
*
* @param float $float The float to print
* @param bool $stripzeros If true, removes final zeros after decimal point
* @return string locale float
*/
function attendance_format_float($float, $stripzeros=true) {
return format_float($float, 1, true, $stripzeros);
}

24
renderer.php
View File

@ -802,8 +802,8 @@ class mod_attendance_renderer extends plugin_renderer_base {
if (isset($sess->statusid)) { if (isset($sess->statusid)) {
$status = $userdata->statuses[$sess->statusid]; $status = $userdata->statuses[$sess->statusid];
$row->cells[] = $status->description; $row->cells[] = $status->description;
$row->cells[] = attendance_format_float($status->grade) . ' / ' . $row->cells[] = format_float($status->grade, 1, true, true) . ' / ' .
attendance_format_float($statussetmaxpoints[$status->setnumber]); format_float($statussetmaxpoints[$status->setnumber], 1, true, true);
$row->cells[] = $sess->remarks; $row->cells[] = $sess->remarks;
} else if ($sess->sessdate < $userdata->user->enrolmentstart) { } else if ($sess->sessdate < $userdata->user->enrolmentstart) {
$cell = new html_table_cell(get_string('enrolmentstart', 'attendance', $cell = new html_table_cell(get_string('enrolmentstart', 'attendance',
@ -825,7 +825,7 @@ class mod_attendance_renderer extends plugin_renderer_base {
$row->cells[] = $cell; $row->cells[] = $cell;
} else { // Student cannot mark their own attendace. } else { // Student cannot mark their own attendace.
$row->cells[] = '?'; $row->cells[] = '?';
$row->cells[] = '? / ' . attendance_format_float($statussetmaxpoints[$sess->statusset]); $row->cells[] = '? / ' . format_float($statussetmaxpoints[$sess->statusset], 1, true, true);
$row->cells[] = ''; $row->cells[] = '';
} }
} }
@ -951,19 +951,19 @@ class mod_attendance_renderer extends plugin_renderer_base {
$usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id); $usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id);
} }
$row->cells[] = $usersummary->numtakensessions; $row->cells[] = $usersummary->numtakensessions;
$row->cells[] = attendance_format_float($usersummary->takensessionspoints) . ' / ' . $row->cells[] = format_float($usersummary->takensessionspoints, 1, true, true) . ' / ' .
attendance_format_float($usersummary->takensessionsmaxpoints); format_float($usersummary->takensessionsmaxpoints, 1, true, true);
$row->cells[] = attendance_format_float($usersummary->takensessionspercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->takensessionspercentage * 100) . '%';
if ($reportdata->pageparams->view == ATT_VIEW_SUMMARY) { if ($reportdata->pageparams->view == ATT_VIEW_SUMMARY) {
$row->cells[] = $usersummary->numallsessions; $row->cells[] = $usersummary->numallsessions;
$row->cells[] = attendance_format_float($usersummary->takensessionspoints) . ' / ' . $row->cells[] = format_float($usersummary->takensessionspoints, 1, true, true) . ' / ' .
attendance_format_float($usersummary->allsessionsmaxpoints); format_float($usersummary->allsessionsmaxpoints, 1, true, true);
$row->cells[] = attendance_format_float($usersummary->allsessionspercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->allsessionspercentage * 100) . '%';
$row->cells[] = attendance_format_float($usersummary->maxpossiblepoints) . ' / ' . $row->cells[] = format_float($usersummary->maxpossiblepoints, 1, true, true) . ' / ' .
attendance_format_float($usersummary->allsessionsmaxpoints); format_float($usersummary->allsessionsmaxpoints, 1, true, true);
$row->cells[] = attendance_format_float($usersummary->maxpossiblepercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->maxpossiblepercentage * 100) . '%';
} }
if ($bulkmessagecapability) { // Create the checkbox for bulk messaging. if ($bulkmessagecapability) { // Create the checkbox for bulk messaging.

21
renderhelpers.php
View File

@ -49,8 +49,8 @@ class user_sessions_cells_generator {
if (array_key_exists($sess->id, $this->reportdata->sessionslog[$this->user->id])) { if (array_key_exists($sess->id, $this->reportdata->sessionslog[$this->user->id])) {
$statusid = $this->reportdata->sessionslog[$this->user->id][$sess->id]->statusid; $statusid = $this->reportdata->sessionslog[$this->user->id][$sess->id]->statusid;
if (array_key_exists($statusid, $this->reportdata->statuses)) { if (array_key_exists($statusid, $this->reportdata->statuses)) {
$points = attendance_format_float($this->reportdata->statuses[$statusid]->grade); $points = format_float($this->reportdata->statuses[$statusid]->grade, 1, true, true);
$maxpoints = attendance_format_float($sess->maxpoints); $maxpoints = format_float($sess->maxpoints, 1, true, true);
$this->construct_existing_status_cell($this->reportdata->statuses[$statusid]->acronym . $this->construct_existing_status_cell($this->reportdata->statuses[$statusid]->acronym .
" ({$points}/{$maxpoints})"); " ({$points}/{$maxpoints})");
} else { } else {
@ -243,44 +243,47 @@ function construct_user_data_stat($usersummary, $view) {
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'normal'; $row->attributes['class'] = 'normal';
$row->cells[] = get_string('pointssessionscompleted', 'attendance') . ':'; $row->cells[] = get_string('pointssessionscompleted', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->takensessionspoints) . ' / ' . attendance_format_float($usersummary->takensessionsmaxpoints); $row->cells[] = format_float($usersummary->takensessionspoints, 1, true, true) . ' / ' .
format_float($usersummary->takensessionsmaxpoints, 1, true, true);
$stattable->data[] = $row; $stattable->data[] = $row;
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'normal'; $row->attributes['class'] = 'normal';
$row->cells[] = get_string('percentagesessionscompleted', 'attendance') . ':'; $row->cells[] = get_string('percentagesessionscompleted', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->takensessionspercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->takensessionspercentage * 100) . '%';
$stattable->data[] = $row; $stattable->data[] = $row;
if ($view == ATT_VIEW_ALL) { if ($view == ATT_VIEW_ALL) {
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'highlight'; $row->attributes['class'] = 'highlight';
$row->cells[] = get_string('sessionstotal', 'attendance') . ':'; $row->cells[] = get_string('sessionstotal', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->numallsessions); $row->cells[] = $usersummary->numallsessions;
$stattable->data[] = $row; $stattable->data[] = $row;
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'highlight'; $row->attributes['class'] = 'highlight';
$row->cells[] = get_string('pointsallsessions', 'attendance') . ':'; $row->cells[] = get_string('pointsallsessions', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->takensessionspoints) . ' / ' . attendance_format_float($usersummary->allsessionsmaxpoints); $row->cells[] = format_float($usersummary->takensessionspoints, 1, true, true) . ' / ' .
format_float($usersummary->allsessionsmaxpoints, 1, true, true);
$stattable->data[] = $row; $stattable->data[] = $row;
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'highlight'; $row->attributes['class'] = 'highlight';
$row->cells[] = get_string('percentageallsessions', 'attendance') . ':'; $row->cells[] = get_string('percentageallsessions', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->allsessionspercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->allsessionspercentage * 100) . '%';
$stattable->data[] = $row; $stattable->data[] = $row;
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'normal'; $row->attributes['class'] = 'normal';
$row->cells[] = get_string('maxpossiblepoints', 'attendance') . ':'; $row->cells[] = get_string('maxpossiblepoints', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->maxpossiblepoints) . ' / ' . attendance_format_float($usersummary->allsessionsmaxpoints); $row->cells[] = format_float($usersummary->maxpossiblepoints, 1, true, true) . ' / ' .
format_float($usersummary->allsessionsmaxpoints, 1, true, true);
$stattable->data[] = $row; $stattable->data[] = $row;
$row = new html_table_row(); $row = new html_table_row();
$row->attributes['class'] = 'normal'; $row->attributes['class'] = 'normal';
$row->cells[] = get_string('maxpossiblepercentage', 'attendance') . ':'; $row->cells[] = get_string('maxpossiblepercentage', 'attendance') . ':';
$row->cells[] = attendance_format_float($usersummary->maxpossiblepercentage * 100, false) . '%'; $row->cells[] = format_float($usersummary->maxpossiblepercentage * 100) . '%';
$stattable->data[] = $row; $stattable->data[] = $row;
} }

Write Preview
Loading…
Cancel
Save