Diff for /loncom/homework/bridgetask.pm between versions 1.182 and 1.184.2.1

version 1.182, 2006/09/28 18:59:11 version 1.184.2.1, 2006/11/06 16:03:45
Line 392  sub submission_time_stamp { Line 392  sub submission_time_stamp {
     my $submissiontime;      my $submissiontime;
     my $version=$Apache::lonhomework::history{'resource.0.version'};      my $version=$Apache::lonhomework::history{'resource.0.version'};
     for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {      for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
  if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {   if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})
       && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) {
     $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};      $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
     last;      last;
  }   }
Line 1101  DONEBUTTON Line 1102  DONEBUTTON
     if ($award eq 'SUBMITTED') {      if ($award eq 'SUBMITTED') {
  &add_to_queue('gradingqueue',\%queue_data);   &add_to_queue('gradingqueue',\%queue_data);
     }      }
  } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {  
     &Apache::structuretags::finalize_storage();  
  }   }
  if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes'    if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
     && exists($env{'form.cancel'})) {      && exists($env{'form.cancel'})) {
Line 1213  DONEBUTTON Line 1212  DONEBUTTON
     &minimize_storage();      &minimize_storage();
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
    if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
       # instance generation occured and hasn't yet been stored
       &Apache::structuretags::finalize_storage();
    }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</div>";   $result.="</div>";
  #$result.='<input type="submit" name="next" value="'.   #$result.='<input type="submit" name="next" value="'.
Line 2226  sub get_criteria { Line 2229  sub get_criteria {
     &nested_parse(\$dimension{$dim}{'criteria.'.$id},      &nested_parse(\$dimension{$dim}{'criteria.'.$id},
   [@_],{'set_dim_id' => $id});    [@_],{'set_dim_id' => $id});
  $result.='</p><p class="LC_grade">'.$status_display.'</p>';   $result.='</p><p class="LC_grade">'.$status_display.'</p>';
  if ($comment) {   if ($comment =~ /\w/) {
     $result.='<p class="LC_comment">'.      $result.='<p class="LC_comment">'.
  &mt('Comment: [_1]',$comment).'</p>';   &mt('Comment: [_1]',$comment).'</p>';
  }   }

Removed from v.1.182  
changed lines
  Added in v.1.184.2.1


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