Commit efedeaf1 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1836656: LTI - misc formatting improvements"

parents e7c140c7 ec676ea8
......@@ -44,13 +44,14 @@ $string['notreadylabel'] = 'Not ready';
$string['oauthprotocolenabled'] = 'OAuth protocol enabled';
$string['parentauthforlti'] = 'Parent authority';
$string['portfoliosubmitted'] = 'You submitted the portfolio "%s" for assessment on %s.';
$string['portfoliosubmittedheader'] = 'Portfolio Submitted';
$string['readylabel'] = 'Ready';
$string['restprotocolenabled'] = 'REST protocol enabled';
$string['usernameexists2'] = 'Username "%s" is not valid.';
$string['saveandrelease'] = 'Save and allow submissions';
$string['submitportfolio'] = 'Submit a portfolio for assessment';
$string['submitto'] = 'Submit this portfolio for assessment to %s, %s';
$string['submitintro'] = 'Select the page or collection that you want to submit to this activity. If you do not yet have a portfolio, <a href="%sview/index.php" target="_blank">create one</a>. Once you are done, reload the activity from the LMS.';
$string['submitintro'] = 'Select the page or collection that you want to submit to this activity. If you do not yet have a portfolio, <strong><a href="%sview/index.php" target="_blank">create one</a></strong>. Once you are done, reload the activity from the LMS.';
$string['timegraded'] = 'Time graded';
$string['timesubmitted'] = 'Time submitted';
$string['usernameexists1'] = 'Username "%s" already exists.';
......
......@@ -54,11 +54,10 @@ if (PluginModuleLti::can_grade()) {
}
else if (PluginModuleLti::can_submit_for_grading()) {
$smarty->assign('PAGEHEADING', get_string('submitportfolio', 'module.lti'));
$sub = PluginModuleLti::get_submission();
if ($sub && $sub->is_submitted()) {
$smarty->assign('PAGEHEADING', get_string('portfoliosubmittedheader', 'module.lti'));
// Info on submitted collection
$info = $sub->get_portfolio_info();
$grader = $sub->get_grader();
......@@ -73,11 +72,13 @@ else if (PluginModuleLti::can_submit_for_grading()) {
$smarty->display('module:lti:submittedforgrading.tpl');
}
else if (PluginModuleLTI::activity_configured()) {
$smarty->assign('PAGEHEADING', get_string('submitportfolio', 'module.lti'));
// Assessment submission form
$smarty->assign('form', $form);
$smarty->display('module:lti:submitforgrading.tpl');
}
else {
$smarty->assign('PAGEHEADING', get_string('submitportfolio', 'module.lti'));
$smarty->assign('error', get_string('notconfigured', 'module.lti'));
$smarty->display('module:lti:submitforgrading.tpl');
}
......
......@@ -17,7 +17,11 @@
<tr>
<td>{$s->user->firstname}</td>
<td>{$s->user->lastname}</td>
<td>{$s->name}</td>
{if is_null($s->grade)}
<td><a href="{$WWWROOT}./module/lti/graderedirect.php?collectionid={$s->collectionid}&viewid={$s->viewid}">{$s->name}</a></td>
{else}
<td>{$s->name}</td>
{/if}
<td>{$s->timesubmitted|strtotime|format_date}</td>
<td>{$s->grade|default:"-"}</td>
<td>{if $s->timegraded}{$s->timegraded|strtotime|format_date}{else}-{/if}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment