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

Diff for /loncom/homework/bridgetask.pm between versions 1.217 and 1.224.2.2

version 1.217, 2007/01/10 22:46:22 version 1.224.2.2, 2007/03/26 23:33:26
Line 591  sub start_Task { Line 591  sub start_Task {
     &Apache::structuretags::page_start($target,$token,$tagstack,      &Apache::structuretags::page_start($target,$token,$tagstack,
        $parstack,$parser,$safeeval,         $parstack,$parser,$safeeval,
        $name,&style($target));         $name,&style($target));
  $result .= '<div class="LC_task">'."\n";  
     }      }
   
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {      if ($target eq 'web' && $env{'request.state'} ne 'construct') {
Line 640  sub start_Task { Line 639  sub start_Task {
   'slot' => $slot_name});    'slot' => $slot_name});
     ($version,$previous)=&get_version();      ($version,$previous)=&get_version();
  }   }
   
    my $status_id = 
       ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
                                               : 'LC_task_take';
    $result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
   
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
Line 707  sub start_Task { Line 711  sub start_Task {
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
       $result .= '<div class="LC_task">'."\n";
     $result.= "\n".'<div class="LC_GRADING_task">'."\n".      $result.= "\n".'<div class="LC_GRADING_task">'."\n".
  '<script type="text/javascript"    '<script type="text/javascript" 
                          src="/res/adm/includes/task_grading.js"></script>';                           src="/res/adm/includes/task_grading.js"></script>';
Line 863  sub get_key_todo { Line 868  sub get_key_todo {
  my ($symb,$cid)=&Apache::lonnet::whichuser();   my ($symb,$cid)=&Apache::lonnet::whichuser();
  my $cnum  = $env{'course.'.$cid.'.num'};   my $cnum  = $env{'course.'.$cid.'.num'};
  my $cdom  = $env{'course.'.$cid.'.domain'};   my $cdom  = $env{'course.'.$cid.'.domain'};
  my $uname = $env{'form.gradinguser'};   my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
  my $udom  = $env{'form.gradingdomain'};   my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});
   
  my $gradingkey=&encode_queue_key($symb,$udom,$uname);   my $gradingkey=&encode_queue_key($symb,$udom,$uname);
   
Line 2240  sub end_Dimension { Line 2245  sub end_Dimension {
     my $result=&Apache::lonxml::endredirection();      my $result=&Apache::lonxml::endredirection();
     my $dim=&get_id($parstack,$safeeval);      my $dim=&get_id($parstack,$safeeval);
     if (&skip_dimension_parsing($dim)) {      if (&skip_dimension_parsing($dim)) {
  &disable_dimension_parsing($dim);  
  pop(@Apache::bridgetask::dimension);   pop(@Apache::bridgetask::dimension);
  return;   return;
     }      }
Line 2285  sub end_Dimension { Line 2289  sub end_Dimension {
     ('sub' x $dimension{$dim}{'depth'}).'question';      ('sub' x $dimension{$dim}{'depth'}).'question';
  $ucquestion =~ s/^(.)/uc($1)/e;   $ucquestion =~ s/^(.)/uc($1)/e;
  if ($dim_status eq 'pass') {   if ($dim_status eq 'pass') {
     $dim_info.='<h3>'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'</h3>';      $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
  }   }
  if ($dim_status eq 'fail') {   if ($dim_status eq 'fail') {
     $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'</h3>';      $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
  }   }
  my %counts = &get_counts($dim,$instance,$parstack,   my %counts = &get_counts($dim,$instance,$parstack,
  $safeeval);   $safeeval);
Line 2318  sub end_Dimension { Line 2322  sub end_Dimension {
     }      }
  }   }
  # puts the results at the end of the dimension   # puts the results at the end of the dimension
  $result .= $dim_info;   if ($result =~m{<QuestionGradeInfo\s*/>}) {
       $result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
    } else {
       $result .= $dim_info;
    }
  # puts the results at the beginning of the dimension   # puts the results at the beginning of the dimension
  # my $internal_location=&internal_location($dim);   # my $internal_location=&internal_location($dim);
  # $result=~s/\Q$internal_location\E/$dim_info/;   # $result=~s/\Q$internal_location\E/$dim_info/;
Line 2481  sub question_status_message { Line 2488  sub question_status_message {
     $status .= '.';      $status .= '.';
     if ($counts->{'opt'}) {      if ($counts->{'opt'}) {
  $status .= ' You were required to pass '.$counts->{'opt_req'}.   $status .= ' You were required to pass '.$counts->{'opt_req'}.
     ' optional component'.($counts->{'opt_req'} == 1?'':'s');      ' optional ';
    if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
       $status .=
    ($counts->{'opt_req'} == 1?'criterion':'criteria');
    } else {
       $status .=
    'component'.($counts->{'opt_req'} == 1?'':'s');
    }
    $status .= '.';
     }      }
     return $status;      return $status;
 }  }
Line 2821  sub proctor_validation_screen { Line 2836  sub proctor_validation_screen {
     .'</font></p>';      .'</font></p>';
     }      }
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }      if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
       $uri = &HTML::Entities::encode($uri,'<>&"');
     my $result= (<<ENDCHECKOUT);      my $result= (<<ENDCHECKOUT);
 <h2>Proctor Validation</h2>  <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>      <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg      $msg
 <form name="checkout" method="post" action="$env{'request.uri'}">  <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />  <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />  <input type="hidden" name="submitted" value="yes" />
 <table>  <table>
Removed from v.1.217  
changed lines
  Added in v.1.224.2.2

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