|
@@ -429,7 +429,7 @@ class iassign {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
function get_answer () {
|
|
|
|
|
|
global $USER, $CFG, $DB, $OUTPUT;
|
|
@@ -727,25 +727,6 @@ class iassign {
|
|
|
exit;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- function htmlcode_2_export ($course_fullname, $course_id, $iassign_block_id, $iassign_block_name, $array_iassign_name, $array_iassign_id, $userid, $username) {
|
|
|
- $str_html = "<html dir='ltr' lang='pt-br' xml:lang='pt-br'>
|
|
|
- <head>
|
|
|
- <title>" . get_string('pluginname', 'iassign') . "</title>\n"; // 'iAssign: interactive Learning Activities'
|
|
|
- $str_html .= " </head>
|
|
|
- <body>\n";
|
|
|
- $tam = sizeof($array_iassign_name);
|
|
|
- for ($ii=0; $ii<$tam; $ii++) {
|
|
|
-
|
|
|
- }
|
|
|
- $str_html .= "
|
|
|
- </body>\n</html>";
|
|
|
- return $str_html;
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
|
|
|
function export_package_answer () {
|
|
@@ -1334,9 +1315,11 @@ class iassign {
|
|
|
$link_print = "<a href='" . $CFG->wwwroot . "/mod/iassign/view.php?id=" . $id . "&action=print&iassignid=" . $this->iassign->id . "'>" . iassign_icons::insert('print') . ' ' . get_string('print', 'iassign') . "</a>";
|
|
|
$link_stats = "<a href='" . $CFG->wwwroot . "/mod/iassign/view.php?id=" . $id . "&action=stats&iassignid=" . $this->iassign->id . "'>" . iassign_icons::insert('results') . ' ' . get_string('graphic', 'iassign') . "</a>";
|
|
|
$link_export = "<a href='" . $CFG->wwwroot . "/mod/iassign/view.php?id=" . $id . "&action=export_csv&iassignid=" . $this->iassign->id . "'>" . iassign_icons::insert('export_ilm') . ' ' . get_string('export_csv', 'iassign') . "</a>";
|
|
|
+ $link_auto_evaluate = "<a href='" . $CFG->wwwroot . "/mod/iassign/view.php?id=" . $id . "&action=auto_evaluate&iassignid=" . $this->iassign->id . "'>" . iassign_icons::insert('correct') . ' ' . get_string('auto_evaluate_reprocess', 'iassign') . "</a>";
|
|
|
print '<td width=15% align="right">' . $link_stats . '</td>' . "\n";
|
|
|
print '<td width=15% align="right">' . $link_export . '</td>' . "\n";
|
|
|
- print '<td width=15% align="right">' . $link_print . '</td>' . "\n";
|
|
|
+ print '<td width=15% align="right">' . $link_auto_evaluate . '</td>' . "\n";
|
|
|
+ print '<td width=15% align="right">' . $link_print . '</td>' . "\n";
|
|
|
}
|
|
|
print '</tr></table>' . "\n";
|
|
|
}
|
|
@@ -3995,7 +3978,6 @@ class ilm {
|
|
|
$this->ilm = null;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
function view_iLM ($iassign_statement_activity_item, $student_answer, $enderecoPOST, $view_teacherfileversion) {
|
|
@@ -6067,7 +6049,6 @@ class ilm_manager {
|
|
|
die();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
function view_files_ilm ($iassign_ilm_class, $extension) {
|
|
@@ -6307,18 +6288,7 @@ class ilm_manager {
|
|
|
$pathname = $pathname[count($pathname) - 1];
|
|
|
$fileid = $value->get_id();
|
|
|
$tmp = explode(".", $filename);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- if (is_array($tmp)) {
|
|
|
- if (sizeof($tmp)>1)
|
|
|
- $filetype = $tmp[1];
|
|
|
- else
|
|
|
- $filetype = $extension;
|
|
|
- }
|
|
|
- else
|
|
|
- $filetype = $extension;
|
|
|
-
|
|
|
+ $filetype = $tmp[1];
|
|
|
$author = $value->get_author();
|
|
|
$timemodified = date("d/m/Y H:i:s", $value->get_timemodified());
|
|
|
$timecreated = date("d/m/Y H:i:s", $value->get_timecreated());
|
|
@@ -6337,110 +6307,102 @@ class ilm_manager {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $array_iassign_ilm = $DB->get_records("iassign_ilm", array('extension' => $filetype, 'parent' => '0', 'enable' => '1'));
|
|
|
-
|
|
|
- foreach ($array_iassign_ilm as $iassign_ilm) {
|
|
|
-
|
|
|
- if (!$iassign_ilm) {
|
|
|
- $iassign_ilm = new stdClass();
|
|
|
- $iassign_ilm->id = $ilmid;
|
|
|
- }
|
|
|
+ $iassign_ilm = $DB->get_record("iassign_ilm", array('extension' => $filetype, 'parent' => '0', 'enable' => '1'));
|
|
|
+ if (!$iassign_ilm) {
|
|
|
+ $iassign_ilm = new stdClass();
|
|
|
+ $iassign_ilm->id = $ilmid;
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
- $url = $CFG->wwwroot . "/pluginfile.php/" . $value->get_contextid() . "/mod_iassign/activity";
|
|
|
- $fileurl = $url . '/' . $value->get_itemid() . $filepath . $filename;
|
|
|
- $dirurl = new moodle_url($this->url) . '&ilmid=' . $iassign_ilm->id . '&dirid=' . $fileid;
|
|
|
-
|
|
|
- $straux = $CFG->wwwroot . "/mod/iassign/ilm_manager.php?from=" . $this->from . "&id=" . $this->id . "&fileid=" . $fileid . "&";
|
|
|
- $link_add_ilm_iassign = " <a href='" . $straux . "action=addilm&filename=$filename '>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
- $link_add_ilm_tinymce = " <a href='" . $straux . "action=tinymceilm'>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
- $link_add_ilm_atto = " <a href='" . $straux . "action=attoilm'>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
-
|
|
|
- $check_select = "";
|
|
|
- $link_rename = "";
|
|
|
- $link_delete = "";
|
|
|
- $link_duplicate = " <a href='#' onclick='duplicate_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" . iassign_icons::insert('duplicate_iassign') . "</a>\n";
|
|
|
- $link_edit = " " . iassign_icons::insert('no_edit_iassign');
|
|
|
- $link_filter = " <a href='#' onclick='preview_ilm(" . $fileid . "," . $ilmid . ");'>" . iassign_icons::insert('preview_iassign') . "</a>\n";
|
|
|
-
|
|
|
- $link_duplicate = " <a href='#' onclick='duplicate_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" .
|
|
|
- iassign_icons::insert('duplicate_iassign') . "</a>\n";
|
|
|
-
|
|
|
- $link_edit = " " . iassign_icons::insert('no_edit_iassign');
|
|
|
- $link_filter = " <a href='#' onclick='preview_ilm(" . $fileid . "," . $ilmid . ");'>" . iassign_icons::insert('preview_iassign') . "</a>\n";
|
|
|
-
|
|
|
- if ($value->get_userid() == $USER->id) {
|
|
|
- if ($iassign_statement_activity_list) {
|
|
|
- $check_select = "";
|
|
|
- $link_edit = iassign_icons::insert('edit_iassign_disable');
|
|
|
- $link_delete = " " . iassign_icons::insert('delete_iassign_disable');
|
|
|
- $link_rename = "";
|
|
|
- }
|
|
|
- else {
|
|
|
- $check_select = "<input name='selected_file' type='checkbox' value='$fileid'/>\n";
|
|
|
- $link_edit = " <a href='#' onclick='update_ilm(\"$iassign_ilm->id\", $fileid)'>" . iassign_icons::insert('edit_iassign') . "</a>\n";
|
|
|
- $link_delete = " <a href='#' onclick='delete_ilm(\"$iassign_ilm->id\", $fileid);'>" . iassign_icons::insert('delete_iassign') . "</a>\n";
|
|
|
- $link_rename = " <a href='#' onclick='rename_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" . iassign_icons::insert('rename_iassign') . "</a>\n";
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (!in_array($filetype, $extensions_allow)) {
|
|
|
- $link_edit = "";
|
|
|
- $link_add_ilm_iassign = "";
|
|
|
- $link_add_ilm_tinymce = "";
|
|
|
- $link_add_ilm_atto = "";
|
|
|
- $link_filter = "";
|
|
|
+
|
|
|
+ $url = $CFG->wwwroot . "/pluginfile.php/" . $value->get_contextid() . "/mod_iassign/activity";
|
|
|
+ $fileurl = $url . '/' . $value->get_itemid() . $filepath . $filename;
|
|
|
+ $dirurl = new moodle_url($this->url) . '&ilmid=' . $iassign_ilm->id . '&dirid=' . $fileid;
|
|
|
+
|
|
|
+ $straux = $CFG->wwwroot . "/mod/iassign/ilm_manager.php?from=" . $this->from . "&id=" . $this->id . "&fileid=" . $fileid . "&";
|
|
|
+ $link_add_ilm_iassign = " <a href='" . $straux . "action=addilm&filename=$filename '>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
+ $link_add_ilm_tinymce = " <a href='" . $straux . "action=tinymceilm'>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
+ $link_add_ilm_atto = " <a href='" . $straux . "action=attoilm'>" . iassign_icons::insert('add_ilm_iassign') . "</a>\n";
|
|
|
+
|
|
|
+ $check_select = "";
|
|
|
+ $link_rename = "";
|
|
|
+ $link_delete = "";
|
|
|
+ $link_duplicate = " <a href='#' onclick='duplicate_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" . iassign_icons::insert('duplicate_iassign') . "</a>\n";
|
|
|
+ $link_edit = " " . iassign_icons::insert('no_edit_iassign');
|
|
|
+ $link_filter = " <a href='#' onclick='preview_ilm(" . $fileid . "," . $ilmid . ");'>" . iassign_icons::insert('preview_iassign') . "</a>\n";
|
|
|
+
|
|
|
+ $link_duplicate = " <a href='#' onclick='duplicate_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" .
|
|
|
+ iassign_icons::insert('duplicate_iassign') . "</a>\n";
|
|
|
+
|
|
|
+ $link_edit = " " . iassign_icons::insert('no_edit_iassign');
|
|
|
+ $link_filter = " <a href='#' onclick='preview_ilm(" . $fileid . "," . $ilmid . ");'>" . iassign_icons::insert('preview_iassign') . "</a>\n";
|
|
|
+
|
|
|
+ if ($value->get_userid() == $USER->id) {
|
|
|
+ if ($iassign_statement_activity_list) {
|
|
|
+ $check_select = "";
|
|
|
+ $link_edit = iassign_icons::insert('edit_iassign_disable');
|
|
|
+ $link_delete = " " . iassign_icons::insert('delete_iassign_disable');
|
|
|
+ $link_rename = "";
|
|
|
+ } else {
|
|
|
+ $check_select = "<input name='selected_file' type='checkbox' value='$fileid'/>\n";
|
|
|
+ $link_edit = " <a href='#' onclick='update_ilm(\"$iassign_ilm->id\", $fileid)'>" . iassign_icons::insert('edit_iassign') . "</a>\n";
|
|
|
+ $link_delete = " <a href='#' onclick='delete_ilm(\"$iassign_ilm->id\", $fileid);'>" . iassign_icons::insert('delete_iassign') . "</a>\n";
|
|
|
+ $link_rename = " <a href='#' onclick='rename_ilm(\"$iassign_ilm->id\", \"$filename\"," . $fileid . ");'>" . iassign_icons::insert('rename_iassign') . "</a>\n";
|
|
|
}
|
|
|
+ }
|
|
|
+ if (!in_array($filetype, $extensions_allow)) {
|
|
|
+ $link_edit = "";
|
|
|
+ $link_add_ilm_iassign = "";
|
|
|
+ $link_add_ilm_tinymce = "";
|
|
|
+ $link_add_ilm_atto = "";
|
|
|
+ $link_filter = "";
|
|
|
+ }
|
|
|
|
|
|
- if ($value->is_directory()) {
|
|
|
- $link_delete = " <a href='#' onclick='delete_dir_ilm(\"$iassign_ilm->id\", $fileid);'>" . iassign_icons::insert('delete_dir') . "</a>\n";
|
|
|
- $link_rename = " <a href='#' onclick='rename_dir_ilm(\"$iassign_ilm->id\", \"" . $pathname . "\"," . $fileid . ");'>" . iassign_icons::insert('rename_dir') . "</a>\n";
|
|
|
- $output .= "<tr><td>$check_select$link_rename$link_delete</td>
|
|
|
+ if ($value->is_directory()) {
|
|
|
+ $link_delete = " <a href='#' onclick='delete_dir_ilm(\"$iassign_ilm->id\", $fileid);'>" . iassign_icons::insert('delete_dir') . "</a>\n";
|
|
|
+ $link_rename = " <a href='#' onclick='rename_dir_ilm(\"$iassign_ilm->id\", \"" . $pathname . "\"," . $fileid . ");'>" . iassign_icons::insert('rename_dir') . "</a>\n";
|
|
|
+ $output .= "<tr><td>$check_select$link_rename$link_delete</td>
|
|
|
<td><a href='$dirurl' title='" . get_string('dir', 'iassign') . $pathname . "'>" . iassign_icons::insert('dir') . ' ' . $pathname . "</a></td>
|
|
|
<td><center>$author</center></td>
|
|
|
<td><center>$timecreated</center></td>
|
|
|
<td><center>$timemodified</center></td></tr>\n";
|
|
|
+ }
|
|
|
+ else if ($this->from == 'iassign') {
|
|
|
+ $new_id = "";
|
|
|
+ $new_class = "";
|
|
|
+ if (isset($_SESSION['file_name']) && $filename == $_SESSION['file_name']) {
|
|
|
+ $new_class = "<div id='new_file' style='position: absolute;'></div>"; unset($_SESSION['file_name']);
|
|
|
+ $new_id = "id='id_new_blink' style='background-color: hsl(244,61%,90%);'";
|
|
|
}
|
|
|
- else if ($this->from == 'iassign') {
|
|
|
- $new_id = "";
|
|
|
- $new_class = "";
|
|
|
- if (isset($_SESSION['file_name']) && $filename == $_SESSION['file_name']) {
|
|
|
- $new_class = "<div id='new_file' style='position: absolute;'></div>"; unset($_SESSION['file_name']);
|
|
|
- $new_id = "id='id_new_blink' style='background-color: hsl(244,61%,90%);'";
|
|
|
- }
|
|
|
|
|
|
- $output .= "<tr $new_id><td>$new_class $check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_iassign</td>
|
|
|
+ $output .= "<tr $new_id><td>$new_class $check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_iassign</td>
|
|
|
<td><a href='$fileurl' title='" . get_string('download_file', 'iassign') . "$filename'>$filename</a></td>
|
|
|
<td><center>$author</center></td>
|
|
|
<td><center>$timecreated</center></td>
|
|
|
<td><center>$timemodified</center></td></tr>\n";
|
|
|
- }
|
|
|
- else if ($this->from == 'block') {
|
|
|
- $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter</td>
|
|
|
+ }
|
|
|
+ else if ($this->from == 'block') {
|
|
|
+ $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter</td>
|
|
|
<td><a href='$fileurl' title='" . get_string('download_file', 'iassign') . "$filename'>$filename</a></td>
|
|
|
<td><center>$author</center></td>
|
|
|
<td><center>$timecreated</center></td>
|
|
|
<td><center>$timemodified</center></td></tr>\n";
|
|
|
- }
|
|
|
- else if ($this->from == 'tinymce') {
|
|
|
- $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_tinymce</td>
|
|
|
+ }
|
|
|
+ else if ($this->from == 'tinymce') {
|
|
|
+ $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_tinymce</td>
|
|
|
<td><a href='$fileurl' title='" . get_string('download_file', 'iassign') . "$filename'>$filename</a></td>
|
|
|
<td><center>$author</center></td>
|
|
|
<td><center>$timecreated</center></td>
|
|
|
<td><center>$timemodified</center></td></tr>\n";
|
|
|
- }
|
|
|
- else if ($this->from == 'atto') {
|
|
|
- $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_atto</td>
|
|
|
+ }
|
|
|
+ else if ($this->from == 'atto') {
|
|
|
+ $output .= "<tr><td>$check_select$link_rename$link_delete$link_duplicate$link_edit$link_filter$link_add_ilm_atto</td>
|
|
|
<td><a href='$fileurl' title='" . get_string('download_file', 'iassign') . "$filename'>$filename</a></td>
|
|
|
<td><center>$author</center></td>
|
|
|
<td><center>$timecreated</center></td>
|
|
|
<td><center>$timemodified</center></td></tr>\n";
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$basename = explode("/", substr($dir_base, 0, strlen($dir_base) - 1));
|
|
|
$dir_base = "";
|