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

more coding guideline fixes

MOODLE_29_STABLE
Dan Marsden 9 years ago
parent
a741491d10
commit
55fdb47cba
4 changed files with 13 additions and 14 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. 14
      add_form.php
  2. 2
      duration_form.php
  3. 9
      locallib.php
  4. 2
      update_form.php

14
add_form.php
View File

@ -114,7 +114,7 @@ class mod_attendance_add_form extends moodleform {
for ($i = 0; $i <= 23; $i++) { for ($i = 0; $i <= 23; $i++) {
$hours[$i] = sprintf("%02d", $i); $hours[$i] = sprintf("%02d", $i);
} }
for ($i = 0; $i < 60; $i+=5) { for ($i = 0; $i < 60; $i += 5) {
$minutes[$i] = sprintf("%02d", $i); $minutes[$i] = sprintf("%02d", $i);
} }
$durtime = array(); $durtime = array();
@ -194,12 +194,12 @@ class mod_attendance_add_form extends moodleform {
} }
$addmulti = isset($data['addmultiply']) ? (int)$data['addmultiply'] : 0; $addmulti = isset($data['addmultiply']) ? (int)$data['addmultiply'] : 0;
if (($addmulti != 0) && (!array_key_exists('sdays',$data) || empty($data['sdays']))) { if (($addmulti != 0) && (!array_key_exists('sdays', $data) || empty($data['sdays']))) {
$data['sdays']= array(); $data['sdays'] = array();
$errors['sdays'] = get_string('required', 'attendance'); $errors['sdays'] = get_string('required', 'attendance');
} }
if (isset($data['sdays'])) { if (isset($data['sdays'])) {
if (!$this->checkWeekDays($data['sessiondate'], $data['sessionenddate'], $data['sdays']) ) { if (!$this->checkweekdays($data['sessiondate'], $data['sessionenddate'], $data['sdays']) ) {
$errors['sdays'] = get_string('checkweekdays', 'attendance'); $errors['sdays'] = get_string('checkweekdays', 'attendance');
} }
} }
@ -216,11 +216,11 @@ class mod_attendance_add_form extends moodleform {
return $errors; return $errors;
} }
private function checkWeekDays($sessiondate, $sessionenddate, $sdays) { private function checkweekdays($sessiondate, $sessionenddate, $sdays) {
$found = false; $found = false;
$daysOfWeek = array(0 => "Sun", 1 => "Mon", 2 => "Tue", 3 => "Wed", 4 => "Thu", 5 => "Fri", 6 => "Sat"); $daysofweek = array(0 => "Sun", 1 => "Mon", 2 => "Tue", 3 => "Wed", 4 => "Thu", 5 => "Fri", 6 => "Sat");
$start = new DateTime( date("Y-m-d", $sessiondate) ); $start = new DateTime( date("Y-m-d", $sessiondate) );
$interval = new DateInterval('P1D'); $interval = new DateInterval('P1D');
$end = new DateTime( date("Y-m-d", $sessionenddate) ); $end = new DateTime( date("Y-m-d", $sessionenddate) );
@ -230,7 +230,7 @@ class mod_attendance_add_form extends moodleform {
foreach ($period as $date) { foreach ($period as $date) {
if (!$found) { if (!$found) {
foreach ($sdays as $name => $value) { foreach ($sdays as $name => $value) {
$key = array_search($name, $daysOfWeek); $key = array_search($name, $daysofweek);
if ($date->format("w") == $key) { if ($date->format("w") == $key) {
$found = true; $found = true;
break; break;

2
duration_form.php
View File

@ -53,7 +53,7 @@ class mod_attendance_duration_form extends moodleform {
for ($i = 0; $i <= 23; $i++) { for ($i = 0; $i <= 23; $i++) {
$hours[$i] = sprintf("%02d", $i); $hours[$i] = sprintf("%02d", $i);
} }
for ($i = 0; $i < 60; $i+=5) { for ($i = 0; $i < 60; $i += 5) {
$minutes[$i] = sprintf("%02d", $i); $minutes[$i] = sprintf("%02d", $i);
} }
$durselect[] =& $mform->createElement('select', 'hours', '', $hours); $durselect[] =& $mform->createElement('select', 'hours', '', $hours);

9
locallib.php
View File

@ -856,8 +856,7 @@ class attendance {
$sesslog[$sid]->studentid = $sid; // We check is_numeric on this above. $sesslog[$sid]->studentid = $sid; // We check is_numeric on this above.
$sesslog[$sid]->statusid = $value; // We check is_numeric on this above. $sesslog[$sid]->statusid = $value; // We check is_numeric on this above.
$sesslog[$sid]->statusset = $statuses; $sesslog[$sid]->statusset = $statuses;
$sesslog[$sid]->remarks = array_key_exists('remarks'.$sid, $formdata) ? $sesslog[$sid]->remarks = array_key_exists('remarks'.$sid, $formdata) ? clean_param($formdata['remarks'.$sid], PARAM_TEXT) : '';
clean_param($formdata['remarks'.$sid], PARAM_TEXT) : '';
$sesslog[$sid]->sessionid = $this->pageparams->sessionid; $sesslog[$sid]->sessionid = $this->pageparams->sessionid;
$sesslog[$sid]->timetaken = $now; $sesslog[$sid]->timetaken = $now;
$sesslog[$sid]->takenby = $USER->id; $sesslog[$sid]->takenby = $USER->id;
@ -1420,7 +1419,7 @@ class attendance {
/** /**
* Remove a status variable from an attendance instance * Remove a status variable from an attendance instance
* *
* @global moodle_database $DB * @global moodle_database $DB
* @param stdClass $status * @param stdClass $status
*/ */
@ -1442,7 +1441,7 @@ class attendance {
/** /**
* Add an attendance status variable * Add an attendance status variable
* *
* @global moodle_database $DB * @global moodle_database $DB
* @param string $acronym * @param string $acronym
* @param string $description * @param string $description
@ -1478,7 +1477,7 @@ class attendance {
/** /**
* Update status variable for a particular Attendance module instance * Update status variable for a particular Attendance module instance
* *
* @global moodle_database $DB * @global moodle_database $DB
* @param stdClass $status * @param stdClass $status
* @param string $acronym * @param string $acronym

2
update_form.php
View File

@ -68,7 +68,7 @@ class mod_attendance_update_form extends moodleform {
for ($i = 0; $i <= 23; $i++) { for ($i = 0; $i <= 23; $i++) {
$hours[$i] = sprintf("%02d", $i); $hours[$i] = sprintf("%02d", $i);
} }
for ($i = 0; $i < 60; $i+=5) { for ($i = 0; $i < 60; $i += 5) {
$minutes[$i] = sprintf("%02d", $i); $minutes[$i] = sprintf("%02d", $i);
} }
$durselect[] =& $mform->createElement('select', 'hours', '', $hours); $durselect[] =& $mform->createElement('select', 'hours', '', $hours);

Write Preview
Loading…
Cancel
Save