From d632ac4eaebee8d3950ba5eb53f7948a28535e73 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 18 Sep 2018 14:49:55 +1200 Subject: [PATCH] WIP Teacher submission form. --- classes/output/mobile.php | 110 ++++++++++++++++++++++--- classes/structure.php | 1 + db/mobile.php | 8 +- mobilestyles.css | 4 + templates/mobile_teacher_form.mustache | 74 +++++++++++++++++ templates/mobile_user_form.mustache | 4 +- 6 files changed, 185 insertions(+), 16 deletions(-) create mode 100644 mobilestyles.css create mode 100644 templates/mobile_teacher_form.mustache diff --git a/classes/output/mobile.php b/classes/output/mobile.php index 4412c48..4ce1647 100644 --- a/classes/output/mobile.php +++ b/classes/output/mobile.php @@ -43,12 +43,11 @@ class mobile { require_once($CFG->dirroot.'/mod/attendance/locallib.php'); - $args = (object) $args; - $cmid = $args->cmid; - $courseid = $args->courseid; - $takenstatus = empty($args->status) ? '' : $args->status; - $sessid = empty($args->sessid) ? '' : $args->sessid; - $password = empty($args->studentpass) ? '' : $args->studentpass; + $cmid = $args['cmid']; + $courseid = $args['courseid']; + $takenstatus = empty($args['status']) ? '' : $args['status']; + $sessid = empty($args['sessid']) ? '' : $args['sessid']; + $password = empty($args['studentpass']) ? '' : $args['studentpass']; // Capabilities check. $cm = get_coursemodule_from_id('attendance', $cmid); @@ -70,7 +69,7 @@ class mobile { $isteacher = false; if (has_capability('mod/attendance:takeattendances', $context)) { $isteacher = true; - $data['attendancefunction'] = 'mobile_take_attendance_all'; + $data['attendancefunction'] = 'mobile_teacher_form'; } // Add stats for this use to output. @@ -84,18 +83,30 @@ class mobile { $att = new \mod_attendance_structure($attendance, $cm, $course, $context, $pageparams); + if ($isteacher) { + $keys = array_keys($args); + $userkeys = preg_grep("/status\d+/", $keys); + if (!empty($userkeys)) { // If this is a post from the teacher form. + // Build data to pass to take_from_form_data. + foreach ($userkeys as $uk) { + $userid = str_replace('status', '', $uk); + $status = $args[$uk]; + + } + // Call take_from_form_data function. + // $att->take_from_form_data($formdata); + + } + } + // Get list of sessions within the next 24hrs and in last 6hrs. // TODO: provide way of adjusting which sessions to show in app. $time = time() - (6 * 60 * 60); $data['sessions'] = array(); - if ($isteacher) { - $sessions = array(); // Support for teacher marking not implemented yet. - } else { - $sessions = $DB->get_records_select('attendance_sessions', - 'attendanceid = ? AND sessdate > ? ORDER BY sessdate', array($attendance->id, $time)); - } + $sessions = $DB->get_records_select('attendance_sessions', + 'attendanceid = ? AND sessdate > ? ORDER BY sessdate', array($attendance->id, $time)); if (!empty($sessions)) { $userdata = new \attendance_user_data($att, $USER->id, true); @@ -205,6 +216,7 @@ class mobile { 'otherdata' => '' ]; } + /** * Returns the form to take attendance for the mobile app. * @@ -305,4 +317,76 @@ class mobile { 'otherdata' => '' ]; } + + /** + * Returns the form to take attendance for the mobile app. + * + * @param array $args Arguments from tool_mobile_get_content WS + * @return array HTML, javascript and other data + */ + public static function mobile_teacher_form($args) { + global $OUTPUT, $DB, $CFG; + + require_once($CFG->dirroot.'/mod/attendance/locallib.php'); + + $args = (object) $args; + $cmid = $args->cmid; + $courseid = $args->courseid; + $sessid = $args->sessid; + + // Capabilities check. + $cm = get_coursemodule_from_id('attendance', $cmid); + + require_login($courseid, false , $cm, true, true); + + $context = \context_module::instance($cm->id); + require_capability('mod/attendance:takeattendances', $context); + + $attendance = $DB->get_record('attendance', array('id' => $cm->instance), '*', MUST_EXIST); + $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); + + $pageparams = new \mod_attendance_sessions_page_params(); + $pageparams->sessionid = $sessid; + $att = new \mod_attendance_structure($attendance, $cm, $course, $context, $pageparams); + + $data = array(); // Data to pass to renderer. + $data['attendance'] = $attendance; + $data['cmid'] = $cmid; + $data['courseid'] = $courseid; + $data['sessid'] = $sessid; + $data['messages'] = array(); + $data['showmessage'] = false; + $data['statuses'] = array(); + $data['args'] = ''; // Stores list of userid status args that should be added to form post. + + $statuses = $att->get_statuses(); + foreach ($statuses as $status) { + $data['statuses'][] = array('stid' => $status->id, 'acronym' => $status->acronym, + 'description' => $status->description); + } + // TODO: Add support for group marking (non-editing teachers etc). + $data['users'] = array(); + $users = $att->get_users(0, 0); + foreach ($users as $user) { + $data['users'][] = array('userid' => $user->id, 'fullname' => $user->fullname); + $data['args'] .= ', status'. $user->id. ': status'. $user->id; + } + + if (!empty($data['messages'])) { + $data['showmessage'] = true; + } + + return [ + 'templates' => [ + [ + 'id' => 'main', + 'html' => $OUTPUT->render_from_template('mod_attendance/mobile_teacher_form', $data), + 'cache-view' => false + ], + ], + 'javascript' => '', + 'otherdata' => '' + ]; + } + } \ No newline at end of file diff --git a/classes/structure.php b/classes/structure.php index f1235e9..782defa 100644 --- a/classes/structure.php +++ b/classes/structure.php @@ -843,6 +843,7 @@ class mod_attendance_structure { $enrolments = $DB->get_records_sql($sql, $params); foreach ($users as $user) { + $users[$user->id]->fullname = fullname($user); $users[$user->id]->enrolmentstatus = $enrolments[$user->id]->status; $users[$user->id]->enrolmentstart = $enrolments[$user->id]->mintime; $users[$user->id]->enrolmentend = $enrolments[$user->id]->maxtime; diff --git a/db/mobile.php b/db/mobile.php index 9fb7ae4..eeb1c09 100644 --- a/db/mobile.php +++ b/db/mobile.php @@ -33,7 +33,11 @@ $addons = [ 'class' => '', ], 'delegate' => 'CoreCourseModuleDelegate', - 'method' => 'mobile_view_activity' + 'method' => 'mobile_view_activity', + 'styles' => [ + 'url' => '/mod/attendance/mobilestyles.css', + 'version' => 7 + ] ] ], 'lang' => [ // Language strings that are used in all the handlers. @@ -59,6 +63,6 @@ $addons = [ ['subnetwrong', 'attendance'], ['enterpassword', 'attendance'], ['incorrectpasswordshort', 'attendance'] - ] + ], ] ]; \ No newline at end of file diff --git a/mobilestyles.css b/mobilestyles.css new file mode 100644 index 0000000..4e9b308 --- /dev/null +++ b/mobilestyles.css @@ -0,0 +1,4 @@ +.attendance_teacher_form .item-radio { + display: inline-block; + width: 70px; +} diff --git a/templates/mobile_teacher_form.mustache b/templates/mobile_teacher_form.mustache new file mode 100644 index 0000000..1526364 --- /dev/null +++ b/templates/mobile_teacher_form.mustache @@ -0,0 +1,74 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see . +}} +{{! + @template mod_attendance/mobile_user_form + + The page to take attendance + + Classes required for JS: + * None + + Data attibutes required for JS: + * All data attributes are required + + Context variables required for this template: + * attendance + * summary + * cmid + + Example context (json): + { + "attendance": { + "id": "1", + "course": "2", + "name": "Class Attendance", + "intro": "Intro" + }, + "cmid": "25", + "courseid": "4", + "sessid": "43" + } +}} +{{=<% %>=}} +
+ + <%#showmessage%> + <%#messages%> + + {{ 'plugin.mod_attendance.<% string %>' | translate }} + + <%/messages%> + <%/showmessage%> + <%#users%> + +

<% fullname %>

+ + + + <%#statuses%> + + <% acronym %> + + + <%/statuses%> + + <%/users%> + + +
\ No newline at end of file diff --git a/templates/mobile_user_form.mustache b/templates/mobile_user_form.mustache index 7268ee9..41c9a0e 100644 --- a/templates/mobile_user_form.mustache +++ b/templates/mobile_user_form.mustache @@ -38,7 +38,9 @@ "name": "Class Attendance", "intro": "Intro" }, - "cmid": "25" + "cmid": "25", + "courseid": "4", + "sessid": "43" } }} {{=<% %>=}}