Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix UX issue with submit capability in kaltura assignment #380

Open
wants to merge 1 commit into
base: MOODLE_311_DEV
Choose a base branch
from
Open

Fix UX issue with submit capability in kaltura assignment #380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 50 additions & 51 deletions mod/kalvidassign/view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,63 +78,62 @@
$width = 0;
$height = 0;

// Here we can assume that the user has permission to submit no matter what their role is.
// The old method denied module-level locally assigned instructors the right to submit items,
// even if they were also students within the course.
$param = array('vidassignid' => $kalvidassign->id, 'userid' => $USER->id);
$submission = $DB->get_record('kalvidassign_submission', $param);
if (has_capability('mod/kalvidassign:submit', $context)) {
$param = array('vidassignid' => $kalvidassign->id, 'userid' => $USER->id);
$submission = $DB->get_record('kalvidassign_submission', $param);

echo $renderer->display_video_container_markup($submission, $course->id, $cm->id);
echo $renderer->display_video_container_markup($submission, $course->id, $cm->id);

if (kalvidassign_assignemnt_submission_expired($kalvidassign)) {
$disabled = true;
}

if (empty($submission->entry_id) && empty($submission->timecreated)) {
echo $renderer->display_student_submit_buttons($cm, $USER->id, $disabled);
echo $renderer->display_grade_feedback($kalvidassign, $context);
} else {
if ($disabled || !$kalvidassign->resubmit) {
if (kalvidassign_assignemnt_submission_expired($kalvidassign)) {
$disabled = true;
}
echo $renderer->display_student_resubmit_buttons($cm, $USER->id, $disabled);
echo $renderer->display_grade_feedback($kalvidassign, $context);
}

$params = array(
'withblocks' => 0,
'courseid' => $course->id,
'width' => KALTURA_PANEL_WIDTH,
'height' => KALTURA_PANEL_HEIGHT,
'cmid' => $cm->id
);

$url = new moodle_url('/mod/kalvidassign/lti_launch.php', $params);

$params = array(
'addvidbtnid' => 'id_add_video',
'ltilaunchurl' => $url->out(false),
'height' => KALTURA_PANEL_HEIGHT,
'width' => KALTURA_PANEL_WIDTH
);

$PAGE->requires->yui_module('moodle-local_kaltura-ltipanel', 'M.local_kaltura.initmediaassignment', array($params), null, true);

// Require a YUI module to make the object tag be as large as possible.
$params = array(
'bodyclass' => $pageclass,
'lastheight' => null,
'padding' => 15
);

if(isset($submission->width) && isset($submission->height))
{
$params['width'] = $submission->width;
$params['height'] = $submission->height;
}
if (empty($submission->entry_id) && empty($submission->timecreated)) {
echo $renderer->display_student_submit_buttons($cm, $USER->id, $disabled);
echo $renderer->display_grade_feedback($kalvidassign, $context);
} else {
if ($disabled || !$kalvidassign->resubmit) {
$disabled = true;
}
echo $renderer->display_student_resubmit_buttons($cm, $USER->id, $disabled);
echo $renderer->display_grade_feedback($kalvidassign, $context);
}

$params = array(
'withblocks' => 0,
'courseid' => $course->id,
'width' => KALTURA_PANEL_WIDTH,
'height' => KALTURA_PANEL_HEIGHT,
'cmid' => $cm->id
);

$url = new moodle_url('/mod/kalvidassign/lti_launch.php', $params);

$params = array(
'addvidbtnid' => 'id_add_video',
'ltilaunchurl' => $url->out(false),
'height' => KALTURA_PANEL_HEIGHT,
'width' => KALTURA_PANEL_WIDTH
);

$PAGE->requires->yui_module('moodle-local_kaltura-ltipanel', 'M.local_kaltura.initmediaassignment', array($params), null, true);

// Require a YUI module to make the object tag be as large as possible.
$params = array(
'bodyclass' => $pageclass,
'lastheight' => null,
'padding' => 15
);

if(isset($submission->width) && isset($submission->height))
{
$params['width'] = $submission->width;
$params['height'] = $submission->height;
}

$PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);
$PAGE->requires->string_for_js('replacevideo', 'kalvidassign');
$PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);
$PAGE->requires->string_for_js('replacevideo', 'kalvidassign');
}

// Limit the instructor buttons to ONLY those users with the role appropriate for them.
if (has_capability('mod/kalvidassign:gradesubmission', $context)) {
Expand Down