$formparams = array('course' => $course, 'cm' => $cm, 'modcontext' => $PAGE->context);
$mform = new mod_attendance_export_form($att->url_export(), $formparams);
-if ($mform->is_submitted()) {
- $formdata = $mform->get_data();
+if ($formdata = $mform->get_data()) {
$pageparams = new att_page_with_filter_controls();
$pageparams->init($cm);
$pageparams->startdate = $formdata->sessionstartdate;
$pageparams->enddate = $formdata->sessionenddate;
}
+ if ($formdata->selectedusers) {
+ $pageparams->userids = $formdata->users;
+ }
$att->pageparams = $pageparams;
$reportdata = new attendance_report_data($att);
*/
public function definition() {
- global $USER;
+ global $USER, $DB, $PAGE;
$mform =& $this->_form;
$course = $this->_customdata['course'];
}
$mform->addElement('select', 'group', get_string('group'), $grouplist);
+
+ // Restrict the export to the selected users.
+ $namefields = get_all_user_name_fields(true, 'u');
+ $allusers = get_enrolled_users($modcontext, 'mod/attendance:canbelisted', 0, 'u.id,'.$namefields);
+ $userlist = array();
+ foreach ($allusers as $user) {
+ $userlist[$user->id] = fullname($user);
+ }
+ unset($allusers);
+ $tempusers = $DB->get_records('attendance_tempusers', array('courseid' => $course->id), 'studentid, fullname');
+ foreach ($tempusers as $user) {
+ $userlist[$user->studentid] = $user->fullname;
+ }
+ list($gsql, $gparams) = $DB->get_in_or_equal(array_keys($grouplist), SQL_PARAMS_NAMED);
+ list($usql, $uparams) = $DB->get_in_or_equal(array_keys($userlist), SQL_PARAMS_NAMED);
+ $params = array_merge($gparams, $uparams);
+ $groupmembers = $DB->get_recordset_select('groups_members', "groupid {$gsql} AND userid {$usql}", $params,
+ '', 'groupid, userid');
+ $groupmappings = array();
+ foreach ($groupmembers as $groupmember) {
+ if (!isset($groupmappings[$groupmember->groupid])) {
+ $groupmappings[$groupmember->groupid] = array();
+ }
+ $groupmappings[$groupmember->groupid][$groupmember->userid] = $userlist[$groupmember->userid];
+ }
+ if (isset($grouplist[0])) {
+ $groupmappings[0] = $userlist;
+ }
+
+ $mform->addElement('selectyesno', 'selectedusers', get_string('onlyselectedusers', 'mod_attendance'));
+ $sel = $mform->addElement('select', 'users', get_string('users', 'mod_attendance'), $userlist, array('size' => 12));
+ $sel->setMultiple(true);
+ $mform->disabledIf('users', 'selectedusers', 'eq', 0);
+
+ $opts = array('groupmappings' => $groupmappings);
+ $PAGE->requires->yui_module('moodle-mod_attendance-groupfilter', 'M.mod_attendance.groupfilter.init', array($opts));
+
$ident = array();
$ident[] =& $mform->createElement('checkbox', 'id', '', get_string('studentid', 'attendance'));
$ident[] =& $mform->createElement('checkbox', 'uname', '', get_string('username'));
$mform->addElement('hidden', 'id', $cm->id);
}
+
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
+
+ // Validate the 'users' field.
+ if ($data['selectedusers'] && empty($data['users'])) {
+ $errors['users'] = get_string('mustselectusers', 'mod_attendance');
+ }
+
+ return $errors;
+ }
}
$string['modulenameplural'] = 'Attendances';
$string['months'] = 'Months';
$string['moreattendance'] = 'Attendance has been successfully taken for this page';
+$string['mustselectusers'] = 'Must select users to export';
$string['myvariables'] = 'My Variables';
$string['newdate'] = 'New date';
$string['newduration'] = 'New duration';
$string['notfound'] = 'Attendance activity not found in this course!';
$string['noupgradefromthisversion'] = 'The Attendance module cannot upgrade from the version of attforblock you have installed. - please delete attforblock or upgrade it to the latest version before isntalling the new attendance module';
$string['olddate'] = 'Old date';
+$string['onlyselectedusers'] = 'Export specific users';
$string['participant'] = 'Participant';
+$string['percentage'] = 'Percentage';
$string['period'] = 'Frequency';
$string['pluginname'] = 'Attendance';
$string['pluginadministration'] = 'Attendance administration';
$string['update'] = 'Update';
$string['usestatusset'] = 'Use status set';
$string['userexists'] = 'There is already a real user with this email address';
+$string['users'] = 'Users to export';
$string['variable'] = 'variable';
$string['variablesupdated'] = 'Variables successfully updated';
$string['versionforprinting'] = 'version for printing';
$this->users = $att->get_users($att->pageparams->group, $att->pageparams->page);
+ if (isset($att->pageparams->userids)) {
+ foreach ($this->users as $key => $user) {
+ if (!in_array($user->id, $att->pageparams->userids)) {
+ unset($this->users[$key]);
+ }
+ }
+ }
+
$this->groups = groups_get_all_groups($att->course->id);
$this->sessions = $att->get_filtered_sessions();
And "A" "text" should exist in the "Student 3" "table_row"
And I should not see "Temporary user 2"
+ Scenario: A teacher can select a subset of users for export
+ Given the following "groups" exist:
+ | course | name | idnumber |
+ | C1 | Group1 | Group1 |
+ | C1 | Group2 | Group2 |
+ And the following "group members" exist:
+ | group | user |
+ | Group1 | student1 |
+ | Group1 | student2 |
+ | Group2 | student2 |
+ | Group2 | student3 |
+
+ And I log in as "teacher1"
+ And I follow "Course 1"
+ And I follow "Test attendance"
+ And I follow "Add"
+ And I set the following fields to these values:
+ | Create multiple sessions | 0 |
+ And I click on "submitbutton" "button"
+
+ And I follow "Export"
+
+ When I set the field "Export specific users" to "Yes"
+ And I set the field "Group" to "Group1"
+ Then the "Users to export" select box should contain "Student 1"
+ And the "Users to export" select box should contain "Student 2"
+ And the "Users to export" select box should not contain "Student 3"
+
+ When I set the field "Group" to "Group2"
+ Then the "Users to export" select box should contain "Student 2"
+ And the "Users to export" select box should contain "Student 3"
+ And the "Users to export" select box should not contain "Student 1"
+ # Ideally the download would be tested here, but that is difficult to configure.
+
Scenario: A teacher can create and use multiple status lists
Given I log in as "teacher1"
And I follow "Course 1"
--- /dev/null
+YUI.add('moodle-mod_attendance-groupfilter', function (Y, NAME) {
+
+/*global M*/
+M.mod_attendance = M.mod_attendance || {};
+M.mod_attendance.groupfilter = {
+ groupmappings: null,
+
+ init: function(opts) {
+ "use strict";
+
+ this.groupmappings = opts.groupmappings;
+ Y.one('#id_group').after('change', this.update_user_list, this);
+ },
+
+ /**
+ * Update the user list with those found in the selected group.
+ */
+ update_user_list: function() {
+ "use strict";
+ var groupid, userlist, users, userid, opt;
+
+ // Get the list of users in the current group.
+ groupid = Y.one('#id_group').get('value');
+ users = this.groupmappings[groupid];
+
+ // Remove the options from the users select.
+ userlist = Y.one('#id_users');
+ userlist.get('options').remove();
+
+ // Repopulate the users select with those users in the selected group (if any).
+ if (users !== undefined) {
+ for (userid in users) {
+ if (users.hasOwnProperty(userid)) {
+ opt = Y.Node.create('<option></option>');
+ opt.set('value', userid);
+ opt.set('text', users[userid]);
+ userlist.appendChild(opt);
+ }
+ }
+ }
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["base", "node"]});
--- /dev/null
+YUI.add("moodle-mod_attendance-groupfilter",function(e,t){M.mod_attendance=M.mod_attendance||{},M.mod_attendance.groupfilter={groupmappings:null,init:function(t){"use strict";this.groupmappings=t.groupmappings,e.one("#id_group").after("change",this.update_user_list,this)},update_user_list:function(){"use strict";var t,n,r,i,s;t=e.one("#id_group").get("value"),r=this.groupmappings[t],n=e.one("#id_users"),n.get("options").remove();if(r!==undefined)for(i in r)r.hasOwnProperty(i)&&(s=e.Node.create("<option></option>"),s.set("value",i),s.set("text",r[i]),n.appendChild(s))}}},"@VERSION@",{requires:["base","node"]});
--- /dev/null
+YUI.add('moodle-mod_attendance-groupfilter', function (Y, NAME) {
+
+/*global M*/
+M.mod_attendance = M.mod_attendance || {};
+M.mod_attendance.groupfilter = {
+ groupmappings: null,
+
+ init: function(opts) {
+ "use strict";
+
+ this.groupmappings = opts.groupmappings;
+ Y.one('#id_group').after('change', this.update_user_list, this);
+ },
+
+ /**
+ * Update the user list with those found in the selected group.
+ */
+ update_user_list: function() {
+ "use strict";
+ var groupid, userlist, users, userid, opt;
+
+ // Get the list of users in the current group.
+ groupid = Y.one('#id_group').get('value');
+ users = this.groupmappings[groupid];
+
+ // Remove the options from the users select.
+ userlist = Y.one('#id_users');
+ userlist.get('options').remove();
+
+ // Repopulate the users select with those users in the selected group (if any).
+ if (users !== undefined) {
+ for (userid in users) {
+ if (users.hasOwnProperty(userid)) {
+ opt = Y.Node.create('<option></option>');
+ opt.set('value', userid);
+ opt.set('text', users[userid]);
+ userlist.appendChild(opt);
+ }
+ }
+ }
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["base", "node"]});
--- /dev/null
+{
+ "name": "moodle-mod_attendance-groupfilter",
+ "builds": {
+ "moodle-mod_attendance-groupfilter": {
+ "jsfiles": [
+ "groupfilter.js"
+ ]
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+/*global M*/
+M.mod_attendance = M.mod_attendance || {};
+M.mod_attendance.groupfilter = {
+ groupmappings: null,
+
+ init: function(opts) {
+ "use strict";
+
+ this.groupmappings = opts.groupmappings;
+ Y.one('#id_group').after('change', this.update_user_list, this);
+ },
+
+ /**
+ * Update the user list with those found in the selected group.
+ */
+ update_user_list: function() {
+ "use strict";
+ var groupid, userlist, users, userid, opt;
+
+ // Get the list of users in the current group.
+ groupid = Y.one('#id_group').get('value');
+ users = this.groupmappings[groupid];
+
+ // Remove the options from the users select.
+ userlist = Y.one('#id_users');
+ userlist.get('options').remove();
+
+ // Repopulate the users select with those users in the selected group (if any).
+ if (users !== undefined) {
+ for (userid in users) {
+ if (users.hasOwnProperty(userid)) {
+ opt = Y.Node.create('<option></option>');
+ opt.set('value', userid);
+ opt.set('text', users[userid]);
+ userlist.appendChild(opt);
+ }
+ }
+ }
+ }
+};
--- /dev/null
+{
+ "moodle-mod_attendance-groupfilter": {
+ "requires": [
+ "base",
+ "node"
+ ]
+ }
+}
\ No newline at end of file
projects / moodle-mod_attendance.git / commitdiff
