mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-07-05 20:44:14 +02:00
commit 1d44e47cc4
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/workshop/lang/en/workshop.php
View File

@ -320,6 +320,7 @@ $string['usepeerassessment_help'] = 'If enabled, a user may be allocated submiss
$string['userdatecreated'] = 'submitted on <span>{$a}</span>';
$string['userdatemodified'] = 'modified on <span>{$a}</span>';
$string['userplan'] = 'Workshop planner';
$string['userplancurrentphase'] = 'Current phase';
$string['userplan_help'] = 'The workshop planner displays all phases of the activity and lists the tasks for each phase. The current phase is highlighted and task completion is indicated with a tick.';
$string['useselfassessment'] = 'Use self-assessment';
$string['useselfassessment_help'] = 'If enabled, a user may be allocated their own submission to assess and will receive a grade for assessment in addition to a grade for their submission.';

4
mod/workshop/renderer.php
View File

@ -289,6 +289,10 @@ class mod_workshop_renderer extends plugin_renderer_base {
$row->attributes['class'] = 'phasetasks';
foreach ($plan->phases as $phasecode => $phase) {
$title = html_writer::tag('span', $phase->title);
if ($phase->active) {
$title .= html_writer::tag('span', get_string('userplancurrentphase', 'workshop'),
array('class' => 'accesshide'));
}
$actions = '';
foreach ($phase->actions as $action) {
switch ($action->type) {

1
mod/workshop/submission.php
View File

@ -316,6 +316,7 @@ if ($edit) {
$output = $PAGE->get_renderer('mod_workshop');
echo $output->header();
echo $output->heading(format_string($workshop->name), 2);
echo $output->heading(get_string('mysubmission', 'workshop'), 3);
// show instructions for submitting as thay may contain some list of questions and we need to know them
// while reading the submitted answer

12
mod/workshop/view.php
View File

@ -84,7 +84,15 @@ if (!is_null($editmode) && $PAGE->user_allowed_editing()) {
$USER->editing = $editmode;
}
$PAGE->set_title($workshop->name);
$userplan = new workshop_user_plan($workshop, $USER->id);
foreach ($userplan->phases as $phase) {
if ($phase->active) {
$currentphasetitle = $phase->title;
}
}
$PAGE->set_title($workshop->name . " (" . $currentphasetitle . ")");
$PAGE->set_heading($course->fullname);
if ($perpage and $perpage > 0 and $perpage <= 1000) {
@ -101,12 +109,12 @@ if ($eval) {
}
$output = $PAGE->get_renderer('mod_workshop');
$userplan = new workshop_user_plan($workshop, $USER->id);
/// Output starts here
echo $output->header();
echo $output->heading_with_help(format_string($workshop->name), 'userplan', 'workshop');
echo $output->heading(format_string($currentphasetitle), 3);
echo $output->render($userplan);
switch ($workshop->phase) {