loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.596.2.12.2.55 and 1.596.2.12.2.56

version 1.596.2.12.2.55, 2020/11/12 01:37:12	version 1.596.2.12.2.56, 2021/01/05 22:01:28
Line 1143 LISTJAVASCRIPT	Line 1143 LISTJAVASCRIPT
$nocompmsg = '';	$nocompmsg = '';
}	}
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
.$submission_options	.$submission_options;
.&Apache::lonhtmlcommon::row_closure()	# Check if any gradable
	my $showmore;
	if ($perm{'mgr'}) {
	my @sections;
	if ($env{'request.course.sec'} ne '') {
	@sections = ($env{'request.course.sec'});
	} else {
	@sections = &Apache::loncommon::get_env_multiple('form.section');
	}
	if (grep(/^all$/,@sections)) {
	$showmore = 1;
	} else {
	foreach my $sec (@sections) {
	if (&canmodify($sec)) {
	$showmore = 1;
	last;
	}
	}
	}
	}

	if ($showmore) {
	$gradeTable .=
	&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))	.&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))
.'<span class="LC_nobreak">'	.'<span class="LC_nobreak">'
.'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'	.'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
Line 1153 LISTJAVASCRIPT	Line 1176 LISTJAVASCRIPT
.&mt('Yes').(' 'x2).'</label>'	.&mt('Yes').(' 'x2).'</label>'
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();

$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))	$gradeTable .=
	&Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
.'<select name="increment">'	.'<select name="increment">'
.'<option value="1">'.&mt('Whole Points').'</option>'	.'<option value="1">'.&mt('Whole Points').'</option>'
.'<option value=".5">'.&mt('Half Points').'</option>'	.'<option value=".5">'.&mt('Half Points').'</option>'
.'<option value=".25">'.&mt('Quarter Points').'</option>'	.'<option value=".25">'.&mt('Quarter Points').'</option>'
.'<option value=".1">'.&mt('Tenths of a Point').'</option>'	.'<option value=".1">'.&mt('Tenths of a Point').'</option>'
.'</select>';	.'</select>';
	}
$gradeTable .=	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
Line 3993 sub viewgrades {	Line 4018 sub viewgrades {
}	}

my ($common_header,$specific_header,@sections,$section_display);	my ($common_header,$specific_header,@sections,$section_display);
@sections = &Apache::loncommon::get_env_multiple('form.section');	if ($env{'request.course.sec'} ne '') {
	@sections = ($env{'request.course.sec'});
	} else {
	@sections = &Apache::loncommon::get_env_multiple('form.section');
	}

	# Check if Save button should be usable
	my $disabled = ' disabled="disabled"';
	if ($perm{'mgr'}) {
	if (grep(/^all$/,@sections)) {
	undef($disabled);
	} else {
	foreach my $sec (@sections) {
	if (&canmodify($sec)) {
	undef($disabled);
	last;
	}
	}
	}
	}
if (grep(/^all$/,@sections)) {	if (grep(/^all$/,@sections)) {
@sections = ('all');	@sections = ('all');
if ($group_display) {	if ($group_display) {
Line 4168 sub viewgrades {	Line 4212 sub viewgrades {
}	}
$result.=&Apache::loncommon::end_data_table();	$result.=&Apache::loncommon::end_data_table();
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";	$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
$result.='<input type="button" value="'.&mt('Save').'" '.	$result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
'onclick="javascript:submit();" target="_self" /></form>'."\n";	'onclick="javascript:submit();" target="_self" /></form>'."\n";
if ($ctr == 0) {	if ($ctr == 0) {
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
Line 5364 sub displayPage {	Line 5408 sub displayPage {
}	}
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}
	my $disabled;
	unless (&canmodify($usec)) {
	$disabled = ' disabled="disabled"';
	}

$studentTable.=	$studentTable.=
'</table>'."\n".	'</table>'."\n".
'<input type="button" value="'.&mt('Save').'" '.	'<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";	'</form>'."\n";
$request->print($studentTable);	$request->print($studentTable);
Line 9873 sub grading_menu {	Line 9921 sub grading_menu {

$fields{'command'} = 'initialverifyreceipt';	$fields{'command'} = 'initialverifyreceipt';
my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

	my %permissions;
	if ($perm{'mgr'}) {
	$permissions{'either'} = 'F';
	$permissions{'mgr'} = 'F';
	}
	if ($perm{'vgr'}) {
	$permissions{'either'} = 'F';
	$permissions{'vgr'} = 'F';
	}

my @menu = ({ categorytitle=>'Hand Grading',	my @menu = ({ categorytitle=>'Hand Grading',
items =>[	items =>[
{ linktext => 'Select individual students to grade',	{ linktext => 'Select individual students to grade',
url => $url1a,	url => $url1a,
permission => 'F',	permission => $permissions{'either'},
icon => 'grade_students.png',	icon => 'grade_students.png',
linktitle => 'Grade current resource for a selection of students.'	linktitle => 'Grade current resource for a selection of students.'
},	},
{ linktext => 'Grade ungraded submissions',	{ linktext => 'Grade ungraded submissions',
url => $url1b,	url => $url1b,
permission => 'F',	permission => $permissions{'either'},
icon => 'ungrade_sub.png',	icon => 'ungrade_sub.png',
linktitle => 'Grade all submissions that have not been graded yet.'	linktitle => 'Grade all submissions that have not been graded yet.'
},	},

{ linktext => 'Grading table',	{ linktext => 'Grading table',
url => $url1c,	url => $url1c,
permission => 'F',	permission => $permissions{'either'},
icon => 'grading_table.png',	icon => 'grading_table.png',
linktitle => 'Grade current resource for all students.'	linktitle => 'Grade current resource for all students.'
},	},
{ linktext => 'Grade page/folder for one student',	{ linktext => 'Grade page/folder for one student',
url => $url1d,	url => $url1d,
permission => 'F',	permission => $permissions{'either'},
icon => 'grade_PageFolder.png',	icon => 'grade_PageFolder.png',
linktitle => 'Grade all resources in current page/sequence/folder for one student.'	linktitle => 'Grade all resources in current page/sequence/folder for one student.'
},	},
{ linktext => 'Download submitted files',	{ linktext => 'Download submitted files',
url => $url1e,	url => $url1e,
permission => 'F',	permission => $permissions{'either'},
icon => 'download_sub.png',	icon => 'download_sub.png',
linktitle => 'Download all files submitted by students.'	linktitle => 'Download all files submitted by students.'
}]},	}]},
Line 9912 sub grading_menu {	Line 9970 sub grading_menu {

{ linktext => 'Upload Scores',	{ linktext => 'Upload Scores',
url => $url2,	url => $url2,
permission => 'F',	permission => $permissions{'mgr'},
icon => 'uploadscores.png',	icon => 'uploadscores.png',
linktitle => 'Specify a file containing the class scores for current resource.'	linktitle => 'Specify a file containing the class scores for current resource.'
},	},
{ linktext => 'Process Clicker',	{ linktext => 'Process Clicker',
url => $url3,	url => $url3,
permission => 'F',	permission => $permissions{'mgr'},
icon => 'addClickerInfoFile.png',	icon => 'addClickerInfoFile.png',
linktitle => 'Specify a file containing the clicker information for this resource.'	linktitle => 'Specify a file containing the clicker information for this resource.'
},	},
{ linktext => 'Grade/Manage/Review Bubblesheets',	{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,	url => $url4,
permission => 'F',	permission => $permissions{'mgr'},
icon => 'bubblesheet.png',	icon => 'bubblesheet.png',
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'	linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
},	},
{ linktext => 'Verify Receipt Number',	{ linktext => 'Verify Receipt Number',
url => $url5,	url => $url5,
permission => 'F',	permission => $permissions{'either'},
icon => 'receipt_number.png',	icon => 'receipt_number.png',
linktitle => 'Verify a system-generated receipt number for correct problem solution.'	linktitle => 'Verify a system-generated receipt number for correct problem solution.'
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.596.2.12.2.55
changed lines
	Added in v.1.596.2.12.2.56