[BACK]Return to inputtags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.333.2.1 and 1.336

version 1.333.2.1, 2015/03/19 08:40:38 version 1.336, 2015/06/18 20:18:54
Line 640  sub file_selector { Line 640  sub file_selector {
     my $current_files_display = &current_file_submissions($part,$id);      my $current_files_display = &current_file_submissions($part,$id);
     my $addfiles;      my $addfiles;
     if ($current_files_display) {      if ($current_files_display) {
         $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).          $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
                    $current_files_display.                     $current_files_display.
                    &Apache::lonhtmlcommon::row_closure();                     &Apache::lonhtmlcommon::row_closure();
         $addfiles = &mt('Submit other file(s)');          $addfiles = &mt('Submit other file(s)');
Line 661  sub file_selector { Line 661  sub file_selector {
         $result .= $constraints.'<br />';          $result .= $constraints.'<br />';
     }      }
     if ($which eq 'uploadonly' || $which eq 'both') {       if ($which eq 'uploadonly' || $which eq 'both') { 
  $result.=&mt('Submit a file: (only one file per submission)').          my $free_space = $maxfilesize * 1048576;
     ' <br /><input type="file" size="50" name="HWFILE'.          $result .= &mt('Submit a file: (only one file per submission)').
     $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';              ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
     }              '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'.
               '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'
           }
     if ( $which eq 'both') {      if ( $which eq 'both') {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }      }
Line 698  sub current_file_submissions { Line 700  sub current_file_submissions {
     my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};      my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
     my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};      my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
     return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));      return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
       my @unversioned;
       foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
           my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
           my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
           unless ($version) {
               push(@unversioned,$file);
           }    
       }
       return if (!@unversioned);
     my $header = &portpath_popup_js().      my $header = &portpath_popup_js().
                  &Apache::loncommon::start_data_table().                   &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();                   &Apache::loncommon::start_data_table_header_row();
Line 708  sub current_file_submissions { Line 719  sub current_file_submissions {
                  '<th>'.&mt('Size (MB)').'</th>'.                   '<th>'.&mt('Size (MB)').'</th>'.
                  '<th>'.&mt('Last Modified').'</th>'.                   '<th>'.&mt('Last Modified').'</th>'.
                  &Apache::loncommon::end_data_table_header_row();                   &Apache::loncommon::end_data_table_header_row();
     my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();      my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
     my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);      my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
     my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);      my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
     if ($uploadedfile) {      if ($uploadedfile) {
Line 727  sub current_file_submissions { Line 738  sub current_file_submissions {
             push(@bad_file_list,$error);              push(@bad_file_list,$error);
         }          }
     }      }
     if ($portfiles =~ /[^\s]/) {      if (@unversioned > 0) {
         my $prefix = "/uploaded/$udom/$uname/portfolio";          my $prefix = "/uploaded/$udom/$uname/portfolio";
         foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {          foreach my $file (@unversioned) {
             my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});              my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
             my $url = $prefix.$path.$name;              my $url = $prefix.$path.$name;
             my $uploadedfile = &HTML::Entities::encode($url,'<>&"');              my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
Line 897  sub valid_award { Line 908  sub valid_award {
   
 {  {
     my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',      my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
   'WRONG_NUMCHECKEDBOXES','TOO_LONG',    'WRONG_NUMBOXESCHECKED','TOO_LONG',
   'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',    'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
   'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',    'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
   'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION',     'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
Line 987  sub finalizeawards { Line 998  sub finalizeawards {
  $j++;   $j++;
     }      }
   
       # if at least one response item is set to include lenient grading
       # and that item is partially correct then overall award reflects
       # that, unless an award for one of the other response items does
       # not fall within the basic awards for correct or incorrect.
       if ($Apache::inputtags::leniency) {
           if (($$awardref[$which] eq 'INCORRECT')
               && (grep { $_ eq 'EXACT_ANS' ||
                          $_ eq 'APPROX_ANS' ||
                          $_ eq 'ASSIGNED_SCORE' } (@$awardref))
               && !((grep { $_ ne 'INCORRECT' &&
                            $_ ne 'EXACT_ANS' &&
                            $_ ne 'APPROX_ANS' &&
                            $_ ne 'ASSIGNED_SCORE' } (@$awardref)))) {
               return ('ASSIGNED_SCORE');
           }
       }
   
     if (defined($which)) {      if (defined($which)) {
  if (ref($nameref)) {   if (ref($nameref)) {
     return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);      return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
Removed from v.1.333.2.1  
changed lines
  Added in v.1.336

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>