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

Diff for /loncom/homework/grades.pm between versions 1.113 and 1.115

version 1.113, 2003/07/14 14:29:07 version 1.115, 2003/07/14 16:11:19
Line 2662  sub getSymbMap { Line 2662  sub getSymbMap {
     my ($request) = @_;      my ($request) = @_;
     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',      my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
   $ENV{'request.course.fn'}.'_parms.db',1, 1);    $ENV{'request.course.fn'}.'_parms.db',1, 1);
   
     #my $res = $navmap->firstResource(); # temp resource to access constants  
     $navmap->init();      $navmap->init();
   
     # End navmap using boilerplate      # End navmap using boilerplate
   
     my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, 1, undef, 1);      my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, undef, 1, undef, 1);
     my $depth = 1;      my $depth = 1;
     my $curRes = $iterator->next();      my $curRes = $iterator->next();
   
Line 2676  sub getSymbMap { Line 2674  sub getSymbMap {
     my @titles = ();      my @titles = ();
     my $minder=0;      my $minder=0;
     my $seenBeginMap = 0;      my $seenBeginMap = 0;
     while ($depth > 0 && !$seenBeginMap) {      while ($depth > 0 || !$seenBeginMap) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }          if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }
         if ($curRes == $iterator->END_MAP()) { $depth--; }          if ($curRes == $iterator->END_MAP()) { $depth--; }
   
Line 2814  sub displayPage { Line 2812  sub displayPage {
  my @versionKeys = split(/\:/,$record{$version.':keys'});   my @versionKeys = split(/\:/,$record{$version.':keys'});
  my @displaySub = ();   my @displaySub = ();
  foreach my $partid (@{$parts}) {   foreach my $partid (@{$parts}) {
       my $responseType = $curRes->responseType($partid);
     my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;      my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
     next if ($record{"$version:resource.$partid.solved"} eq '');      next if ($record{"$version:resource.$partid.solved"} eq '');
 #    next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' &&   #    next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' && 
 #     $record{"$version:resource.$partid.solved"} eq '');  #     $record{"$version:resource.$partid.solved"} eq '');
     $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?       $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ? 
  '<b>Part&nbsp;'.$partid.'&nbsp;'.   '<b>Part&nbsp;'.$partid.'&nbsp;Type:'.$responseType.':endtype'.
  ($record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :   ($record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
  'Trial&nbsp;'.$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.   'Trial&nbsp;'.$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
  $record{$version.':'.$matchKey[0]}.'<br />' : '';   $record{$version.':'.$matchKey[0]}.'<br />' : '';
Removed from v.1.113  
changed lines
  Added in v.1.115

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