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

Prevent automarking settings from being used if setunmarked status not in place.

40-behatfixes
Dan Marsden 3 years ago
parent
0228f4e468
commit
4e4c2542d2
2 changed files with 23 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      classes/form/addsession.php
  2. 23
      classes/form/updatesession.php

21
classes/form/addsession.php
View File

@ -207,19 +207,20 @@ class addsession extends moodleform {
$mform->addElement('hidden', 'studentscanmark', '0');
$mform->settype('studentscanmark', PARAM_INT);
}
if ($DB->record_exists('attendance_statuses', ['attendanceid' => $this->_customdata['att']->id, 'setunmarked' => 1])) {
$options = attendance_get_automarkoptions();
$options = attendance_get_automarkoptions();
$mform->addElement('select', 'automark', get_string('automark', 'attendance'), $options);
$mform->setType('automark', PARAM_INT);
$mform->addHelpButton('automark', 'automark', 'attendance');
$mform->setDefault('automark', $this->_customdata['att']->automark);
$mform->addElement('select', 'automark', get_string('automark', 'attendance'), $options);
$mform->setType('automark', PARAM_INT);
$mform->addHelpButton('automark', 'automark', 'attendance');
$mform->setDefault('automark', $this->_customdata['att']->automark);
$automarkcmoptions = attendance_get_coursemodulenames($course->id);
$automarkcmoptions = attendance_get_coursemodulenames($course->id);
$mform->addElement('select', 'automarkcmid', get_string('selectactivity', 'attendance'), $automarkcmoptions);
$mform->setType('automarkcmid', PARAM_INT);
$mform->hideif('automarkcmid', 'automark', 'neq', '3');
$mform->addElement('select', 'automarkcmid', get_string('selectactivity', 'attendance'), $automarkcmoptions);
$mform->setType('automarkcmid', PARAM_INT);
$mform->hideif('automarkcmid', 'automark', 'neq', '3');
}
if (!empty($studentscanmark)) {
$mgroup = array();

23
classes/form/updatesession.php
View File

@ -143,21 +143,22 @@ class updatesession extends \moodleform {
$mform->settype('studentscanmark', PARAM_INT);
}
$options2 = attendance_get_automarkoptions();
if ($DB->record_exists('attendance_statuses', ['attendanceid' => $this->_customdata['att']->id, 'setunmarked' => 1])) {
$options2 = attendance_get_automarkoptions();
$mform->addElement('select', 'automark', get_string('automark', 'attendance'), $options2);
$mform->setType('automark', PARAM_INT);
$mform->addHelpButton('automark', 'automark', 'attendance');
$mform->addElement('select', 'automark', get_string('automark', 'attendance'), $options2);
$mform->setType('automark', PARAM_INT);
$mform->addHelpButton('automark', 'automark', 'attendance');
$automarkcmoptions2 = attendance_get_coursemodulenames($COURSE->id);
$automarkcmoptions2 = attendance_get_coursemodulenames($COURSE->id);
$mform->addElement('select', 'automarkcmid', get_string('selectactivity', 'attendance'), $automarkcmoptions2);
$mform->setType('automarkcmid', PARAM_INT);
$mform->hideif('automarkcmid', 'automark', 'neq', '3');
if (!empty($sess->automarkcompleted)) {
$mform->hardFreeze('automarkcmid,automark,studentscanmark');
$mform->addElement('select', 'automarkcmid', get_string('selectactivity', 'attendance'), $automarkcmoptions2);
$mform->setType('automarkcmid', PARAM_INT);
$mform->hideif('automarkcmid', 'automark', 'neq', '3');
if (!empty($sess->automarkcompleted)) {
$mform->hardFreeze('automarkcmid,automark,studentscanmark');
}
}
if (!empty($studentscanmark)) {
$mform->addElement('text', 'studentpassword', get_string('studentpassword', 'attendance'));
$mform->setType('studentpassword', PARAM_TEXT);

Write Preview
Loading…
Cancel
Save