--- loncom/homework/grades.pm 2017/12/18 14:46:10 1.744 +++ loncom/homework/grades.pm 2020/05/06 00:09:49 1.764 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.744 2017/12/18 14:46:10 raeburn Exp $ +# $Id: grades.pm,v 1.764 2020/05/06 00:09:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,10 @@ use Apache::lonenc; use Apache::lonstathelpers; use Apache::lonquickgrades; use Apache::bridgetask(); +use Apache::lontexconvert(); use String::Similarity; +use HTML::Parser(); +use File::MMagic; use LONCAPA; use POSIX qw(floor); @@ -116,7 +119,11 @@ sub getpartlist { my $res = $navmap->getBySymb($symb); my $partlist = $res->parts(); my $url = $res->src(); - my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys')); + my $toolsymb; + if ($url =~ /ext\.tool$/) { + $toolsymb = $symb; + } + my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys',$toolsymb)); my @stores; foreach my $part (@{ $partlist }) { @@ -413,6 +420,7 @@ sub cleanRecord { $env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. } + $answer = &Apache::lontexconvert::msgtexconverted($answer); return '

'.&keywords_highlight($answer).'
'; } elsif ( $response eq 'organic') { @@ -498,7 +506,7 @@ COMMONJSFUNCTIONS #--- Dumps the class list with usernames,list of sections, #--- section, ids and fullnames for each user. sub getclasslist { - my ($getsec,$filterlist,$getgroup) = @_; + my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_; my @getsec; my @getgroup; my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); @@ -526,6 +534,13 @@ sub getclasslist { # my %sections; my %fullnames; + 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,my $handgrade,my $responseType) = &response_type($symb,\$res_error); + } foreach my $student (keys(%$classlist)) { my $end = $classlist->{$student}->[&Apache::loncoursedata::CL_END()]; @@ -542,7 +557,7 @@ sub getclasslist { my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; # filter students according to status selected - if ($filterlist && (!($stu_status =~ /Any/))) { + if ($filterbyaccstatus && (!($stu_status =~ /Any/))) { if (!($stu_status =~ $status)) { delete($classlist->{$student}); next; @@ -559,13 +574,58 @@ sub getclasslist { } } if (($grp eq 'none') && !$group) { - $exclude = 0; + $exclude = 0; } } if ($exclude) { delete($classlist->{$student}); + next; } } + if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) { + my $udom = + $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()]; + my $uname = + $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()]; + if (($symb ne '') && ($udom ne '') && ($uname ne '')) { + if ($submitonly eq 'queued') { + my %queue_status = + &Apache::bridgetask::get_student_status($symb,$cdom,$cnum, + $udom,$uname); + if (!defined($queue_status{'gradingqueue'})) { + delete($classlist->{$student}); + next; + } + } else { + my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist); + my $submitted = 0; + my $graded = 0; + my $incorrect = 0; + foreach (keys(%status)) { + $submitted = 1 if ($status{$_} ne 'nothing'); + $graded = 1 if ($status{$_} =~ /^ungraded/); + $incorrect = 1 if ($status{$_} =~ /^incorrect/); + + my ($foo,$partid,$foo1) = split(/\./,$_); + if ($status{'resource.'.$partid.'.submitted_by'} ne '') { + $submitted = 0; + } + } + if (!$submitted && ($submitonly eq 'yes' || + $submitonly eq 'incorrect' || + $submitonly eq 'graded')) { + delete($classlist->{$student}); + next; + } elsif (!$graded && ($submitonly eq 'graded')) { + delete($classlist->{$student}); + next; + } elsif (!$incorrect && $submitonly eq 'incorrect') { + delete($classlist->{$student}); + next; + } + } + } + } $section = ($section ne '' ? $section : 'none'); if (&canview($section)) { if (!@getsec || grep(/^\Q$section\E$/,@getsec)) { @@ -580,7 +640,6 @@ sub getclasslist { delete($classlist->{$student}); } } - my %seen = (); my @sections = sort(keys(%sections)); return ($classlist,\@sections,\%fullnames); } @@ -596,7 +655,7 @@ sub canmodify { #can modify the requested section return 1; } else { - # can't modify the request section + # can't modify the requested section return 0; } } @@ -609,19 +668,19 @@ sub canview { my ($sec)=@_; if ($perm{'vgr'}) { if (!defined($perm{'vgr_section'})) { - # can modify whole class + # can view whole class return 1; } else { if ($sec eq $perm{'vgr_section'}) { - #can modify the requested section + #can view the requested section return 1; } else { - # can't modify the request section + # can't view the requested section return 0; } } } - #can't modify + #can't view return 0; } @@ -852,6 +911,7 @@ sub verifyreceipt { sub listStudents { my ($request,$symb,$submitonly) = @_; + my $is_tool = ($symb =~ /ext\.tool$/); my $cdom = $env{"course.$env{'request.course.id'}.domain"}; my $cnum = $env{"course.$env{'request.course.id'}.num"}; my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; @@ -907,38 +967,66 @@ LISTJAVASCRIPT "\n"; $gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) - .''."\n" - .''."\n" - .'
'."\n" - .&Apache::lonhtmlcommon::row_closure(); - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer')) - .''."\n" - .''."\n" - .'
'."\n" - .&Apache::lonhtmlcommon::row_closure(); + unless ($is_tool) { + $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) + .''."\n" + .''."\n" + .'
'."\n" + .&Apache::lonhtmlcommon::row_closure(); + $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer')) + .''."\n" + .''."\n" + .'
'."\n" + .&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; + my %optiontext; + if ($is_tool) { + %optiontext = &Apache::lonlocal::texthash ( + lastonly => 'last transaction', + last => 'last transaction with details', + datesub => 'all transactions', + all => 'all transactions with details', + ); + } else { + %optiontext = &Apache::lonlocal::texthash ( + lastonly => 'last submission', + last => 'last submission with details', + datesub => 'all submissions', + all => 'all submissions with details', + ); + } $submission_options.= ''. ''."\n". + $optiontext{'lastonly'}.' '."\n". ''. ''."\n". + $optiontext{'last'}.' '."\n". ''. ''."\n". + $optiontext{'datesub'}.''."\n". ''. ''; - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Submissions')) + $optiontext{'all'}.''; + my $viewtitle; + if ($is_tool) { + $viewtitle = &mt('View Transactions'); + } else { + $viewtitle = &mt('View Submissions'); + } + $gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle) .$submission_options .&Apache::lonhtmlcommon::row_closure(); + my $closure; + if (($is_tool) && (exists($env{'form.Status'}))) { + $closure = 1; + } $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) .'' - .&Apache::lonhtmlcommon::row_closure(); + .&Apache::lonhtmlcommon::row_closure($closure); $gradeTable .= &build_section_inputs(). @@ -957,19 +1045,30 @@ LISTJAVASCRIPT if (exists($env{'form.Status'})) { $gradeTable .= ''."\n"; } else { + if ($is_tool) { + $closure = 1; + } $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status')) .&Apache::lonhtmlcommon::StatusOptions( $saveStatus,undef,1,'javascript:reLoadList(this.form);') - .&Apache::lonhtmlcommon::row_closure(); + .&Apache::lonhtmlcommon::row_closure($closure); } - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) - .'' - .&Apache::lonhtmlcommon::row_closure(1) - .&Apache::lonhtmlcommon::end_pick_box(); - + unless ($is_tool) { + $closure = 1; + $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) + .'' + .&Apache::lonhtmlcommon::row_closure($closure); + } + $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."); + } else { + $regrademsg = &mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button."); + } $gradeTable .= '

' - .&mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n" + .$regrademsg."\n" .'' .'

'; @@ -1908,7 +2007,6 @@ sub show_problem { sub files_exist { my ($r, $symb) = @_; my @students = &Apache::loncommon::get_env_multiple('form.stuinfo'); - foreach my $student (@students) { my ($uname,$udom,$fullname) = split(/:/,$student); my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, @@ -1931,7 +2029,6 @@ sub download_all_link { $r->print(&mt('There are currently no submitted documents.')); return; } - my $all_students = join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo')); @@ -1951,7 +2048,55 @@ sub submit_download_link { my ($request,$symb) = @_; if (!$symb) { return ''; } #FIXME: Figure out which type of problem this is and provide appropriate download - &download_all_link($request,$symb); + my $res_error; + 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 ($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 (($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'}; + (undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1); + if (ref($fullname) eq 'HASH') { + my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname})); + if (@students) { + @{$env{'form.stuinfo'}} = @students; + if ($numupload) { + &download_all_link($request,$symb); + } +# 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')); + } + } else { + $request->print(&mt('Could not retrieve student information')); + } + } else { + $request->print(&mt('No essayresponse items found')); + } + return; } sub build_section_inputs { @@ -1977,6 +2122,8 @@ sub submission { my $probtitle=&Apache::lonnet::gettitle($symb); if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } + my $is_tool = ($symb =~ /ext\.tool$/); + my ($essayurl,%coursedesc_by_cid); if (!&canview($usec)) { $request->print( @@ -1989,8 +2136,10 @@ sub submission { } if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; } - if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } - if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } + unless ($is_tool) { + if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } + if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } + } my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); my $checkIcon = ''.&mt('Check Mark'). '' - .'

'.&mt('Submissions').'

'; + .'

'.$boxtitle.'

'; $result.=''."\n"; # if ($env{'form.handgrade'} eq 'no') { - if (1) { + unless ($is_tool) { $result.='

' .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon) ."

\n"; @@ -2178,7 +2344,7 @@ sub submission { my $fullname; my $col_fullnames = []; # if ($env{'form.handgrade'} eq 'yes') { - if (1) { + unless ($is_tool) { (my $sub_result,$fullname,$col_fullnames)= &check_collaborators($symb,$uname,$udom,\%record,$handgrade, $counter); @@ -2193,12 +2359,16 @@ sub submission { # (3) Last submission plus the parts info # (4) The whole record for this student - my ($string,$timestamp)= &get_last_submission(\%record); + my ($string,$timestamp)= &get_last_submission(\%record,$is_tool); my $lastsubonly; if ($$timestamp eq '') { $lastsubonly.='
'.$$string[0].'
'; + } elsif ($is_tool) { + $lastsubonly = + '
' + .''.&mt('Date Grade Passed Back:').' '.$$timestamp."
\n"; } else { $lastsubonly = '
' @@ -2252,24 +2422,52 @@ sub submission { &most_similar($uname,$udom,$symb,$subval); if ($osim) { $osim=int($osim*100.0); - my %old_course_desc = - &Apache::lonnet::coursedescription($ocrsid, - {'one_time' => 1}); - if ($hide eq 'anon') { $similar='
'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'
'. &mt('As the current submission is for an anonymous survey, no other details are available.').'
'; } else { - $similar="

". - &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', - $osim, - &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', - $old_course_desc{'description'}, - $old_course_desc{'num'}, - $old_course_desc{'domain'}). - '

'. - &keywords_highlight($oessay). - '
'; + $similar='
'; + if ($essayurl eq 'lib/templates/simpleproblem.problem') { + $similar .= '

'. + &mt('Essay is [_1]% similar to an essay by [_2]', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). + '

'; + } else { + my %old_course_desc; + if ($ocrsid ne '') { + 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'}) { + $args = {'one_time' => 1}; + } + %old_course_desc = + &Apache::lonnet::coursedescription($ocrsid,$args); + $coursedesc_by_cid{$ocrsid} = \%old_course_desc; + } + $similar .= + '

'. + &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', + $old_course_desc{'description'}, + $old_course_desc{'num'}, + $old_course_desc{'domain'}). + '

'; + } else { + $similar .= + '

'. + &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). + '

'; + } + } + $similar .= '
'. + &keywords_highlight($oessay). + '
'; } } } @@ -2381,7 +2579,12 @@ sub submission { my %seen = (); my @partlist; my @gradePartRespid; - my @part_response_id = &flatten_responseType($responseType); + my @part_response_id; + if ($is_tool) { + @part_response_id = ([0,'']); + } else { + @part_response_id = &flatten_responseType($responseType); + } $request->print( '
' .'

'.&mt('Assign Grades').'

' @@ -2507,7 +2710,7 @@ sub check_collaborators { #--- Retrieve the last submission for all the parts sub get_last_submission { - my ($returnhash)=@_; + my ($returnhash,$is_tool)=@_; my (@string,$timestamp,%lasthidden); if ($$returnhash{'version'}) { my %lasthash=(); @@ -2573,8 +2776,14 @@ sub get_last_submission { } } if (!@string) { + my $msg; + if ($is_tool) { + $msg = &mt('No grade passed back.'); + } else { + $msg = &mt('Nothing submitted - no attempts.'); + } $string[0] = - ''.&mt('Nothing submitted - no attempts.').''; + ''.$msg.''; } return (\@string,\$timestamp); } @@ -3561,6 +3770,11 @@ VIEWJAVASCRIPT #--- show scores for a section or whole class w/ option to change/update a score sub viewgrades { my ($request,$symb) = @_; + my ($is_tool,$toolsymb); + if ($symb =~ /ext\.tool$/) { + $is_tool = 1; + $toolsymb = $symb; + } &viewgrades_js($request); #need to make sure we have the correct data for later EXT calls, @@ -3641,7 +3855,13 @@ sub viewgrades { if ($env{'form.submitonly'} eq 'all') { $result.= '

'.$common_header.'

'; } else { - $result.= '

'.$common_header.' '.&mt('(submission status: "[_1]")',$submission_status).'

'; + my $text; + if ($is_tool) { + $text = &mt('(transaction status: "[_1]")',$submission_status); + } else { + $text = &mt('(submission status: "[_1]")',$submission_status); + } + $result.= '

'.$common_header.' '.$text.'

'; } $result .= &Apache::loncommon::start_data_table(); #radio buttons/text box for assigning points for a section or class. @@ -3654,7 +3874,12 @@ sub viewgrades { my %weight = (); my $ctsparts = 0; my %seen = (); - my @part_response_id = &flatten_responseType($responseType); + my @part_response_id; + if ($is_tool) { + @part_response_id = ([0,'']); + } else { + @part_response_id = &flatten_responseType($responseType); + } foreach my $part_response_id (@part_response_id) { my ($partid,$respid) = @{ $part_response_id }; my $part_resp = join('_',@{ $part_response_id }); @@ -3709,7 +3934,13 @@ sub viewgrades { if ($env{'form.submitonly'} eq 'all') { $result.= '

'.$specific_header.'

'; } else { - $result.= '

'.$specific_header.' '.&mt('(submission status: "[_1]")',$submission_status).'

'; + my $text; + if ($is_tool) { + $text = &mt('(transaction status: "[_1]")',$submission_status); + } else { + $text = &mt('(submission status: "[_1]")',$submission_status); + } + $result.= '

'.$specific_header.' '.$text.'

'; } $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). @@ -3723,10 +3954,10 @@ sub viewgrades { my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); my @partids = (); foreach my $part (@parts) { - my $display=&Apache::lonnet::metadata($url,$part.'.display'); + my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb); my $narrowtext = &mt('Tries'); $display =~ s|^Number of Attempts|$narrowtext
|; # makes the column narrower - if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } + if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name',$toolsymb); } my ($partid) = &split_part_type($part); push(@partids,$partid); # @@ -3767,7 +3998,7 @@ sub viewgrades { return $a cmp $b; } (keys(%$fullname))) { $result.=&viewstudentgrade($symb,$env{'request.course.id'}, - $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets); + $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets,$is_tool); } $result.=&Apache::loncommon::end_data_table(); $result.=''."\n"; @@ -3855,7 +4086,7 @@ sub viewgrades { #--- call by previous routine to display each student who satisfies submission filter. sub viewstudentgrade { - my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_; + my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_; my ($uname,$udom) = split(/:/,$student); my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); my $submitonly = $env{'form.submitonly'}; @@ -3961,6 +4192,10 @@ sub viewstudentgrade { # record does not get update if unchanged sub editgrades { my ($request,$symb) = @_; + my $toolsymb; + if ($symb =~ /ext\.tool$/) { + $toolsymb = $symb; + } my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); my $title='

'.&mt('Current Grade Status').'

'; @@ -3998,6 +4233,7 @@ sub editgrades { $ctr++; } my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); + my $totcolspan = 0; foreach my $partid (@partid) { $header .= ''.&mt('Old Score').''. ''.&mt('New Score').''; @@ -4006,7 +4242,7 @@ sub editgrades { my ($part,$type) = &split_part_type($stores); if ($part !~ m/^\Q$partid\E/) { next;} if ($type eq 'awarded' || $type eq 'solved') { next; } - my $display=&Apache::lonnet::metadata($url,$stores.'.display'); + my $display=&Apache::lonnet::metadata($url,$stores.'.display',$toolsymb); $display =~ s/\[Part: \Q$part\E\]//; my $narrowtext = &mt('Tries'); $display =~ s/Number of Attempts/$narrowtext/; @@ -4014,6 +4250,7 @@ sub editgrades { ''.&mt('New').' '.$display.''; $columns{$partid}+=2; } + $totcolspan += $columns{$partid}; } foreach my $partid (@partid) { my $display_part=&get_display_part($partid,$symb); @@ -4029,18 +4266,18 @@ sub editgrades { my @noupdate; my ($updateCtr,$noupdateCtr) = (1,1); for ($i=0; $i<$env{'form.total'}; $i++) { - my $line; my $user = $env{'form.ctr'.$i}; my ($uname,$udom)=split(/:/,$user); my %newrecord; my $updateflag = 0; - $line .= ''.&nameUserString(undef,$$fullname{$user},$uname,$udom).''; my $usec=$classlist->{"$uname:$udom"}[5]; - if (!&canmodify($usec)) { - my $numcols=scalar(@partid)*4+2; + my $canmodify = &canmodify($usec); + my $line = ''. + &nameUserString(undef,$$fullname{$user},$uname,$udom).''; + if (!$canmodify) { push(@noupdate, - $line."". - &mt('Not allowed to modify student').""); + $line."". + &mt('Not allowed to modify student').""); next; } my %aggregate = (); @@ -4157,8 +4394,7 @@ sub editgrades { } } if (@noupdate) { -# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; - my $numcols=scalar(@partid)*4+2; + my $numcols=$totcolspan+2; $result .= &Apache::loncommon::start_data_table_row('LC_empty_row'). ''. &mt('No Changes Occurred For the Students Below'). @@ -4257,7 +4493,7 @@ sub csvupload_javascript_forward_associa tw=eval('vf.f'+i+'.selectedIndex'); if (tw==1) { foundID=1; } if (tw==2) { founduname=1; } - if (tw==3) { foundclicker=1; } + if (tw==3) { foundclicker=1; } if (tw>4) { foundsomething=1; } } if (founduname==0 && foundID==0 && ƒoundclicker==0) { @@ -4318,6 +4554,10 @@ ENDPICK sub csvupload_fields { my ($symb,$errorref) = @_; + my $toolsymb; + if ($symb =~ /ext\.tool$/) { + $toolsymb = $symb; + } my (@parts) = &getpartlist($symb,$errorref); if (ref($errorref)) { if ($$errorref) { @@ -4332,9 +4572,9 @@ sub csvupload_fields { my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); foreach my $part (sort(@parts)) { my @datum; - my $display=&Apache::lonnet::metadata($url,$part.'.display'); + 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]"]); @@ -4685,6 +4925,7 @@ LISTJAVASCRIPT my $cdom = $env{"course.$env{'request.course.id'}.domain"}; my $cnum = $env{"course.$env{'request.course.id'}.num"}; my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; + my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; my $result='

 '. &mt('Manual Grading by Page or Sequence').'

'; @@ -4774,7 +5015,7 @@ LISTJAVASCRIPT ''.&nameUserString('header').''. &Apache::loncommon::end_data_table_header_row(); - my (undef,undef,$fullname) = &getclasslist($getsec,'1'); + my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup); my $ptr = 1; foreach my $student (sort { @@ -4824,7 +5065,7 @@ sub getSymbMap { my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1,0,1); for my $sequence ($navmap->getById('0.0'), @sequences) { - if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) { + if ($navmap->hasResource($sequence, sub { shift->is_gradable(); }, 0) ) { my $title = $minder.'.'. &HTML::Entities::encode($sequence->compTitle(),'"\'&'); push(@titles, $title); # minder in case two titles are identical @@ -4921,10 +5162,11 @@ sub displayPage { if($curRes == $iterator->BEGIN_MAP) { $depth++; } if($curRes == $iterator->END_MAP) { $depth--; } - if (ref($curRes) && $curRes->is_problem()) { + if (ref($curRes) && $curRes->is_gradable()) { my $parts = $curRes->parts(); my $title = $curRes->compTitle(); my $symbx = $curRes->symb(); + my $is_tool = ($symbx =~ /ext\.tool$/); $studentTable.= &Apache::loncommon::start_data_table_row(). ''.$prob. @@ -4935,26 +5177,34 @@ sub displayPage { ''; $studentTable.=''; my %form = ('CODE' => $env{'form.CODE'},); - if ($env{'form.vProb'} eq 'yes' ) { - $studentTable.=&show_problem($request,$symbx,$uname,$udom,1, - undef,'both',\%form); - } else { - my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form); - $companswer =~ s|||g; - $companswer =~ s|||g; -# while ($companswer =~ /()/s) { #\n"); -# } -# $companswer =~ s||
|g; - $studentTable.=' '.$title.' 
 '.&mt('Correct answer').':
'.$companswer; + if ($is_tool) { + $studentTable.=' '.$title.'
'; + } else { + if ($env{'form.vProb'} eq 'yes' ) { + $studentTable.=&show_problem($request,$symbx,$uname,$udom,1, + undef,'both',\%form); + } else { + my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form); + $companswer =~ s|||g; + $companswer =~ s|||g; +# while ($companswer =~ /()/s) { #\n"); +# } +# $companswer =~ s|
|
|g; + $studentTable.=' '.$title.' 
 '.&mt('Correct answer').':
'.$companswer; + } } my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); if ($env{'form.lastSub'} eq 'datesub') { if ($record{'version'} eq '') { - $studentTable.='
 '.&mt('No recorded submission for this problem.').'
'; + my $msg = &mt('No recorded submission for this problem.'); + if ($is_tool) { + $msg = &mt('No recorded transactions for this external tool'); + } + $studentTable.='
 '.$msg.'
'; } else { my %responseType = (); foreach my $partid (@{$parts}) { @@ -4967,7 +5217,6 @@ 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' : ''); @@ -5008,13 +5257,14 @@ sub displaySubByDates { my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_; my $isCODE=0; my $isTask = ($symb =~/\.task$/); + my $is_tool = ($symb =~/\.tool$/); if (exists($record->{'resource.CODE'})) { $isCODE=1; } my $studentTable=&Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''. ($isCODE?'':''). ($isTask?'':''). - ''. + ''. ''. &Apache::loncommon::end_data_table_header_row(); my ($version); @@ -5022,7 +5272,11 @@ sub displaySubByDates { my %orders; $mark{'correct_by_student'} = $checkIcon; if (!exists($$record{'1:timestamp'})) { - return '
 '.&mt('Nothing submitted - no attempts.').'
'; + if ($is_tool) { + return '
 '.&mt('No grade passed back.').'
'; + } else { + return '
 '.&mt('Nothing submitted - no attempts.').'
'; + } } my $interaction; @@ -5055,56 +5309,64 @@ sub displaySubByDates { if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) { $hidden = 1; } - my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys) - : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); - + 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); + } # next if ($$record{"$version:resource.$partid.solved"} eq ''); my $display_part=&get_display_part($partid,$symb); foreach my $matchKey (@matchKey) { if (exists($$record{$version.':'.$matchKey}) && $$record{$version.':'.$matchKey} ne '') { - - my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) - : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); - $displaySub[0].=''; - $displaySub[0].=''.&mt('Part: [_1]',$display_part).'' - .' ' - .'('.&mt('Response ID: [_1]',$responseId).')' - .'' - .' '; - if ($hidden) { - $displaySub[0].= &mt('Anonymous Survey').''; + if ($is_tool) { + $displaySub[0].=$$record{"$version:resource.$partid.awarded"}; } else { - my ($trial,$rndseed,$newvariation); - if ($type eq 'randomizetry') { - $trial = $$record{"$where.$partid.tries"}; - $rndseed = $$record{"$where.$partid.rndseed"}; - } - if ($$record{"$where.$partid.tries"} eq '') { - $displaySub[0].=&mt('Trial not counted'); - } else { - $displaySub[0].=&mt('Trial: [_1]', - $$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').')'; - } + my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) + : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); + $displaySub[0].=''; + $displaySub[0].=''.&mt('Part: [_1]',$display_part).'' + .' ' + .'('.&mt('Response ID: [_1]',$responseId).')' + .'' + .' '; + if ($hidden) { + $displaySub[0].= &mt('Anonymous Survey').''; + } else { + my ($trial,$rndseed,$newvariation); + if ($type eq 'randomizetry') { + $trial = $$record{"$where.$partid.tries"}; + $rndseed = $$record{"$where.$partid.rndseed"}; } - $lastrndseed{$partid} = $rndseed; - $lasttype{$partid} = $type; - } - my $responseType=($isTask ? 'Task' + if ($$record{"$where.$partid.tries"} eq '') { + $displaySub[0].=&mt('Trial not counted'); + } else { + $displaySub[0].=&mt('Trial: [_1]', + $$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').')'; + } + } + $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}= - &get_order($partid,$responseId,$symb,$uname,$udom, - $no_increment,$type,$trial,$rndseed); - } - $displaySub[0].=''.$newvariation.''; # /nobreak - $displaySub[0].='  '. - &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'
'; + 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); + } + $displaySub[0].=''.$newvariation.''; # /nobreak + $displaySub[0].='  '. + &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'
'; + } } } } @@ -5119,14 +5381,22 @@ sub displaySubByDates { lc($$record{"$where.$partid.award"}).' '. $mark{$$record{"$where.$partid.solved"}}. '
'; + } 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"}. - ' ('.&mt('Part').': '.$display_part.')'; + $displaySub[2].=$$record{"$where.$partid.regrader"}; + unless ($is_tool) { + $displaySub[2].=' ('.&mt('Part').': '.$display_part.')'; + } } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) { $displaySub[2].= - $$record{"$version:resource.$partid.regrader"}. - ' ('.&mt('Part').': '.$display_part.')'; + $$record{"$version:resource.$partid.regrader"}; + unless ($is_tool) { + $displaySub[2].=' ('.&mt('Part').': '.$display_part.')'; + } } } # needed because old essay regrader has not parts info @@ -5538,7 +5808,7 @@ sub scantron_uploads { sub scantron_scantab { my $result=' - '.&Apache::loncommon::end_data_table_header_row().' - '.&Apache::loncommon::start_data_table_row().' - + '.&Apache::loncommon::end_data_table_header_row().' + '.&Apache::loncommon::start_data_table_row().' + + '.&Apache::loncommon::end_data_table_row().' + '.&Apache::loncommon::start_data_table_row().' + + '.&Apache::loncommon::end_data_table_row().' + '.&Apache::loncommon::start_data_table_row().' + + '.&Apache::loncommon::end_data_table_row().' + '.&Apache::loncommon::end_data_table().' + ' + ); - $r->print(' - - '.&Apache::loncommon::end_data_table_row().' - '.&Apache::loncommon::end_data_table().' -'); } # Chunk of form to prompt for a file to grade and how: @@ -5842,98 +6065,6 @@ sub scantron_selectphase { return; } -=pod - -=item get_scantron_config - - Parse and return the bubblesheet configuration line selected as a - hash of configuration file fields. - - Arguments: - which - the name of the configuration to parse from the file. - - - Returns: - If the named configuration is not in the file, an empty - hash is returned. - a hash with the fields - name - internal name for the this configuration setup - description - text to display to operator that describes this config - CODElocation - if 0 or the string 'none' - - no CODE exists for this config - if -1 || the string 'letter' - - a CODE exists for this config and is - a string of letters - Unsupported value (but planned for future support) - if a positive integer - - The CODE exists as the first n items from - the question section of the form - if the string 'number' - - The CODE exists for this config and is - a string of numbers - CODEstart - (only matter if a CODE exists) column in the line where - the CODE starts - CODElength - length of the CODE - IDstart - column where the student/employee ID starts - IDlength - length of the student/employee ID info - Qstart - column where the information from the bubbled - 'questions' start - Qlength - number of columns comprising a single bubble line from - the sheet. (usually either 1 or 10) - Qon - either a single character representing the character used - to signal a bubble was chosen in the positional setup, or - the string 'letter' if the letter of the chosen bubble is - in the final, or 'number' if a number representing the - chosen bubble is in the file (1->A 0->J) - Qoff - the character used to represent that a bubble was - left blank - PaperID - if the scanning process generates a unique number for each - sheet scanned the column that this ID number starts in - PaperIDlength - number of columns that comprise the unique ID number - for the sheet of paper - FirstName - column that the first name starts in - FirstNameLength - number of columns that the first name spans - - LastName - column that the last name starts in - LastNameLength - number of columns that the last name spans - BubblesPerRow - number of bubbles available in each row used to - bubble an answer. (If not specified, 10 assumed). - -=cut - -sub get_scantron_config { - my ($which) = @_; - my @lines = &get_scantronformat_file(); - my %config; - #FIXME probably should move to XML it has already gotten a bit much now - foreach my $line (@lines) { - my ($name,$descrip)=split(/:/,$line); - if ($name ne $which ) { next; } - chomp($line); - my @config=split(/:/,$line); - $config{'name'}=$config[0]; - $config{'description'}=$config[1]; - $config{'CODElocation'}=$config[2]; - $config{'CODEstart'}=$config[3]; - $config{'CODElength'}=$config[4]; - $config{'IDstart'}=$config[5]; - $config{'IDlength'}=$config[6]; - $config{'Qstart'}=$config[7]; - $config{'Qlength'}=$config[8]; - $config{'Qoff'}=$config[9]; - $config{'Qon'}=$config[10]; - $config{'PaperID'}=$config[11]; - $config{'PaperIDlength'}=$config[12]; - $config{'FirstName'}=$config[13]; - $config{'FirstNamelength'}=$config[14]; - $config{'LastName'}=$config[15]; - $config{'LastNamelength'}=$config[16]; - $config{'BubblesPerRow'}=$config[17]; - last; - } - return %config; -} - =pod =item username_to_idmap @@ -5981,7 +6112,7 @@ sub username_to_idmap { Process a requested correction to a scanline. Arguments: - $scantron_config - hash from &get_scantron_config() + $scantron_config - hash from &Apache::lonnet::get_scantron_config() $scan_data - hash of correction information (see &scantron_getfile()) $line - existing scanline @@ -6664,7 +6795,7 @@ sub scantron_filter { sub scantron_process_corrections { my ($r) = @_; - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + 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 $which=$env{'form.scantron_line'}; @@ -6833,7 +6964,7 @@ sub check_for_error { sub scantron_warning_screen { my ($button_text,$symb)=@_; my $title=&Apache::lonnet::gettitle($env{'form.selectpage'}); - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my $CODElist; if ($scantron_config{'CODElocation'} && $scantron_config{'CODEstart'} && @@ -6989,7 +7120,7 @@ sub scantron_validate_file { #get the student pick code ready $r->print(&Apache::loncommon::studentbrowser_javascript()); my $nav_error; - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); if ($nav_error) { $r->print(&navmap_errormsg()); @@ -7449,7 +7580,7 @@ sub scantron_validate_ID { my %idmap=&username_to_idmap($classlist); #get scantron line setup - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my ($scanlines,$scan_data)=&scantron_getfile(); my $nav_error; @@ -7919,7 +8050,7 @@ sub prompt_for_corrections { Arguments: $r - Apache request object - $scan_config - hash from &get_scantron_config() + $scan_config - hash from &Apache::lonnet::get_scantron_config() $line - Number of the line being displayed. $questionnum - Question number (may include subquestion) $error - Type of error. @@ -8083,7 +8214,7 @@ sub get_codes { sub scantron_validate_CODE { my ($r,$currentphase) = @_; - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); if ($scantron_config{'CODElocation'} && $scantron_config{'CODEstart'} && $scantron_config{'CODElength'}) { @@ -8157,7 +8288,7 @@ sub scantron_validate_doublebubble { &Apache::lonnet::decode_symb($env{'form.selectpage'}); #get scantron line setup - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my ($scanlines,$scan_data)=&scantron_getfile(); my $navmap = Apache::lonnavmaps::navmap->new(); @@ -8339,7 +8470,7 @@ sub scantron_validate_missingbubbles { &Apache::lonnet::decode_symb($env{'form.selectpage'}); #get scantron line setup - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my ($scanlines,$scan_data)=&scantron_getfile(); my $navmap = Apache::lonnavmaps::navmap->new(); @@ -8468,7 +8599,7 @@ sub hand_bubble_option { } } if ($needs_hand_bubbles) { - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); return &mt('The sequence to be graded contains response types which are handgraded.').'

'. &mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','
'). @@ -8487,7 +8618,7 @@ sub scantron_process_students { } my $default_form_data=&defaultFormData($symb); - my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); + 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)=&scantron_getfile(); my $classlist=&Apache::loncoursedata::get_classlist(); @@ -8555,7 +8686,7 @@ SCANTRONFORM return ''; # Dunno why the other returns return '' rather than just returning. } - my %lettdig = &letter_to_digits(); + my %lettdig = &Apache::lonnet::letter_to_digits(); my $numletts = scalar(keys(%lettdig)); my %orderedforcode; @@ -8882,6 +9013,7 @@ sub grade_student_bubbles { sub scantron_upload_scantron_data { my ($r,$symb)=@_; my $dom = $env{'request.role.domain'}; + my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom); my $domdesc = &Apache::lonnet::domain($dom,'description'); $r->print(&Apache::loncommon::coursebrowser_javascript($dom)); my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid', @@ -8921,6 +9053,7 @@ sub scantron_upload_scantron_data { return; } + '.$formatjs.' ')); $r->print('

'.&mt('Send bubblesheet data to a course').'

@@ -8936,7 +9069,12 @@ sub scantron_upload_scantron_data { &Apache::lonhtmlcommon::row_closure(). &Apache::lonhtmlcommon::row_title(&mt('Domain')). ''.$domdesc. - &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_closure()); + if ($formatoptions) { + $r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions. + &Apache::lonhtmlcommon::row_closure()); + } + $r->print( &Apache::lonhtmlcommon::row_title(&mt('File to upload')). ''. &Apache::lonhtmlcommon::row_closure(1). @@ -8949,6 +9087,84 @@ sub scantron_upload_scantron_data { return ''; } +sub scantron_upload_dataformat { + my ($dom) = @_; + my ($formatoptions,$formattitle,$formatjs); + $formatjs = <<'END'; +function toggleScantab(form) { + return; +} +END + my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom); + if (ref($domconfig{'scantron'}) eq 'HASH') { + if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { + 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 (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 =~ /^#/); + $singleline = $line; + $count ++; + } + if ($count > 1) { + $formatextra = ''; + $onclick = ' onclick="toggleScantab(this.form);"'; + $formatjs = <<"END"; +function toggleScantab(form) { + var divid = 'bubbletype'; + if (document.getElementById(divid)) { + var radioname = 'fileformat'; + var num = form.elements[radioname].length; + if (num) { + for (var i=0; i'; + } + $formattitle = &mt('File format'); + $formatoptions = ''.(' 'x2). + ''.$formatextra; + } + } + } + } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) { + if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { + if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) { + $formattitle = &mt('Bubblesheet type'); + $formatoptions = &scantron_scantab(); + } + } + } + } + } + return ($formatoptions,$formattitle,$formatjs); +} sub scantron_upload_scantron_data_save { my($r,$symb)=@_; @@ -8975,8 +9191,38 @@ sub scantron_upload_scantron_data_save { &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.', ''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').''),1)); } else { - my $result = - &Apache::lonnet::userfileupload('upfile','','scantron','','','', + my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'}); + my $parser; + if (ref($domconfig{'scantron'}) eq 'HASH') { + if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { + my $is_csv; + my @possibles = keys(%{$domconfig{'scantron'}{'config'}}); + if (@possibles > 1) { + if ($env{'form.fileformat'} eq 'csv') { + if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { + if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { + if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) { + $is_csv = 1; + } + } + } + } + } elsif (@possibles == 1) { + if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { + if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { + if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) { + $is_csv = 1; + } + } + } + } + if ($is_csv) { + $parser = $domconfig{'scantron'}{'config'}{'csv'}; + } + } + } + my $result = + &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','', $env{'form.courseid'},$env{'form.domainid'}); if ($result =~ m{^/uploaded/}) { $r->print( @@ -9021,7 +9267,7 @@ sub validate_uploaded_scantron_file { $idmap{$lckey} = $idmap{$key}; } my %unique_formats; - my @formatlines = &get_scantronformat_file(); + my @formatlines = &Apache::lonnet::get_scantronformat_file(); foreach my $line (@formatlines) { chomp($line); my @config = split(/:/,$line); @@ -9162,14 +9408,14 @@ sub checkscantron_results { my ($r,$symb) = @_; if (!$symb) {return '';} my $cid = $env{'request.course.id'}; - my %lettdig = &letter_to_digits(); + my %lettdig = &Apache::lonnet::letter_to_digits(); my $numletts = scalar(keys(%lettdig)); my $cnum = $env{'course.'.$cid.'.num'}; my $cdom = $env{'course.'.$cid.'.domain'}; my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'}); my %record; my %scantron_config = - &Apache::grades::get_scantron_config($env{'form.scantron_format'}); + &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 $classlist=&Apache::loncoursedata::get_classlist(); @@ -9493,22 +9739,6 @@ sub verify_scantron_grading { return ($counter,$record); } -sub letter_to_digits { - my %lettdig = ( - A => 1, - B => 2, - C => 3, - D => 4, - E => 5, - F => 6, - G => 7, - H => 8, - I => 9, - J => 0, - ); - return %lettdig; -} - #-------- end of section for handling grading scantron forms ------- # @@ -9564,7 +9794,7 @@ sub grading_menu { icon => 'grade_students.png', linktitle => 'Grade current resource for a selection of students.' }, - { linktext => 'Grade ungraded submissions.', + { linktext => 'Grade ungraded submissions', url => $url1b, permission => 'F', icon => 'ungrade_sub.png', @@ -9658,12 +9888,13 @@ sub submit_options_table { my ($request,$symb) = @_; if (!$symb) {return '';} &commonJSfunctions($request); + my $is_tool = ($symb =~ /ext\.tool$/); my $result; $result.='
'."\n". ''."\n"; - $result.=&selectfield(1). + $result.=&selectfield(1,$is_tool). '
@@ -9677,14 +9908,15 @@ sub submit_options_download { my ($request,$symb) = @_; if (!$symb) {return '';} + my $is_tool = ($symb =~ /ext\.tool$/); &commonJSfunctions($request); my $result=''."\n". ''."\n"; $result.='

- '.&mt('Select Students for Which to Download Submissions').' -

'.&selectfield(1).' + '.&mt('Select Students for whom to Download Submissions').' +'.&selectfield(1,$is_tool).'
@@ -9700,12 +9932,13 @@ sub submit_options { my ($request,$symb) = @_; if (!$symb) {return '';} + my $is_tool = ($symb =~ /ext\.tool$/); &commonJSfunctions($request); my $result; $result.=''."\n". ''."\n"; - $result.=&selectfield(1).' + $result.=&selectfield(1,$is_tool).' @@ -9717,10 +9950,17 @@ sub submit_options { } sub selectfield { - my ($full)=@_; - my %options = - (&substatus_options, - 'select_form_order' => ['yes','queued','graded','incorrect','all']); + my ($full,$is_tool)=@_; + my %options; + if ($is_tool) { + %options = + (&transtatus_options, + 'select_form_order' => ['yes','incorrect','all']); + } else { + %options = + (&substatus_options, + 'select_form_order' => ['yes','queued','graded','incorrect','all']); + } my $result='
@@ -9744,10 +9984,14 @@ sub selectfield { '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
'; if ($full) { - $result.=' + my $heading = &mt('Submission Status'); + if ($is_tool) { + $heading = &mt('Transaction Status'); + } + $result.='
- '.&mt('Submission Status').' + '.$heading.' '. &Apache::loncommon::select_form('all','submitonly',\%options). '
'; @@ -9766,6 +10010,14 @@ sub substatus_options { ); } +sub transtatus_options { + return &Apache::lonlocal::texthash( + 'yes' => 'with score transactions', + 'incorrect' => 'with less than full credit', + 'all' => 'with any status', + ); +} + sub reset_perm { undef(%perm); } @@ -10046,6 +10298,22 @@ sub process_clicker_file { ''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').''),1); return $result; } + my $mimetype; + if ($env{'form.upfiletype'} eq 'iclicker') { + my $mm = new File::MMagic; + $mimetype = $mm->checktype_contents($env{'form.upfile'}); + unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) { + $result.= '

'. + &Apache::lonhtmlcommon::confirm_success( + &mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'

'; + return $result; + } + } elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) { + $result .= '

'. + &Apache::lonhtmlcommon::confirm_success( + &mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'

'; + return $result; + } # Were able to get all the info needed, now analyze the file @@ -10072,12 +10340,14 @@ ENDHEADER my $errormsg=''; my $number=0; if ($env{'form.upfiletype'} eq 'iclicker') { - ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses); - } - if ($env{'form.upfiletype'} eq 'interwrite') { + if ($mimetype eq 'text/plain') { + ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses); + } elsif ($mimetype eq 'text/html') { + ($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses); + } + } elsif ($env{'form.upfiletype'} eq 'interwrite') { ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses); - } - if ($env{'form.upfiletype'} eq 'turning') { + } elsif ($env{'form.upfiletype'} eq 'turning') { ($errormsg,$number)=&turning_eval(\@questiontitles,\%responses); } $result.='
'.&mt('Found [_1] question(s)',$number).'
'. @@ -10130,7 +10400,7 @@ ENDHEADER "\n".&mt("Username").":  ". "\n".&mt("Domain").": ". &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '. - &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id); + &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,'',$id); $unknown_count++; } } @@ -10185,6 +10455,49 @@ sub iclicker_eval { return ($errormsg,$number); } +sub iclickerxml_eval { + my ($questiontitles,$responses)=@_; + my $number=0; + my $errormsg=''; + my @state; + my %respbyid; + my $p = HTML::Parser->new + ( + xml_mode => 1, + start_h => + [sub { + my ($tagname,$attr) = @_; + push(@state,$tagname); + if ("@state" eq "ssn p") { + my $title = $attr->{qn}; + $title =~ s/(^\s+|\s+$)//g; + $questiontitles->[$number]=$title; + } elsif ("@state" eq "ssn p v") { + my $id = $attr->{id}; + my $entry = $attr->{ans}; + $id=~s/^[\#0]+//; + $entry =~s/[^a-zA-Z0-9\.\*\-\+]+//g; + $respbyid{$id}[$number] = $entry; + } + }, "tagname, attr"], + end_h => + [sub { + my ($tagname) = @_; + if ("@state" eq "ssn p") { + $number++; + } + pop(@state); + }, "tagname"], + ); + + $p->parse($env{'form.upfile'}); + $p->eof; + foreach my $id (keys(%respbyid)) { + $responses->{$id}=join(',',@{$respbyid{$id}}); + } + return ($errormsg,$number); +} + sub interwrite_eval { my ($questiontitles,$responses)=@_; my $number=0; @@ -10379,24 +10692,32 @@ sub navmap_errormsg { } sub startpage { - my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_; + my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_; + my %args; + if ($onload) { + my %loaditems = ( + 'onload' => $onload, + ); + $args{'add_entries'} = \%loaditems; + } if ($nomenu) { - $r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'})); + $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"}); - $r->print(&Apache::loncommon::start_page('Grading',$js, - {'bread_crumbs' => $crumbs})); + $args{'bread_crumbs'} = $crumbs; + $r->print(&Apache::loncommon::start_page('Grading',$js,\%args)); &Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading')); } unless ($nodisplayflag) { - $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)); + $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)); } } sub select_problem { my ($r)=@_; $r->print('

'.&mt('Select the problem or one of the problems you want to grade').'

'); - $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1)); + $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,undef,undef,1)); $r->print(''); $r->print(''); } @@ -10569,7 +10890,8 @@ sub handler { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvuploadassign($request,$symb)); } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &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'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); @@ -10583,7 +10905,8 @@ sub handler { } elsif ($command eq 'scantronupload' && (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})|| &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &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'})|| @@ -10603,7 +10926,7 @@ sub handler { } elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) { &startpage($request,$symb, [{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'}, - {href=>'', text=>'Download submissions'}]); + {href=>'', text=>'Download submitted files'}]); &submit_download_link($request,$symb); } elsif ($command) { &startpage($request,$symb,[{href=>'', text=>'Access denied'}]); @@ -10766,7 +11089,7 @@ Side Effects: None. $r - Apache request object $i - number of the current scanline $scan_record - hash ref as returned from &scantron_parse_scanline() - $scan_config - hash ref as returned from &get_scantron_config() + $scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config() $line - full contents of the current scanline $error - error condition, valid values are 'incorrectCODE', 'duplicateCODE',
'.&mt('Date/Time').''.&mt('CODE').''.&mt('Version').''.&mt('Submission').''.($is_tool?&mt('Grade'):&mt('Submission')).''.&mt('Status').' -  '.&mt('Specify a bubblesheet data file to upload.').' - -'); - my $default_form_data=&defaultFormData($symb); +
'); 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(' function checkUpload(formname) { if (formname.upfile.value == "") { @@ -5712,24 +5917,42 @@ sub scantron_selectphase { return false; } formname.submit(); - }')); + }'."\n".$formatjs)); $r->print('
'.$default_form_data.' - '.&mt('File to upload: [_1]','').' -
- -
-'); + '.&Apache::loncommon::start_data_table('LC_scantron_action').' + '.&Apache::loncommon::start_data_table_header_row().' + 		+  '.&mt('Specify a bubblesheet data file to upload.').' + + '.&mt('File to upload: [_1]','').'
'."\n"); + if ($formatoptions) { + $r->print('		'.$formattitle.(' 'x2).$formatoptions.' + ' + ); + } else { + $r->print('
'); + } + $r->print(' +