--- loncom/homework/grades.pm 2008/11/18 19:14:28 1.530 +++ loncom/homework/grades.pm 2008/12/21 22:01:35 1.539 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.530 2008/11/18 19:14:28 jms Exp $ +# $Id: grades.pm,v 1.539 2008/12/21 22:01:35 riegler Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,163 +26,7 @@ # http://www.lon-capa.org/ # -=head1 NAME - -Apache::grades - -=head1 SYNOPSIS - -Handles the viewing of grades. - -This is part of the LearningOnline Network with CAPA project -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, -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). - -At least the logic that drives this has been pulled out into loncommon. - - - -ssi_with_retries - Does the server side include of a resource. - if the ssi call returns an error we'll retry it up to - the number of times requested by the caller. - If we still have a proble, no text is appended to the - output and we set some global variables. - to indicate to the caller an SSI error occurred. - All of this is supposed to deal with the issues described - in LonCAPA BZ 5631 see: - http://bugs.lon-capa.org/show_bug.cgi?id=5631 - by informing the user that this happened. - -Parameters: - resource - The resource to include. This is passed directly, without - interpretation to lonnet::ssi. - form - The form hash parameters that guide the interpretation of the resource - - retries - Number of retries allowed before giving up completely. -Returns: - On success, returns the rendered resource identified by the resource parameter. -Side Effects: - The following global variables can be set: - ssi_error - If an unrecoverable error occurred this becomes true. - It is up to the caller to initialize this to false - if desired. - ssi_error_resource - If an unrecoverable error occurred, this is the value - of the resource that could not be rendered by the ssi - call. - ssi_error_message - The error string fetched from the ssi response - in the event of an error. - - -=head1 HANDLER SUBROUTINE - -ssi_with_retries() - -=head1 SUBROUTINES - -=over - -=item scantron_get_correction() : - - Builds the interface screen to interact with the operator to fix a - specific error condition in a specific scanline - - Arguments: - $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() - $line - full contents of the current scanline - $error - error condition, valid values are - 'incorrectCODE', 'duplicateCODE', - 'doublebubble', 'missingbubble', - 'duplicateID', 'incorrectID' - $arg - extra information needed - For errors: - - duplicateID - paper number that this studentID was seen before on - - duplicateCODE - array ref of the paper numbers this CODE was - seen on before - - incorrectCODE - current incorrect CODE - - doublebubble - array ref of the bubble lines that have double - bubble errors - - missingbubble - array ref of the bubble lines that have missing - bubble errors - -=item scantron_get_maxbubble() : - - Returns the maximum number of bubble lines that are expected to - occur. Does this by walking the selected sequence rendering the - resource and then checking &Apache::lonxml::get_problem_counter() - for what the current value of the problem counter is. - - Caches the results to $env{'form.scantron_maxbubble'}, - $env{'form.scantron.bubble_lines.n'}, - $env{'form.scantron.first_bubble_line.n'} and - $env{"form.scantron.sub_bubblelines.n"} - which are the total number of bubble, lines, the number of bubble - lines for response n and number of the first bubble line for response n, - and a comma separated list of numbers of bubble lines for sub-questions - (for optionresponse, matchresponse, and rankresponse items), for response n. - - -=item scantron_validate_missingbubbles() : - - Validates all scanlines in the selected file to not have any - answers that don't have bubbles that have not been verified - to be bubble free. - -=item scantron_process_students() : - - Routine that does the actual grading of the bubble sheet information. - - The parsed scanline hash is added to %env - - Then foreach unskipped scanline it does an &Apache::lonnet::ssi() - foreach resource , with the form data of - - 'submitted' =>'scantron' - 'grade_target' =>'grade', - 'grade_username'=> username of student - 'grade_domain' => domain of student - 'grade_courseid'=> of course - 'grade_symb' => symb of resource to grade - - This triggers a grading pass. The problem grading code takes care - of converting the bubbled letter information (now in %env) into a - valid submission. - -=item scantron_upload_scantron_data() : - - Creates the screen for adding a new bubble sheet data file to a course. - -=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. - -=item valid_file() : - - Validates that the requested bubble data file exists in the course. - -=item scantron_download_scantron_data() : - - Shows a list of the three internal files (original, corrected, - skipped) for a specific bubble sheet data file that exists in the - course. - -=item scantron_validate_ID() : - - Validates all scanlines in the selected file to not have any - invalid or underspecified student IDs - -=back - -=cut package Apache::grades; use strict; @@ -373,9 +217,9 @@ sub showResourceInfo { $partsseen{$partID}=1; } my $display_part=&get_display_part($partID,$symb); - $result.=''.&mt('Part: [_1]',$display_part).' '. - $resID.''. - ''.&mt('Type: [_1]',$responsetype).''; + $result.=''.&mt('Part').': '.$display_part. + ' '.$resID.''. + ''.&mt('Type').': '.$responsetype.''; # ''.&mt('Handgrade: [_1]',$handgrade).''; } } @@ -935,20 +779,20 @@ sub listStudents { my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; - my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View'; + my $viewgrade = $env{'form.showgrading'} eq 'yes' ? &mt('View/Grade/Regrade') : &mt('View'); $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; - my $result='

 '. - &mt($viewgrade.' Submissions for a Student or a Group of Students') + my $result='

 '.$viewgrade. + &mt(' Submissions for a Student or a Group of Students') .'

'; my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); my %lt = ( 'multiple' => - "Please select a student or group of students before clicking on the Next button.", + &mt("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.", + &mt("Please select the student before clicking on the Next button."), ); %lt = &Apache::lonlocal::texthash(%lt); $request->print(<View Problem Text: [_1]', + ' '.&mt('View Problem Text').': '. ''."\n". ''."\n". - '').'
'."\n"; + '
'."\n"; $gradeTable .= - ' '. - &mt('View Answer: [_1]', + ' '.&mt('View Answer').': '. ''."\n". ''."\n". - '').'
'."\n"; + '
'."\n"; my $submission_options; if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { @@ -1019,18 +861,16 @@ LISTJAVASCRIPT ''."\n". ''; $gradeTable .= - ' '. - &mt('Submissions: [_1]',$submission_options).'
'."\n"; + ' '.&mt('Submissions').': '.$submission_options.'
'."\n"; $gradeTable .= - ' '. - &mt('Grading Increments: [_1]', + ' '.&mt('Grading Increments').': '. ''); + ''; $gradeTable .= &build_section_inputs(). @@ -1049,15 +889,14 @@ LISTJAVASCRIPT &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'
'; } - $gradeTable.=&mt('To '.lc($viewgrade).' 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". + $gradeTable.=&mt('To [_1] 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.',lc($viewgrade)).'
'."\n". ''."\n"; # checkall buttons $gradeTable.=&check_script('gradesub', 'stuinfo'); $gradeTable.='
'."\n"; + 'value="'.&mt('Next').' →" />
'."\n"; $gradeTable.=&check_buttons(); $gradeTable.=''; my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); @@ -1177,7 +1016,7 @@ LISTJAVASCRIPT $gradeTable.=&Apache::loncommon::end_data_table()."\n". ''."\n"; + 'value="'.&mt('Next').' →" />'."\n"; if ($ctr == 0) { my $num_students=(scalar(keys(%$fullname))); if ($num_students eq 0) { @@ -1273,6 +1112,7 @@ sub processGroup { #--- Javascript to handle the submission page functionality --- sub sub_page_js { my $request = shift; + my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); $request->print(< function updateRadio(formname,id,weight) { @@ -1283,7 +1123,7 @@ sub sub_page_js { gradeBox.value = pts; var resetbox = false; if (isNaN(pts) || pts < 0) { - alert("A number equal or greater than 0 is expected. Entered value = "+pts); + alert("$alertmsg"+pts); for (var i=0; iprint(< @@ -1560,7 +1401,7 @@ INNERJS else return; var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); if (cleantxt=="") { - alert("Please select a word or group of words from document and then click this link."); + alert("$alertmsg"); return; } var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); @@ -1799,7 +1640,7 @@ sub gradeBox { my $radio.=''."\n"; # display radio buttons in a nice table 10 across while ($thisweight<=$wgt) { - $radio.= '\n"; @@ -2212,7 +2053,7 @@ KEYWORDS $lastsubonly.="\n".'
Part: '. $display_part.' ( ID '.$respid. ' )   '. - ''.&mt('Nothing submitted - no attempts').'

'; + ''.&mt('Nothing submitted - no attempts.').'

'; next; } foreach my $submission (@$string) { @@ -2490,7 +2331,7 @@ sub get_last_submission { } if (!@string) { $string[0] = - 'Nothing submitted - no attempts.'; + ''.&mt('Nothing submitted - no attempts.').''; } return (\@string,\$timestamp); } @@ -2914,8 +2755,10 @@ sub handback_files { $newflg.'_'.$part_resp.'_returndoc'.$file_counter, $save_file_name); if ($result !~ m|^/uploaded/|) { - $request->print('An error occurred ('.$result. - ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'
'); + $request->print('
'. + &mt('An error occurred ([_1]) while trying to upload [_2].', + $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter). + ''); } else { # mark the file as read only my @files = ($save_file_name); @@ -3134,6 +2977,7 @@ sub file_name_version_ext { sub viewgrades_js { my ($request) = shift; + my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); $request->print(< function writePoint(partid,weight,point) { @@ -3142,7 +2986,7 @@ sub viewgrades_js { if (point == "textval") { point = document.classgrade["TEXTVAL_"+partid].value; if (isNaN(point) || parseFloat(point) < 0) { - alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point)); + alert("$alertmsg"+parseFloat(point)); var resetbox = false; for (var i=0; i'; + &mt("Assign Common Grade to [_1]",$sectionClass,$section_display).''; $result.= &Apache::loncommon::start_data_table(); #radio buttons/text box for assigning points for a section or class. #handles different parts of a problem @@ -3372,8 +3216,8 @@ sub viewgrades { my $line = ' /'. - $weight{$partid}.' (problem weight)'."\n"; - $line.= '',$display_part,$radio,$line). $result.= &Apache::loncommon::start_data_table_row()."\n". - &mt('',$display_part,$radio,$line). + ''. &Apache::loncommon::end_data_table_row()."\n"; $ctsparts++; } @@ -3399,8 +3244,8 @@ sub viewgrades { #table listing all the students in a section/class #header of table - $result.= '

'.&mt('Assign Grade to Specific Students in '.$sectionClass, - $section_display).'

'; + $result.= '

'.&mt('Assign Grade to Specific Students in ').$sectionClass, + $section_display.'

'; $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''. @@ -3410,7 +3255,8 @@ sub viewgrades { my @partids = (); foreach my $part (@parts) { my $display=&Apache::lonnet::metadata($url,$part.'.display'); - $display =~ s|^Number of Attempts|Tries
|; # makes the column narrower + my $narrowtext = &mt('Tries'); + $display =~ s|^Number of Attempts|$narrowtext
|; # makes the column narrower if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } my ($partid) = &split_part_type($part); push(@partids,$partid); @@ -3582,9 +3428,10 @@ sub editgrades { if ($type eq 'awarded' || $type eq 'solved') { next; } my $display=&Apache::lonnet::metadata($url,$stores.'.display'); $display =~ s/\[Part: (\w)+\]//; - $display =~ s/Number of Attempts/Tries/; - $header .= ''. - ''; + my $narrowtext = &mt('Tries'); + $display =~ s/Number of Attempts/$narrowtext/; + $header .= ''. + ''; $columns{$partid}+=2; } } @@ -3926,11 +3773,12 @@ ENDPICK } sub checkforfile_js { + my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); my $result =< function checkUpload(formname) { if (formname.upfile.value == "") { - alert("Please use the browse button to select a file from your local directory."); + alert("$alertmsg"); return false; } formname.submit(); @@ -3950,8 +3798,8 @@ sub upcsvScores_form { $result.=$table; $result.='
'.&mt('Grade Status').':'."\n"; + #&mt('Part:[_1]Points:[_2]or[_3]Part:[_1]Points:[_2]or[_3]'.&mt('Part').':'.$display_part.''.&mt('Points').':'.$radio.''.&mt('or').''.$line.''.&mt('No.').''.&mt('Old '.$display).''.&mt('New '.$display).''.&mt('Old').' '.$display.''.&mt('New').' '.$display.'
'."\n"; $result.=''."\n"; + $result.=' '.&mt('Specify a file containing the class scores for current resource.'). + ''."\n"; $result.='
'."\n"; - $result.=' '.&mt('Specify a file containing the class scores for current resource'). - '.
'."\n"; my $upload=&mt("Upload Scores"); my $upfile_select=&Apache::loncommon::upfile_select_html(); @@ -4204,12 +4052,13 @@ sub csvuploadassign { sub pickStudentPage { my ($request) = shift; + my $alertmsg = &mt('Please select the student you wish to grade.'); $request->print(< function checkPickOne(formname) { if (radioSelection(formname.student) == null) { - alert("Please select the student you wish to grade."); + alert("$alertmsg"); return; } ptr = pullDownSelection(formname.selectpage); @@ -4244,7 +4093,7 @@ LISTJAVASCRIPT $ctr++; } $select.= ''; - $result.=&mt(' Problems from: [_1]',$select)."
\n"; + $result.=' '.&mt('Problems from').': '.$select."
\n"; $ctr=0; foreach (@$titles) { @@ -4259,13 +4108,13 @@ LISTJAVASCRIPT my $options = ''."\n". ''."
\n"; - $result.=' '.&mt('View Problems Text: [_1]',$options); + $result.=' '.&mt('View Problem Text').': '.$options; $options = ''."\n". ''."\n". ''."\n"; - $result.=' '.&mt('Submission Details: [_1]',$options); + $result.=' '.&mt('Submissions').': '.$options; $result.=&build_section_inputs(); my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); @@ -4274,12 +4123,10 @@ LISTJAVASCRIPT ''."\n". ''."
\n"; - $result.=' '.&mt('Use CODE: [_1] ', - ''). - '
'."\n"; + $result.=' '.&mt('Use CODE').':
'."\n"; $result.=' 
'."\n"; + 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" />
'."\n"; $request->print($result); @@ -4318,7 +4165,7 @@ LISTJAVASCRIPT } $studentTable.=&Apache::loncommon::end_data_table()."\n"; $studentTable.=''."\n"; + 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" />'."\n"; $studentTable.=&show_grading_menu_form($symb); $request->print($studentTable); @@ -4455,7 +4302,7 @@ sub displayPage { # $request->print('match='.$1."
\n"); # } # $companswer =~ s||
|g; - $studentTable.=' '.$title.' 
 '.&mt('Correct answer:
[_1]',$companswer); + $studentTable.=' '.$title.' 
 '.&mt('Correct answer').':
'.$companswer; } my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); @@ -4525,7 +4372,7 @@ sub displaySubByDates { my %orders; $mark{'correct_by_student'} = $checkIcon; if (!exists($$record{'1:timestamp'})) { - return '
 '.&mt('Nothing submitted - no attempts').'
'; + return '
 '.&mt('Nothing submitted - no attempts.').'
'; } my $interaction; @@ -5103,11 +4950,11 @@ sub scantron_CODElist { =cut sub scantron_CODEunique { - my $result=' + my $result=' - + '; @@ -6343,15 +6190,15 @@ sub scantron_validate_file { } if ($stop) { if ($validate_phases[$currentphase] eq 'sequence') { - $r->print(''); + $r->print(''); $r->print(' '.&mt('this error').'
'); $r->print("

".&mt("Or click the 'Grading Menu' button to start over.")."

"); } else { if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } $r->print(' '.&mt('using corrected info').'
'); $r->print(""); @@ -7704,7 +7551,7 @@ sub scantron_upload_scantron_data {