--- loncom/homework/grades.pm 2018/10/08 19:04:06 1.751 +++ loncom/homework/grades.pm 2019/01/27 23:16:25 1.755 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.751 2018/10/08 19:04:06 raeburn Exp $ +# $Id: grades.pm,v 1.755 2019/01/27 23:16:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,6 +46,7 @@ use Apache::lonenc; use Apache::lonstathelpers; use Apache::lonquickgrades; use Apache::bridgetask(); +use Apache::lontexconvert(); use String::Similarity; use LONCAPA; @@ -2120,6 +2121,7 @@ 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( @@ -2250,11 +2252,24 @@ sub submission { # # Load the other essays for similarity check # - my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); - my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); - $apath=&escape($apath); - $apath=~s/\W/\_/gs; - &init_old_essays($symb,$apath,$adom,$aname); + (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); + if ($essayurl eq 'lib/templates/simpleproblem.problem') { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + if ($cdom ne '' && $cnum ne '') { + my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb); + if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) { + my $apath = $1.'_'.$id; + $apath=~s/\W/\_/gs; + &init_old_essays($symb,$apath,$cdom,$cnum); + } + } + } else { + my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); + $apath=&escape($apath); + $apath=~s/\W/\_/gs; + &init_old_essays($symb,$apath,$adom,$aname); + } } } @@ -2405,24 +2420,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). + '
'; } } } @@ -5762,7 +5805,7 @@ sub scantron_uploads { sub scantron_scantab { my $result=' - '.&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.').' + + '.&Apache::loncommon::end_data_table_header_row().' + '.&Apache::loncommon::start_data_table_row().' + + '.&mt('File to upload: [_1]','').'
'."\n"); + if ($formatoptions) { + $r->print(' + '.&Apache::loncommon::end_data_table_row().' + '.&Apache::loncommon::start_data_table_row().' + '.$formattitle.(' 'x2).$formatoptions.' + + '.&Apache::loncommon::end_data_table_row().' + '.&Apache::loncommon::start_data_table_row().' + ' + ); + } else { + $r->print('
'); + } + $r->print(' + + '.&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: @@ -6066,98 +6063,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 @@ -6205,7 +6110,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 @@ -6888,7 +6793,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'}; @@ -7057,7 +6962,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'} && @@ -7213,7 +7118,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()); @@ -7673,7 +7578,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; @@ -8143,7 +8048,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. @@ -8307,7 +8212,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'}) { @@ -8381,7 +8286,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(); @@ -8563,7 +8468,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(); @@ -8692,7 +8597,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?','
'). @@ -8711,7 +8616,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(); @@ -8779,7 +8684,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; @@ -9106,6 +9011,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', @@ -9145,6 +9051,7 @@ sub scantron_upload_scantron_data { return; } + '.$formatjs.' ')); $r->print('

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

@@ -9160,7 +9067,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). @@ -9173,6 +9085,78 @@ 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 (keys(%{$domconfig{'scantron'}{'config'}{'csv'}})) { + 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 (keys(%{$domconfig{'scantron'}{'config'}{'csv'}})) { + $formattitle = &mt('Format of bubblesheet data file:'); + $formatoptions = &scantron_scantab(); + } + } + } + } + return ($formatoptions,$formattitle,$formatjs); +} sub scantron_upload_scantron_data_save { my($r,$symb)=@_; @@ -9199,8 +9183,34 @@ 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 (keys(%{$domconfig{'scantron'}{'config'}{'csv'}}) > 1) { + $is_csv = 1; + } + } + } + } elsif (@possibles == 1) { + if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { + if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}}) > 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( @@ -9245,7 +9255,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); @@ -9386,14 +9396,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(); @@ -9717,22 +9727,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 ------- # @@ -10625,13 +10619,21 @@ 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) { @@ -10815,7 +10817,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); @@ -10829,7 +10832,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'})||