--- loncom/homework/inputtags.pm 2008/12/10 22:47:31 1.248.2.1 +++ loncom/homework/inputtags.pm 2010/09/13 04:26:26 1.260.4.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.248.2.1 2008/12/10 22:47:31 raeburn Exp $ +# $Id: inputtags.pm,v 1.260.4.2 2010/09/13 04:26:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,10 +25,35 @@ # # http://www.lon-capa.org/ +=pod + +=head1 NAME + +Apache::inputtags + +=head1 SYNOPSIS + + + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + + +=head1 NOTABLE SUBROUTINES + +=over + +=item + +=back + +=cut + package Apache::inputtags; use HTML::Entities(); use strict; use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::lonnet; use LONCAPA; @@ -38,41 +63,47 @@ BEGIN { &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); } -# Initializes a set of global variables used during the parse of the problem. -# -# @Apache::inputtags::input - List of current input ids. -# @Apache::inputtags::inputlist - List of all input ids seen this problem. -# @Apache::inputtags::response - List of all current resopnse ids. -# @Apache::inputtags::responselist - List of all response ids seen this -# problem. -# @Apache::inputtags::hint - List of all hint ids. -# @Apache::inputtags::hintlist - List of all hint ids seen this problem. -# @Apache::inputtags::previous - List describing if specific responseds -# have been used -# @Apache::inputtags::previous_version - Submission responses were used in. -# $Apache::inputtags::part - Current part id (valid only in -# ) -# 0 if not in a part. -# @Apache::inputtags::partlist - List of part ids seen in the current -# -# @Apache::inputtags::status - List of problem statuses. First -# element is the status of the -# the remainder are for individual s. -# %Apache::inputtags::params - Hash of defined parameters for the -# current response. -# @Apache::inputtags::import - List of all ids for thes get -# join()ed and prepended. -# @Apache::inputtags::importlist - List of all import ids seen. -# $Apache::inputtags::response_with_no_part -# - Flag set true if we have seen a response -# that is not inside a -# %Apache::inputtags::answertxt - <*response> tags store correct -# answer strings for display by -# in this hash. -# %Apache::inputtags::submission_display -# - <*response> tags store improved display -# of submission strings for display by part -# end. +=pod + +=item initialize_inputtags() + +Initializes a set of global variables used during the parse of the problem. + +@Apache::inputtags::input - List of current input ids. +@Apache::inputtags::inputlist - List of all input ids seen this problem. +@Apache::inputtags::response - List of all current resopnse ids. +@Apache::inputtags::responselist - List of all response ids seen this + problem. +@Apache::inputtags::hint - List of all hint ids. +@Apache::inputtags::hintlist - List of all hint ids seen this problem. +@Apache::inputtags::previous - List describing if specific responseds + have been used +@Apache::inputtags::previous_version - Submission responses were used in. +$Apache::inputtags::part - Current part id (valid only in + ) + 0 if not in a part. +@Apache::inputtags::partlist - List of part ids seen in the current + +@Apache::inputtags::status - List of problem statuses. First + element is the status of the + the remainder are for individual s. +%Apache::inputtags::params - Hash of defined parameters for the + current response. +@Apache::inputtags::import - List of all ids for thes get + join()ed and prepended. +@Apache::inputtags::importlist - List of all import ids seen. +$Apache::inputtags::response_with_no_part + - Flag set true if we have seen a response + that is not inside a +%Apache::inputtags::answertxt - <*response> tags store correct + answer strings for display by + in this hash. +%Apache::inputtags::submission_display + - <*response> tags store improved display + of submission strings for display by part + end. + +=cut sub initialize_inputtags { @Apache::inputtags::input=(); @@ -358,12 +389,13 @@ sub start_textline { && $Apache::lonhomework::type ne 'exam') { my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} - if ($env{'form.pdfFormFields'} eq 'yes') { + if ($env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { my $fieldname = $env{'request.symb'}. '&part_'. $Apache::inputtags::part. '&textresponse'. '&HWVAL_' . $Apache::inputtags::response['-1']; - $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; + $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; } else { $result='\framebox['.$size.'][s]{\tiny\strut}'; } @@ -424,95 +456,201 @@ sub end_hiddenline { return ""; } -# $part -> partid -# $id -> responseid -# $uploadefiletypes -> comma seperated list of extensions allowed or * for any -# $which -> 'uploadedonly' -> only newly uploaded files -# 'portfolioonly' -> only allow files from portfolio -# 'both' -> allow files from either location -# $extratext -> additional text to go between the link and the input box -# returns a table row +=pod + +=item file_selector() + +$part -> partid +$id -> responseid +$uploadefiletypes -> comma seperated list of extensions allowed or * for any +$which -> 'uploadonly' -> only newly uploaded files + 'portfolioonly' -> only allow files from portfolio + 'both' -> allow files from either location +$extratext -> additional text to go between the link and the input box +$maxfilesize -> maximum cumulative filesize for submitted files (in MB). +returns a table row + +=cut + sub file_selector { - my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_; + my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_; if (!$uploadedfiletypes) { return ''; } my $jspart=$part; $jspart=~s/\./_/g; my $result; - - $result.=''; + my $current_files_display = ¤t_file_submissions($part,$id); + my $addfiles; + if ($current_files_display) { + $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). + $current_files_display. + &Apache::lonhtmlcommon::row_closure(); + $addfiles = &mt('Submit other file(s)'); + } else { + $addfiles = &mt('Choose file(s) to submit'); + } + $result .= &Apache::lonhtmlcommon::row_title($addfiles); + my $constraints; if ($uploadedfiletypes ne '*') { - $result.= - &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'; + $constraints = + &mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.'').'
'; + } + if ($maxfilesize) { + $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].', + ''.$maxfilesize.'').'
'; + } + if ($constraints) { + $result .= $constraints.'
'; } if ($which eq 'uploadonly' || $which eq 'both') { - $result.=&mt('Submit a file: (only one file can be uploaded)'). + $result.=&mt('Submit a file: (only one file per submission)'). '

'; - $result .= &show_past_file_submission($part,$id); } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; } if ($which eq 'portfolioonly' || $which eq 'both') { $result.=$extratext.''. - &mt('Select Portfolio Files').'
'. + &mt('Select Portfolio Files: (one or more files per submission)').'
'. ''. '
'; - $result .= &show_past_portfile_submission($part,$id); } - $result.=''; + $result.=&Apache::lonhtmlcommon::row_closure(1); return $result; } -sub show_past_file_submission { - my ($part,$id) = @_; - my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); - - return if (!$uploadedfile); - - my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; - &Apache::lonxml::extlink($url); - &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); - my $icon=&Apache::loncommon::icon($url); - my $curfile=''.$uploadedfile.''; - return &mt('Currently submitted: [_1]',$curfile); - -} - -sub show_past_portfile_submission { +sub current_file_submissions { my ($part,$id) = @_; - if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){ - return; + my $jspart=$part; + $jspart=~s/\./_/g; + my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; + my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; + return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); + my $header = &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + $header .= ''.&mt('Delete?').''; + } + $header .= ''.&mt('File').''. + ''.&mt('Size (MB)').''. + ''.&mt('Last Modified').''. + &Apache::loncommon::end_data_table_header_row(); + my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); + my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); + my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); + if ($uploadedfile) { + my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; + my $link = &HTML::Entities::encode($url,'<>&"'); + my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$}); + my ($status,$hashref,$error) = + ¤t_file_info($url,$link,$name,$path); + if ($status eq 'ok') { + push(@{$okfiles{$name}},$url); + $rows{$url} = $hashref; + $legacy{$url} = 1; + &Apache::lonxml::extlink($url); + &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); + } else { + push(@bad_file_list,$error); + } + } + if ($portfiles =~ /[^\s]/) { + my $prefix = "/uploaded/$udom/$uname/portfolio"; + foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { + my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); + my $url = $prefix.$path.$name; + my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); + my ($status,$hashref,$error) = + ¤t_file_info($url,$uploadedfile,$name,$path); + if ($status eq 'ok') { + push(@{$okfiles{$name}},$url); + $rows{$url} = $hashref; + } else { + push(@bad_file_list,$error); + } + } + } + foreach my $name (sort(keys(%okfiles))) { + if (ref($okfiles{$name}) eq 'ARRAY') { + foreach my $url (@{$okfiles{$name}}) { + if (ref($rows{$url}) eq 'HASH') { + my $link = $rows{$url}{link}; + my $portfile = $rows{$url}{path}.$rows{$url}{name}; + $portfile = &HTML::Entities::encode($portfile,'<>&"'); + if ($link) { + my $icon=&Apache::loncommon::icon($url); + unless ($header_shown) { + $result .= $header; + $header_shown = 1; + } + $result.= + &Apache::loncommon::start_data_table_row()."\n"; + if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + $result .= + ''."\n"; + } + my $showname = $rows{$url}{path}.$name; + if ($legacy{$url}) { + $showname = $name.' '.&mt('not in portfolio'); + } + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + $showname = $name; + } + $result .= + ''.$showname.''."\n". + ''.$rows{$url}{size}.''."\n". + ''.$rows{$url}{lastmodified}.''."\n". + &Apache::loncommon::end_data_table_row(); + } + } + } + } + } + if ($header_shown) { + $result .= &Apache::loncommon::end_data_table(); } - my (@file_list,@bad_file_list); - foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) { - my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); - my $url="/uploaded/$domain/$user/portfolio$file"; - my $icon=&Apache::loncommon::icon($url); - push(@file_list,''.$file.''); - if (! &Apache::lonnet::stat_file($url)) { - &Apache::lonnet::logthis("bad file is $url"); - push(@bad_file_list,''.$file.''); - } - } - my $files = ''. - join(', ',@file_list). - ''; - my $result = &mt("Portfolio files previously selected: [_1]",$files); if (@bad_file_list) { - my $bad_files = ''. - join(', ',@bad_file_list). - ''; - $result.='
'.&mt('These file(s) don\'t exist: [_1]',$bad_files); + my $bad_files = ''. + join(', ',@bad_file_list). + ''; + $result.='

'. + &mt("These file(s) don't exist: [_1]",$bad_files). + '

'; } return $result; +} +sub current_file_info { + my ($url,$uploadedfile,$name,$path) = @_; + my ($status,$error,%info); + my @stat = &Apache::lonnet::stat_file($url); + if ((@stat) && ($stat[0] ne 'no_such_dir')) { + my ($lastmod,$size); + if ($stat[9] =~ /^\d+$/) { + $lastmod = &Apache::lonlocal::locallocaltime($stat[9]); + } + $size = $stat[7]/(1024*1024); + $size = sprintf("%.3f",$size); + %info = ( + link => $uploadedfile, + name => $name, + path => $path, + size => $size, + lastmodified => $lastmod, + ); + $status = 'ok'; + } else { + &Apache::lonnet::logthis("bad file is $url"); + my $icon=&Apache::loncommon::icon($url); + $error = ''.$uploadedfile.''; + } + return ($status,\%info,$error); } sub valid_award { @@ -525,8 +663,8 @@ sub valid_award { 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', 'INVALID_FILETYPE', - 'EXCESS_FILESIZE', 'DRAFT', - 'SUBMITTED', 'ASSIGNED_SCORE', + 'EXCESS_FILESIZE', 'FILENAME_INUSE', + 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { if ($award eq $possibleaward) { return 1; } } @@ -540,7 +678,8 @@ sub valid_award { 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', 'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', - 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED', + 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', + 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); my $i=0; my %fwd_awards = map { ($_,$i++) } @awards; @@ -635,6 +774,7 @@ sub finalizeawards { sub decideoutput { my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; + my $message=''; my $button=0; my $previousmsg; @@ -688,7 +828,7 @@ sub decideoutput { '.disable_receipt_display'} ne 'yes') && ($Apache::lonhomework::type ne 'practice')) { $message.=(($target eq 'web')?'
':' '). - &mt('Your receipt is [_1]', + &mt('Your receipt no. is [_1]', (&Apache::lonnet::receipt($Apache::inputtags::part). (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''))); } @@ -769,15 +909,24 @@ sub decideoutput { $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); $css_class=$possible_class{'not_charged_try'}; $button=1; - + } elsif ($award eq 'FILENAME_INUSE') { + $message = &mt('You have already uploaded a file with that filename.'); + if ($target eq 'tex') { + $message.= "\\\\\n"; + } else { + $message .= '
'; + } + $message .= &mt('Please use a different file name.'); + $css_class=$possible_class{'not_charged_try'}; + $button=1; } elsif ($award eq 'INVALID_FILETYPE') { - $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); + $message = &mt("Submission won't be graded. The type of file submitted is not allowed."); $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'SIG_FAIL') { my ($used,$min,$max)=split(':',$awardmsg); my $word = ($used < $min) ? 'more' : 'fewer'; - $message = &mt("Submission not graded. Use $word digits.",$used); + $message = &mt("Submission not graded. Use $word digits.",$used); $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { @@ -822,11 +971,17 @@ sub decideoutput { $css_class=$possible_class{'charged_try'}; $button=1; } elsif ($award eq 'SUBMITTED') { - $message = &mt("Your submission has been recorded."); + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + if ($target eq 'web') { + $message .= '
'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.'); + } + } else { + $message = &mt("Your submission has been recorded."); + } $css_class=$possible_class{'no_grade'}; $button=1; } elsif ($award eq 'DRAFT') { - $message = &mt("A draft copy has been saved."); + $message = &mt("Copy saved but not submitted."); $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'ASSIGNED_SCORE') { @@ -848,21 +1003,41 @@ sub decideoutput { my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); foreach my $resid(@Apache::inputtags::response){ if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { - $message.='
'; + if ($target eq 'tex') { + $message.= "\\\\\n"; + } else { + $message.='
'; + } my @files = split(/\s*,\s*/, $Apache::lonhomework::history{"resource.$part.$resid.handback"}); my $file_msg; foreach my $file (@files) { - $file_msg.= '
'.$file.''; + if ($target eq 'tex') { + $file_msg.= "\\\\\n".$file; + } else { + $file_msg.= '
'.$file.''; + } } $message .= &mt('Returned file(s): [_1]',$file_msg); + if ($target eq 'tex') { + $message.= "\\\\\n"; + } else { + $message.='
'; + } } } if (&Apache::lonhomework::hide_problem_status() && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER' && &hide_award($award)) { - $message = &mt("Answer Submitted: Your final submission will be graded after the due date."); + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + if ($target eq 'web') { + $message = &mt("Your submission has been recorded.").'
'. + &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.'); + } + } else { + $message = &mt("Answer Submitted: Your final submission will be graded after the due date."); + } $css_class=$possible_class{'no_grade'}; $button=1; } @@ -1177,16 +1352,20 @@ sub get_grade_messages { $trystr = '\vskip 0 mm '; } } else { - $trystr = "".$tries_text." $tries"; - if ($Apache::lonhomework::parsing_a_task) { - } elsif($env{'request.state'} ne 'construct') { - $trystr.="/$maxtries"; - } else { - if (defined($Apache::inputtags::params{'maxtries'})) { - $trystr.="/".$Apache::inputtags::params{'maxtries'}; - } - } - $trystr.=""; + $trystr = ''; + my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'}); + if ($parmhash{'suppress_tries'} ne 'yes') { + $trystr .= "$tries_text $tries"; + if ($Apache::lonhomework::parsing_a_task) { + } elsif($env{'request.state'} ne 'construct') { + $trystr.="/$maxtries"; + } else { + if (defined($Apache::inputtags::params{'maxtries'})) { + $trystr.="/".$Apache::inputtags::params{'maxtries'}; + } + } + } + $trystr.=""; } } @@ -1228,12 +1407,14 @@ sub gradestatus { } if ( $showbutton ) { if ($target ne 'tex') { + my $submit_text = &mt('Submit Answer'); + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + $submit_text = &mt('Submit Questions'); + } $button = - ''; + ''; } } @@ -1329,8 +1510,12 @@ sub previous_tries { $output.='
'; my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); + my $pagetitle = 'Previous Tries'; + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + $pagetitle = 'Submission History'; + } my $start_page = - &Apache::loncommon::start_page('Previous Tries', undef, + &Apache::loncommon::start_page($pagetitle, undef, {'only_body' => 1, 'bgcolor' => '#FFFFFF', 'js_ready' => 1, @@ -1341,11 +1526,15 @@ sub previous_tries { $prefix =~ tr{.}{_}; my $function_name = "LONCAPA_previous_tries_".$prefix. $Apache::lonxml::curdepth.'_'.$env{'form.counter'}; + my $triestext = &mt('Previous Tries'); + if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { + $triestext = &mt('Submission History'); + } my $result ="".&mt("Previous Tries")."
"; +".$triestext."
"; #use Data::Dumper; #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); return $result; @@ -1353,4 +1542,10 @@ sub previous_tries { 1; __END__ + +=pod + +=back + +=cut 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.