--- loncom/homework/grades.pm 2025/01/17 03:46:07 1.596.2.12.2.60.2.7
+++ loncom/homework/grades.pm 2020/05/20 22:02:57 1.770
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.596.2.12.2.60.2.7 2025/01/17 03:46:07 raeburn Exp $
+# $Id: grades.pm,v 1.770 2020/05/20 22:02:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,14 +44,13 @@ use Apache::Constants qw(:common :http);
use Apache::lonlocal;
use Apache::lonenc;
use Apache::lonstathelpers;
+use Apache::lonquickgrades;
use Apache::bridgetask();
use Apache::lontexconvert();
-use Apache::loncourserespicker;
use String::Similarity;
use HTML::Parser();
use File::MMagic;
use LONCAPA;
-use LONCAPA::ltiutils();
use POSIX qw(floor);
@@ -66,7 +65,7 @@ my $ssi_retries = 5;
my $ssi_error;
my $ssi_error_resource;
my $ssi_error_message;
-my $registered_cleanup;
+
sub ssi_with_retries {
my ($resource, $retries, %form) = @_;
@@ -149,7 +148,6 @@ sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---
-#--- Count responseIDs, essayresponse items, and dropbox items ---
#--- Sets response_error pointer to "1" if navmaps object broken ---
sub response_type {
my ($symb,$response_error) = @_;
@@ -167,7 +165,6 @@ sub response_type {
return;
}
my $partlist = $res->parts();
- my ($numresp,$numessay,$numdropbox) = (0,0,0);
my %vPart =
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
my (%response_types,%handgrade);
@@ -177,20 +174,13 @@ sub response_type {
my @types = $res->responseType($part);
my @ids = $res->responseIds($part);
for (my $i=0; $i < scalar(@ids); $i++) {
- $numresp ++;
$response_types{$part}{$ids[$i]} = $types[$i];
- if ($types[$i] eq 'essay') {
- $numessay ++;
- if (&Apache::lonnet::EXT("resource.$part".'_'.$ids[$i].".uploadedfiletypes",$symb)) {
- $numdropbox ++;
- }
- }
$handgrade{$part.'_'.$ids[$i]} =
&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
'.handgrade',$symb);
}
}
- return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox);
+ return ($partlist,\%handgrade,\%response_types);
}
sub flatten_responseType {
@@ -217,129 +207,6 @@ sub get_display_part {
return $display;
}
-#--- Show parts and response type
-sub showResourceInfo {
- my ($symb,$partlist,$responseType,$formname,$checkboxes,$uploads) = @_;
- unless ((ref($partlist) eq 'ARRAY') && (ref($responseType) eq 'HASH')) {
- return '<br clear="all">';
- }
- my $coltitle = &mt('Problem Part Shown');
- if ($checkboxes) {
- $coltitle = &mt('Problem Part');
- } else {
- my $checkedparts = 0;
- foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
- if (grep(/^\Q$partid\E$/,@{$partlist})) {
- $checkedparts ++;
- }
- }
- if ($checkedparts == scalar(@{$partlist})) {
- return '<br clear="all">';
- }
- if ($uploads) {
- $coltitle = &mt('Problem Part Selected');
- }
- }
- my $result = '<div class="LC_left_float" style="display:inline-block;">';
- if ($checkboxes) {
- my $legend = &mt('Parts to display');
- if ($uploads) {
- $legend = &mt('Part(s) with dropbox');
- }
- $result .= '<fieldset style="display:inline-block;"><legend>'.$legend.'</legend>'.
- '<span class="LC_nobreak">'.
- '<label><input type="radio" name="chooseparts" value="0" onclick="toggleParts('."'$formname'".');" checked="checked" />'.
- &mt('All parts').'</label>'.(' 'x2).
- '<label><input type="radio" name="chooseparts" value="1" onclick="toggleParts('."'$formname'".');" />'.
- &mt('Selected parts').'</label></span>'.
- '<div id="LC_partselector" style="display:none">';
- }
- $result .= &Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row();
- if ($checkboxes) {
- $result .= '<th>'.&mt('Display?').'</th>';
- }
- $result .= '<th>'.$coltitle.'</th>'
- .'<th>'.&mt('Res. ID').'</th>'
- .'<th>'.&mt('Type').'</th>'
- .&Apache::loncommon::end_data_table_header_row();
- my %partsseen;
- foreach my $partID (sort(keys(%$responseType))) {
- foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
- my $responsetype = $responseType->{$partID}->{$resID};
- if ($uploads) {
- next unless ($responsetype eq 'essay');
- next unless (&Apache::lonnet::EXT("resource.$partID".'_'."$resID.uploadedfiletypes",$symb));
- }
- my $display_part=&get_display_part($partID,$symb);
- if (exists($partsseen{$partID})) {
- $result.=&Apache::loncommon::continue_data_table_row();
- } else {
- $partsseen{$partID}=scalar(keys(%{$responseType->{$partID}}));
- $result.=&Apache::loncommon::start_data_table_row().
- '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">';
- if ($checkboxes) {
- $result.='<input type="checkbox" name="vPart" checked="checked" value="'.$partID.'" /></td>'.
- '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'.$display_part.'</td>';
- } else {
- $result.=$display_part.'</td>';
- }
- }
- $result.='<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
- .'<td>'.&mt($responsetype).'</td>'
- .&Apache::loncommon::end_data_table_row();
- }
- }
- $result.=&Apache::loncommon::end_data_table();
- if ($checkboxes) {
- $result .= '</div></fieldset>';
- }
- $result .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
- if (!keys(%partsseen)) {
- $result = '';
- if ($uploads) {
- return '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
- '<p class="LC_info">'.
- &mt('No dropbox items or essayresponse items with uploadedfiletypes set.').
- '</p>';
- } else {
- return '<br clear="all" />';
- }
- }
- return $result;
-}
-
-sub part_selector_js {
- my $js = <<"END";
-function toggleParts(formname) {
- if (document.getElementById('LC_partselector')) {
- var index = '';
- if (document.forms.length) {
- for (var i=0; i<document.forms.length; i++) {
- if (document.forms[i].name == formname) {
- index = i;
- break;
- }
- }
- }
- if ((index != '') && (document.forms[index].elements['chooseparts'].length > 1)) {
- for (var i=0; i<document.forms[index].elements['chooseparts'].length; i++) {
- if (document.forms[index].elements['chooseparts'][i].checked) {
- var val = document.forms[index].elements['chooseparts'][i].value;
- if (document.forms[index].elements['chooseparts'][i].value == 1) {
- document.getElementById('LC_partselector').style.display = 'block';
- } else {
- document.getElementById('LC_partselector').style.display = 'none';
- }
- }
- }
- }
- }
-}
-END
- return &Apache::lonhtmlcommon::scripttag($js);
-}
-
sub reset_caches {
&reset_analyze_cache();
&reset_perm();
@@ -638,7 +505,7 @@ COMMONJSFUNCTIONS
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
- my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus,$filterbypbid,$possibles) = @_;
+ my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;
my @getsec;
my @getgroup;
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -666,16 +533,12 @@ sub getclasslist {
#
my %sections;
my %fullnames;
- my %passback;
my ($cdom,$cnum,$partlist);
if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
$cdom = $env{"course.$env{'request.course.id'}.domain"};
$cnum = $env{"course.$env{'request.course.id'}.num"};
my $res_error;
- ($partlist) = &response_type($symb,\$res_error);
- } elsif ($filterbypbid) {
- $cdom = $env{"course.$env{'request.course.id'}.domain"};
- $cnum = $env{"course.$env{'request.course.id'}.num"};
+ ($partlist,my $handgrade,my $responseType) = &response_type($symb,\$res_error);
}
foreach my $student (keys(%$classlist)) {
my $end =
@@ -762,27 +625,6 @@ sub getclasslist {
}
}
}
- if ($filterbypbid) {
- if (ref($possibles) eq 'HASH') {
- unless (exists($possibles->{$student})) {
- delete($classlist->{$student});
- next;
- }
- }
- my $udom =
- $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];
- my $uname =
- $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];
- if (($udom ne '') && ($uname ne '')) {
- my %pbinfo = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',[$filterbypbid],$udom,$uname);
- if (ref($pbinfo{$filterbypbid}) eq 'ARRAY') {
- $passback{$student} = $pbinfo{$filterbypbid};
- } else {
- delete($classlist->{$student});
- next;
- }
- }
- }
$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {
if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
@@ -798,7 +640,7 @@ sub getclasslist {
}
}
my @sections = sort(keys(%sections));
- return ($classlist,\@sections,\%fullnames,\%passback);
+ return ($classlist,\@sections,\%fullnames);
}
sub canmodify {
@@ -1061,883 +903,12 @@ sub verifyreceipt {
return $string;
}
-#-------------------------------------------------------------------
-
-#------------------------------------------- Grade Passback Routines
-#
-
-sub initialpassback {
- my ($request,$symb) = @_;
- my $cdom = $env{"course.$env{'request.course.id'}.domain"};
- my $cnum = $env{"course.$env{'request.course.id'}.num"};
- my $crstype = &Apache::loncommon::course_type();
- my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum);
- my $readonly;
- unless ($perm{'mgr'}) {
- $readonly = 1;
- }
- my $formname = 'initialpassback';
- my $navmap = Apache::lonnavmaps::navmap->new();
- my $output;
- if (!defined($navmap)) {
- if ($crstype eq 'Community') {
- $output = &mt('Unable to retrieve information about community contents');
- } else {
- $output = &mt('Unable to retrieve information about course contents');
- }
- return '<p>'.$output.'</p>';
- }
- return &Apache::loncourserespicker::create_picker($navmap,'passback',$formname,$crstype,undef,
- undef,undef,undef,undef,undef,undef,
- \%passback,$readonly);
-}
-
-sub passback_filters {
- my ($request,$symb) = @_;
- my $cdom = $env{"course.$env{'request.course.id'}.domain"};
- my $cnum = $env{"course.$env{'request.course.id'}.num"};
- my $crstype = &Apache::loncommon::course_type();
- my ($launcher,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen);
- if ($env{'form.passback'} ne '') {
- $chosen = &unescape($env{'form.passback'});
- ($linkuri,$linkprotector,$scope) = split("\0",$chosen);
- ($launcher,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen);
- }
- my $result;
- if ($launcher ne '') {
- $result = &launcher_info_box($launcher,$appname,$setter,$linkuri,$scope).
- '<p><br />'.&mt('Set criteria to use to list students for possible passback of scores, then push Next [_1]',
- '→').
- '</p>';
- }
- $result .= '<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
- '<input type="hidden" name="passback" value="'.&escape($chosen).'" />'."\n".
- '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
- my ($submittext,$newcommand);
- if ($launcher ne '') {
- $submittext = &mt('Next').' →';
- $newcommand = 'passbacknames';
- $result .= &selectfield(0)."\n";
- } else {
- $submittext = '← '.&mt('Previous');
- $newcommand = 'initialpassback';
- if ($env{'form.passback'}) {
- $result .= '<span class="LC_warning">'.&mt('Invalid launcher').'</span>'."\n";
- } else {
- $result .= '<span class="LC_warning">'.&mt('No launcher selected').'</span>'."\n";
- }
- }
- $result .= '<input type="hidden" name="command" value="'.$newcommand.'" />'."\n".
- '<div>'."\n".
- '<input type="submit" value="'.$submittext.'" />'."\n".
- '</div>'."\n".
- '</form>'."\n";
- return $result;
-}
-
-sub names_for_passback {
- my ($request,$symb) = @_;
- my $cdom = $env{"course.$env{'request.course.id'}.domain"};
- my $cnum = $env{"course.$env{'request.course.id'}.num"};
- my $crstype = &Apache::loncommon::course_type();
- my ($launcher,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen);
- if ($env{'form.passback'} ne '') {
- $chosen = &unescape($env{'form.passback'});
- ($linkuri,$linkprotector,$scope) = split("\0",$chosen);
- ($launcher,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen);
- }
- my ($result,$ctr,$newcommand,$submittext);
- if ($launcher ne '') {
- $result = &launcher_info_box($launcher,$appname,$setter,$linkuri,$scope);
- }
- $ctr = 0;
- my @statuses = &Apache::loncommon::get_env_multiple('form.Status');
- my $stu_status = join(':',@statuses);
- $result .= '<form action="/adm/grades" method="post" name="passbackusers">'."\n".
- '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
- if ($launcher ne '') {
- $result .= '<input type="hidden" name="passback" value="'.&escape($chosen).'" />'."\n".
- '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
- my ($sections,$groups,$group_display,$disabled) = §ions_and_groups();
- my $section_display = join(' ',@{$sections});
- my $status_display;
- if ((grep(/^Any$/,@statuses)) ||
- (@statuses == 3)) {
- $status_display = &mt('Any');
- } else {
- $status_display = join(' '.&mt('or').' ',map { &mt($_); } @statuses);
- }
- $result .= '<p>'.&mt('Student(s) with stored passback credentials for [_1], and also satisfy:',
- '<span class="LC_cusr_emph">'.$linkuri.'</span>').
- '<ul>'.
- '<li>'.&mt('Section(s)').": $section_display</li>\n".
- '<li>'.&mt('Group(s)').": $group_display</li>\n".
- '<li>'.&mt('Status').": $status_display</li>\n".
- '</ul>';
- my ($classlist,undef,$fullname) = &getclasslist($sections,'1',$groups,'','','',$chosen);
- if (keys(%$fullname)) {
- $newcommand = 'passbackscores';
- $result .= &build_section_inputs().
- &checkselect_js('passbackusers').
- '<p><br />'.
- &mt("To send scores, check box(es) next to the student's name(s), then push 'Send Scores'.").
- '</p>'.
- &check_script('passbackusers', 'stuinfo')."\n".
- '<input type="button" '."\n".
- 'onclick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 'value="'.&mt('Send Scores').'" /> <br />'."\n".
- &check_buttons()."\n".
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row();
- my $loop = 0;
- while ($loop < 2) {
- $result .= '<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
- '<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>';
- $loop++;
- }
- $result .= &Apache::loncommon::end_data_table_header_row()."\n";
- foreach my $student (sort
- {
- if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
- }
- return $a cmp $b;
- }
- (keys(%$fullname))) {
- $ctr++;
- my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
- my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
- my $udom = $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];
- my $uname = $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];
- if ( $perm{'vgr'} eq 'F' ) {
- if ($ctr%2 ==1) {
- $result.= &Apache::loncommon::start_data_table_row();
- }
- $result .= '<td align="right">'.$ctr.' </td>'.
- '<td align="center"><label><input type="checkbox" name="stuinfo" value="'.
- $student.':'.$$fullname{$student}.':::SECTION'.$section.
- ') " /> </label></td>'."\n".'<td>'.
- &nameUserString(undef,$$fullname{$student},$uname,$udom).
- ' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
-
- if ($ctr%2 ==0) {
- $result .= &Apache::loncommon::end_data_table_row()."\n";
- }
- }
- }
- if ($ctr%2 ==1) {
- $result .= &Apache::loncommon::end_data_table_row();
- }
- $result .= &Apache::loncommon::end_data_table()."\n";
- if ($ctr) {
- $result .= '<input type="button" '.
- 'onclick="javascript:checkSelect(this.form.stuinfo);" '.
- 'value="'.&mt('Send Scores').'" />'."\n";
- }
- } else {
- $submittext = '← '.&mt('Previous');
- $newcommand = 'passback';
- $result .= '<span class="LC_warning">'.&mt('No students match the selection criteria').'</p>';
- }
- } else {
- $newcommand = 'initialpassback';
- $submittext = &mt('Start over');
- if ($env{'form.passback'}) {
- $result .= '<span class="LC_warning">'.&mt('Invalid launcher').'</span>'."\n";
- } else {
- $result .= '<span class="LC_warning">'.&mt('No launcher selected').'</span>'."\n";
- }
- }
- $result .= '<input type="hidden" name="command" value="'.$newcommand.'" />'."\n";
- if (!$ctr) {
- $result .= '<div>'."\n".
- '<input type="submit" value="'.$submittext.'" />'."\n".
- '</div>'."\n";
- }
- $result .= '</form>'."\n";
- return $result;
-}
-
-sub do_passback {
- my ($request,$symb) = @_;
- my $cdom = $env{"course.$env{'request.course.id'}.domain"};
- my $cnum = $env{"course.$env{'request.course.id'}.num"};
- my $crstype = &Apache::loncommon::course_type();
- my ($launchsymb,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen);
- if ($env{'form.passback'} ne '') {
- $chosen = &unescape($env{'form.passback'});
- ($linkuri,$linkprotector,$scope) = split("\0",$chosen);
- ($launchsymb,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen);
- }
- if ($launchsymb ne '') {
- $request->print(&launcher_info_box($launchsymb,$appname,$setter,$linkuri,$scope));
- }
- my $error;
- if ($perm{'mgr'}) {
- if ($launchsymb ne '') {
- my @poss_students = &Apache::loncommon::get_env_multiple('form.stuinfo');
- if (@poss_students) {
- my %possibles;
- foreach my $item (@poss_students) {
- my ($stuname,$studom) = split(/:/,$item,3);
- $possibles{$stuname.':'.$studom} = 1;
- }
- my ($sections,$groups,$group_display,$disabled) = §ions_and_groups();
- my ($classlist,undef,$fullname,$pbinfo) =
- &getclasslist($sections,'1',$groups,'','','',$chosen,\%possibles);
- if ((ref($classlist) eq 'HASH') && (ref($pbinfo) eq 'HASH')) {
- my %passback = %{$pbinfo};
- my (%tosend,%remotenotok,%scorenotok,%zeroposs,%nopbinfo);
- foreach my $possible (keys(%possibles)) {
- if ((exists($classlist->{$possible})) &&
- (exists($passback{$possible})) && (ref($passback{$possible}) eq 'ARRAY')) {
- $tosend{$possible} = 1;
- }
- }
- if (keys(%tosend)) {
- my ($lti_in_use,$crsdef);
- my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/);
- if ($ltitype eq 'c') {
- my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
- $lti_in_use = $crslti{$ltinum};
- $crsdef = 1;
- } else {
- my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
- $lti_in_use = $domlti{$ltinum};
- }
- if (ref($lti_in_use) eq 'HASH') {
- my $msgformat = $lti_in_use->{'passbackformat'};
- my $keynum = $lti_in_use->{'cipher'};
- my $scoretype = 'decimal';
- if ($lti_in_use->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
- $scoretype = $1;
- }
- my $pbmap;
- if ($launchsymb =~ /\.(page|sequence)$/) {
- $pbmap = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($launchsymb))[2]);
- } else {
- $pbmap = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($launchsymb))[0]);
- }
- $pbmap = &Apache::lonnet::clutter($pbmap);
- my $pbscope;
- if ($scope eq 'res') {
- $pbscope = 'resource';
- } elsif ($scope eq 'map') {
- $pbscope = 'nonrec';
- } elsif ($scope eq 'rec') {
- $pbscope = 'map';
- }
- my %pb = &common_passback_info();
- my $numstudents = scalar(keys(%tosend));
- my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($request,$numstudents);
- my $outcome = &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row();
- my $loop = 0;
- while ($loop < 2) {
- $outcome .= '<th>'.&mt('No.').'</th>'.
- '<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'.
- '<th>'.&mt('Score').'</th>';
- $loop++;
- }
- $outcome .= &Apache::loncommon::end_data_table_header_row()."\n";
- my $ctr=0;
- foreach my $student (sort
- {
- if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
- }
- return $a cmp $b;
- } (keys(%$fullname))) {
- next unless ($tosend{$student});
- my ($uname,$udom) = split(/:/,$student);
- &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,'last student');
- my ($uname,$udom) = split(/:/,$student);
- my $uhome = &Apache::lonnet::homeserver($uname,$udom),
- my $id = $passback{$student}[0],
- my $url = $passback{$student}[1],
- my ($total,$possible,$usec);
- if (ref($classlist->{$student}) eq 'ARRAY') {
- $usec = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION];
- }
- if ($pbscope eq 'resource') {
- $total = 0;
- $possible = 0;
- my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($launchsymb);
- if (ref($res)) {
- my $partlist = $res->parts();
- if (ref($partlist) eq 'ARRAY') {
- my %record = &Apache::lonnet::restore($launchsymb,$env{'request.course.id'},$udom,$uname);
- foreach my $part (@{$partlist}) {
- next if ($record{"resource.$part.solved"} =~/^excused/);
- my $weight = &Apache::lonnet::EXT("resource.$part.weight",$launchsymb,$udom,$uname,$usec);
- $possible += $weight;
- if (($record{'version'}) && (exists($record{"resource.$part.awarded"}))) {
- my $awarded = $record{"resource.$part.awarded"};
- if ($awarded) {
- $total += $weight * $awarded;
- }
- }
- }
- }
- }
- }
- } elsif (($pbscope eq 'map') || ($pbscope eq 'nonrec')) {
- ($total,$possible) =
- &Apache::lonhomework::get_lti_score($uname,$udom,$usec,$pbmap,$pbscope);
- }
- if (($id ne '') && ($url ne '') && ($possible)) {
- my ($sent,$score,$code,$result) =
- &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$pb{'type'},$ltinum,$keynum,$id,
- $url,$scoretype,$pb{'sigmethod'},$msgformat,$total,$possible);
- my $no_passback;
- if ($sent) {
- if ($code == 200) {
- delete($tosend{$student});
- my $namespace = $cdom.'_'.$cnum.'_lp_passback';
- my $store = {
- 'score' => $score,
- 'ip' => $pb{'ip'},
- 'host' => $pb{'lonhost'},
- 'protector' => $linkprotector,
- 'deeplink' => $linkuri,
- 'scope' => $scope,
- 'url' => $url,
- 'id' => $id,
- 'clientip' => $pb{'clientip'},
- 'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'},
- };
- my $value='';
- foreach my $key (keys(%{$store})) {
- $value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&';
- }
- $value=~s/\&$//;
- &Apache::lonnet::courselog(&escape($linkuri).':'.$uname.':'.$udom.':EXPORT:'.$value);
- &Apache::lonnet::cstore({'score' => $score},$chosen,$namespace,$udom,$uname,'',$pb{'ip'},1);
- $ctr++;
- if ($ctr%2 ==1) {
- $outcome .= &Apache::loncommon::start_data_table_row();
- }
- my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
- $outcome .= '<td align="right">'.$ctr.' </td>'.
- '<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).
- ' '.$usec.($group ne '' ?'/'.$group:'').'</td>'.
- '<td>'.$score.'</td>'."\n";
- if ($ctr%2 ==0) {
- $outcome .= &Apache::loncommon::end_data_table_row()."\n";
- }
- } else {
- $remotenotok{$student} = 1;
- $no_passback = "Passback response for ".$linkprotector." was $code ($result)";
- &Apache::lonnet::logthis($no_passback." for $uname:$udom in ${cdom}_${cnum}");
- }
- } else {
- $scorenotok{$student} = 1;
- $no_passback = "Passback of grades not sent for ".$linkprotector;
- &Apache::lonnet::logthis($no_passback." for $uname:$udom in ${cdom}_${cnum}");
- }
- if ($no_passback) {
- &Apache::lonnet::log($udom,$uname,$uhome,$no_passback." score: $score; total: $total; possible: $possible");
- my $key = &Time::HiRes::time().':'.$uname.':'.$udom.':'.
- "$linkuri\0$linkprotector\0$scope";
- my $ltigrade = {
- $key => {
- 'ltinum' => $ltinum,
- 'lti' => $lti_in_use,
- 'crsdef' => $crsdef,
- 'cid' => $cdom.'_'.$cnum,
- 'uname' => $uname,
- 'udom' => $udom,
- 'uhome' => $uhome,
- 'pbid' => $id,
- 'pburl' => $url,
- 'pbtype' => $pb{'type'},
- 'pbscope' => $pbscope,
- 'pbmap' => $pbmap,
- 'pbsymb' => $launchsymb,
- 'format' => $scoretype,
- 'scope' => $scope,
- 'clientip' => $pb{'clientip'},
- 'linkprot' => $linkprotector.':'.$linkuri,
- 'total' => $total,
- 'possible' => $possible,
- 'score' => $score,
- },
- };
- &Apache::lonnet::put('linkprot_passback_pending',$ltigrade,$cdom,$cnum);
- }
- } else {
- if (($id ne '') && ($url ne '')) {
- $zeroposs{$student} = 1;
- } else {
- $nopbinfo{$student} = 1;
- }
- }
- }
- &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
- if ($ctr%2 ==1) {
- $outcome .= &Apache::loncommon::end_data_table_row();
- }
- $outcome .= &Apache::loncommon::end_data_table();
- if ($ctr) {
- $request->print('<p><br />'.&mt('Scores sent to launcher CMS').'</p>'.
- '<p>'.$outcome.'</p>');
- } else {
- $request->print('<p>'.&mt('No scores sent to launcher CMS').'</p>');
- }
- if (keys(%tosend)) {
- $request->print('<p>'.&mt('No scores sent for following'));
- my ($zeros,$nopbcreds,$noconfirm,$noscore);
- foreach my $student (sort
- {
- if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
- }
- return $a cmp $b;
- } (keys(%$fullname))) {
- next unless ($tosend{$student});
- my ($uname,$udom) = split(/:/,$student);
- my $line = '<li>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</li>'."\n";
- if ($zeroposs{$student}) {
- $zeros .= $line;
- } elsif ($nopbinfo{$student}) {
- $nopbcreds .= $line;
- } elsif ($remotenotok{$student}) {
- $noconfirm .= $line;
- } elsif ($scorenotok{$student}) {
- $noscore .= $line;
- }
- }
- if ($zeros) {
- $request->print('<br />'.&mt('Total points possible was 0').':'.
- '<ul>'.$zeros.'</ul><br />');
- }
- if ($nopbcreds) {
- $request->print('<br />'.&mt('Missing unique identifier and/or passback location').':'.
- '<ul>'.$nopbcreds.'</ul><br />');
- }
- if ($noconfirm) {
- $request->print('<br />'.&mt('Score receipt not confirmed by receiving CMS').':'.
- '<ul>'.$noconfirm.'</ul><br />');
- }
- if ($noscore) {
- $request->print('<br />'.&mt('Score computation or transmission failed').':'.
- '<ul>'.$noscore.'</ul><br />');
- }
- $request->print('</p>');
- }
- } else {
- $error = &mt('Settings for deep-link launch target unavailable, so no scores were sent');
- }
- } else {
- $error = &mt('No available students for whom scores can be sent.');
- }
- } else {
- $error = &mt('Classlist could not be retrieved so no scores were sent.');
- }
- } else {
- $error = &mt('No students selected to receive scores so none were sent.');
- }
- } else {
- if ($env{'form.passback'}) {
- $error = &mt('Deep-link launch target was invalid so no scores were sent.');
- } else {
- $error = &mt('Deep-link launch target was missing so no scores were sent.');
- }
- }
- } else {
- $error = &mt('You do not have permission to manage grades, so no scores were sent');
- }
- if ($error) {
- $request->print('<p class="LC_info">'.$error.'</p>');
- }
- return;
-}
-
-sub get_passback_launcher {
- my ($cdom,$cnum,$chosen) = @_;
- my ($linkuri,$linkprotector,$scope) = split("\0",$chosen);
- my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/);
- my ($appname,$setter);
- if ($ltitype eq 'c') {
- my %lti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
- if (ref($lti{$ltinum}) eq 'HASH') {
- $appname = $lti{$ltinum}{'name'};
- if ($appname) {
- $setter = ' (defined in course)';
- }
- }
- } elsif ($ltitype eq 'd') {
- my %lti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
- if (ref($lti{$ltinum}) eq 'HASH') {
- $appname = $lti{$ltinum}{'name'};
- if ($appname) {
- $setter = ' (defined in domain)';
- }
- }
- }
- my $launchsymb = &Apache::loncommon::symb_from_tinyurl($linkuri,$cnum,$cdom);
- if ($launchsymb eq '') {
- my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum);
- foreach my $poss_symb (keys(%passback)) {
- if (ref($passback{$poss_symb}) eq 'HASH') {
- if (exists($passback{$poss_symb}{$chosen})) {
- $launchsymb = $poss_symb;
- last;
- }
- }
- }
- if ($launchsymb ne '') {
- return ($launchsymb,$appname,$setter);
- }
- } else {
- my %passback = &Apache::lonnet::get('nohist_linkprot_passback',[$launchsymb],$cdom,$cnum);
- if (ref($passback{$launchsymb}) eq 'HASH') {
- if (exists($passback{$launchsymb}{$chosen})) {
- return ($launchsymb,$appname,$setter);
- }
- }
- }
- return ();
-}
-
-sub sections_and_groups {
- my (@sections,@groups,$group_display);
- @groups = &Apache::loncommon::get_env_multiple('form.group');
- if (grep(/^all$/,@groups)) {
- @groups = ('all');
- $group_display = 'all';
- } elsif (grep(/^none$/,@groups)) {
- @groups = ('none');
- $group_display = 'none';
- } elsif (@groups > 0) {
- $group_display = join(', ',@groups);
- }
- if ($env{'request.course.sec'} ne '') {
- @sections = ($env{'request.course.sec'});
- } else {
- @sections = &Apache::loncommon::get_env_multiple('form.section');
- }
- 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)) {
- @sections = ('all');
- }
- return(\@sections,\@groups,$group_display,$disabled);
-}
-
-sub launcher_info_box {
- my ($launcher,$appname,$setter,$linkuri,$scope) = @_;
- my $shownscope;
- if ($scope eq 'res') {
- $shownscope = &mt('Resource');
- } elsif ($scope eq 'map') {
- $shownscope = &mt('Folder');
- } elsif ($scope eq 'rec') {
- $shownscope = &mt('Folder + sub-folders');
- }
- return '<p>'.
- &Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title(&mt('Launch Item Title')).
- &Apache::lonnet::gettitle($launcher).
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(&mt('Deep-link')).
- $linkuri.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(&mt('Launcher')).
- $appname.' '.$setter.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(&mt('Score Type')).
- $shownscope.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</p>'."\n";
-}
-
-sub passbacks_for_symb {
- my ($cdom,$cnum,$symb) = @_;
- my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum);
- my %needpb;
- if (keys(%passback)) {
- my $checkpb = 1;
- if (exists($passback{$symb})) {
- if (keys(%passback) == 1) {
- undef($checkpb);
- }
- if (ref($passback{$symb}) eq 'HASH') {
- foreach my $launcher (keys(%{$passback{$symb}})) {
- $needpb{$launcher} = $symb;
- }
- }
- }
- if ($checkpb) {
- my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $mapres = $navmap->getResourceByUrl($map);
- if (ref($mapres)) {
- my $mapsymb = $mapres->symb();
- if (exists($passback{$mapsymb})) {
- if (keys(%passback) == 1) {
- undef($checkpb);
- }
- if (ref($passback{$mapsymb}) eq 'HASH') {
- foreach my $launcher (keys(%{$passback{$mapsymb}})) {
- $needpb{$launcher} = $mapsymb;
- }
- }
- }
- my %posspb;
- if ($checkpb) {
- my @recurseup = $navmap->recurseup_maps($map,1);
- if (@recurseup) {
- map { $posspb{$_} = 1; } @recurseup;
- }
- }
- foreach my $key (keys(%passback)) {
- if (exists($posspb{$key})) {
- if (ref($passback{$key}) eq 'HASH') {
- foreach my $launcher (keys(%{$passback{$key}})) {
- my ($linkuri,$linkprotector,$scope) = split("\0",$launcher);
- next unless ($scope eq 'rec');
- $needpb{$launcher} = $key;
- }
- }
- }
- }
- }
- }
- }
- }
- return %needpb;
-}
-
-sub process_passbacks {
- my ($context,$symbs,$cdom,$cnum,$udom,$uname,$usec,$weights,$awardeds,$excuseds,$needpb,
- $skip_passback,$pbsave,$pbids) = @_;
- if ((ref($needpb) eq 'HASH') && (ref($skip_passback) eq 'HASH') && (ref($pbsave) eq 'HASH')) {
- my (%weight,%awarded,%excused);
- if ((ref($symbs) eq 'ARRAY') && (ref($weights) eq 'HASH') && (ref($awardeds) eq 'HASH') &&
- (ref($excuseds) eq 'HASH')) {
- %weight = %{$weights};
- %awarded = %{$awardeds};
- %excused = %{$excuseds};
- }
- my $uhome = &Apache::lonnet::homeserver($uname,$udom);
- my @launchers = keys(%{$needpb});
- my %pbinfo;
- if (ref($pbids) eq 'HASH') {
- %pbinfo = %{$pbids};
- } else {
- %pbinfo = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',\@launchers,$udom,$uname);
- }
- my %pbc = &common_passback_info();
- foreach my $launcher (@launchers) {
- if (ref($pbinfo{$launcher}) eq 'ARRAY') {
- my $pbid = $pbinfo{$launcher}[0];
- my $pburl = $pbinfo{$launcher}[1];
- my (%total_by_symb,%possible_by_symb);
- if (($pbid ne '') && ($pburl ne '')) {
- next if ($skip_passback->{$launcher});
- my %pb = %pbc;
- if ((exists($pbsave->{$launcher})) &&
- (ref($pbsave->{$launcher}) eq 'HASH')) {
- foreach my $item ('lti_in_use','crsdef','ltinum','keynum','scoretype','msgformat',
- 'symb','map','pbscope','linkuri','linkprotector','scope') {
- $pb{$item} = $pbsave->{$launcher}{$item};
- }
- } else {
- my $ltitype;
- ($pb{'linkuri'},$pb{'linkprotector'},$pb{'scope'}) = split("\0",$launcher);
- ($pb{'ltinum'},$ltitype) = ($pb{'linkprotector'} =~ /^(\d+)(c|d)$/);
- if ($ltitype eq 'c') {
- my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
- $pb{'lti_in_use'} = $crslti{$pb{'ltinum'}};
- $pb{'crsdef'} = 1;
- } else {
- my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
- $pb{'lti_in_use'} = $domlti{$pb{'ltinum'}};
- }
- if (ref($pb{'lti_in_use'}) eq 'HASH') {
- $pb{'msgformat'} = $pb{'lti_in_use'}->{'passbackformat'};
- $pb{'keynum'} = $pb{'lti_in_use'}->{'cipher'};
- $pb{'scoretype'} = 'decimal';
- if ($pb{'lti_in_use'}->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
- $pb{'scoretype'} = $1;
- }
- $pb{'symb'} = $needpb->{$launcher};
- if ($pb{'symb'} =~ /\.(page|sequence)$/) {
- $pb{'map'} = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($pb{'symb'}))[2]);
- } else {
- $pb{'map'} = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($pb{'symb'}))[0]);
- }
- $pb{'map'} = &Apache::lonnet::clutter($pb{'map'});
- if ($pb{'scope'} eq 'res') {
- $pb{'pbscope'} = 'resource';
- } elsif ($pb{'scope'} eq 'map') {
- $pb{'pbscope'} = 'nonrec';
- } elsif ($pb{'scope'} eq 'rec') {
- $pb{'pbscope'} = 'map';
- }
- foreach my $item ('lti_in_use','crsdef','ltinum','keynum','scoretype','msgformat',
- 'symb','map','pbscope','linkuri','linkprotector','scope') {
- $pbsave->{$launcher}{$item} = $pb{$item};
- }
- } else {
- $skip_passback->{$launcher} = 1;
- }
- }
- if (ref($symbs) eq 'ARRAY') {
- foreach my $symb (@{$symbs}) {
- if ((ref($weight{$symb}) eq 'HASH') && (ref($awarded{$symb}) eq 'HASH') &&
- (ref($excused{$symb}) eq 'HASH')) {
- foreach my $part (keys(%{$weight{$symb}})) {
- if ($excused{$symb}{$part}) {
- next;
- }
- my $partweight = $weight{$symb}{$part} eq '' ? 1 :
- $weight{$symb}{$part};
- if ($awarded{$symb}{$part}) {
- $total_by_symb{$symb} += $partweight * $awarded{$symb}{$part};
- }
- $possible_by_symb{$symb} += $partweight;
- }
- }
- }
- }
- if ($context eq 'updatebypage') {
- my $ltigrade = {
- 'ltinum' => $pb{'ltinum'},
- 'lti' => $pb{'lti_in_use'},
- 'crsdef' => $pb{'crsdef'},
- 'cid' => $cdom.'_'.$cnum,
- 'uname' => $uname,
- 'udom' => $udom,
- 'uhome' => $uhome,
- 'usec' => $usec,
- 'pbid' => $pbid,
- 'pburl' => $pburl,
- 'pbtype' => $pb{'type'},
- 'pbscope' => $pb{'pbscope'},
- 'pbmap' => $pb{'map'},
- 'pbsymb' => $pb{'symb'},
- 'format' => $pb{'scoretype'},
- 'scope' => $pb{'scope'},
- 'clientip' => $pb{'clientip'},
- 'linkprot' => $pb{'linkprotector'}.':'.$pb{'linkuri'},
- 'total_s' => \%total_by_symb,
- 'possible_s' => \%possible_by_symb,
- };
- push(@Apache::grades::ltipassback,$ltigrade);
- next;
- }
- my ($total,$possible);
- if ($pb{'pbscope'} eq 'resource') {
- $total = $total_by_symb{$pb{'symb'}};
- $possible = $possible_by_symb{$pb{'symb'}};
- } elsif (($pb{'pbscope'} eq 'map') || ($pb{'pbscope'} eq 'nonrec')) {
- ($total,$possible) =
- &Apache::lonhomework::get_lti_score($uname,$udom,$usec,$pb{'map'},$pb{'pbscope'},
- \%total_by_symb,\%possible_by_symb);
- }
- if (!$possible) {
- $total = 0;
- $possible = 1;
- }
- my ($sent,$score,$code,$result) =
- &LONCAPA::ltiutils::send_grade($cdom,$cnum,$pb{'crsdef'},$pb{'type'},$pb{'ltinum'},
- $pb{'keynum'},$pbid,$pburl,$pb{'scoretype'},$pb{'sigmethod'},
- $pb{'msgformat'},$total,$possible);
- my $no_passback;
- if ($sent) {
- if ($code == 200) {
- my $namespace = $cdom.'_'.$cnum.'_lp_passback';
- my $store = {
- 'score' => $score,
- 'ip' => $pb{'ip'},
- 'host' => $pb{'lonhost'},
- 'protector' => $pb{'linkprotector'},
- 'deeplink' => $pb{'linkuri'},
- 'scope' => $pb{'scope'},
- 'url' => $pburl,
- 'id' => $pbid,
- 'clientip' => $pb{'clientip'},
- 'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'},
- };
- my $value='';
- foreach my $key (keys(%{$store})) {
- $value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&';
- }
- $value=~s/\&$//;
- &Apache::lonnet::courselog(&escape($pb{'linkuri'}).':'.$uname.':'.$udom.':EXPORT:'.$value);
- &Apache::lonnet::cstore({'score' => $score},$launcher,$namespace,$udom,$uname,'',$pb{'ip'},1);
- } else {
- $no_passback = 1;
- }
- } else {
- $no_passback = 1;
- }
- if ($no_passback) {
- &Apache::lonnet::log($udom,$uname,$uhome,$no_passback." score: $score; total: $total; possible: $possible");
- my $ltigrade = {
- 'ltinum' => $pb{'ltinum'},
- 'lti' => $pb{'lti_in_use'},
- 'crsdef' => $pb{'crsdef'},
- 'cid' => $cdom.'_'.$cnum,
- 'uname' => $uname,
- 'udom' => $udom,
- 'uhome' => $uhome,
- 'pbid' => $pbid,
- 'pburl' => $pburl,
- 'pbtype' => $pb{'type'},
- 'pbscope' => $pb{'pbscope'},
- 'pbmap' => $pb{'map'},
- 'pbsymb' => $pb{'symb'},
- 'format' => $pb{'scoretype'},
- 'scope' => $pb{'scope'},
- 'clientip' => $pb{'clientip'},
- 'linkprot' => $pb{'linkprotector'}.':'.$pb{'linkuri'},
- 'total' => $total,
- 'possible' => $possible,
- 'score' => $score,
- };
- &Apache::lonnet::put('linkprot_passback_pending',$ltigrade,$cdom,$cnum);
- }
- }
- }
- }
- }
- return;
-}
-
-sub common_passback_info {
- my %pbc = (
- sigmethod => 'HMAC-SHA1',
- type => 'linkprot',
- clientip => &Apache::lonnet::get_requestor_ip(),
- lonhost => $Apache::lonnet::perlvar{'lonHostID'},
- ip => &Apache::lonnet::get_host_ip($Apache::lonnet::perlvar{'lonHostID'}),
- );
- return %pbc;
-}
-
#--- This is called by a number of programs.
#--- Called from the Grading Menu - View/Grade an individual student
#--- Also called directly when one clicks on the subm button
# on the problem page.
sub listStudents {
- my ($request,$symb,$submitonly,$divforres) = @_;
+ my ($request,$symb,$submitonly) = @_;
my $is_tool = ($symb =~ /ext\.tool$/);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};
@@ -1950,21 +921,36 @@ sub listStudents {
my $result='';
my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
-
- my $table;
- if (ref($partlist) eq 'ARRAY') {
- if (scalar(@$partlist) > 1 ) {
- $table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1);
- } elsif ($divforres) {
- $table = '<div style="padding:0;clear:both;margin:0;border:0"></div>';
- } else {
- $table = '<br clear="all" />';
- }
- }
+ my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
- $request->print(&checkselect_js());
+ my %js_lt = &Apache::lonlocal::texthash (
+ 'multiple' => 'Please select a student or group of students before clicking on the Next button.',
+ 'single' => 'Please select the student before clicking on the Next button.',
+ );
+ &js_escape(\%js_lt);
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
+ function checkSelect(checkBox) {
+ var ctr=0;
+ var sense="";
+ if (checkBox.length > 1) {
+ for (var i=0; i<checkBox.length; i++) {
+ if (checkBox[i].checked) {
+ ctr++;
+ }
+ }
+ sense = '$js_lt{'multiple'}';
+ } else {
+ if (checkBox.checked) {
+ ctr = 1;
+ }
+ sense = '$js_lt{'single'}';
+ }
+ if (ctr == 0) {
+ alert(sense);
+ return false;
+ }
+ document.gradesub.submit();
+ }
function reLoadList(formname) {
if (formname.saveStatusOld.value == pullDownSelection(formname.Status)) {return;}
@@ -1977,8 +963,8 @@ LISTJAVASCRIPT
$request->print($result);
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
- "\n".$table;
-
+ "\n";
+
$gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
unless ($is_tool) {
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
@@ -1993,6 +979,7 @@ LISTJAVASCRIPT
.&Apache::lonhtmlcommon::row_closure();
}
+ my $submission_options;
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;
@@ -2012,7 +999,7 @@ LISTJAVASCRIPT
all => 'all submissions with details',
);
}
- my $submission_options =
+ $submission_options.=
'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="lastonly" /> '.
$optiontext{'lastonly'}.' </label></span>'."\n".
@@ -2031,77 +1018,48 @@ LISTJAVASCRIPT
} else {
$viewtitle = &mt('View Submissions');
}
- my ($compmsg,$nocompmsg);
- $nocompmsg = ' checked="checked"';
- if ($numessay) {
- $compmsg = $nocompmsg;
- $nocompmsg = '';
- }
$gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle)
- .$submission_options;
-# Check if any gradable
- my $showmore;
- if ($perm{'mgr'}) {
- my @sections;
- if ($env{'request.course.sec'} ne '') {
- @sections = ($env{'request.course.sec'});
- } elsif ($env{'form.section'} eq '') {
- @sections = ('all');
- } 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'))
- .'<span class="LC_nobreak">'
- .'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
- .&mt('No').(' 'x2).'</label>'
- .'<label><input type="radio" name="compmsg" value="1"'.$compmsg.' />'
- .&mt('Yes').(' 'x2).'</label>'
+ .$submission_options
.&Apache::lonhtmlcommon::row_closure();
- $gradeTable .=
- &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+ my $closure;
+ if (($is_tool) && (exists($env{'form.Status'}))) {
+ $closure = 1;
+ }
+ $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
.'<select name="increment">'
.'<option value="1">'.&mt('Whole Points').'</option>'
.'<option value=".5">'.&mt('Half Points').'</option>'
.'<option value=".25">'.&mt('Quarter Points').'</option>'
.'<option value=".1">'.&mt('Tenths of a Point').'</option>'
- .'</select>';
- }
+ .'</select>'
+ .&Apache::lonhtmlcommon::row_closure($closure);
+
$gradeTable .=
&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
+
if (exists($env{'form.Status'})) {
- $gradeTable .= '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
+ $gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
} else {
- $gradeTable .= &Apache::lonhtmlcommon::row_closure()
- .&Apache::lonhtmlcommon::row_title(&mt('Student Status'))
+ if ($is_tool) {
+ $closure = 1;
+ }
+ $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
.&Apache::lonhtmlcommon::StatusOptions(
- $saveStatus,undef,1,'javascript:reLoadList(this.form);');
+ $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+ .&Apache::lonhtmlcommon::row_closure($closure);
}
- if ($numessay) {
- $gradeTable .= &Apache::lonhtmlcommon::row_closure()
- .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
- .'<input type="checkbox" name="checkPlag" checked="checked" />';
+
+ unless ($is_tool) {
+ $closure = 1;
+ $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
+ .'<input type="checkbox" name="checkPlag" checked="checked" />'
+ .&Apache::lonhtmlcommon::row_closure($closure);
}
- $gradeTable .= &Apache::lonhtmlcommon::row_closure(1)
- .&Apache::lonhtmlcommon::end_pick_box();
+ $gradeTable .= &Apache::lonhtmlcommon::end_pick_box();
my $regrademsg;
if ($is_tool) {
$regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button.");
@@ -2252,55 +1210,7 @@ LISTJAVASCRIPT
return '';
}
-#---- Called from the listStudents and the names_for_passback routines.
-
-sub checkselect_js {
- my ($formname) = @_;
- if ($formname eq '') {
- $formname = 'gradesub';
- }
- my %js_lt;
- if ($formname eq 'passbackusers') {
- %js_lt = &Apache::lonlocal::texthash (
- 'multiple' => 'Please select a student or group of students before pushing the Save Scores button.',
- 'single' => 'Please select the student before pushing the Save Scores button.',
- );
- } else {
- %js_lt = &Apache::lonlocal::texthash (
- 'multiple' => 'Please select a student or group of students before clicking on the Next button.',
- 'single' => 'Please select the student before clicking on the Next button.',
- );
- }
- &js_escape(\%js_lt);
- return &Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT);
-
- function checkSelect(checkBox) {
- var ctr=0;
- var sense="";
- var len = checkBox.length;
- if (len == undefined) len = 1;
- if (len > 1) {
- for (var i=0; i<len; i++) {
- if (checkBox[i].checked) {
- ctr++;
- }
- }
- sense = '$js_lt{'multiple'}';
- } else {
- if (checkBox.checked) {
- ctr = 1;
- }
- sense = '$js_lt{'single'}';
- }
- if (ctr == 0) {
- alert(sense);
- return false;
- }
- document.$formname.submit();
- }
-LISTJAVASCRIPT
-
-}
+#---- Called from the listStudents routine
sub check_script {
my ($form,$type) = @_;
@@ -2537,8 +1447,8 @@ sub sub_page_js {
SUBJAVASCRIPT
}
-#--- javascript for grading message center
-sub sub_grademessage_js {
+#--- javascript for essay type problem --
+sub sub_page_kw_js {
my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');
&commonJSfunctions($request);
@@ -2584,17 +1494,55 @@ sub sub_grademessage_js {
</script>
INNERJS
- my $start_page_msg_central =
+ my $inner_js_highlight_central= (<<INNERJS);
+<script type="text/javascript">
+ function updateChoice(flag) {
+ opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+ opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+ opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+ opener.document.SCORE.refresh.value = "on";
+ if (opener.document.SCORE.keywords.value!=""){
+ opener.document.SCORE.submit();
+ }
+ self.close()
+ }
+</script>
+INNERJS
+
+ my $start_page_msg_central =
&Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
{'js_ready' => 1,
'only_body' => 1,
'bgcolor' =>'#FFFFFF',});
- my $end_page_msg_central =
+ my $end_page_msg_central =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
+
+ my $start_page_highlight_central =
+ &Apache::loncommon::start_page('Highlight Central',
+ $inner_js_highlight_central,
+ {'js_ready' => 1,
+ 'only_body' => 1,
+ 'bgcolor' =>'#FFFFFF',});
+ my $end_page_highlight_central =
&Apache::loncommon::end_page({'js_ready' => 1});
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;
-
+ my %js_lt = &Apache::lonlocal::texthash(
+ keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
+ plse => 'Please select a word or group of words from document and then click this link.',
+ adds => 'Add selection to keyword list? Edit if desired.',
+ col1 => 'red',
+ col2 => 'green',
+ col3 => 'blue',
+ siz1 => 'normal',
+ siz2 => '+1',
+ siz3 => '+2',
+ sty1 => 'normal',
+ sty2 => 'italic',
+ sty3 => 'bold',
+ );
my %html_js_lt = &Apache::lonlocal::texthash(
comp => 'Compose Message for: ',
incl => 'Include',
@@ -2604,11 +1552,29 @@ INNERJS
new => 'New',
save => 'Save',
canc => 'Cancel',
+ kehi => 'Keyword Highlight Options',
+ txtc => 'Text Color',
+ font => 'Font Size',
+ fnst => 'Font Style',
);
+ &js_escape(\%js_lt);
&html_escape(\%html_js_lt);
&js_escape(\%html_js_lt);
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
+//===================== Show list of keywords ====================
+ function keywords(formname) {
+ var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);
+ if (nret==null) return;
+ formname.keywords.value = nret;
+
+ if (formname.keywords.value != "") {
+ formname.refresh.value = "on";
+ formname.submit();
+ }
+ return;
+ }
+
//===================== Script to view submitted by ==================
function viewSubmitter(submitter) {
document.SCORE.refresh.value = "on";
@@ -2618,6 +1584,26 @@ INNERJS
return;
}
+//===================== Script to add keyword(s) ==================
+ function getSel() {
+ if (document.getSelection) txt = document.getSelection();
+ else if (document.selection) txt = document.selection.createRange().text;
+ else return;
+ var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+ if (cleantxt=="") {
+ alert("$js_lt{'plse'}");
+ return;
+ }
+ var nret = prompt("$js_lt{'adds'}",cleantxt);
+ if (nret==null) return;
+ document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
+ if (document.SCORE.keywords.value != "") {
+ document.SCORE.refresh.value = "on";
+ document.SCORE.submit();
+ }
+ return;
+ }
+
//====================== Script for composing message ==============
// preload images
img1 = new Image();
@@ -2719,6 +1705,7 @@ INNERJS
function msgTail() {
pDoc = pWin.document;
+ //pDoc.write("<\\/table>");
pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\"> ");
pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
@@ -2727,107 +1714,6 @@ INNERJS
pDoc.close();
}
-SUBJAVASCRIPT
-}
-
-#--- javascript for essay type problem --
-sub sub_page_kw_js {
- my $request = shift;
-
- unless ($env{'form.compmsg'}) {
- &commonJSfunctions($request);
- }
-
- my $inner_js_highlight_central= (<<INNERJS);
-<script type="text/javascript">
- function updateChoice(flag) {
- opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
- opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
- opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
- opener.document.SCORE.refresh.value = "on";
- if (opener.document.SCORE.keywords.value!=""){
- opener.document.SCORE.submit();
- }
- self.close()
- }
-</script>
-INNERJS
-
- my $start_page_highlight_central =
- &Apache::loncommon::start_page('Highlight Central',
- $inner_js_highlight_central,
- {'js_ready' => 1,
- 'only_body' => 1,
- 'bgcolor' =>'#FFFFFF',});
- my $end_page_highlight_central =
- &Apache::loncommon::end_page({'js_ready' => 1});
-
- my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
- $docopen=~s/^document\.//;
-
- my %js_lt = &Apache::lonlocal::texthash(
- keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
- plse => 'Please select a word or group of words from document and then click this link.',
- adds => 'Add selection to keyword list? Edit if desired.',
- col1 => 'red',
- col2 => 'green',
- col3 => 'blue',
- siz1 => 'normal',
- siz2 => '+1',
- siz3 => '+2',
- sty1 => 'normal',
- sty2 => 'italic',
- sty3 => 'bold',
- );
- my %html_js_lt = &Apache::lonlocal::texthash(
- save => 'Save',
- canc => 'Cancel',
- kehi => 'Keyword Highlight Options',
- txtc => 'Text Color',
- font => 'Font Size',
- fnst => 'Font Style',
- );
- &js_escape(\%js_lt);
- &html_escape(\%html_js_lt);
- &js_escape(\%html_js_lt);
- $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
-
-//===================== Show list of keywords ====================
- function keywords(formname) {
- var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);
- if (nret==null) return;
- formname.keywords.value = nret;
-
- if (formname.keywords.value != "") {
- formname.refresh.value = "on";
- formname.submit();
- }
- return;
- }
-
-//===================== Script to add keyword(s) ==================
- function getSel() {
- if (document.getSelection) txt = document.getSelection();
- else if (document.selection) txt = document.selection.createRange().text;
- else return;
- if (typeof(txt) != 'string') {
- txt = String(txt);
- }
- var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
- if (cleantxt=="") {
- alert("$js_lt{'plse'}");
- return;
- }
- var nret = prompt("$js_lt{'adds'}",cleantxt);
- if (nret==null) return;
- document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
- if (document.SCORE.keywords.value != "") {
- document.SCORE.refresh.value = "on";
- document.SCORE.submit();
- }
- return;
- }
-
//====================== Script for keyword highlight options ==============
function kwhighlight() {
var kwclr = document.SCORE.kwclr.value;
@@ -3018,8 +1904,7 @@ sub gradeBox {
sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,$res_error_pointer);
- return unless ($numessay);
+ my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);
my (@respids);
my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {
@@ -3038,7 +1923,7 @@ sub handback_box {
if ($file =~ /\/portfolio\//) {
$file_counter++;
my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
- my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+ my ($name,$version,$ext) = &Apache::lonnet::file_name_version_ext($file_disp);
$file_disp = "$name.$ext";
$file = $file_path.$file_disp;
$result.=&mt('Return commented version of [_1] to student.',
@@ -3125,7 +2010,7 @@ sub files_exist {
my ($uname,$udom,$fullname) = split(/:/,$student);
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
$udom,$uname);
- my ($string)= &get_last_submission(\%record);
+ my ($string,$timestamp)= &get_last_submission(\%record);
foreach my $submission (@$string) {
my ($partid,$respid) =
($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
@@ -3161,23 +2046,33 @@ sub download_all_link {
sub submit_download_link {
my ($request,$symb) = @_;
if (!$symb) { return ''; }
+#FIXME: Figure out which type of problem this is and provide appropriate download
my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
- &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&mt('An error occurred retrieving response types'));
- return;
- }
- unless ($numessay) {
- $request->print(&mt('No essayresponse items found'));
- return;
+ my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+ if (ref($res_error)) {
+ if ($$res_error) {
+ $request->print(&mt('An error occurred retrieving response types'));
+ return;
+ }
}
- my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
- if (@chosenparts) {
- $request->print(&showResourceInfo($symb,$partlist,$responseType,
- undef,undef,1));
+ my ($numupload,$numessay) = (0,0);
+ if (ref($responseType) eq 'HASH') {
+ foreach my $part (sort(keys(%$responseType))) {
+ foreach my $id (sort(keys(%{ $responseType->{$part} }))) {
+ my $responsetype = $responseType->{$part}->{$id};
+ if ($responsetype eq 'essay') {
+ my $uploadedfiletypes =
+ &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes",$symb);
+ if ($uploadedfiletypes) {
+ $numupload++;
+ } else {
+ $numessay++;
+ }
+ }
+ }
+ }
}
- if ($numessay) {
+ if (($numupload) || ($numessay)) {
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
@@ -3186,12 +2081,10 @@ sub submit_download_link {
my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
if (@students) {
@{$env{'form.stuinfo'}} = @students;
- if ($numdropbox) {
+ if ($numupload) {
&download_all_link($request,$symb);
- } else {
- $request->print(&mt('No essayrespose items with dropbox found'));
}
-# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox
+# FIXME Need to provide a mechanism to download essays, i.e., if $numessay > 0
# Needs to omit user's identity if resource instance is for an anonymous survey.
} else {
$request->print(&mt('No students match the criteria you selected'));
@@ -3220,14 +2113,14 @@ sub build_section_inputs {
# --------------------------- show submissions of a student, option to grade
sub submission {
- my ($request,$counter,$total,$symb,$divforres,$calledby) = @_;
+ my ($request,$counter,$total,$symb) = @_;
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
+ my $probtitle=&Apache::lonnet::gettitle($symb);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
- my $probtitle=&Apache::lonnet::gettitle($symb);
my $is_tool = ($symb =~ /ext\.tool$/);
my ($essayurl,%coursedesc_by_cid);
@@ -3241,22 +2134,11 @@ sub submission {
return;
}
- my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
- &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&navmap_errormsg());
- return;
- }
-
if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
- unless ($is_tool) {
+ unless ($is_tool) {
if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
}
- if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {
- $env{'form.compmsg'} = 1;
- }
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.$request->dir_config('lonIconsURL').
@@ -3264,17 +2146,8 @@ sub submission {
# header info
if ($counter == 0) {
- my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
- if (@chosenparts) {
- $request->print(&showResourceInfo($symb,$partlist,$responseType,'gradesub'));
- } elsif ($divforres) {
- $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
- } else {
- $request->print('<br clear="all" />');
- }
&sub_page_js($request);
- &sub_grademessage_js($request) if ($env{'form.compmsg'});
- &sub_page_kw_js($request) if ($numessay);
+ &sub_page_kw_js($request);
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
@@ -3291,27 +2164,24 @@ sub submission {
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}
+ # kwclr is the only variable that is guaranteed not to be blank
+ # if this subroutine has been called once.
my %keyhash = ();
- if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) {
+# if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
+ if (1) {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
- }
- # kwclr is the only variable that is guaranteed not to be blank
- # if this subroutine has been called once.
- if ($env{'form.kwclr'} eq '' && $numessay) {
+
my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
$env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
$env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
- }
- if ($env{'form.compmsg'}) {
- $env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
+ $env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $probtitle;
$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}
-
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
@@ -3325,23 +2195,24 @@ sub submission {
'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".
'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".
'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".
- '<input type="hidden" name="compmsg" value="'.$env{'form.compmsg'}.'" />'."\n".
&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
'<input type="hidden" name="NCT"'.
' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
- if ($env{'form.compmsg'}) {
- $request->print('<input type="hidden" name="msgsub" value="'.$env{'form.msgsub'}.'" />'."\n".
- '<input type="hidden" name="shownSub" value="0" />'."\n".
- '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
- }
- if ($numessay) {
+# if ($env{'form.handgrade'} eq 'yes') {
+ if (1) {
$request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
'<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n".
'<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n".
- '<input type="hidden" name="kwstyle" value="'.$env{'form.kwstyle'}.'" />'."\n");
+ '<input type="hidden" name="kwstyle" value="'.$env{'form.kwstyle'}.'" />'."\n".
+ '<input type="hidden" name="msgsub" value="'.$env{'form.msgsub'}.'" />'."\n".
+ '<input type="hidden" name="shownSub" value="0" />'."\n".
+ '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
+ foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+ $request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+ }
}
-
+
my ($cts,$prnmsg) = (1,'');
while ($cts <= $env{'form.savemsgN'}) {
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
@@ -3354,7 +2225,8 @@ sub submission {
}
$request->print($prnmsg);
- if ($numessay) {
+# if ($env{'form.handgrade'} eq 'yes') {
+ unless ($is_tool) {
my %lt = &Apache::lonlocal::texthash(
keyh => 'Keyword Highlighting for Essays',
@@ -3362,7 +2234,7 @@ sub submission {
list => 'List',
past => 'Paste Selection to List',
high => 'Highlight Attribute',
- );
+ );
#
# Print out the keyword options line
#
@@ -3442,6 +2314,12 @@ sub submission {
}
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+ my $res_error;
+ my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+ if ($res_error) {
+ $request->print(&navmap_errormsg());
+ return;
+ }
# Display student info
$request->print(($counter == 0 ? '' : '<br />'));
@@ -3454,238 +2332,100 @@ sub submission {
.'<h3 class="LC_hcell">'.$boxtitle.'</h3>';
$result.='<input type="hidden" name="name'.$counter.
'" value="'.$env{'form.fullname'}.'" />'."\n";
- if (($numresp > $numessay) && !$is_tool) {
+# if ($env{'form.handgrade'} eq 'no') {
+ unless ($is_tool) {
$result.='<p class="LC_info">'
.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
."</p>\n";
}
- # If any part of the problem is an essayresponse, then check for collaborators
+ # If any part of the problem is an essay-response (handgraded), then check for collaborators
my $fullname;
my $col_fullnames = [];
- if ($numessay) {
+# if ($env{'form.handgrade'} eq 'yes') {
+ unless ($is_tool) {
(my $sub_result,$fullname,$col_fullnames)=
&check_collaborators($symb,$uname,$udom,\%record,$handgrade,
$counter);
$result.=$sub_result;
}
$request->print($result."\n");
-
+
# print student answer/submission
- # Options are (1) Last submission only
- # (2) Last submission (with detailed information for that submission)
- # (3) All transactions (by date)
- # (4) The whole record (with detailed information for all transactions)
-
- my ($lastsubonly,$partinfo) =
- &show_last_submission($uname,$udom,$symb,$essayurl,$responseType,$env{'form.lastSub'},
- $is_tool,$fullname,\%record,\%coursedesc_by_cid);
- $request->print($partinfo);
- $request->print($lastsubonly);
-
- if ($env{'form.lastSub'} eq 'datesub') {
- my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
- $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
- }
- if ($env{'form.lastSub'} =~ /^(last|all)$/) {
- my $identifier = (&canmodify($usec)? $counter : '');
- $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- $env{'request.course.id'},
- $last,'.submission',
- 'Apache::grades::keywords_highlight',
- $usec,$identifier));
- }
- $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
- .$udom.'" />'."\n");
- # return if view submission with no grading option
- if (!&canmodify($usec)) {
- $request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
- return;
- } else {
- $request->print('</div>'."\n");
- }
-
- # grading message center
-
- if ($env{'form.compmsg'}) {
- my $result='<div class="LC_Box">'.
- '<h3 class="LC_hcell">'.&mt('Send Message').'</h3>'.
- '<div class="LC_grade_message_center_body">';
- my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
- my $msgfor = $givenn.' '.$lastname;
- if (scalar(@$col_fullnames) > 0) {
- my $lastone = pop(@$col_fullnames);
- $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
- }
- $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
- $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
- '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
- ' <a href="javascript:msgCenter(document.SCORE,'.$counter.
- ',\''.$msgfor.'\');" target="_self">'.
- &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.
- &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
- ' <img src="'.$request->dir_config('lonIconsURL').
- '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".
- '<br /> ('.
- &mt('Message will be sent when you click on Save & Next below.').")\n".
- '</div></div>';
- $request->print($result);
- }
-
- my %seen = ();
- my @partlist;
- my @gradePartRespid;
- my @part_response_id;
- if ($is_tool) {
- @part_response_id = ([0,'']);
- } else {
- @part_response_id = &flatten_responseType($responseType);
- }
- $request->print(
- '<div class="LC_Box">'
- .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
- );
- $request->print(&gradeBox_start());
- foreach my $part_response_id (@part_response_id) {
- my ($partid,$respid) = @{ $part_response_id };
- my $part_resp = join('_',@{ $part_response_id });
- next if ($seen{$partid} > 0);
- $seen{$partid}++;
- push(@partlist,$partid);
- push(@gradePartRespid,$partid.'.'.$respid);
- $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
- }
- $request->print(&gradeBox_end()); # </div>
- $request->print('</div>');
-
- $request->print('<div class="LC_grade_info_links">');
- $request->print('</div>');
-
- $result='<input type="hidden" name="partlist'.$counter.
- '" value="'.(join ":",@partlist).'" />'."\n";
- $result.='<input type="hidden" name="gradePartRespid'.
- '" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
- my $ctr = 0;
- while ($ctr < scalar(@partlist)) {
- $result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
- $partlist[$ctr].'" />'."\n";
- $ctr++;
- }
- $request->print($result.''."\n");
-
-# Done with printing info for one student
-
- $request->print('</div>');#LC_grade_show_user
-
-
- # print end of form
- if ($counter == $total) {
- my $endform='<br /><hr /><table border="0"><tr><td>'."\n";
- $endform.='<input type="button" value="'.&mt('Save & Next').'" '.
- 'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
- $total.','.scalar(@partlist).');" target="_self" /> '."\n";
- my $ntstu ='<select name="NTSTU">'.
- '<option>1</option><option>2</option>'.
- '<option>3</option><option>5</option>'.
- '<option>7</option><option>10</option></select>'."\n";
- my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
- $ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
- $endform.=&mt('[_1]student(s)',$ntstu);
- $endform.=' <input type="button" value="'.&mt('Previous').'" '.
- 'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n".
- '<input type="button" value="'.&mt('Next').'" '.
- 'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> ';
- $endform.='<span class="LC_warning">'.
- &mt('(Next and Previous (student) do not save the scores.)').
- '</span>'."\n" ;
- $endform.="<input type='hidden' value='".&get_increment().
- "' name='increment' />";
- $endform.='</td></tr></table></form>';
- $request->print($endform);
- }
- return '';
-}
+ # Options are (1) Handgraded submission only
+ # (2) Last submission, includes submission that is not handgraded
+ # (for multi-response type part)
+ # (3) Last submission plus the parts info
+ # (4) The whole record for this student
+
+ my ($string,$timestamp)= &get_last_submission(\%record,$is_tool);
+
+ my $lastsubonly;
-sub show_last_submission {
- my ($uname,$udom,$symb,$essayurl,$responseType,$viewtype,$is_tool,$fullname,
- $record,$coursedesc_by_cid) = @_;
- my ($string,$timestamp,$lastgradetime,$lastsubmittime) =
- &get_last_submission($record,$is_tool);
-
- my ($lastsubonly,$partinfo);
- if ($timestamp eq '') {
- $lastsubonly.='<div class="LC_grade_submissions_body">'.$string->[0].'</div>';
+ if ($$timestamp eq '') {
+ $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';
} elsif ($is_tool) {
$lastsubonly =
'<div class="LC_grade_submissions_body">'
- .'<b>'.&mt('Date Grade Passed Back:').'</b> '.$timestamp."</div>\n";
+ .'<b>'.&mt('Date Grade Passed Back:').'</b> '.$$timestamp."</div>\n";
} else {
- my ($shownsubmdate,$showngradedate);
- if ($lastsubmittime && $lastgradetime) {
- $shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime);
- if ($lastgradetime > $lastsubmittime) {
- $showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime);
- }
- } else {
- $shownsubmdate = $timestamp;
- }
$lastsubonly =
'<div class="LC_grade_submissions_body">'
- .'<b>'.&mt('Date Submitted:').'</b> '.$shownsubmdate."\n";
- if ($showngradedate) {
- $lastsubonly .= '<br /><b>'.&mt('Date Graded:').'</b> '.$showngradedate."\n";
- }
+ .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";
+
+ my %seenparts;
+ my @part_response_id = &flatten_responseType($responseType);
+ foreach my $part (@part_response_id) {
+ next if ($env{'form.lastSub'} eq 'hdgrade'
+ && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
- my %seenparts;
- my @part_response_id = &flatten_responseType($responseType);
- foreach my $part (@part_response_id) {
- my ($partid,$respid) = @{ $part };
- my $display_part=&get_display_part($partid,$symb);
- if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
- if (exists($seenparts{$partid})) { next; }
- $seenparts{$partid}=1;
- $partinfo .=
+ my ($partid,$respid) = @{ $part };
+ my $display_part=&get_display_part($partid,$symb);
+ if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
+ if (exists($seenparts{$partid})) { next; }
+ $seenparts{$partid}=1;
+ $request->print(
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <b>'.&mt('Collaborative submission by: [_1]',
'<a href="javascript:viewSubmitter(\''.
$env{"form.$uname:$udom:$partid:submitted_by"}.
'\');" target="_self">'.
$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').
- '<br />';
- next;
- }
- my $responsetype = $responseType->{$partid}->{$respid};
- if (!exists($record->{"resource.$partid.$respid.submission"})) {
+ '<br />');
+ next;
+ }
+ my $responsetype = $responseType->{$partid}->{$respid};
+ if (!exists($record{"resource.$partid.$respid.submission"})) {
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.
'('.&mt('Response ID: [_1]',$respid).')'.
'</span> '.
- '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
- next;
- }
- foreach my $submission (@$string) {
- my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
- if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
- my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);
- # Similarity check
+ '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
+ next;
+ }
+ foreach my $submission (@$string) {
+ my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
+ if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
+ my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);
+ # Similarity check
my $similar='';
my ($type,$trial,$rndseed);
if ($hide eq 'rand') {
$type = 'randomizetry';
- $trial = $record->{"resource.$partid.tries"};
- $rndseed = $record->{"resource.$partid.rndseed"};
+ $trial = $record{"resource.$partid.tries"};
+ $rndseed = $record{"resource.$partid.rndseed"};
}
- if ($env{'form.checkPlag'}) {
- my ($oname,$odom,$ocrsid,$oessay,$osim)=
- &most_similar($uname,$udom,$symb,$subval);
- if ($osim) {
- $osim=int($osim*100.0);
+ if ($env{'form.checkPlag'}) {
+ my ($oname,$odom,$ocrsid,$oessay,$osim)=
+ &most_similar($uname,$udom,$symb,$subval);
+ if ($osim) {
+ $osim=int($osim*100.0);
if ($hide eq 'anon') {
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
} else {
- $similar='<hr />';
+ $similar='<hr />';
if ($essayurl eq 'lib/templates/simpleproblem.problem') {
$similar .= '<h3><span class="LC_warning">'.
&mt('Essay is [_1]% similar to an essay by [_2]',
@@ -3695,8 +2435,8 @@ sub show_last_submission {
} else {
my %old_course_desc;
if ($ocrsid ne '') {
- if (ref($coursedesc_by_cid->{$ocrsid}) eq 'HASH') {
- %old_course_desc = %{$coursedesc_by_cid->{$ocrsid}};
+ if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') {
+ %old_course_desc = %{$coursedesc_by_cid{$ocrsid}};
} else {
my $args;
if ($ocrsid ne $env{'request.course.id'}) {
@@ -3704,7 +2444,7 @@ sub show_last_submission {
}
%old_course_desc =
&Apache::lonnet::coursedescription($ocrsid,$args);
- $coursedesc_by_cid->{$ocrsid} = \%old_course_desc;
+ $coursedesc_by_cid{$ocrsid} = \%old_course_desc;
}
$similar .=
'<h3><span class="LC_warning">'.
@@ -3728,21 +2468,21 @@ sub show_last_submission {
&keywords_highlight($oessay).
'</i></blockquote><hr />';
}
- }
- }
- my $order=&get_order($partid,$respid,$symb,$uname,$udom,
+ }
+ }
+ my $order=&get_order($partid,$respid,$symb,$uname,$udom,
undef,$type,$trial,$rndseed);
- if (($viewtype eq 'lastonly') ||
- ($viewtype eq 'datesub') ||
- ($viewtype =~ /^(last|all)$/)) {
- my $display_part=&get_display_part($partid,$symb);
+ if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' &&
+ $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
+ my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.
'('.&mt('Response ID: [_1]',$respid).')'.
'</span> ';
- my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
- if (@$files) {
+ my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+
+ if (@$files) {
if ($hide eq 'anon') {
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
} else {
@@ -3753,37 +2493,162 @@ sub show_last_submission {
} else {
$lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
}
- $lastsubonly .= '</span>';
+ $lastsubonly .= '</span>';
foreach my $file (@$files) {
&Apache::lonnet::allowuploaded('/adm/grades',$file);
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>';
}
}
- $lastsubonly.='<br />';
+ $lastsubonly.='<br />';
}
if ($hide eq 'anon') {
- $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';
+ $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';
} else {
- $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
+ $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
if ($draft) {
$lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';
}
$subval =
- &cleanRecord($subval,$responsetype,$symb,$partid,
- $respid,$record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
+ &cleanRecord($subval,$responsetype,$symb,$partid,
+ $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
if ($responsetype eq 'essay') {
$subval =~ s{\n}{<br />}g;
}
$lastsubonly.=$subval."\n";
}
- if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
- $lastsubonly.='</div>';
- }
+ if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+ $lastsubonly.='</div>';
+ }
}
- }
- $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
+ }
+ $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
+ }
+ $request->print($lastsubonly);
+ if ($env{'form.lastSub'} eq 'datesub') {
+ my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
+ $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
+
+ }
+ if ($env{'form.lastSub'} =~ /^(last|all)$/) {
+ my $identifier = (&canmodify($usec)? $counter : '');
+ $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+ $env{'request.course.id'},
+ $last,'.submission',
+ 'Apache::grades::keywords_highlight',
+ $usec,$identifier));
+ }
+ $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ .$udom.'" />'."\n");
+ # return if view submission with no grading option
+ if (!&canmodify($usec)) {
+ $request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
+ return;
+ } else {
+ $request->print('</div>'."\n");
+ }
+
+ # essay grading message center
+# if ($env{'form.handgrade'} eq 'yes') {
+ if (1) {
+ my $result='<div class="LC_grade_message_center">';
+
+ $result.='<div class="LC_grade_message_center_header">'.
+ &mt('Send Message').'</div><div class="LC_grade_message_center_body">';
+ my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
+ my $msgfor = $givenn.' '.$lastname;
+ if (scalar(@$col_fullnames) > 0) {
+ my $lastone = pop(@$col_fullnames);
+ $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
+ }
+ $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
+ $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+ $result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
+ ',\''.$msgfor.'\');" target="_self">'.
+ &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.
+ &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
+ ' <img src="'.$request->dir_config('lonIconsURL').
+ '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".
+ '<br /> ('.
+ &mt('Message will be sent when you click on Save & Next below.').")\n";
+ $result.='</div></div>';
+ $request->print($result);
+ }
+
+ my %seen = ();
+ my @partlist;
+ my @gradePartRespid;
+ my @part_response_id;
+ if ($is_tool) {
+ @part_response_id = ([0,'']);
+ } else {
+ @part_response_id = &flatten_responseType($responseType);
+ }
+ $request->print(
+ '<div class="LC_Box">'
+ .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
+ );
+ $request->print(&gradeBox_start());
+ foreach my $part_response_id (@part_response_id) {
+ my ($partid,$respid) = @{ $part_response_id };
+ my $part_resp = join('_',@{ $part_response_id });
+ next if ($seen{$partid} > 0);
+ $seen{$partid}++;
+ next if ($$handgrade{$part_resp} ne 'yes'
+ && $env{'form.lastSub'} eq 'hdgrade');
+ push(@partlist,$partid);
+ push(@gradePartRespid,$partid.'.'.$respid);
+ $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
+ }
+ $request->print(&gradeBox_end()); # </div>
+ $request->print('</div>');
+
+ $request->print('<div class="LC_grade_info_links">');
+ $request->print('</div>');
+
+ $result='<input type="hidden" name="partlist'.$counter.
+ '" value="'.(join ":",@partlist).'" />'."\n";
+ $result.='<input type="hidden" name="gradePartRespid'.
+ '" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
+ my $ctr = 0;
+ while ($ctr < scalar(@partlist)) {
+ $result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
+ $partlist[$ctr].'" />'."\n";
+ $ctr++;
}
- return ($lastsubonly,$partinfo);
+ $request->print($result.''."\n");
+
+# Done with printing info for one student
+
+ $request->print('</div>');#LC_grade_show_user
+
+
+ # print end of form
+ if ($counter == $total) {
+ my $endform='<br /><hr /><table border="0"><tr><td>'."\n";
+ $endform.='<input type="button" value="'.&mt('Save & Next').'" '.
+ 'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
+ $total.','.scalar(@partlist).');" target="_self" /> '."\n";
+ my $ntstu ='<select name="NTSTU">'.
+ '<option>1</option><option>2</option>'.
+ '<option>3</option><option>5</option>'.
+ '<option>7</option><option>10</option></select>'."\n";
+ my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
+ $ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
+ $endform.=&mt('[_1]student(s)',$ntstu);
+ $endform.=' <input type="button" value="'.&mt('Previous').'" '.
+ 'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n".
+ '<input type="button" value="'.&mt('Next').'" '.
+ 'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> ';
+ $endform.='<span class="LC_warning">'.
+ &mt('(Next and Previous (student) do not save the scores.)').
+ '</span>'."\n" ;
+ $endform.="<input type='hidden' value='".&get_increment().
+ "' name='increment' />";
+ $endform.='</td></tr></table></form>';
+ $request->print($endform);
+ }
+ return '';
}
sub check_collaborators {
@@ -3845,51 +2710,18 @@ sub check_collaborators {
#--- Retrieve the last submission for all the parts
sub get_last_submission {
my ($returnhash,$is_tool)=@_;
- my (@string,$timestamp,$lastgradetime,$lastsubmittime);
+ my (@string,$timestamp,%lasthidden);
if ($$returnhash{'version'}) {
my %lasthash=();
- my %prevsolved=();
- my %solved=();
- my $version;
+ my ($version);
for ($version=1;$version<=$$returnhash{'version'};$version++) {
- my %handgraded = ();
foreach my $key (sort(split(/\:/,
$$returnhash{$version.':keys'}))) {
$lasthash{$key}=$$returnhash{$version.':'.$key};
- if ($key =~ /\.([^.]+)\.regrader$/) {
- $handgraded{$1} = 1;
- } elsif ($key =~ /\.portfiles$/) {
- if (($$returnhash{$version.':'.$key} ne '') &&
- ($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) {
- $lastsubmittime = $$returnhash{$version.':timestamp'};
- }
- } elsif ($key =~ /\.submission$/) {
- if ($$returnhash{$version.':'.$key} ne '') {
- $lastsubmittime = $$returnhash{$version.':timestamp'};
- }
- } elsif ($key =~ /\.([^.]+)\.solved$/) {
- $prevsolved{$1} = $solved{$1};
- $solved{$1} = $lasthash{$key};
- }
- }
- foreach my $partid (keys(%handgraded)) {
- if (($prevsolved{$partid} eq 'ungraded_attempted') &&
- (($solved{$partid} eq 'incorrect_by_override') ||
- ($solved{$partid} eq 'correct_by_override'))) {
- $lastgradetime = $$returnhash{$version.':timestamp'};
- }
- if ($solved{$partid} ne '') {
- $prevsolved{$partid} = $solved{$partid};
- }
- }
+ $timestamp =
+ &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
+ }
}
-#
-# Timestamp is for last transaction for this resource, which does not
-# necessarily correspond to the time of last submission for problem (or part).
-#
- if ($lasthash{'timestamp'} ne '') {
- $timestamp = &Apache::lonlocal::locallocaltime($lasthash{'timestamp'});
- }
my (%typeparts,%randombytry);
my $showsurv =
&Apache::lonnet::allowed('vas',$env{'request.course.id'});
@@ -3952,7 +2784,7 @@ sub get_last_submission {
$string[0] =
'<span class="LC_warning">'.$msg.'</span>';
}
- return (\@string,$timestamp,$lastgradetime,$lastsubmittime);
+ return (\@string,\$timestamp);
}
#--- High light keywords, with style choosen by user.
@@ -3982,11 +2814,12 @@ sub show_previous_task_version {
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
if (!&canview($usec)) {
- $request->print('<span class="LC_warning">'.
- &mt('Unable to view previous version for requested student.').
- ' '.&mt('([_1] in section [_2] in course id [_3])',
- $uname.':'.$udom,$usec,$env{'request.course.id'}).
- '</span>');
+ $request->print(
+ '<span class="LC_warning">'.
+ &mt('Unable to view previous version for requested student.').
+ ' '.&mt('([_1] in section [_2] in course id [_3])',
+ $uname.':'.$udom,$usec,$env{'request.course.id'}).
+ '</span>');
return;
}
my $mode = 'both';
@@ -4158,39 +2991,19 @@ sub processHandGrade {
my $ntstu = $env{'form.NTSTU'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my ($res_error,%queueable);
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&navmap_errormsg());
- return;
- } else {
- foreach my $part (@{$partlist}) {
- if (ref($responseType->{$part}) eq 'HASH') {
- foreach my $id (keys(%{$responseType->{$part}})) {
- if (($responseType->{$part}->{$id} eq 'essay') ||
- (lc($handgrade->{$part.'_'.$id}) eq 'yes')) {
- $queueable{$part} = 1;
- last;
- }
- }
- }
- }
- }
if ($button eq 'Save & Next') {
- my %needpb = &passbacks_for_symb($cdom,$cnum,$symb);
- my (%skip_passback,%pbsave,%pbcollab);
my $ctr = 0;
while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt,$numhidden) =
- &saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable,\%needpb,\%skip_passback,\%pbsave);
+ &saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {
$ctr++;
next;
}
if ($errorflag eq 'not_allowed') {
- $request->print(
+ $request->print(
'<span class="LC_error">'
.&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
.'</span>');
@@ -4237,85 +3050,37 @@ sub processHandGrade {
foreach my $collabstr (@collabstrs) {
my ($part,@collaborators) = split(/:/,$collabstr);
foreach my $collaborator (@collaborators) {
- my ($errorflag,$pts,$wgt,$numchg,$numupdate) =
+ my ($errorflag,$pts,$wgt) =
&saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
- $env{'form.unamedom'.$ctr},$part,\%queueable);
+ $env{'form.unamedom'.$ctr},$part);
if ($errorflag eq 'not_allowed') {
$request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
next;
- } else {
- if ($numchg || $numupdate) {
- $pbcollab{$collaborator}{$part} = [$pts,$wgt];
- }
- if ($message ne '') {
- my ($baseurl,$showsymb) =
- &get_feedurl_and_symb($symb,$collaborator,
- $udom);
- if ($env{'form.withgrades'.$ctr}) {
- $messagetail = " for <a href=\"".
- $baseurl."?symb=$showsymb\">$restitle</a>";
- }
- $msgstatus =
- &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
- }
+ } elsif ($message ne '') {
+ my ($baseurl,$showsymb) =
+ &get_feedurl_and_symb($symb,$collaborator,
+ $udom);
+ if ($env{'form.withgrades'.$ctr}) {
+ $messagetail = " for <a href=\"".
+ $baseurl."?symb=$showsymb\">$restitle</a>";
+ }
+ $msgstatus =
+ &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
}
}
}
}
$ctr++;
}
- if ((keys(%pbcollab)) && (keys(%needpb))) {
- foreach my $user (keys(%pbcollab)) {
- my ($clbuname,$clbudom) = split(/:/,$user);
- my $clbusec = &Apache::lonnet::getsection($clbudom,$clbuname,$cdom.'_'.$cnum);
- if (ref($pbcollab{$user}) eq 'HASH') {
- my @clparts = keys(%{$pbcollab{$user}});
- if (@clparts) {
- my $navmap = Apache::lonnavmaps::navmap->new($clbuname,$clbudom,$clbusec);
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- my $partlist = $res->parts();
- if (ref($partlist) eq 'ARRAY') {
- my (%weights,%awardeds,%excuseds);
- foreach my $part (@{$partlist}) {
- if ($res->status($part) eq $res->EXCUSED) {
- $excuseds{$symb}{$part} = 1;
- } else {
- $excuseds{$symb}{$part} = '';
- }
- if ((exists($pbcollab{$user}{$part})) && (ref($pbcollab{$user}{$part}) eq 'ARRAY')) {
- my $pts = $pbcollab{$user}{$part}[0];
- my $wt = $pbcollab{$user}{$part}[1];
- if ($wt) {
- $awardeds{$symb}{$part} = $pts/$wt;
- $weights{$symb}{$part} = $wt;
- } else {
- $awardeds{$symb}{$part} = 0;
- $weights{$symb}{$part} = 0;
- }
- } else {
- $awardeds{$symb}{$part} = $res->awarded($part);
- $weights{$symb}{$part} = $res->weight($part);
- }
- }
- &process_passbacks('handgrade',[$symb],$cdom,$cnum,$clbudom,$clbuname,$clbusec,\%weights,
- \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
- }
- }
- }
- }
- }
- }
- }
}
- my %keyhash = ();
- if ($numessay) {
+# if ($env{'form.handgrade'} eq 'yes') {
+ if (1) {
# Keywords sorted in alphabatical order
my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
+ my %keyhash = ();
$env{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
- $env{'form.keywords'} =~ s/^\s+|\s+$//g;
+ $env{'form.keywords'} =~ s/^\s+|\s+$//;
my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
$env{'form.keywords'} = join(' ',@keywords);
$keyhash{$symb.'_keywords'} = $env{'form.keywords'};
@@ -4323,9 +3088,7 @@ sub processHandGrade {
$keyhash{$loginuser.'_kwclr'} = $env{'form.kwclr'};
$keyhash{$loginuser.'_kwsize'} = $env{'form.kwsize'};
$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
- }
- if ($env{'form.compmsg'}) {
# message center - Order of message gets changed. Blank line is eliminated.
# New messages are saved in env for the next student.
# All messages are saved in nohist_handgrade.db
@@ -4348,12 +3111,9 @@ sub processHandGrade {
}
$env{'form.savemsgN'} = --$idx;
$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
- }
- if (($numessay) || ($env{'form.compmsg'})) {
my $putresult = &Apache::lonnet::put
('nohist_handgrade',\%keyhash,$cdom,$cnum);
}
-
# Called by Save & Refresh from Highlight Attribute Window
my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
if ($env{'form.refresh'} eq 'on') {
@@ -4393,6 +3153,7 @@ sub processHandGrade {
}
return $a cmp $b;
} (keys(%$fullname))) {
+# FIXME: this is fishy, looks like the button label
if ($nextflg == 1 && $button =~ /Next$/) {
push(@parsedlist,$item);
}
@@ -4403,7 +3164,14 @@ sub processHandGrade {
}
}
$ctr = 0;
+# FIXME: this is fishy, looks like the button label
@parsedlist = reverse @parsedlist if ($button eq 'Previous');
+ my $res_error;
+ my ($partlist) = &response_type($symb,\$res_error);
+ if ($res_error) {
+ $request->print(&navmap_errormsg());
+ return;
+ }
foreach my $student (@parsedlist) {
my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);
@@ -4453,7 +3221,7 @@ sub processHandGrade {
$ctr++;
}
if ($total < 0) {
- my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
+ my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
$request->print($the_end);
}
return '';
@@ -4461,7 +3229,7 @@ sub processHandGrade {
#---- Save the score and award for each student, if changed
sub saveHandGrade {
- my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable,$needpb,$skip_passback,$pbsave) = @_;
+ my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
my @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,
$env{'request.course.id'});
@@ -4469,7 +3237,7 @@ sub saveHandGrade {
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
my @parts_graded;
my %newrecord = ();
- my ($pts,$wgt,$totchg,$sendupdate) = ('','',0,0);
+ my ($pts,$wgt,$totchg) = ('','',0);
my %aggregate = ();
my $aggregateflag = 0;
if ($env{'form.HIDE'.$newflg}) {
@@ -4477,27 +3245,18 @@ sub saveHandGrade {
my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1);
$totchg += $numchgs;
}
- my (%weights,%awardeds,%excuseds);
my @parts = split(/:/,$env{'form.partlist'.$newflg});
foreach my $new_part (@parts) {
- #collaborator ($submitter may vary for different parts)
+ #collaborator ($submi may vary for different parts
if ($submitter && $new_part ne $part) { next; }
my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
- if ($env{'form.WGT'.$newflg.'_'.$new_part} eq '') {
- $weights{$symb}{$new_part} = 1;
- } else {
- $weights{$symb}{$new_part} = $env{'form.WGT'.$newflg.'_'.$new_part};
- }
if ($dropMenu eq 'excused') {
- $excuseds{$symb}{$new_part} = 1;
- $awardeds{$symb}{$new_part} = '';
if ($record{'resource.'.$new_part.'.solved'} ne 'excused') {
$newrecord{'resource.'.$new_part.'.solved'} = 'excused';
if (exists($record{'resource.'.$new_part.'.awarded'})) {
$newrecord{'resource.'.$new_part.'.awarded'} = '';
}
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
- $sendupdate ++;
}
} elsif ($dropMenu eq 'reset status'
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
@@ -4521,9 +3280,6 @@ sub saveHandGrade {
&decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
$aggregateflag = 1;
}
- $sendupdate ++;
- $excuseds{$symb}{$new_part} = '';
- $awardeds{$symb}{$new_part} = '';
} elsif ($dropMenu eq '') {
$pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ?
$env{'form.GD_BOX'.$newflg.'_'.$new_part} :
@@ -4534,15 +3290,12 @@ sub saveHandGrade {
$wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 :
$env{'form.WGT'.$newflg.'_'.$new_part};
my $partial= $pts/$wgt;
- $awardeds{$symb}{$new_part} = $partial;
- $excuseds{$symb}{$new_part} = '';
if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
#do not update score for part if not changed.
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
next;
} else {
push(@parts_graded,$new_part);
- $sendupdate ++;
}
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
$newrecord{'resource.'.$new_part.'.awarded'} = $partial;
@@ -4588,20 +3341,13 @@ sub saveHandGrade {
&Apache::lonnet::cstore(\%newrecord,$symb,
$env{'request.course.id'},$domain,$stuname);
&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
- $cdom,$cnum,$domain,$stuname,$queueable);
+ $cdom,$cnum,$domain,$stuname);
}
if ($aggregateflag) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$cdom,$cnum);
}
- if (($sendupdate || $totchg) && (!$submitter)) {
- if ((ref($needpb) eq 'HASH') &&
- (keys(%{$needpb}))) {
- &process_passbacks('handgrade',[$symb],$cdom,$cnum,$domain,$stuname,$usec,\%weights,
- \%awardeds,\%excuseds,$needpb,$skip_passback,$pbsave);
- }
- }
- return ('',$pts,$wgt,$totchg,$sendupdate);
+ return ('',$pts,$wgt,$totchg);
}
sub makehidden {
@@ -4635,7 +3381,7 @@ sub makehidden {
}
sub check_and_remove_from_queue {
- my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_;
+ my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
my @ungraded_parts;
foreach my $part (@{$parts}) {
if ( $record->{ 'resource.'.$part.'.awarded'} eq ''
@@ -4643,9 +3389,7 @@ sub check_and_remove_from_queue {
&& $newrecord->{'resource.'.$part.'.awarded'} eq ''
&& $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
) {
- if ($queueable->{$part}) {
- push(@ungraded_parts, $part);
- }
+ push(@ungraded_parts, $part);
}
}
if ( !@ungraded_parts ) {
@@ -4671,19 +3415,19 @@ sub handback_files {
my $part_resp = join('_',@{ $part_response_id });
if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) {
for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) {
- # if multiple files are uploaded names will be 'returndoc2','returndoc3'
- if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
+ # if multiple files are uploaded names will be 'returndoc2','returndoc3'
+ if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};
my ($directory,$answer_file) =
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/);
my ($answer_name,$answer_ver,$answer_ext) =
- &file_name_version_ext($answer_file);
+ &Apache::lonnet::file_name_version_ext($answer_file);
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
my $getpropath = 1;
- my ($dir_list,$listerror) =
+ my ($dir_list,$listerror) =
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path,
$domain,$stuname,$getpropath);
- my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
+ my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list);
# fix filename
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
@@ -4701,8 +3445,7 @@ sub handback_files {
$$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
}
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
- $file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
-
+ $file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
}
$request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));
}
@@ -4713,7 +3456,7 @@ sub handback_files {
$request->print('<br />');
my @what = ($symb,$env{'request.course.id'},'handback');
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what);
- my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});
+ my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});
my ($subject,$message);
if (scalar(@handedback) == 1) {
$subject = &mt_user($user_lh,'File Handed Back by Instructor');
@@ -4833,93 +3576,20 @@ sub version_portfiles {
my $version_parts = join('|',@$v_flag);
my @returned_keys;
my $parts = join('|', @$parts_graded);
- my $portfolio_root = '/userfiles/portfolio';
foreach my $key (keys(%$record)) {
my $new_portfiles;
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
my @versioned_portfiles;
my @portfiles = split(/\s*,\s*/,$$record{$key});
- foreach my $file (@portfiles) {
- &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
- my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
- my ($answer_name,$answer_ver,$answer_ext) =
- &file_name_version_ext($answer_file);
- my $getpropath = 1;
- my ($dir_list,$listerror) =
- &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
- $stu_name,$getpropath);
- my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
- my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
- if ($new_answer ne 'problem getting file') {
- push(@versioned_portfiles, $directory.$new_answer);
- &Apache::lonnet::mark_as_readonly($domain,$stu_name,
- [$directory.$new_answer],
- [$symb,$env{'request.course.id'},'graded']);
- }
+ if (@portfiles) {
+ &Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles,
+ \@versioned_portfiles);
}
$$record{$key} = join(',',@versioned_portfiles);
push(@returned_keys,$key);
}
- }
- return (@returned_keys);
-}
-
-sub get_next_version {
- my ($answer_name, $answer_ext, $dir_list) = @_;
- my $version;
- if (ref($dir_list) eq 'ARRAY') {
- foreach my $row (@{$dir_list}) {
- my ($file) = split(/\&/,$row,2);
- my ($file_name,$file_version,$file_ext) =
- &file_name_version_ext($file);
- if (($file_name eq $answer_name) &&
- ($file_ext eq $answer_ext)) {
- # gets here if filename and extension match,
- # regardless of version
- if ($file_version ne '') {
- # a versioned file is found so save it for later
- if ($file_version > $version) {
- $version = $file_version;
- }
- }
- }
- }
- }
- $version ++;
- return($version);
-}
-
-sub version_selected_portfile {
- my ($domain,$stu_name,$directory,$file_name,$version) = @_;
- my ($answer_name,$answer_ver,$answer_ext) =
- &file_name_version_ext($file_name);
- my $new_answer;
- $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
- if($env{'form.copy'} eq '-1') {
- $new_answer = 'problem getting file';
- } else {
- $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
- my $copy_result = &Apache::lonnet::finishuserfileupload(
- $stu_name,$domain,'copy',
- '/portfolio'.$directory.$new_answer);
- }
- return ($new_answer);
-}
-
-sub file_name_version_ext {
- my ($file)=@_;
- my @file_parts = split(/\./, $file);
- my ($name,$version,$ext);
- if (@file_parts > 1) {
- $ext=pop(@file_parts);
- if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
- $version=pop(@file_parts);
- }
- $name=join('.',@file_parts);
- } else {
- $name=join('.',@file_parts);
- }
- return($name,$version,$ext);
+ }
+ return (@returned_keys);
}
#--------------------------------------------------------------------------------------
@@ -5138,26 +3808,7 @@ sub viewgrades {
}
my ($common_header,$specific_header,@sections,$section_display);
- 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;
- }
- }
- }
- }
+ @sections = &Apache::loncommon::get_env_multiple('form.section');
if (grep(/^all$/,@sections)) {
@sections = ('all');
if ($group_display) {
@@ -5167,7 +3818,7 @@ sub viewgrades {
$common_header = &mt('Assign Common Grade to Students not assigned to any groups');
$specific_header = &mt('Assign Grade to Specific Students not assigned to any groups');
} else {
- $common_header = &mt('Assign Common Grade to Class');
+ $common_header = &mt('Assign Common Grade to Class');
$specific_header = &mt('Assign Grade to Specific Students in Class');
}
} elsif (grep(/^none$/,@sections)) {
@@ -5180,7 +3831,7 @@ sub viewgrades {
$specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group');
} else {
$common_header = &mt('Assign Common Grade to Students in no Section');
- $specific_header = &mt('Assign Grade to Specific Students in no Section');
+ $specific_header = &mt('Assign Grade to Specific Students in no Section');
}
} else {
$section_display = join (", ",@sections);
@@ -5194,7 +3845,7 @@ sub viewgrades {
$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display);
} else {
$common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);
- $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
+ $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
}
}
my %submit_types = &substatus_options();
@@ -5233,6 +3884,7 @@ sub viewgrades {
my $part_resp = join('_',@{ $part_response_id });
next if $seen{$partid};
$seen{$partid}++;
+# my $handgrade=$$handgrade{$part_resp};
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;
@@ -5251,10 +3903,10 @@ sub viewgrades {
$partid.'" size="4" '.'onchange="javascript:writePoint(\''.
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
- $line.= '<td><b>'.&mt('Grade Status').':</b>'.
- '<select name="SELVAL_'.$partid.'" '.
- 'onchange="javascript:writeRadText(\''.$partid.'\','.
- $weight{$partid}.')"> '.
+ $line.= '<td><b>'.&mt('Grade Status').':</b>'.
+ '<select name="SELVAL_'.$partid.'" '.
+ 'onchange="javascript:writeRadText(\''.$partid.'\','.
+ $weight{$partid}.')"> '.
'<option selected="selected"> </option>'.
'<option value="excused">'.&mt('excused').'</option>'.
'<option value="reset status">'.&mt('reset status').'</option>'.
@@ -5313,8 +3965,8 @@ sub viewgrades {
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
$result.='<th>'.
- &mt('Score Part: [_1][_2](weight = [_3])',
- $display_part,'<br />',$weight{$partid}).'</th>'."\n";
+ &mt('Score Part: [_1][_2](weight = [_3])',
+ $display_part,'<br />',$weight{$partid}).'</th>'."\n";
next;
} else {
@@ -5349,7 +4001,7 @@ sub viewgrades {
}
$result.=&Apache::loncommon::end_data_table();
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
- $result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+ $result.='<input type="button" value="'.&mt('Save').'" '.
'onclick="javascript:submit();" target="_self" /></form>'."\n";
if ($ctr == 0) {
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -5362,7 +4014,7 @@ sub viewgrades {
$stu_status);
} elsif (grep(/^none$/,@groups)) {
$result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.',
- $stu_status);
+ $stu_status);
} else {
$result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',
$group_display,$stu_status);
@@ -5415,8 +4067,8 @@ sub viewgrades {
}
} else {
if (grep(/^all$/,@groups)) {
- $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
- $section_display,$stu_status,$submission_status);
+ $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
+ $section_display,$stu_status,$submission_status);
} elsif (grep(/^none$/,@groups)) {
$result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.',
$section_display,$stu_status,$submission_status);
@@ -5425,13 +4077,13 @@ sub viewgrades {
$section_display,$group_display,$stu_status,$submission_status);
}
}
- }
+ }
$result .= '</span><br />';
}
return $result;
}
-#--- call by previous routine to display each student who satisfies submission filter.
+#--- call by previous routine to display each student who satisfies submission filter.
sub viewstudentgrade {
my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_;
my ($uname,$udom) = split(/:/,$student);
@@ -5562,10 +4214,6 @@ sub editgrades {
);
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my %needpb = &passbacks_for_symb($cdom,$cnum,$symb);
-
my (@partid);
my %weight = ();
my %columns = ();
@@ -5616,26 +4264,24 @@ sub editgrades {
&Apache::loncommon::end_data_table_header_row();
my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);
- my ($got_types,%queueable,%pbsave,%skip_passback);
for ($i=0; $i<$env{'form.total'}; $i++) {
my $user = $env{'form.ctr'.$i};
my ($uname,$udom)=split(/:/,$user);
my %newrecord;
my $updateflag = 0;
- my $usec=$classlist->{"$uname:$udom"}[5];
- my $canmodify = &canmodify($usec);
- my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
- &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
- if (!$canmodify) {
- push(@noupdate,
- $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
- &mt('Not allowed to modify student')."</span></td>");
- next;
- }
+ my $usec=$classlist->{"$uname:$udom"}[5];
+ my $canmodify = &canmodify($usec);
+ my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
+ &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
+ if (!$canmodify) {
+ push(@noupdate,
+ $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
+ &mt('Not allowed to modify student')."</span></td>");
+ next;
+ }
my %aggregate = ();
my $aggregateflag = 0;
$user=~s/:/_/; # colon doen't work in javascript for names
- my (%weights,%awardeds,%excuseds);
foreach (@partid) {
my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
@@ -5644,7 +4290,6 @@ sub editgrades {
my $awarded = $env{'form.GD_'.$user.'_'.$_.'_awarded'};
my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
my $partial = $awarded eq '' ? '' : $pcr;
- $awardeds{$symb}{$_} = $partial;
my $score;
if ($partial eq '') {
$score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
@@ -5685,11 +4330,6 @@ sub editgrades {
my $partid=$_;
- if ($score eq 'excused') {
- $excuseds{$symb}{$partid} = 1;
- } else {
- $excuseds{$symb}{$partid} = '';
- }
foreach my $stores (@parts) {
my ($part,$type) = &split_part_type($stores);
if ($part !~ m/^\Q$partid\E/) { next;}
@@ -5707,6 +4347,9 @@ sub editgrades {
}
$line.="\n";
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
if ($updateflag) {
$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
@@ -5720,32 +4363,12 @@ sub editgrades {
$udom,$uname);
my $all_graded = 1;
my $none_graded = 1;
- unless ($got_types) {
- my $error;
- my ($plist,$handgrd,$resptype) = &response_type($symb,\$error);
- unless ($error) {
- foreach my $part (@parts) {
- if (ref($resptype->{$part}) eq 'HASH') {
- foreach my $id (keys(%{$resptype->{$part}})) {
- if (($resptype->{$part}->{$id} eq 'essay') ||
- (lc($handgrd->{$part.'_'.$id}) eq 'yes')) {
- $queueable{$part} = 1;
- last;
- }
- }
- }
- }
- }
- $got_types = 1;
- }
foreach my $part (@parts) {
- if ($queueable{$part}) {
- if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
- $all_graded = 0;
- } else {
- $none_graded = 0;
- }
- }
+ if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
+ $all_graded = 0;
+ } else {
+ $none_graded = 0;
+ }
}
if ($all_graded || $none_graded) {
@@ -5759,11 +4382,6 @@ sub editgrades {
'<td align="right"> '.$updateCtr.' </td>'.$line.
&Apache::loncommon::end_data_table_row();
$updateCtr++;
- if (keys(%needpb)) {
- $weights{$symb} = \%weight;
- &process_passbacks('editgrades',[$symb],$cdom,$cnum,$udom,$uname,$usec,\%weights,
- \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
- }
} else {
push(@noupdate,
'<td align="right"> '.$noupdateCtr.' </td>'.$line);
@@ -5816,7 +4434,7 @@ sub split_part_type {
#
#--- Javascript to handle csv upload
sub csvupload_javascript_reverse_associate {
- my $error1=&mt('You need to specify the username or the student/employee ID');
+ my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
my $error2=&mt('You need to specify at least one grading field');
&js_escape(\$error1);
&js_escape(\$error2);
@@ -5825,13 +4443,15 @@ sub csvupload_javascript_reverse_associa
var foundsomething=0;
var founduname=0;
var foundID=0;
+ var foundclicker=0;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
if (i==0 && tw!=0) { foundID=1; }
if (i==1 && tw!=0) { founduname=1; }
- if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
+ if (i==2 && tw!=0) { foundclicker=1; }
+ if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; }
}
- if (founduname==0 && foundID==0) {
+ if (founduname==0 && foundID==0 && foundclicker==0) {
alert('$error1');
return;
}
@@ -5858,7 +4478,7 @@ ENDPICK
}
sub csvupload_javascript_forward_associate {
- my $error1=&mt('You need to specify the username or the student/employee ID');
+ my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
my $error2=&mt('You need to specify at least one grading field');
&js_escape(\$error1);
&js_escape(\$error2);
@@ -5867,13 +4487,15 @@ sub csvupload_javascript_forward_associa
var foundsomething=0;
var founduname=0;
var foundID=0;
+ var foundclicker=0;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
if (tw==1) { foundID=1; }
if (tw==2) { founduname=1; }
- if (tw>3) { foundsomething=1; }
+ if (tw==3) { foundclicker=1; }
+ if (tw>4) { foundsomething=1; }
}
- if (founduname==0 && foundID==0) {
+ if (founduname==0 && foundID==0 && ƒoundclicker==0) {
alert('$error1');
return;
}
@@ -5905,8 +4527,6 @@ sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();
}
- my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
- my $ignore=&mt('Ignore First Line');
$symb = &Apache::lonenc::check_encrypt($symb);
$request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'.
&mt('Total number of records found in file: [_1]',$distotal).'<hr />'.
@@ -5915,7 +4535,6 @@ sub csvuploadmap_header {
$request->print(<<ENDPICK);
<br />
<input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />
@@ -5947,13 +4566,14 @@ sub csvupload_fields {
my @fields=(['ID','Student/Employee ID'],
['username','Student Username'],
+ ['clicker','Clicker ID'],
['domain','Student Domain']);
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $part (sort(@parts)) {
my @datum;
my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
my $name=$part;
- if (!$display) { $display = $name; }
+ if (!$display) { $display = $name; }
@datum=($name,$display);
if ($name=~/^stores_(.*)_awarded/) {
push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
@@ -6009,12 +4629,11 @@ sub upcsvScores_form {
<input type="hidden" name="command" value="csvuploadmap" />
$upfile_select
<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>
ENDUPFORM
$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet")).
- '</td>'.
+ '</td>'.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
return $result;
@@ -6029,13 +4648,12 @@ sub csvuploadmap {
if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($request);
} else {
- $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
- if ($datatoken ne '') {
+ $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+ if ($datatoken ne '') {
&Apache::loncommon::load_tmp_file($request,$datatoken);
}
}
my @records=&Apache::loncommon::upfile_record_sep();
- if ($env{'form.noFirstLine'}) { shift(@records); }
&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);
if (@records) {
@@ -6072,8 +4690,6 @@ sub csvuploadmap {
sub csvuploadoptions {
my ($request,$symb)= @_;
my $overwrite=&mt('Overwrite any existing score');
- my $checked=(($env{'form.noFirstLine'})?'1':'0');
- my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="command" value="csvuploadassign" />
@@ -6087,7 +4703,7 @@ ENDPICK
my %fields=&get_fields();
if (!defined($fields{'domain'})) {
my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
- $request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
+ $request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
}
foreach my $key (sort(keys(%env))) {
if ($key !~ /^form\.(.*)$/) { next; }
@@ -6125,40 +4741,17 @@ sub csvuploadassign {
if (!$symb) {return '';}
my $error_msg = '';
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
- if ($datatoken ne '') {
+ if ($datatoken ne '') {
&Apache::loncommon::load_tmp_file($request,$datatoken);
}
my @gradedata = &Apache::loncommon::upfile_record_sep();
- if ($env{'form.noFirstLine'}) { shift(@gradedata); }
my %fields=&get_fields();
my $courseid=$env{'request.course.id'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my ($classlist) = &getclasslist('all',0);
my @notallowed;
my @skipped;
my @warnings;
my $countdone=0;
- my @parts;
- my %needpb = &passbacks_for_symb($cdom,$cnum,$symb);
- my $passback;
- if (keys(%needpb)) {
- $passback = 1;
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- my $partlist = $res->parts();
- if (ref($partlist) eq 'ARRAY') {
- @parts = sort(@{$partlist});
- }
- }
- } else {
- return &navmap_errormsg();
- }
- }
- my (%skip_passback,%pbsave,%weights,%awardeds,%excuseds);
-
foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);
my $domain;
@@ -6173,13 +4766,45 @@ sub csvuploadassign {
if (!$username) {
my $id=$entries{$fields{'ID'}};
$id=~s/\s//g;
- my %ids=&Apache::lonnet::idget($domain,$id);
- $username=$ids{$id};
+ if ($id ne '') {
+ my %ids=&Apache::lonnet::idget($domain,[$id]);
+ $username=$ids{$id};
+ } else {
+ if ($entries{$fields{'clicker'}}) {
+ my $clicker = $entries{$fields{'clicker'}};
+ $clicker=~s/\s//g;
+ if ($clicker ne '') {
+ my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers');
+ if ($clickers{$clicker} ne '') {
+ my $match = 0;
+ my @inclass;
+ foreach my $poss (split(/,/,$clickers{$clicker})) {
+ if (exists($$classlist{"$poss:$domain"})) {
+ $username = $poss;
+ push(@inclass,$poss);
+ $match ++;
+
+ }
+ }
+ if ($match > 1) {
+ undef($username);
+ $request->print('<p class="LC_warning">'.
+ &mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])',
+ $clicker,join(', ',@inclass)).'</p>');
+ }
+ }
+ }
+ }
+ }
}
if (!exists($$classlist{"$username:$domain"})) {
my $id=$entries{$fields{'ID'}};
$id=~s/\s//g;
- if ($id) {
+ my $clicker = $entries{$fields{'clicker'}};
+ $clicker=~s/\s//g;
+ if ($clicker) {
+ push(@skipped,"$clicker:$domain");
+ } elsif ($id) {
push(@skipped,"$id:$domain");
} else {
push(@skipped,"$username:$domain");
@@ -6201,18 +4826,13 @@ sub csvuploadassign {
my $part=$1;
my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
$symb,$domain,$username);
- $weights{$symb}{$part} = $wgt;
if ($wgt) {
$entries{$fields{$dest}}=~s/\s//g;
my $pcr=$entries{$fields{$dest}} / $wgt;
- if ($passback) {
- $awardeds{$symb}{$part} = $pcr;
- $excuseds{$symb}{$part} = '';
- }
my $award=($pcr == 0) ? 'incorrect_by_override'
: 'correct_by_override';
if ($pcr>1) {
- push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
+ push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
}
$grades{"resource.$part.awarded"}=$pcr;
$grades{"resource.$part.solved"}=$award;
@@ -6228,22 +4848,6 @@ sub csvuploadassign {
if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }
my $store_key=$dest;
- if ($passback) {
- if ($store_key=~/stores_(.*)_(awarded|solved)/) {
- my ($part,$key) = ($1,$2);
- unless ((ref($weights{$symb}) eq 'HASH') && (exists($weights{$symb}{$part}))) {
- $weights{$symb}{$part} = &Apache::lonnet::EXT('resource.'.$part.'.weight',
- $symb,$domain,$username);
- }
- if ($key eq 'awarded') {
- $awardeds{$symb}{$part} = $entries{$fields{$dest}};
- } elsif ($key eq 'solved') {
- if ($entries{$fields{$dest}} =~ /^excused/) {
- $excuseds{$symb}{$part} = 1;
- }
- }
- }
- }
$store_key=~s/^stores/resource/;
$store_key=~s/_/\./g;
$grades{$store_key}=$entries{$fields{$dest}};
@@ -6260,33 +4864,12 @@ sub csvuploadassign {
# Successfully stored
$request->print('.');
# Remove from grading queue
- &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,$cnum,
- $domain,$username);
+ &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $domain,$username);
$countdone++;
- if ($passback) {
- my @parts_in_upload;
- if (ref($weights{$symb}) eq 'HASH') {
- @parts_in_upload = sort(keys(%{$weights{$symb}}));
- }
- my @diffs = &Apache::loncommon::compare_arrays(\@parts_in_upload,\@parts);
- if (@diffs > 0) {
- my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$username);
- foreach my $part (@parts) {
- next if (grep(/^\Q$part\E$/,@parts_in_upload));
- $weights{$symb}{$part} = &Apache::lonnet::EXT('resource.'.$part.'.weight',
- $symb,$domain,$username);
- if ($record{"resource.$part.solved"} =~/^excused/) {
- $excuseds{$symb}{$part} = 1;
- } else {
- $excuseds{$symb}{$part} = '';
- }
- $awardeds{$symb}{$part} = $record{"resource.$part.awarded"};
- }
- }
- &process_passbacks('csvupload',[$symb],$cdom,$cnum,$domain,$username,$usec,\%weights,
- \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
- }
- } else {
+ } else {
$request->print("<p><span class=\"LC_error\">".
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
"$username:$domain",$result)."</span></p>");
@@ -6360,30 +4943,30 @@ LISTJAVASCRIPT
# Collection of hidden fields
my $ctr=0;
foreach (@$titles) {
- my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
- $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
- $ctr++;
+ my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+ $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
+ $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
+ $ctr++;
}
$result.='<input type="hidden" name="page" />'."\n".
- '<input type="hidden" name="title" />'."\n";
+ '<input type="hidden" name="title" />'."\n";
$result.=&build_section_inputs();
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
- '<input type="hidden" name="command" value="displayPage" />'."\n".
- '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+ '<input type="hidden" name="command" value="displayPage" />'."\n".
+ '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
# Show grading options
$result.=&Apache::lonhtmlcommon::start_pick_box();
my $select = '<select name="selectpage">'."\n";
$ctr=0;
foreach (@$titles) {
- my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- $select.='<option value="'.$ctr.'"'.
- ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
- '>'.$showtitle.'</option>'."\n";
- $ctr++;
+ my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+ $select.='<option value="'.$ctr.'"'.
+ ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
+ '>'.$showtitle.'</option>'."\n";
+ $ctr++;
}
$select.= '</select>';
@@ -6409,7 +4992,7 @@ LISTJAVASCRIPT
.'<label><input type="radio" name="lastSub" value="all" /> '
.&mt('all submissions with details').' </label>'
.&Apache::lonhtmlcommon::row_closure();
-
+
$result.=
&Apache::lonhtmlcommon::row_title(&mt('Use CODE'))
.'<input type="text" name="CODE" value="" />'
@@ -6512,10 +5095,10 @@ sub displayPage {
&Apache::lonnet::clear_EXT_cache_status();
if (!&canview($usec)) {
- $request->print(
+ $request->print(
'<span class="LC_warning">'.
&mt('Unable to view requested student. ([_1])',
- $env{'form.student'}).
+ $env{'form.student'}).
'</span>');
return;
}
@@ -6598,7 +5181,7 @@ sub displayPage {
} else {
if ($env{'form.vProb'} eq 'yes' ) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
- undef,'both',\%form);
+ undef,'both',\%form);
} else {
my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
$companswer =~ s|<form(.*?)>||g;
@@ -6609,7 +5192,7 @@ sub displayPage {
# }
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer;
- }
+ }
}
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
@@ -6633,11 +5216,10 @@ sub displayPage {
$responseType{$partid} = \%responseIds;
}
$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
-
}
} elsif ($env{'form.lastSub'} eq 'all') {
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
- my $identifier = (&canmodify($usec)? $prob : '');
+ my $identifier = (&canmodify($usec)? $prob : '');
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
$env{'request.course.id'},
'','.submission',undef,
@@ -6659,14 +5241,10 @@ sub displayPage {
}
$curRes = $iterator->next();
}
- my $disabled;
- unless (&canmodify($usec)) {
- $disabled = ' disabled="disabled"';
- }
$studentTable.=
'</table>'."\n".
- '<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+ '<input type="button" value="'.&mt('Save').'" '.
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";
$request->print($studentTable);
@@ -6696,7 +5274,7 @@ sub displaySubByDates {
if ($is_tool) {
return '<br /> <span class="LC_warning">'.&mt('No grade passed back.').'</span><br />';
} else {
- return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
+ return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
}
}
@@ -6730,13 +5308,13 @@ sub displaySubByDates {
if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
$hidden = 1;
}
- my @matchKey;
+ my @matchKey;
if ($isTask) {
@matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));
} elsif ($is_tool) {
@matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys));
} else {
- @matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
+ @matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
}
# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,$symb);
@@ -6747,7 +5325,7 @@ sub displaySubByDates {
$displaySub[0].=$$record{"$version:resource.$partid.awarded"};
} else {
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
- : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
+ : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<span class="LC_nobreak">';
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
.' <span class="LC_internal_info">'
@@ -6766,8 +5344,8 @@ sub displaySubByDates {
$displaySub[0].=&mt('Trial not counted');
} else {
$displaySub[0].=&mt('Trial: [_1]',
- $$record{"$where.$partid.tries"});
- if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
+ $$record{"$where.$partid.tries"});
+ if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
if (($rndseed ne $lastrndseed{$partid}) &&
(($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
$newvariation = ' ('.&mt('New variation this try').')';
@@ -6775,12 +5353,12 @@ sub displaySubByDates {
}
$lastrndseed{$partid} = $rndseed;
$lasttype{$partid} = $type;
- }
- my $responseType=($isTask ? 'Task'
- : $responseType->{$partid}->{$responseId});
- if (!exists($orders{$partid})) { $orders{$partid}={}; }
- if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
- $orders{$partid}->{$responseId}=
+ }
+ my $responseType=($isTask ? 'Task'
+ : $responseType->{$partid}->{$responseId});
+ if (!exists($orders{$partid})) { $orders{$partid}={}; }
+ if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
+ $orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment,$type,$trial,$rndseed);
}
@@ -6802,16 +5380,16 @@ sub displaySubByDates {
lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$where.$partid.solved"}}.
'<br />';
- } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
- if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) {
- $displaySub[1].=&mt('Grade passed back by external tool');
- }
+ } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
+ if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) {
+ $displaySub[1].=&mt('Grade passed back by external tool');
+ }
}
if (exists $$record{"$where.$partid.regrader"}) {
$displaySub[2].=$$record{"$where.$partid.regrader"};
- unless ($is_tool) {
+ unless ($is_tool) {
$displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
- }
+ }
} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
$displaySub[2].=
$$record{"$version:resource.$partid.regrader"};
@@ -6882,7 +5460,6 @@ sub updateGradeByPage {
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0);
- my (@updates,%weights,%excuseds,%awardeds,@symbs_in_map);
while ($depth > 0) {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }
@@ -6891,7 +5468,6 @@ sub updateGradeByPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- push(@symbs_in_map,$symbx);
$studentTable.=
&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.
@@ -6904,37 +5480,18 @@ sub updateGradeByPage {
my @displayPts=();
my %aggregate = ();
my $aggregateflag = 0;
- my %queueable;
if ($env{'form.HIDE'.$prob}) {
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);
my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1);
- if ($numchgs) {
- push(@updates,$symbx);
- }
$hideflag += $numchgs;
}
foreach my $partid (@{$parts}) {
my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
- my @types = $curRes->responseType($partid);
- if (grep(/^essay$/,@types)) {
- $queueable{$partid} = 1;
- } else {
- my @ids = $curRes->responseIds($partid);
- for (my $i=0; $i < scalar(@ids); $i++) {
- my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i].
- '.handgrade',$symb);
- if (lc($hndgrd) eq 'yes') {
- $queueable{$partid} = 1;
- last;
- }
- }
- }
+
my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?
$env{'form.WGT'.$question.'_'.$partid} : 1;
- $weights{$symbx}{$partid} = $wgt;
- $excuseds{$symbx}{$partid} = '';
my $partial = $newpts/$wgt;
my $score;
if ($partial > 0) {
@@ -6946,7 +5503,6 @@ sub updateGradeByPage {
if ($dropMenu eq 'excused') {
$partial = '';
$score = 'excused';
- $excuseds{$symbx}{$partid} = 1;
} elsif ($dropMenu eq 'reset status'
&& $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
$newrecord{'resource.'.$partid.'.tries'} = 0;
@@ -6974,11 +5530,6 @@ sub updateGradeByPage {
(($score eq 'excused') ? 'excused' : $newpts).
' <br />';
$question++;
- if (($newpts eq '') || ($partial eq '')) {
- $awardeds{$symbx}{$partid} = 0;
- } else {
- $awardeds{$symbx}{$partid} = $partial;
- }
next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused'));
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
@@ -7004,7 +5555,7 @@ sub updateGradeByPage {
$env{'request.course.id'},
$udom,$uname);
&check_and_remove_from_queue($parts,\%record,undef,$symbx,
- $cdom,$cnum,$udom,$uname,\%queueable);
+ $cdom,$cnum,$udom,$uname);
}
if ($aggregateflag) {
@@ -7018,9 +5569,6 @@ sub updateGradeByPage {
&Apache::loncommon::end_data_table_row();
$prob++;
- if ($changeflag) {
- push(@updates,$symbx);
- }
}
$curRes = $iterator->next();
}
@@ -7034,95 +5582,9 @@ sub updateGradeByPage {
$hideflag).'<br />');
$request->print($hidemsg.$grademsg.$studentTable);
- if (@updates) {
- my (@allsymbs,$mapsymb,@recurseup,%parentmapsymbs,%possmappb,%possrespb);
- @allsymbs = @updates;
- if (ref($map)) {
- $mapsymb = $map->symb();
- push(@allsymbs,$mapsymb);
- @recurseup = $navmap->recurseup_maps($map->src,1);
- }
- if (@recurseup) {
- push(@allsymbs,@recurseup);
- map { $parentmapsymbs{$_} = 1; } @recurseup;
- }
- my %passback = &Apache::lonnet::get('nohist_linkprot_passback',\@allsymbs,$cdom,$cnum);
- my (%uniqsymbs,$use_symbs_in_map,%launch_to_symb);
- if (keys(%passback)) {
- foreach my $possible (keys(%passback)) {
- if (ref($passback{$possible}) eq 'HASH') {
- if ($possible eq $mapsymb) {
- foreach my $launcher (keys(%{$passback{$possible}})) {
- $possmappb{$launcher} = 1;
- $launch_to_symb{$launcher} = $possible;
- }
- $use_symbs_in_map = 1;
- } elsif (exists($parentmapsymbs{$possible})) {
- foreach my $launcher (keys(%{$passback{$possible}})) {
- my ($linkuri,$linkprotector,$scope) = split(/\0/,$launcher);
- if ($scope eq 'rec') {
- $possmappb{$launcher} = 1;
- $use_symbs_in_map = 1;
- $launch_to_symb{$launcher} = $possible;
- }
- }
- } elsif (grep(/^\Q$possible$\E$/,@updates)) {
- foreach my $launcher (keys(%{$passback{$possible}})) {
- $possrespb{$launcher} = 1;
- $launch_to_symb{$launcher} = $possible;
- }
- $uniqsymbs{$possible} = 1;
- }
- }
- }
- }
- if ($use_symbs_in_map) {
- map { $uniqsymbs{$_} = 1; } @symbs_in_map;
- }
- my @posslaunchers;
- if (keys(%possmappb)) {
- push(@posslaunchers,keys(%possmappb));
- }
- if (keys(%possrespb)) {
- push(@posslaunchers,keys(%possrespb));
- }
- if (@posslaunchers) {
- my (%pbsave,%skip_passback,%needpb);
- my %pbids = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',\@posslaunchers,$udom,$uname);
- foreach my $key (keys(%pbids)) {
- if (ref($pbids{$key}) eq 'ARRAY') {
- if ($launch_to_symb{$key}) {
- $needpb{$key} = $launch_to_symb{$key};
- }
- }
- }
- my @symbs = keys(%uniqsymbs);
- &process_passbacks('updatebypage',\@symbs,$cdom,$cnum,$udom,$uname,$usec,\%weights,
- \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave,\%pbids);
- if (@Apache::grades::ltipassback) {
- unless ($registered_cleanup) {
- my $handlers = $request->get_handlers('PerlCleanupHandler');
- $request->set_handlers('PerlCleanupHandler' =>
- [\&Apache::grades::make_passback,@{$handlers}]);
- $registered_cleanup=1;
- }
- }
- }
- }
return '';
}
-sub make_passback {
- if (@Apache::grades::ltipassback) {
- my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
- my $ip = &Apache::lonnet::get_host_ip($lonhost);
- foreach my $item (@Apache::grades::ltipassback) {
- &Apache::lonhomework::run_passback($item,$lonhost,$ip);
- }
- undef(@Apache::grades::ltipassback);
- }
-}
-
#-------- end of section for handling grading by page/sequence ---------
#
#-------------------------------------------------------------------
@@ -7435,30 +5897,31 @@ sub scantron_selectphase {
$ssi_error = 0;
- if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
- &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+ if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'}) {
- # Chunk of form to prompt for a scantron file upload.
+ # Chunk of form to prompt for a scantron file upload.
$r->print('
<br />');
- my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
- my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
- &js_escape(\$alertmsg);
- my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
- $r->print(&Apache::lonhtmlcommon::scripttag('
+ my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $csec= $env{'request.course.sec'};
+ my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
+ &js_escape(\$alertmsg);
+ my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
+ $r->print(&Apache::lonhtmlcommon::scripttag('
function checkUpload(formname) {
- if (formname.upfile.value == "") {
- alert("'.$alertmsg.'");
- return false;
- }
- formname.submit();
+ if (formname.upfile.value == "") {
+ alert("'.$alertmsg.'");
+ return false;
+ }
+ formname.submit();
}'."\n".$formatjs));
- $r->print('
+ $r->print('
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'
<input name="courseid" type="hidden" value="'.$cnum.'" />
+ <input name="coursesec" type="hidden" value="'.$csec.'" />
<input name="domainid" type="hidden" value="'.$cdom.'" />
<input name="command" value="scantronupload_save" type="hidden" />
'.&Apache::loncommon::start_data_table('LC_scantron_action').'
@@ -7470,8 +5933,8 @@ sub scantron_selectphase {
'.&Apache::loncommon::start_data_table_row().'
<td>
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");
- if ($formatoptions) {
- $r->print('</td>
+ if ($formatoptions) {
+ $r->print('</td>
'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'
<td>'.$formattitle.(' 'x2).$formatoptions.'
@@ -7479,16 +5942,16 @@ sub scantron_selectphase {
'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'
<td>'
- );
- } else {
- $r->print(' <br />');
- }
- $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
+ );
+ } else {
+ $r->print(' <br />');
+ }
+ $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</td>
'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'
</form>'
- );
+ );
}
@@ -7605,7 +6068,9 @@ sub scantron_selectphase {
=item username_to_idmap
creates a hash keyed by student/employee ID with values of the corresponding
- student username:domain.
+ student username:domain. If a single ID occurs for more than one student,
+ the status of the student is checked, and if Active, the value in the hash
+ will be set to the Active student.
Arguments:
@@ -7805,12 +6270,12 @@ sub digits_to_letters {
=item scantron_parse_scanline
- Decodes a scanline from the selected scantron file
+ Decodes a scanline from the selected bubblesheet file
Arguments:
- line - The text of the scantron file line to process
+ line - The text of the bubblesheet file line to process
whichline - Line number
- scantron_config - Hash describing the format of the scantron lines.
+ scantron_config - Hash describing the format of the bubblesheet lines.
scan_data - Hash of extra information about the scanline
(see scantron_getfile for more information)
just_header - True if should not process question answers but only
@@ -7835,7 +6300,7 @@ sub digits_to_letters {
totalref - Ref of scalar used to score total number of bubble
lines needed for responses in a scan line (used when
randompick in use.
-
+
Returns:
Hash containing the result of parsing the scanline
@@ -7928,7 +6393,7 @@ sub scantron_parse_scanline {
$partids_by_symb,$orderedforcode,
$respnumlookup,$startline);
if ($total) {
- $lastpos = $total*$$scantron_config{'Qlength'};
+ $lastpos = $total*$$scantron_config{'Qlength'};
}
if (ref($totalref)) {
$$totalref = $total;
@@ -7942,7 +6407,7 @@ sub scantron_parse_scanline {
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
$answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}};
} else {
- $answers_needed = $bubble_lines_per_response{$questnum};
+ $answers_needed = $bubble_lines_per_response{$questnum};
}
my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed)
|| 1;
@@ -8002,12 +6467,9 @@ sub scantron_parse_scanline {
}
sub get_master_seq {
- my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_;
- return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
+ my ($resources,$master_seq,$symb_to_resource) = @_;
+ return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
(ref($symb_to_resource) eq 'HASH'));
- if ($need_symb_in_map) {
- return unless (ref($symb_for_examcode) eq 'HASH');
- }
my $resource_error;
foreach my $resource (@{$resources}) {
my $ressymb;
@@ -8015,14 +6477,6 @@ sub get_master_seq {
$ressymb = $resource->symb();
push(@{$master_seq},$ressymb);
$symb_to_resource->{$ressymb} = $resource;
- if ($need_symb_in_map) {
- unless ($resource->is_map()) {
- my $map=(&Apache::lonnet::decode_symb($ressymb))[0];
- unless (exists($symb_for_examcode->{$map})) {
- $symb_for_examcode->{$map} = $ressymb;
- }
- }
- }
} else {
$resource_error = 1;
last;
@@ -8092,7 +6546,7 @@ sub scantron_validator_lettnum {
my $occurrences = 0;
my $responsenum = $questnum-1;
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
- $responsenum = $respnumlookup->{$questnum-1}
+ $responsenum = $respnumlookup->{$questnum-1}
}
if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
($responsetype_per_response{$responsenum} eq 'formularesponse') ||
@@ -8388,7 +6842,7 @@ sub scantron_process_corrections {
}
}
if ($err) {
- $r->print(
+ $r->print(
'<p class="LC_error">'
.&mt('Unable to accept last correction, an error occurred: [_1]',
$errmsg)
@@ -8525,7 +6979,7 @@ sub scantron_warning_screen {
'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'.
$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>';
}
- return ('
+ return '
<p>
<span class="LC_warning">
'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span>
@@ -8537,9 +6991,7 @@ sub scantron_warning_screen {
</table>
<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'<br />
'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>
-
-<br />
-');
+';
}
=pod
@@ -8565,15 +7017,58 @@ sub scantron_do_warning {
}
if ( $env{'form.scantron_selectfile'} eq '') {
$r->print('<p><span class="LC_error">'.&mt("You have not selected a file that contains the student's response data.").'</span></p>');
- }
+ }
if ( $env{'form.scantron_format'} eq '') {
$r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>');
- }
+ }
} else {
my $warning=&scantron_warning_screen('Grading: Validate Records',$symb);
+ my ($checksec,@possibles) = &gradable_sections();
+ my $gradesections;
+ if ($checksec) {
+ my $file=$env{'form.scantron_selectfile'};
+ if (&valid_file($file)) {
+ my %bysec = &scantron_get_sections();
+ my $table;
+ if ((keys(%bysec) > 1) || ((keys(%bysec) == 1) && ((keys(%bysec))[0] ne $checksec))) {
+ $gradesections = &mt('Your current role is for section [_1].','<i>'.$checksec.'</i>').'<br />';
+ $table = &Apache::loncommon::start_data_table()."\n".
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Section').'</th><th>'.&mt('Number of records').'</th>'.
+ &Apache::loncommon::end_data_table_header_row()."\n";
+ if ($bysec{'none'}) {
+ $table .= &Apache::loncommon::start_data_table_row().
+ '<td>'.&mt('None').'</td><td>'.$bysec{'none'}.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
+ foreach my $sec (sort { $a <=> $b } keys(%bysec)) {
+ next if ($sec eq 'none');
+ $table .= &Apache::loncommon::start_data_table_row().
+ '<td>'.$sec.'</td><td>'.$bysec{$sec}.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
+ $table .= &Apache::loncommon::end_data_table()."\n";
+ $gradesections .= &mt('Sections represented in the bubblesheet data file (based on bubbled student IDs) are as follows:').
+ '<p>'.$table.'</p>';
+ if (@possibles) {
+ $gradesections .= '<p>'.
+ &mt('You have role(s) in [quant,_1,other section,other sections] with privileges to manage grades.',
+ scalar(@possibles)).'<br />'.
+ &mt('Check which of those section(s), in addition to section [_1], you wish to grade using this bubblesheet file:',
+ '<i>'.$checksec.'</i>').' ';
+ foreach my $sec (sort {$a <=> $b } @possibles) {
+ $gradesections .= '<label><input type="checkbox" name="scantron_othersections" value="'.$sec.'" />'.$sec.'</label>'.(' 'x2);
+ }
+ $gradesections .= '</p>';
+ }
+ }
+ } else {
+ $gradesections = '<p class="LC_error">'.&mt('The selected file is unavailable').'</p>';
+ }
+ }
my $bubbledbyhand=&hand_bubble_option();
$r->print('
-'.$warning.$bubbledbyhand.'
+'.$warning.$gradesections.$bubbledbyhand.'
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
<input type="hidden" name="command" value="scantron_validate" />
');
@@ -8660,7 +7155,38 @@ sub scantron_validate_file {
if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);
}
- $r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
+
+ $r->print('<p>'.&mt('Gathering necessary information.').'</p>');
+ my ($checksec,@gradable);
+ if ($env{'request.course.sec'}) {
+ ($checksec,my @possibles) = &gradable_sections();
+ if ($checksec) {
+ if (@possibles) {
+ my @chosensecs = &Apache::loncommon::get_env_multiple('form.scantron_othersections');
+ if (@chosensecs) {
+ foreach my $sec (@chosensecs) {
+ if (grep(/^\Q$sec\E$/,@possibles)) {
+ unless (grep(/^\Q$sec\E$/,@gradable)) {
+ push(@gradable,$sec);
+ }
+ }
+ }
+ }
+ }
+ $r->print('<p><table>');
+ if (@gradable) {
+ my @showsections = sort { $a <=> $b } (@gradable,$checksec);
+ $r->print(
+ '<tr><td><b>'.&mt('Sections to be Graded:').'</b></td><td>'.join(', ',@showsections).'</td></tr>');
+ } else {
+ $r->print(
+ '<tr><td><b>'.&mt('Section to be Graded:').'</b></td><td>'.$checksec.'</td></tr>');
+ }
+ $r->print('</table></p>');
+ }
+ }
+ $r->rflush();
+
#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());
my $nav_error;
@@ -8685,23 +7211,39 @@ sub scantron_validate_file {
$env{'form.validatepass'} = 0;
}
my $currentphase=$env{'form.validatepass'};
-
+ my %skipbysec=();
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
$r->rflush();
-
+
my $which="scantron_validate_".$validate_phases[$currentphase];
{
no strict 'refs';
- ($stop,$currentphase)=&$which($r,$currentphase);
+ my @extras=();
+ if ($validate_phases[$currentphase] eq 'ID') {
+ @extras = (\%skipbysec,$checksec,@gradable);
+ }
+ ($stop,$currentphase)=&$which($r,$currentphase,@extras);
}
}
if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading',$symb);
+ my $secinfo;
+ if (keys(%skipbysec) > 0) {
+ my $seclist = '<ul>';
+ foreach my $sec (sort { $a <=> $b } keys(%skipbysec)) {
+ $seclist .= '<li>'.&mt('section [_1]: [_2]',$sec,$skipbysec{$sec}).'</li>';
+ }
+ $seclist .= '</ul>';
+ $secinfo = '<p class="LC_info">'.
+ &mt('Numbers of records for students in sections not being graded [_1]',
+ $seclist).
+ '</p>';
+ }
$r->print(&mt('Validation process complete.').'<br />'.
- $warning.
+ $secinfo.$warning.
&mt('Perform verification for each student after storage of submissions?').
' <span class="LC_nobreak"><label>'.
'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'.
@@ -8721,7 +7263,7 @@ sub scantron_validate_file {
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />');
$r->print(' '.&mt('this error').' <br />');
- $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
+ $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
} else {
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />');
@@ -9100,9 +7642,10 @@ sub scantron_validate_sequence {
my @resources=
$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
if (@resources) {
- $r->print('<p class="LC_warning">'
+ $r->print(
+ '<p class="LC_warning">'
.&mt('Some resources in the sequence currently are not set to'
- .' exam mode. Grading these resources currently may not'
+ .' bubblesheet exam mode. Grading these resources currently may not'
.' work correctly.')
.'</p>'
);
@@ -9116,11 +7659,12 @@ sub scantron_validate_sequence {
sub scantron_validate_ID {
- my ($r,$currentphase) = @_;
+ my ($r,$currentphase,$skipbysec,$checksec,@gradable) = @_;
#get student info
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);
+ my $secidx = &Apache::loncoursedata::CL_SECTION();
#get scantron line setup
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
@@ -9134,6 +7678,7 @@ sub scantron_validate_ID {
}
my %found=('ids'=>{},'usernames'=>{});
+ my $unsavedskips = 0;
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }
@@ -9146,13 +7691,41 @@ sub scantron_validate_ID {
}
if ($found) {
my $username=$idmap{$found};
+ if ($checksec) {
+ if (ref($classlist->{$username}) eq 'ARRAY') {
+ my $stusec = $classlist->{$username}->[$secidx];
+ if ($stusec ne $checksec) {
+ unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) {
+ my $skip=1;
+ &scantron_put_line($scanlines,$scan_data,$i,$line,$skip);
+ if (ref($skipbysec) eq 'HASH') {
+ if ($stusec eq '') {
+ $skipbysec->{'none'} ++;
+ } else {
+ $skipbysec->{$stusec} ++;
+ }
+ }
+ $unsavedskips ++;
+ next;
+ }
+ }
+ }
+ }
if ($found{'ids'}{$found}) {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'duplicateID',$found);
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return(1,$currentphase);
} elsif ($found{'usernames'}{$username}) {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'duplicateID',$username);
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return(1,$currentphase);
}
#FIXME store away line we previously saw the ID on to use above
@@ -9161,29 +7734,95 @@ sub scantron_validate_ID {
} else {
if ($id =~ /^\s*$/) {
my $username=&scan_data($scan_data,"$i.user");
- if (defined($username) && $found{'usernames'}{$username}) {
+ if (($checksec && $username ne '')) {
+ if (ref($classlist->{$username}) eq 'ARRAY') {
+ my $stusec = $classlist->{$username}->[$secidx];
+ if ($stusec ne $checksec) {
+ unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) {
+ my $skip=1;
+ &scantron_put_line($scanlines,$scan_data,$i,$line,$skip);
+ if (ref($skipbysec) eq 'HASH') {
+ if ($stusec eq '') {
+ $skipbysec->{'none'} ++;
+ } else {
+ $skipbysec->{$stusec} ++;
+ }
+ }
+ $unsavedskips ++;
+ next;
+ }
+ }
+ }
+ } elsif (defined($username) && $found{'usernames'}{$username}) {
&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,
$line,'duplicateID',$username);
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return(1,$currentphase);
} elsif (!defined($username)) {
&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,
$line,'incorrectID');
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return(1,$currentphase);
}
$found{'usernames'}{$username}++;
} else {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'incorrectID');
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return(1,$currentphase);
}
}
}
-
+ if ($unsavedskips) {
+ &scantron_putfile($scanlines,$scan_data);
+ $unsavedskips = 0;
+ }
return (0,$currentphase+1);
}
+sub scantron_get_sections {
+ my %bysec;
+ if ($env{'form.scantron_format'} ne '') {
+ my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+ foreach my $key (keys(%idmap)) {
+ my $lckey = lc($key);
+ $idmap{$lckey} = $idmap{$key};
+ }
+ my $secidx = &Apache::loncoursedata::CL_SECTION();
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ my $id=lc($$scan_record{'scantron.ID'});
+ if (exists($idmap{$id})) {
+ if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') {
+ my $stusec = $classlist->{$idmap{$id}}->[$secidx];
+ if ($stusec eq '') {
+ $bysec{'none'} ++;
+ } else {
+ $bysec{$stusec} ++;
+ }
+ }
+ }
+ }
+ }
+ return %bysec;
+}
sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg,
@@ -9224,10 +7863,10 @@ sub scantron_get_correction {
if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {
- $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
+ $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
"</p>\n");
} elsif ($error eq 'duplicateID') {
- $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
+ $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
}
$r->print($message);
$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
@@ -9247,8 +7886,8 @@ sub scantron_get_correction {
} elsif ($error eq 'duplicateCODE') {
$r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
}
- $r->print("<p>".&mt('The CODE on the form is [_1]',
- "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
+ $r->print("<p>".&mt('The CODE on the form is [_1]',
+ "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
."</p>\n");
$r->print($message);
$r->print("<p>".&mt("How should I handle this?")."</p>\n");
@@ -9345,7 +7984,7 @@ ENDSCRIPT
# The form field scantron_questions is actually a list of line numbers not
# a list of question numbers. Therefore:
#
-
+
my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,
$respnumlookup,$startline);
@@ -9455,7 +8094,7 @@ sub questions_to_line_list {
} else {
$first = $first_bubble_line{$responsenum} + 1;
}
- $count = $bubble_lines_per_response{$responsenum};
+ $count = $bubble_lines_per_response{$responsenum};
}
$last = $first+$count-1;
push(@lines, ($first..$last));
@@ -9486,6 +8125,7 @@ for multi and missing bubble cases).
and value is number of first bubble line for current student
or code-based randompick and/or randomorder.
+
Implicit inputs:
%bubble_lines_per_response - Starting line numbers for each question.
Numbered from 0 (but question numbers are from
@@ -9538,7 +8178,7 @@ sub prompt_for_corrections {
} else {
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
$responsenum = $respnumlookup->{$question-1};
- if (ref($startline) eq 'HASH') {
+ if (ref($startline) eq 'HASH') {
$first = $startline->{$question-1};
}
} else {
@@ -9556,7 +8196,16 @@ sub prompt_for_corrections {
($responsetype_per_response{$responsenum} eq 'imageresponse') ||
($responsetype_per_response{$responsenum} eq 'reactionresponse') ||
($responsetype_per_response{$responsenum} eq 'organicresponse')) {
- $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
+ $r->print(
+ &mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines)
+ .'<br /><br />'
+ .&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.')
+ .'<br />'
+ .&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.')
+ .'<br />'
+ .&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.")
+ .'<br /><br />'
+ );
} else {
$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
}
@@ -9596,7 +8245,7 @@ sub scantron_bubble_selector {
my $max=$$scan_config{'Qlength'};
my $scmode=$$scan_config{'Qon'};
- if ($scmode eq 'number' || $scmode eq 'letter') {
+ if ($scmode eq 'number' || $scmode eq 'letter') {
if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&
($$scan_config{'BubblesPerRow'} > 0)) {
$max=$$scan_config{'BubblesPerRow'};
@@ -9839,17 +8488,6 @@ sub scantron_validate_doublebubble {
if (ref($map)) {
$randomorder = $map->randomorder();
$randompick = $map->randompick();
- unless ($randomorder || $randompick) {
- foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
- if ($res->randomorder()) {
- $randomorder = 1;
- }
- if ($res->randompick()) {
- $randompick = 1;
- }
- last if ($randomorder || $randompick);
- }
- }
if ($randomorder || $randompick) {
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
if ($nav_error) {
@@ -9926,7 +8564,7 @@ sub scantron_get_maxbubble {
my $response_number = 0;
my $bubble_line = 0;
foreach my $resource (@resources) {
- my $resid = $resource->id();
+ my $resid = $resource->id();
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,
$udom,undef,$bubbles_per_row);
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
@@ -9977,7 +8615,7 @@ sub scantron_get_maxbubble {
$bubble_lines_per_response{$response_number} = $lines;
$responsetype_per_response{$response_number} =
$analysis->{$part_id.'.type'};
- $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;
+ $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;
$response_number++;
$bubble_line += $lines;
@@ -10033,17 +8671,6 @@ sub scantron_validate_missingbubbles {
if (ref($map)) {
$randomorder = $map->randomorder();
$randompick = $map->randompick();
- unless ($randomorder || $randompick) {
- foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
- if ($res->randomorder()) {
- $randomorder = 1;
- }
- if ($res->randompick()) {
- $randompick = 1;
- }
- last if ($randomorder || $randompick);
- }
- }
if ($randomorder || $randompick) {
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
if ($nav_error) {
@@ -10069,9 +8696,9 @@ sub scantron_validate_missingbubbles {
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }
- my $scan_record =
+ my $scan_record =
&scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap,
- $randomorder,$randompick,$sequence,\@master_seq,
+ $randomorder,$randompick,$sequence,\@master_seq,
\%symb_to_resource,\%grader_partids_by_symb,
\%orderedforcode,\%respnumlookup,\%startline);
if (!defined($$scan_record{'scantron.missingerror'})) { next; }
@@ -10082,36 +8709,36 @@ sub scantron_validate_missingbubbles {
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
my $lastbubble;
if ($missing =~ /^(\d+)\.(\d+)$/) {
- my $question = $1;
- my $subquestion = $2;
- my ($first,$responsenum);
- if ($randomorder || $randompick) {
- $responsenum = $respnumlookup{$question-1};
- $first = $startline{$question-1};
- } else {
- $responsenum = $question-1;
- $first = $first_bubble_line{$responsenum};
- }
- if (!defined($first)) { next; }
- my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
- my $subcount = 1;
- while ($subcount<$subquestion) {
- $first += $subans[$subcount-1];
- $subcount ++;
- }
- my $count = $subans[$subquestion-1];
- $lastbubble = $first + $count;
+ my $question = $1;
+ my $subquestion = $2;
+ my ($first,$responsenum);
+ if ($randomorder || $randompick) {
+ $responsenum = $respnumlookup{$question-1};
+ $first = $startline{$question-1};
+ } else {
+ $responsenum = $question-1;
+ $first = $first_bubble_line{$responsenum};
+ }
+ if (!defined($first)) { next; }
+ my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
+ my $subcount = 1;
+ while ($subcount<$subquestion) {
+ $first += $subans[$subcount-1];
+ $subcount ++;
+ }
+ my $count = $subans[$subquestion-1];
+ $lastbubble = $first + $count;
} else {
- my ($first,$responsenum);
- if ($randomorder || $randompick) {
- $responsenum = $respnumlookup{$missing-1};
- $first = $startline{$missing-1};
- } else {
- $responsenum = $missing-1;
- $first = $first_bubble_line{$responsenum};
- }
- if (!defined($first)) { next; }
- $lastbubble = $first + $bubble_lines_per_response{$responsenum};
+ my ($first,$responsenum);
+ if ($randomorder || $randompick) {
+ $responsenum = $respnumlookup{$missing-1};
+ $first = $startline{$missing-1};
+ } else {
+ $responsenum = $missing-1;
+ $first = $first_bubble_line{$responsenum};
+ }
+ if (!defined($first)) { next; }
+ $lastbubble = $first + $bubble_lines_per_response{$responsenum};
}
if ($lastbubble > $max_bubble) { next; }
push(@to_correct,$missing);
@@ -10174,7 +8801,7 @@ sub scantron_process_students {
my $default_form_data=&defaultFormData($symb);
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
- my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
+ my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);
@@ -10185,21 +8812,10 @@ sub scantron_process_students {
}
my $map=$navmap->getResourceByUrl($sequence);
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
- %grader_randomlists_by_symb,%symb_for_examcode);
+ %grader_randomlists_by_symb);
if (ref($map)) {
$randomorder = $map->randomorder();
$randompick = $map->randompick();
- unless ($randomorder || $randompick) {
- foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
- if ($res->randomorder()) {
- $randomorder = 1;
- }
- if ($res->randompick()) {
- $randompick = 1;
- }
- last if ($randomorder || $randompick);
- }
- }
} else {
$r->print(&navmap_errormsg());
return '';
@@ -10207,7 +8823,7 @@ sub scantron_process_students {
my $nav_error;
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
if ($randomorder || $randompick) {
- $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode);
+ $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
if ($nav_error) {
$r->print(&navmap_errormsg());
return '';
@@ -10224,9 +8840,10 @@ sub scantron_process_students {
SCANTRONFORM
$r->print($result);
+ my ($checksec,@possibles)=&gradable_sections();
my @delayqueue;
my (%completedstudents,%scandata);
-
+
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
@@ -10269,7 +8886,7 @@ SCANTRONFORM
my %startline = ();
my $total;
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
- $scan_data,undef,\%idmap,$randomorder,
+ $scan_data,undef,\%idmap,$randomorder,
$randompick,$sequence,\@master_seq,
\%symb_to_resource,\%grader_partids_by_symb,
\%orderedforcode,\%respnumlookup,\%startline,
@@ -10286,6 +8903,13 @@ SCANTRONFORM
next;
}
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];
+ if (($checksec ne '') && ($checksec ne $usec)) {
+ unless (grep(/^\Q$usec\E$/,@possibles)) {
+ &scantron_add_delay(\@delayqueue,$line,
+ "No role with manage grades privilege in student's section ($usec)",3);
+ next;
+ }
+ }
my $user = $uname.':'.$usec;
($uname,$udom)=split(/:/,$uname);
@@ -10299,7 +8923,7 @@ SCANTRONFORM
my @mapresources = @resources;
if ($randomorder || $randompick) {
- @mapresources =
+ @mapresources =
&users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
\%orderedforcode);
}
@@ -10354,16 +8978,11 @@ SCANTRONFORM
}
if (($scancode) && ($randomorder || $randompick)) {
- foreach my $key (keys(%symb_for_examcode)) {
- my $symb_in_map = $symb_for_examcode{$key};
- if ($symb_in_map ne '') {
- my $parmresult =
- &Apache::lonparmset::storeparm_by_symb($symb_in_map,
- '0_examcode',2,$scancode,
- 'string_examcode',$uname,
- $udom);
- }
- }
+ my $parmresult =
+ &Apache::lonparmset::storeparm_by_symb($symb,
+ '0_examcode',2,$scancode,
+ 'string_examcode',$uname,
+ $udom);
}
$completedstudents{$uname}={'line'=>$line};
if ($env{'form.verifyrecord'}) {
@@ -10393,7 +9012,7 @@ SCANTRONFORM
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
\@mapresources,\%partids_by_symb,
$bubbles_per_row,$randomorder,$randompick,
- \%respnumlookup,\%startline)
+ \%respnumlookup,\%startline)
eq 'ssi_error') {
$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");
@@ -10486,7 +9105,7 @@ sub graders_resources_pass {
=item users_order
Returns array of resources in current map, ordered based on either CODE,
- if this is a CODEd exam, or based on student's identity if this is a
+ if this is a CODEd exam, or based on student's identity if this is a
"NAMEd" exam.
Should be used when randomorder and/or randompick applied when the
@@ -10513,7 +9132,7 @@ sub users_order {
if (ref($actual_seq) eq 'ARRAY') {
@mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq};
if (ref($orderedforcode) eq 'HASH') {
- if (@mapresources > 0) {
+ if (@mapresources > 0) {
$orderedforcode->{$scancode} = \@mapresources;
}
}
@@ -10526,7 +9145,7 @@ sub users_order {
$master_seq,
$user,undef,1);
if (ref($actual_seq) eq 'ARRAY') {
- @mapresources =
+ @mapresources =
map { $symb_to_resource->{$_}; } @{$actual_seq};
}
}
@@ -10591,7 +9210,7 @@ sub scantron_upload_scantron_data {
'domainid',
'coursename',$dom);
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
- (' 'x2).&mt('(shows course personnel)');
+ (' 'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData($symb);
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
&js_escape(\$nofile_alert);
@@ -10672,20 +9291,20 @@ END
if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) {
if (($domconfig{'scantron'}{'config'}{'dat'}) &&
(ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) {
- if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
+ if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
my ($onclick,$formatextra,$singleline);
my @lines = &Apache::lonnet::get_scantronformat_file();
my $count = 0;
foreach my $line (@lines) {
- next if (($line =~ /^\#/) || ($line eq ''));
+ next if ($line =~ /^#/);
$singleline = $line;
$count ++;
}
if ($count > 1) {
$formatextra = '<div style="display:none" id="bubbletype">'.
'<span class="LC_nobreak">'.
- &mt('Bubblesheet type').': '.
+ &mt('Bubblesheet type:').' '.
&scantron_scantab().'</span></div>';
$onclick = ' onclick="toggleScantab(this.form);"';
$formatjs = <<"END";
@@ -10746,16 +9365,18 @@ sub scantron_upload_scantron_data_save {
'</form>'."\n";
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',
- $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
+ $env{'form.domainid'}.'_'.$env{'form.courseid'}) &&
+ !&Apache::lonnet::allowed('usc',
+ $env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) {
$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
- unless ($symb) {
+ unless ($symb) {
$r->print($doanotherupload);
}
return '';
}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
my $uploadedfile;
- $r->print('<p>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</p>');
+ $r->print('<p>'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'</p>');
if (length($env{'form.upfile'}) < 2) {
$r->print(
&Apache::lonhtmlcommon::confirm_success(
@@ -10795,16 +9416,25 @@ sub scantron_upload_scantron_data_save {
my $result =
&Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
$env{'form.courseid'},$env{'form.domainid'});
- if ($result =~ m{^/uploaded/}) {
+ if ($result =~ m{^/uploaded/}) {
$r->print(
&Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.
&mt('Uploaded [_1] bytes of data into location: [_2]',
(length($env{'form.upfile'})-1),
'<span class="LC_filename">'.$result.'</span>'));
($uploadedfile) = ($result =~ m{/([^/]+)$});
+ if ($uploadedfile =~ /^scantron_orig_/) {
+ my $logname = $uploadedfile;
+ $logname =~ s/^scantron_orig_//;
+ if ($logname ne '') {
+ my $now = time;
+ my %info = ($logname => { $now => $env{'user.name'}.':'.$env{'user.domain'} });
+ &Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'});
+ }
+ }
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
- $env{'form.courseid'},$uploadedfile));
- } else {
+ $env{'form.courseid'},$symb,$uploadedfile));
+ } else {
$r->print(
&Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.
&mt('An error ([_1]) occurred when attempting to upload the file: [_2]',
@@ -10821,13 +9451,34 @@ sub scantron_upload_scantron_data_save {
}
sub validate_uploaded_scantron_file {
- my ($cdom,$cname,$fname) = @_;
+ my ($cdom,$cname,$symb,$fname,$context,$countsref) = @_;
+
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname);
my @lines;
if ($scanlines ne '-1') {
@lines=split("\n",$scanlines,-1);
}
- my $output;
+ my ($output,$secidx,$checksec,$priv,%crsroleshash,@possibles);
+ $secidx = &Apache::loncoursedata::CL_SECTION();
+ if ($context eq 'download') {
+ $priv = 'mgr';
+ } else {
+ $priv = 'usc';
+ }
+ unless ((&Apache::lonnet::allowed($priv,$env{'request.role.domain'})) ||
+ (($env{'request.course.id'}) &&
+ (&Apache::lonnet::allowed($priv,$env{'request.course.id'})))) {
+ if ($env{'request.course.sec'} ne '') {
+ unless (&Apache::lonnet::allowed($priv,
+ "$env{'request.course.id'}/$env{'request.course.sec'}")) {
+ unless ($context eq 'download') {
+ $output = '<p class="LC_warning">'.&mt('You do not have permission to upload bubblesheet data').'</p>';
+ }
+ return $output;
+ }
+ ($checksec,@possibles)=&gradable_sections();
+ }
+ }
if (@lines) {
my (%counts,$max_match_format);
my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0);
@@ -10840,7 +9491,7 @@ sub validate_uploaded_scantron_file {
my %unique_formats;
my @formatlines = &Apache::lonnet::get_scantronformat_file();
foreach my $line (@formatlines) {
- next if (($line =~ /^\#/) || ($line eq ''));
+ chomp($line);
my @config = split(/:/,$line);
my $idstart = $config[5];
my $idlength = $config[6];
@@ -10857,6 +9508,8 @@ sub validate_uploaded_scantron_file {
%{$counts{$key}} = (
'found' => 0,
'total' => 0,
+ 'totalanysec' => 0,
+ 'othersec' => 0,
);
foreach my $line (@lines) {
next if ($line =~ /^#/);
@@ -10864,6 +9517,23 @@ sub validate_uploaded_scantron_file {
my $id = substr($line,$idstart-1,$idlength);
$id = lc($id);
if (exists($idmap{$id})) {
+ if ($checksec ne '') {
+ $counts{$key}{'totalanysec'} ++;
+ if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') {
+ my $stusec = $classlist->{$idmap{$id}}->[$secidx];
+ if ($stusec ne $checksec) {
+ if (@possibles) {
+ unless (grep(/^\Q$stusec\E$/,@possibles)) {
+ $counts{$key}{'othersec'} ++;
+ next;
+ }
+ } else {
+ $counts{$key}{'othersec'} ++;
+ next;
+ }
+ }
+ }
+ }
$counts{$key}{'found'} ++;
}
$counts{$key}{'total'} ++;
@@ -10878,7 +9548,7 @@ sub validate_uploaded_scantron_file {
}
}
}
- if (ref($unique_formats{$max_match_format}) eq 'ARRAY') {
+ if ((ref($unique_formats{$max_match_format}) eq 'ARRAY') && ($context ne 'download')) {
my $format_descs;
my $numwithformat = @{$unique_formats{$max_match_format}};
for (my $i=0; $i<$numwithformat; $i++) {
@@ -10923,13 +9593,179 @@ sub validate_uploaded_scantron_file {
'<li>'.&mt('The course roster is not up to date.').'</li>'.
'</ul>';
}
+ if (($checksec ne '') && (ref($counts{$max_match_format}) eq 'HASH')) {
+ if ($counts{$max_match_format}{'othersec'}) {
+ my $percent_nongrade = (100*$counts{$max_match_format}{'othersec'})/($counts{$max_match_format}{'totalanysec'});
+ my $showpct = sprintf("%.0f",$percent_nongrade).'%';
+ my $confirmdel = &mt('Are you sure you want to permanently delete this file?');
+ &js_escape(\$confirmdel);
+ $output .= '<p class="LC_warning">'.
+ &mt('Comparison of student IDs in the uploaded file with the course roster found [_1][quant,_2,match,matches][_3] for students in section(s) for which none of your role(s) have privileges to modify grades',
+ '<b>',$counts{$max_match_format}{'othersec'},'</b>').
+ '<br />'.
+ &mt('Unless you are assigned role(s) which allow modification of grades in additional sections, [_1] of the records in this file will be automatically excluded when you perform bubblesheet grading.','<b>'.$showpct.'</b>').
+ '</p><p>'.
+ &mt('If you prefer to delete the file now, use: [_1]').
+ '<form method="post" name="delupload" action="/adm/grades">'.
+ '<input type="hidden" name="symb" value="'.$symb.'" />'.
+ '<input type="hidden" name="domainid" value="'.$cdom.'" />'.
+ '<input type="hidden" name="courseid" value="'.$cname.'" />'.
+ '<input type="hidden" name="coursesec" value="'.$env{'request.course.sec'}.'" />'.
+ '<input type="hidden" name="uploadedfile" value="'.$fname.'" />'.
+ '<input type="hidden" name="command" value="scantronupload_delete" />'.
+ '<input type="button" name="delbutton" value="'.&mt('Delete Uploaded File').'" onclick="javascript:if (confirm('."'$confirmdel'".')) { document.delupload.submit(); }" />'.
+ '</form></p>';
+ }
+ }
}
- } else {
+ if (($context eq 'download') && ($checksec ne '')) {
+ if ((ref($countsref) eq 'HASH') && (ref($counts{$max_match_format}) eq 'HASH')) {
+ $countsref->{'totalanysec'} = $counts{$max_match_format}{'totalanysec'};
+ $countsref->{'othersec'} = $counts{$max_match_format}{'othersec'};
+ }
+ }
+ } elsif ($context ne 'download') {
$output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>';
}
return $output;
}
+sub gradable_sections {
+ my $checksec = $env{'request.course.sec'};
+ my @oksecs;
+ if ($checksec) {
+ my %availablesecs = §ions_grade_privs();
+ if (ref($availablesecs{'mgr'}) eq 'ARRAY') {
+ foreach my $sec (@{$availablesecs{'mgr'}}) {
+ unless (grep(/^\Q$sec\E$/,@oksecs)) {
+ push(@oksecs,$sec);
+ }
+ }
+ if (grep(/^all$/,@oksecs)) {
+ undef($checksec);
+ }
+ }
+ }
+ return($checksec,@oksecs);
+}
+
+sub sections_grade_privs {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %availablesecs = (
+ mgr => [],
+ vgr => [],
+ usc => [],
+ );
+ my $ccrole = 'cc';
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+ $ccrole = 'co';
+ }
+ my %crsroleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
+ 'userroles',['active'],
+ [$ccrole,'in','cr'],$cdom,1);
+ my $crsid = $cnum.':'.$cdom;
+ foreach my $item (keys(%crsroleshash)) {
+ next unless ($item =~ /^$crsid\:/);
+ my ($crsnum,$crsdom,$role,$sec) = split(/\:/,$item);
+ my $suffix = "/$cdom/$cnum./$cdom/$cnum";
+ if ($sec ne '') {
+ $suffix = "/$cdom/$cnum/$sec./$cdom/$cnum/$sec";
+ }
+ if (($role eq $ccrole) || ($role eq 'in')) {
+ foreach my $priv ('mgr','vgr','usc') {
+ unless (grep(/^all$/,@{$availablesecs{$priv}})) {
+ if ($sec eq '') {
+ $availablesecs{$priv} = ['all'];
+ } elsif ($sec ne $env{'request.course.sec'}) {
+ unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) {
+ push(@{$availablesecs{$priv}},$sec);
+ }
+ }
+ }
+ }
+ } elsif ($role =~ m{^cr/}) {
+ foreach my $priv ('mgr','vgr','usc') {
+ unless (grep(/^all$/,@{$availablesecs{$priv}})) {
+ if ($env{"user.priv.$role.$suffix"} =~ /:$priv&/) {
+ if ($sec eq '') {
+ $availablesecs{$priv} = ['all'];
+ } elsif ($sec ne $env{'request.course.sec'}) {
+ unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) {
+ push(@{$availablesecs{$priv}},$sec);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return %availablesecs;
+}
+
+sub scantron_upload_delete {
+ my ($r,$symb) = @_;
+ my $filename = $env{'form.uploadedfile'};
+ if ($filename =~ /^scantron_orig_/) {
+ if (&Apache::lonnet::allowed('usc',$env{'form.domainid'}) ||
+ &Apache::lonnet::allowed('usc',
+ $env{'form.domainid'}.'_'.$env{'form.courseid'}) ||
+ &Apache::lonnet::allowed('usc',
+ $env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) {
+ my $uploadurl = '/uploaded/'.$env{'form.domainid'}.'/'.$env{'form.courseid'}.'/'.$env{'form.uploadedfile'};
+ my $retrieval = &Apache::lonnet::getfile($uploadurl);
+ if ($retrieval eq '-1') {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('File requested for deletion not found.'));
+ } else {
+ $filename =~ s/^scantron_orig_//;
+ if ($filename ne '') {
+ my ($is_valid,$numleft);
+ my %info = &Apache::lonnet::get('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'});
+ if (keys(%info)) {
+ if (ref($info{$filename}) eq 'HASH') {
+ foreach my $timestamp (sort(keys(%{$info{$filename}}))) {
+ if ($info{$filename}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ $is_valid = 1;
+ delete($info{$filename}{$timestamp});
+ }
+ }
+ $numleft = scalar(keys(%{$info{$filename}}));
+ }
+ }
+ if ($is_valid) {
+ my $result = &Apache::lonnet::removeuploadedurl($uploadurl);
+ if ($result eq 'ok') {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion successful')).'<br />');
+ if ($numleft) {
+ &Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'});
+ } else {
+ &Apache::lonnet::del('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'});
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('Result was [_1]',$result));
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('File requested for deletion was uploaded by a different user.'));
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('Filename of bubblesheet data file requested for deletion is invalid.'));
+ }
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('You are not permitted to delete bubblesheet data files from the requested course.'));
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'.
+ &mt('Filename of bubblesheet data file requested for deletion is invalid.'));
+ }
+ return;
+}
+
sub valid_file {
my ($requested_file)=@_;
foreach my $filename (sort(&scantron_filenames())) {
@@ -10952,6 +9788,29 @@ sub scantron_download_scantron_data {
');
return;
}
+ my (%uploader,$is_owner,%counts,$percent);
+ my %uploader = &Apache::lonnet::get('scantronupload',[$file],$cdom,$cname);
+ if (ref($uploader{$file}) eq 'HASH') {
+ foreach my $timestamp (sort { $a <=> $b } keys(%{$uploader{$file}})) {
+ if ($uploader{$file}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ $is_owner = 1;
+ last;
+ }
+ }
+ }
+ unless ($is_owner) {
+ &validate_uploaded_scantron_file($cdom,$cname,$symb,'scantron_orig_'.$file,'download',\%counts);
+ if ($counts{'totalanysec'}) {
+ my $percent_othersec = (100*$counts{'othersec'})/($counts{'totalanysec'});
+ if ($percent_othersec >= 10) {
+ my $showpct = sprintf("%.0f",$percent_othersec).'%';
+ $r->print('<p class="LC_warning">'.
+ &mt('The original uploaded file includes [_1] or more of records for students for which none of your roles have rights to modify grades, so files are unavailable for download.',$showpct).
+ '</p>');
+ return;
+ }
+ }
+ }
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file;
my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file;
@@ -10988,7 +9847,7 @@ sub checkscantron_results {
my %scantron_config =
&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
- my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
+ my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&Apache::grades::username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new();
@@ -10999,20 +9858,9 @@ sub checkscantron_results {
my $map=$navmap->getResourceByUrl($sequence);
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
%grader_randomlists_by_symb,%orderedforcode);
- if (ref($map)) {
+ if (ref($map)) {
$randomorder=$map->randomorder();
$randompick=$map->randompick();
- unless ($randomorder || $randompick) {
- foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
- if ($res->randomorder()) {
- $randomorder = 1;
- }
- if ($res->randompick()) {
- $randompick = 1;
- }
- last if ($randomorder || $randompick);
- }
- }
}
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
@@ -11039,8 +9887,7 @@ sub checkscantron_results {
return '';
}
- &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
- 'Processing first student');
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
my $start=&Time::HiRes::time();
my $i=-1;
@@ -11050,8 +9897,7 @@ sub checkscantron_results {
my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }
if ($started) {
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
}
$started=1;
my $scan_record=
@@ -11163,19 +10009,21 @@ sub checkscantron_results {
}
}
}
- $r->print('<p>'.
- &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
- '<b>',
- $numstudents,
- '</b>',
- $env{'form.scantron_maxbubble'}).
- '</p>'
+ $r->print(
+ '<p>'
+ .&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
+ '<b>',
+ $numstudents,
+ '</b>',
+ $env{'form.scantron_maxbubble'})
+ .'</p>'
);
$r->print('<p>'
.&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>')
.'<br />'
.&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>')
- .'</p>');
+ .'</p>'
+ );
if ($passed) {
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
$r->print(&Apache::loncommon::start_data_table()."\n".
@@ -11331,8 +10179,7 @@ sub verify_scantron_grading {
sub href_symb_cmd {
my ($symb,$cmd)=@_;
- return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.
- &HTML::Entities::encode($cmd,'<>&"');
+ return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
}
sub grading_menu {
@@ -11341,7 +10188,7 @@ sub grading_menu {
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'command'=>'individual');
-
+
my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
$fields{'command'}='ungraded';
@@ -11355,7 +10202,7 @@ sub grading_menu {
$fields{'command'}='downloadfilesselect';
my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
-
+
$fields{'command'} = 'csvform';
my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
@@ -11367,94 +10214,71 @@ sub grading_menu {
$fields{'command'} = 'initialverifyreceipt';
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',
items =>[
- { linktext => 'Select individual students to grade',
- url => $url1a,
- permission => $permissions{'either'},
- icon => 'grade_students.png',
- linktitle => 'Grade current resource for a selection of students.'
- },
+ { linktext => 'Select individual students to grade',
+ url => $url1a,
+ permission => 'F',
+ icon => 'grade_students.png',
+ linktitle => 'Grade current resource for a selection of students.'
+ },
{ linktext => 'Grade ungraded submissions',
url => $url1b,
- permission => $permissions{'either'},
+ permission => 'F',
icon => 'ungrade_sub.png',
linktitle => 'Grade all submissions that have not been graded yet.'
},
{ linktext => 'Grading table',
url => $url1c,
- permission => $permissions{'either'},
+ permission => 'F',
icon => 'grading_table.png',
linktitle => 'Grade current resource for all students.'
},
{ linktext => 'Grade page/folder for one student',
url => $url1d,
- permission => $permissions{'either'},
+ permission => 'F',
icon => 'grade_PageFolder.png',
linktitle => 'Grade all resources in current page/sequence/folder for one student.'
},
- { linktext => 'Download submitted files',
+ { linktext => 'Download submissions',
url => $url1e,
- permission => $permissions{'either'},
+ permission => 'F',
icon => 'download_sub.png',
- linktitle => 'Download all files submitted by students.'
+ linktitle => 'Download all students submissions.'
}]},
{ categorytitle=>'Automated Grading',
items =>[
{ linktext => 'Upload Scores',
url => $url2,
- permission => $permissions{'mgr'},
+ permission => 'F',
icon => 'uploadscores.png',
linktitle => 'Specify a file containing the class scores for current resource.'
},
{ linktext => 'Process Clicker',
url => $url3,
- permission => $permissions{'mgr'},
+ permission => 'F',
icon => 'addClickerInfoFile.png',
linktitle => 'Specify a file containing the clicker information for this resource.'
},
{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,
- permission => $permissions{'mgr'},
+ permission => 'F',
icon => 'bubblesheet.png',
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
},
{ linktext => 'Verify Receipt Number',
url => $url5,
- permission => $permissions{'either'},
+ permission => 'F',
icon => 'receipt_number.png',
linktitle => 'Verify a system-generated receipt number for correct problem solution.'
}
]
});
- my $cdom = $env{"course.$env{'request.course.id'}.domain"};
- my $cnum = $env{"course.$env{'request.course.id'}.num"};
- my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum);
- if (keys(%passback)) {
- $fields{'command'} = 'initialpassback';
- my $url6 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
- push (@{$menu[1]{items}},
- { linktext => 'Passback of Scores',
- url => $url6,
- permission => $permissions{'either'},
- icon => 'passback.png',
- linktitle => 'Passback scores to launcher CMS for resources accessed via LTI-mediated deep-linking',
- });
- }
+
# Create the menu
my $Str;
$Str .= '<form method="post" action="" name="gradingMenu">';
@@ -11512,35 +10336,16 @@ sub submit_options_download {
my ($request,$symb) = @_;
if (!$symb) {return '';}
- my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
- &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&mt('An error occurred retrieving response types'));
- return;
- }
- unless ($numessay) {
- $request->print(&mt('No essayresponse items found'));
- return;
- }
- my $table;
- if (ref($partlist) eq 'ARRAY') {
- if (scalar(@$partlist) > 1 ) {
- $table = &showResourceInfo($symb,$partlist,$responseType,'gradingMenu',1,1);
- }
- }
-
my $is_tool = ($symb =~ /ext\.tool$/);
&commonJSfunctions($request);
my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
- $table."\n".
- '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+ '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
$result.='
<h2>
- '.&mt('Select Students for whom to Download Submitted Files').'
+ '.&mt('Select Students for whom to Download Submissions').'
</h2>'.&selectfield(1,$is_tool).'
- <input type="hidden" name="command" value="downloadfileslink" />
+ <input type="hidden" name="command" value="downloadfileslink" />
<input type="submit" value="'.&mt('Next').' →" />
</div>
</div>
@@ -11562,8 +10367,8 @@ sub submit_options {
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
$result.=&selectfield(1,$is_tool).'
- <input type="hidden" name="command" value="submission" />
- <input type="submit" value="'.&mt('Next').' →" />
+ <input type="hidden" name="command" value="submission" />
+ <input type="submit" value="'.&mt('Next').' →" />
</div>
</div>
</form>';
@@ -11578,34 +10383,26 @@ sub selectfield {
(&transtatus_options,
'select_form_order' => ['yes','incorrect','all']);
} else {
- %options =
+ %options =
(&substatus_options,
'select_form_order' => ['yes','queued','graded','incorrect','all']);
}
-
- #
- # PrepareClasslist() needs to be called to avoid getting a sections list
- # for a different course from the @Sections global in lonstatistics.pm,
- # populated by an earlier request.
- #
- &Apache::lonstatistics::PrepareClasslist();
-
my $result='<div class="LC_columnSection">
-
+
<fieldset>
<legend>
'.&mt('Sections').'
</legend>
'.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
</fieldset>
-
+
<fieldset>
<legend>
'.&mt('Groups').'
</legend>
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
</fieldset>
-
+
<fieldset>
<legend>
'.&mt('Access Status').'
@@ -11653,7 +10450,7 @@ sub reset_perm {
sub init_perm {
&reset_perm();
- foreach my $test_perm ('vgr','mgr','opa') {
+ foreach my $test_perm ('vgr','mgr','opa','usc') {
my $scope = $env{'request.course.id'};
if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) {
@@ -11780,7 +10577,7 @@ sub process_clicker {
my $pcorrect=&mt("Percentage points for correct solution");
my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
- {'iclicker' => 'i>clicker',
+ {'iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS',
'turning' => 'Turning Technologies'});
$symb = &Apache::lonenc::check_encrypt($symb);
@@ -12183,6 +10980,7 @@ sub turning_eval {
return ($errormsg,$number);
}
+
sub assign_clicker_grades {
my ($r,$symb) = @_;
if (!$symb) {return '';}
@@ -12192,14 +10990,10 @@ sub assign_clicker_grades {
if ($res_error) {
return &navmap_errormsg();
}
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my %needpb = &passbacks_for_symb($cdom,$cnum,$symb);
- my (%skip_passback,%pbsave);
# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];
# Start screen output
- my $result = &Apache::loncommon::start_data_table().
+ my $result = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Assigning grades based on clicker file').'</th>'.
&Apache::loncommon::end_data_table_header_row().
@@ -12258,7 +11052,7 @@ sub assign_clicker_grades {
&mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').
'</span><br />';
}
- $users{$user}=1;
+ $users{$user}=1;
my @answer=split(/\,/,$env{$key});
my $sum=0;
my $realnumber=$number;
@@ -12305,15 +11099,6 @@ sub assign_clicker_grades {
$result.="<br /><span class=\"LC_error\">Failed to save student $username:$domain. Message when trying to save was ($returncode)</span>";
} else {
$storecount++;
- if (keys(%needpb)) {
- my (%weights,%awardeds,%excuseds);
- my $usec = &Apache::lonnet::getsection($domain,$username,$env{'request.course.id'});
- $weights{$symb}{$part} = &Apache::lonnet::EXT("resource.$part.weight",$symb,$domain,$username,$usec);
- $awardeds{$symb}{$part} = $ave;
- $excuseds{$symb}{$part} = '';
- &process_passbacks('clickergrade',[$symb],$cdom,$cnum,$domain,$username,$usec,\%weights,
- \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
- }
}
}
}
@@ -12333,7 +11118,7 @@ sub navmap_errormsg {
}
sub startpage {
- my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$head_extra,$onload,$divforres) = @_;
+ my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_;
my %args;
if ($onload) {
my %loaditems = (
@@ -12342,99 +11127,29 @@ sub startpage {
$args{'add_entries'} = \%loaditems;
}
if ($nomenu) {
- $args{'only_body'} = 1;
- $r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args));
+ $args{'only_body'} = 1;
+ $r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args));
} else {
+ unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
+ $args{'bread_crumbs'} = $crumbs;
+ $r->print(&Apache::loncommon::start_page('Grading',$js,\%args));
if ($env{'request.course.id'}) {
- unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
+ &Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
}
- $args{'bread_crumbs'} = $crumbs;
- $r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args));
}
unless ($nodisplayflag) {
- $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres));
+ $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
}
}
sub select_problem {
my ($r)=@_;
$r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');
- $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1));
+ $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,undef,undef,1));
$r->print('<input type="hidden" name="command" value="gradingmenu" />');
$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');
}
-#----- display problem, answer, and submissions for a single student (no grading)
-
-sub view_as_user {
- my ($symb,$vuname,$vudom,$hasperm) = @_;
- my $plainname = &Apache::loncommon::plainname($vuname,$vudom,'lastname');
- my $displayname = &nameUserString('',$plainname,$vuname,$vudom);
- my $output = &Apache::loncommon::get_student_view($symb,$vuname,$vudom,
- $env{'request.course.id'},
- undef,{'disable_submit' => 1}).
- "\n\n".
- '<div class="LC_grade_show_user">'.
- '<h2>'.$displayname.'</h2>'.
- "\n".
- &Apache::loncommon::track_student_link('View recent activity',
- $vuname,$vudom,'check').' '.
- "\n";
- if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
- (($env{'request.course.sec'} ne '') &&
- &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) {
- $output .= &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
- $vuname,$vudom,$symb,'check');
- }
- $output .= "\n";
- my $companswer = &Apache::loncommon::get_student_answers($symb,$vuname,$vudom,
- $env{'request.course.id'});
- $companswer=~s|<form(.*?)>||g;
- $companswer=~s|</form>||g;
- $companswer=~s|name="submit"|name="would_have_been_submit"|g;
- $output .= '<div class="LC_Box">'.
- '<h3 class="LC_hcell">'.&mt('Correct answer for[_1]',$displayname).'</h3>'.
- $companswer.
- '</div>'."\n";
- my $is_tool = ($symb =~ /ext\.tool$/);
- my ($essayurl,%coursedesc_by_cid);
- (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
- my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$vudom,$vuname);
- my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
- &response_type($symb,\$res_error);
- my $fullname;
- my $collabinfo;
- if ($numessay) {
- unless ($hasperm) {
- &init_perm();
- }
- ($collabinfo,$fullname)=
- &check_collaborators($symb,$vuname,$vudom,\%record,$handgrade,0);
- unless ($hasperm) {
- &reset_perm();
- }
- }
- my $checkIcon = '<img alt="'.&mt('Check Mark').
- '" src="'.$Apache::lonnet::perlvar{'lonIconsURL'}.
- '/check.gif" height="16" border="0" />';
- my ($lastsubonly,$partinfo) =
- &show_last_submission($vuname,$vudom,$symb,$essayurl,$responseType,'datesub',
- '',$fullname,\%record,\%coursedesc_by_cid);
- $output .= '<div class="LC_Box">'.
- '<h3 class="LC_hcell">'.&mt('Submissions').'</h3>'."\n".$collabinfo."\n";
- if (($numresp > $numessay) & !$is_tool) {
- $output .='<p class="LC_info">'.
- &mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon).
- "</p>\n";
- }
- $output .= $partinfo;
- $output .= $lastsubonly;
- $output .= &displaySubByDates($symb,\%record,$partlist,$responseType,$checkIcon,$vuname,$vudom);
- $output .= '</div></div>'."\n";
- return $output;
-}
-
sub handler {
my $request=$_[0];
&reset_caches();
@@ -12446,7 +11161,7 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
# see what command we need to execute
-
+
my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];
@@ -12469,10 +11184,6 @@ sub handler {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}
-# -------------------------------------- Flag and buffer for registered cleanup
- $registered_cleanup=0;
- undef(@Apache::grades::ltipassback);
-
# see what the symb is
my $symb=$env{'form.symb'};
@@ -12486,98 +11197,62 @@ sub handler {
if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {
#
# Not called from a resource, but inside a course
-#
+#
&startpage($request,undef,[],1,1);
&select_problem($request);
} else {
- if ($command eq 'submission' && $perm{'vgr'}) {
- my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload);
+ if ($command eq 'submission' && $perm{'vgr'}) {
+ my ($stuvcurrent,$stuvdisp,$versionform,$js);
if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
($stuvcurrent,$stuvdisp,$versionform,$js) =
&choose_task_version_form($symb,$env{'form.student'},
$env{'form.userdom'});
}
- my $divforres;
- if ($env{'form.student'} eq '') {
- $js .= &part_selector_js();
- $onload = "toggleParts('gradesub');";
- } else {
- $divforres = 1;
- }
- my $head_extra = $js;
- unless ($env{'form.vProb'} eq 'no') {
- my $csslinks = &Apache::loncommon::css_links($symb);
- if ($csslinks) {
- $head_extra .= "\n$csslinks";
- }
- }
- &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,
- $stuvcurrent,$stuvdisp,undef,$head_extra,$onload,$divforres);
+ &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
if ($versionform) {
- if ($divforres) {
- $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
- }
$request->print($versionform);
}
- ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command));
+ $request->print('<br clear="all" />');
+ ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
} elsif ($command eq 'versionsub' && $perm{'vgr'}) {
my ($stuvcurrent,$stuvdisp,$versionform,$js) =
&choose_task_version_form($symb,$env{'form.student'},
$env{'form.userdom'},
$env{'form.inhibitmenu'});
- my $head_extra = $js;
- unless ($env{'form.vProb'} eq 'no') {
- my $csslinks = &Apache::loncommon::css_links($symb);
- if ($csslinks) {
- $head_extra .= "\n$csslinks";
- }
- }
- &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,
- $stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$head_extra);
+ &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js);
if ($versionform) {
$request->print($versionform);
}
$request->print('<br clear="all" />');
$request->print(&show_previous_task_version($request,$symb));
- } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
+ } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
{href=>'',text=>'Select student'}],1,1);
- &pickStudentPage($request,$symb);
- } elsif ($command eq 'displayPage' && $perm{'vgr'}) {
- my $csslinks;
- unless ($env{'form.vProb'} eq 'no') {
- $csslinks = &Apache::loncommon::css_links($symb,'map');
- }
+ &pickStudentPage($request,$symb);
+ } elsif ($command eq 'displayPage' && $perm{'vgr'}) {
&startpage($request,$symb,
[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
{href=>'',text=>'Select student'},
- {href=>'',text=>'Grade student'}],1,1,undef,undef,undef,$csslinks);
- &displayPage($request,$symb);
- } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
+ {href=>'',text=>'Grade student'}],1,1);
+ &displayPage($request,$symb);
+ } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
{href=>'',text=>'Select student'},
{href=>'',text=>'Grade student'},
{href=>'',text=>'Store grades'}],1,1);
- &updateGradeByPage($request,$symb);
- } elsif ($command eq 'processGroup' && $perm{'vgr'}) {
- my $csslinks;
- unless ($env{'form.vProb'} eq 'no') {
- $csslinks = &Apache::loncommon::css_links($symb);
- }
+ &updateGradeByPage($request,$symb);
+ } elsif ($command eq 'processGroup' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>'',text=>'...'},
- {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1);
- &processGroup($request,$symb);
- } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
+ {href=>'',text=>'Modify grades'}]);
+ &processGroup($request,$symb);
+ } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
&startpage($request,$symb);
- $request->print(&grading_menu($request,$symb));
- } elsif ($command eq 'individual' && $perm{'vgr'}) {
+ $request->print(&grading_menu($request,$symb));
+ } elsif ($command eq 'individual' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]);
- $request->print(&submit_options($request,$symb));
+ $request->print(&submit_options($request,$symb));
} elsif ($command eq 'ungraded' && $perm{'vgr'}) {
- my $js = &part_selector_js();
- my $onload = "toggleParts('gradesub');";
- &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}],
- undef,undef,undef,undef,undef,$js,$onload);
+ &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}]);
$request->print(&listStudents($request,$symb,'graded'));
} elsif ($command eq 'table' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>"", text=>"Grading table"}]);
@@ -12585,26 +11260,26 @@ sub handler {
} elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1);
$request->print(&submit_options_sequence($request,$symb));
- } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
+ } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]);
- $request->print(&viewgrades($request,$symb));
- } elsif ($command eq 'handgrade' && $perm{'mgr'}) {
+ $request->print(&viewgrades($request,$symb));
+ } elsif ($command eq 'handgrade' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'',text=>'...'},
{href=>'',text=>'Store grades'}]);
- $request->print(&processHandGrade($request,$symb));
- } elsif ($command eq 'editgrades' && $perm{'mgr'}) {
+ $request->print(&processHandGrade($request,$symb));
+ } elsif ($command eq 'editgrades' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},
{href=>&href_symb_cmd($symb,'viewgrades').'&group=all§ion=all&Status=Active',
text=>"Modify grades"},
{href=>'', text=>"Store grades"}]);
- $request->print(&editgrades($request,$symb));
+ $request->print(&editgrades($request,$symb));
} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);
$request->print(&initialverifyreceipt($request,$symb));
- } elsif ($command eq 'verify' && $perm{'vgr'}) {
+ } elsif ($command eq 'verify' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'},
{href=>'',text=>'Verification Result'}]);
- $request->print(&verifyreceipt($request,$symb));
+ $request->print(&verifyreceipt($request,$symb));
} elsif ($command eq 'processclicker' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);
$request->print(&process_clicker($request,$symb));
@@ -12617,122 +11292,84 @@ sub handler {
{href=>'', text=>'Process clicker file'},
{href=>'', text=>'Store grades'}]);
$request->print(&assign_clicker_grades($request,$symb));
- } elsif ($command eq 'csvform' && $perm{'mgr'}) {
+ } elsif ($command eq 'csvform' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&upcsvScores_form($request,$symb));
- } elsif ($command eq 'csvupload' && $perm{'mgr'}) {
+ $request->print(&upcsvScores_form($request,$symb));
+ } elsif ($command eq 'csvupload' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&csvupload($request,$symb));
- } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
+ $request->print(&csvupload($request,$symb));
+ } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&csvuploadmap($request,$symb));
- } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
- if ($env{'form.associate'} ne 'Reverse Association') {
+ $request->print(&csvuploadmap($request,$symb));
+ } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
+ if ($env{'form.associate'} ne 'Reverse Association') {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&csvuploadoptions($request,$symb));
- } else {
- if ( $env{'form.upfile_associate'} ne 'reverse' ) {
- $env{'form.upfile_associate'} = 'reverse';
- } else {
- $env{'form.upfile_associate'} = 'forward';
- }
+ $request->print(&csvuploadoptions($request,$symb));
+ } else {
+ if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+ $env{'form.upfile_associate'} = 'reverse';
+ } else {
+ $env{'form.upfile_associate'} = 'forward';
+ }
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&csvuploadmap($request,$symb));
- }
- } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+ $request->print(&csvuploadmap($request,$symb));
+ }
+ } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
- $request->print(&csvuploadassign($request,$symb));
- } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
+ $request->print(&csvuploadassign($request,$symb));
+ } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
undef,undef,undef,undef,'toggleScantab(document.rules);');
- $request->print(&scantron_selectphase($request,undef,$symb));
- } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+ $request->print(&scantron_selectphase($request,undef,$symb));
+ } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
- $request->print(&scantron_do_warning($request,$symb));
- } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+ $request->print(&scantron_do_warning($request,$symb));
+ } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
- $request->print(&scantron_validate_file($request,$symb));
- } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
+ $request->print(&scantron_validate_file($request,$symb));
+ } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
- $request->print(&scantron_process_students($request,$symb));
- } elsif ($command eq 'scantronupload' &&
- (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
- &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
+ $request->print(&scantron_process_students($request,$symb));
+ } elsif ($command eq 'scantronupload' &&
+ (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
undef,undef,undef,undef,'toggleScantab(document.rules);');
- $request->print(&scantron_upload_scantron_data($request,$symb));
- } elsif ($command eq 'scantronupload_save' &&
- (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
- &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
+ $request->print(&scantron_upload_scantron_data($request,$symb));
+ } elsif ($command eq 'scantronupload_save' &&
+ (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) {
+ &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+ $request->print(&scantron_upload_scantron_data_save($request,$symb));
+ } elsif ($command eq 'scantron_download' && ($perm{'usc'} || $perm{'mgr'})) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
- $request->print(&scantron_upload_scantron_data_save($request,$symb));
- } elsif ($command eq 'scantron_download' &&
- &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+ $request->print(&scantron_download_scantron_data($request,$symb));
+ } elsif ($command eq 'scantronupload_delete' &&
+ (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
- $request->print(&scantron_download_scantron_data($request,$symb));
+ &scantron_upload_delete($request,$symb);
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
$request->print(&checkscantron_results($request,$symb));
} elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {
- my $js = &part_selector_js();
- my $onload = "toggleParts('gradingMenu');";
- &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}],
- undef,undef,undef,undef,undef,$js,$onload);
+ &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}]);
$request->print(&submit_options_download($request,$symb));
} elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {
&startpage($request,$symb,
[{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},
- {href=>'', text=>'Download submitted files'}],
- undef,undef,undef,undef,undef,undef,undef,1);
- $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
+ {href=>'', text=>'Download submitted files'}]);
&submit_download_link($request,$symb);
- } elsif ($command eq 'initialpassback') {
- &startpage($request,$symb,[{href=>'', text=>'Choose Launcher'}],undef,1);
- $request->print(&initialpassback($request,$symb));
- } elsif ($command eq 'passback') {
- &startpage($request,$symb,
- [{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'},
- {href=>'', text=>'Types of User'}],undef,1);
- $request->print(&passback_filters($request,$symb));
- } elsif ($command eq 'passbacknames') {
- my $chosen;
- if ($env{'form.passback'} ne '') {
- if ($env{'form.passback'} eq &unescape($env{'form.passback'})) {
- $env{'form.passback'} = &escape($env{'form.passback'} );
- }
- $chosen = &HTML::Entities::encode($env{'form.passback'},'<>"&');
- }
- &startpage($request,$symb,
- [{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'},
- {href=>&href_symb_cmd($symb,'passback').'&passback='.$chosen, text=>'Types of User'},
- {href=>'', text=>'Select Users'}],undef,1);
- $request->print(&names_for_passback($request,$symb));
- } elsif ($command eq 'passbackscores') {
- my ($chosen,$stu_status);
- if ($env{'form.passback'} ne '') {
- if ($env{'form.passback'} eq &unescape($env{'form.passback'})) {
- $env{'form.passback'} = &escape($env{'form.passback'} );
- }
- $chosen = &HTML::Entities::encode($env{'form.passback'},'<>"&');
- }
- if ($env{'form.Status'}) {
- $stu_status = &HTML::Entities::encode($env{'form.Status'});
- }
- &startpage($request,$symb,
- [{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'},
- {href=>&href_symb_cmd($symb,'passback').'&passback='.$chosen, text=>'Types of User'},
- {href=>&href_symb_cmd($symb,'passbacknames').'&Status='.$stu_status.'&passback='.$chosen, text=>'Select Users'},
- {href=>'', text=>'Execute Passback'}],undef,1);
- $request->print(&do_passback($request,$symb));
- } elsif ($command) {
+ } elsif ($command) {
&startpage($request,$symb,[{href=>'', text=>'Access denied'}]);
- $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
- }
+ $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
+ }
}
if ($ssi_error) {
&ssi_print_error($request);
}
- $request->print(&Apache::loncommon::end_page());
+ if ($env{'form.inhibitmenu'}) {
+ $request->print(&Apache::loncommon::end_page());
+ } elsif ($env{'request.course.id'}) {
+ &Apache::lonquickgrades::endGradeScreen($request);
+ }
&reset_caches();
return OK;
}
@@ -12756,7 +11393,7 @@ described at http://www.lon-capa.org.
=head1 OVERVIEW
Do an ssi with retries:
-While I'd love to factor out this with the vesrion in lonprintout,
+While I'd love to factor out this with the version in lonprintout,
that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
I'm not quite ready to invent (e.g. an ssi_with_retry object).
@@ -12803,6 +11440,75 @@ ssi_with_retries()
=over
+=head1 Routines to display previous version of a Task for a specific student
+
+Tasks are graded pass/fail. Students who have yet to pass a particular Task
+can receive another opportunity. Access to tasks is slot-based. If a slot
+requires a proctor to check-in the student, a new version of the Task will
+be created when the student is checked in to the new opportunity.
+
+If a particular student has tried two or more versions of a particular task,
+the submission screen provides a user with vgr privileges (e.g., a Course
+Coordinator) the ability to display a previous version worked on by the
+student. By default, the current version is displayed. If a previous version
+has been selected for display, submission data are only shown that pertain
+to that particular version, and the interface to submit grades is not shown.
+
+=over 4
+
+=item show_previous_task_version()
+
+Displays a specified version of a student's Task, as the student sees it.
+
+Inputs: 2
+ request - request object
+ symb - unique symb for current instance of resource
+
+Output: None.
+
+Side Effects: calls &show_problem() to print version of Task, with
+ version contained in form item: $env{'form.previousversion'}
+
+=item choose_task_version_form()
+
+Displays a web form used to select which version of a student's view of a
+Task should be displayed. Either launches a pop-up window, or replaces
+content in existing pop-up, or replaces page in main window.
+
+Inputs: 4
+ symb - unique symb for current instance of resource
+ uname - username of student
+ udom - domain of student
+ nomenu - 1 if display is in a pop-up window, and hence no menu
+ breadcrumbs etc., are displayed
+
+Output: 4
+ current - student's current version
+ displayed - student's version being displayed
+ result - scalar containing HTML for web form used to switch to
+ a different version (or a link to close window, if pop-up).
+ js - javascript for processing selection in versions web form
+
+Side Effects: None.
+
+=item previous_display_javascript()
+
+Inputs: 2
+ nomenu - 1 if display is in a pop-up window, and hence no menu
+ breadcrumbs etc., are displayed.
+ current - student's current version number.
+
+Output: 1
+ js - javascript for processing selection in versions web form.
+
+Side Effects: None.
+
+=back
+
+=head1 Routines to process bubblesheet data.
+
+=over 4
+
=item scantron_get_correction() :
Builds the interface screen to interact with the operator to fix a
@@ -12829,8 +11535,8 @@ ssi_with_retries()
- missingbubble - array ref of the bubble lines that have missing
bubble errors
- $randomorder - True if exam folder (or a sub-folder) has randomorder set
- $randompick - True if exam folder (or a sub-folder) has randompick set
+ $randomorder - True if exam folder has randomorder set
+ $randompick - True if exam folder has randompick set
$respnumlookup - Reference to HASH mapping question numbers in bubble lines
for current line to question number used for same question
in "Master Seqence" (as seen by Course Coordinator).
@@ -12839,6 +11545,7 @@ ssi_with_retries()
or code-based randompick and/or randomorder.
+
=item scantron_get_maxbubble() :
Arguments:
@@ -12898,7 +11605,12 @@ ssi_with_retries()
=item scantron_upload_scantron_data_save() :
Adds a provided bubble information data file to the course if user
- has the correct privileges to do so.
+ has the correct privileges to do so.
+
+= item scantron_upload_delete() :
+
+ Deletes a previously uploaded bubble information data file, if user
+ was the one who uploaded the file, and has the privileges to do so.
=item valid_file() :
@@ -12918,7 +11630,9 @@ ssi_with_retries()
=item navmap_errormsg() :
Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
- Should be called whenever the request to instantiate a navmap object fails.
+ Should be called whenever the request to instantiate a navmap object fails.
+
+=back
=back