L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaner updating of buttons and scales

Browse Source
This commit is contained in:
moodler
2005-04-15 13:41:57 +00:00
parent 83e8aaa3b0
commit 0f7d4e5e8a
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+10 -2
View File
@@ -585,16 +585,24 @@ function link_to_popup_window ($url, $name='popup', $linkname='click here',
* @uses $CFG
*/
function button_to_popup_window ($url, $name='popup', $linkname='click here',
$height=400, $width=500, $title='Popup window', $options='none', $return=false) {
$height=400, $width=500, $title='Popup window', $options='none', $return=false,
$id='', $class='') {
global $CFG;
if ($options == 'none') {
$options = 'menubar=0,location=0,scrollbars,resizable,width='. $width .',height='. $height;
}
if ($id) {
$id = ' id="'.$id.'" ';
}
if ($class) {
$class = ' class="'.$class.'" ';
}
$fullscreen = 0;
$button = '<input type="button" name="popupwindow" title="'. $title .'" value="'. $linkname .' ..." '.
$button = '<input type="button" name="'.$name.'" title="'. $title .'" value="'. $linkname .' ..." '.$id.$class.
"onclick=\"return openpopup('$url', '$name', '$options', $fullscreen);\" />\n";
if ($return) {
return $button;
mod/assignment/lib.php
+14 -5
View File
@@ -305,6 +305,7 @@ class assignment_base {
}
if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['status'])) {
echo 'opener.document.getElementById("up'.$submission->userid.'").className="s1";';
echo 'opener.document.getElementById("button'.$submission->userid.'").value="'.get_string('update').'";';
}
echo "\n-->\n</script>";
fflush();
@@ -329,7 +330,10 @@ class assignment_base {
return '-';
}
}
return $scalegrades[$grade];
if (isset($scalegrades[$grade])) {
return $scalegrades[$grade];
}
return '';
}
}
@@ -345,7 +349,7 @@ class assignment_base {
error('No such user!');
}
if (!$submission = $this->get_submission($user->id)) { // Get or make one
if (!$submission = $this->get_submission($user->id, true)) { // Get one or make one
error('Could not find submission!');
}
@@ -567,10 +571,15 @@ class assignment_base {
$comment = '<div id="com'.$auser->id.'">&nbsp;</div>';
}
if ($auser->status === NULL) {
$auser->status = 0;
}
$buttontext = ($auser->status == 1) ? $strupdate : $strgrade;
$button = button_to_popup_window ('/mod/assignment/submissions.php?id='.$this->cm->id.'&amp;userid='.$auser->id.'&amp;mode=single',
'grade'.$auser->id, $buttontext, 450, 600, $buttontext, 'none', true);
'grade'.$auser->id, $buttontext, 450, 600, $buttontext, 'none', true, 'button'.$auser->id);
$status = '<div id="up'.$auser->id.'" class="s'.$auser->status.'">'.$button.'</div>';
$row = array($picture, fullname($auser), $grade, $comment, $studentmodified, $teachermodified, $status);
@@ -601,7 +610,7 @@ class assignment_base {
return false;
}
$newsubmission = $this->get_submission($feedback->userid);
$newsubmission = $this->get_submission($feedback->userid, true); // Get or make one
$newsubmission->grade = $feedback->grade;
$newsubmission->comment = $feedback->comment;
@@ -625,7 +634,7 @@ class assignment_base {
}
function get_submission($userid, $createnew=true) {
function get_submission($userid, $createnew=false) {
$submission = get_record('assignment_submissions', 'assignment', $this->assignment->id, 'userid', $userid);
if ($submission || !$createnew) {