|
@@ -2888,26 +2888,24 @@ var exercises = [ '; // '
|
|
$link_up = iassign_icons::insert('up_disable');
|
|
$link_up = iassign_icons::insert('up_disable');
|
|
$link_down = iassign_icons::insert('down_disable');
|
|
$link_down = iassign_icons::insert('down_disable');
|
|
|
|
|
|
|
|
+ $has_row_column = isset($USER->matrix_iassign[$row][$column]) ? True : False;
|
|
// next_activity
|
|
// next_activity
|
|
- if ($USER->matrix_iassign[$row][$column]->iassign_next != - 1) {
|
|
|
|
- $url_next = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row][$column + 1]->iassign_submission_current . "&userid_iassign=$this->userid_iassign&iassign_current=" . $USER->matrix_iassign[$row][$column]->iassign_next . "&view_iassign=report&row=" . ($row) . "&column=" . ($column + 1);
|
|
|
|
|
|
+ if ($has_row_column && $USER->matrix_iassign[$row][$column]->iassign_next != - 1) {
|
|
|
|
+ $url_next = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row][$column + 1]->iassign_submission_current . "&userid_iassign=$t$
|
|
$link_next = "<a href='" . $url_next . "'>" . (iassign_icons::insert('next_activity')) . "</a>";
|
|
$link_next = "<a href='" . $url_next . "'>" . (iassign_icons::insert('next_activity')) . "</a>";
|
|
}
|
|
}
|
|
// previous_activity
|
|
// previous_activity
|
|
- if ($USER->matrix_iassign[$row][$column]->iassign_previous != - 1) {
|
|
|
|
- $url_previous = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row][$column - 1]->iassign_submission_current . "&userid_iassign=$this->userid_iassign&iassign_current=" . $USER->matrix_iassign[$row][$column]->iassign_previous . "&view_iassign=report&row=" . ($row) . "&column=" . ($column - 1);
|
|
|
|
|
|
+ if ($has_row_column && $USER->matrix_iassign[$row][$column]->iassign_previous != - 1) {
|
|
|
|
+ $url_previous = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row][$column - 1]->iassign_submission_current . "&userid_iassig$
|
|
$link_previous = "<a href='" . $url_previous . "'>" . (iassign_icons::insert('previous_activity')) . "</a>";
|
|
$link_previous = "<a href='" . $url_previous . "'>" . (iassign_icons::insert('previous_activity')) . "</a>";
|
|
}
|
|
}
|
|
// previous_student
|
|
// previous_student
|
|
- if ($USER->matrix_iassign[$row][$column]->user_next != - 1) {
|
|
|
|
- $url_down = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row + 1][$column]->iassign_submission_current . "&userid_iassign=" . $USER->matrix_iassign[$row][$column]->user_next . "&iassign_current=" . $this->activity->get_activity()->id . "&view_iassign=report&row=" . ($row + 1) . "&column=" . ($column);
|
|
|
|
|
|
+ if ($has_row_column && $USER->matrix_iassign[$row][$column]->user_next != - 1) {
|
|
|
|
+ $url_down = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row + 1][$column]->iassign_submission_current . "&userid_iassign=" $
|
|
$link_down = "<a href='" . $url_down . "'>" . (iassign_icons::insert('previous_student')) . "</a>";
|
|
$link_down = "<a href='" . $url_down . "'>" . (iassign_icons::insert('previous_student')) . "</a>";
|
|
}
|
|
}
|
|
// next_student
|
|
// next_student
|
|
- if ($USER->matrix_iassign[$row][$column]->user_previous != - 1) {
|
|
|
|
- $url_up = "view.php?action=viewsubmission&id=$id&iassign_submission_current=" . $USER->matrix_iassign[$row - 1][$column]->iassign_submission_current . "&userid_iassign=" . $USER->matrix_iassign[$row][$column]->user_previous . "&iassign_current=" . $this->activity->get_activity()->id . "&view_iassign=report&row=" . ($row - 1) . "&column=" . ($column);
|
|
|
|
- $link_up = "<a href='" . $url_up . "'>" . (iassign_icons::insert('next_student')) . "</a>";
|
|
|
|
- }
|
|
|
|
|
|
+ if ($has_row_column && $USER->matrix_iassign[$row][$column]->user_previous != - 1) {
|
|
|
|
|
|
if ($iassign_submission) {
|
|
if ($iassign_submission) {
|
|
$student_answer = $iassign_submission->answer;
|
|
$student_answer = $iassign_submission->answer;
|