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

Diff for /loncom/homework/bridgetask.pm between versions 1.59 and 1.76

version 1.59, 2005/10/01 03:27:44 version 1.76, 2005/11/04 15:31:53
Line 68  sub proctor_check_auth { Line 68  sub proctor_check_auth {
     foreach my $possible (@allowed) {      foreach my $possible (@allowed) {
  my ($puser,$pdom)=(split('@',$possible));   my ($puser,$pdom)=(split('@',$possible));
  if ($puser eq $user && $pdom eq $domain) {   if ($puser eq $user && $pdom eq $domain) {
     my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);      my $authenticated=0;
     if ($authhost ne 'no_host') {      if ( $slot->{'secret'} =~ /\S/ &&
    $env{'form.proctorpassword'} eq $slot->{'secret'} ) {
    $authenticated=1;
       } else {
   
    my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
    if ($authhost ne 'no_host') {
       $authenticated=1;
    }
       }
       if ($authenticated) {
  my $version=   my $version=
     $Apache::lonhomework::results{'resource.version'}=      $Apache::lonhomework::results{'resource.version'}=
     ++$Apache::lonhomework::history{'resource.version'};      ++$Apache::lonhomework::history{'resource.version'};
Line 294  sub show_task { Line 304  sub show_task {
        ( $status eq 'INVALID_ACCESS') )) {         ( $status eq 'INVALID_ACCESS') )) {
  return 0;   return 0;
     }      }
       if ($env{'form.donescreen'}) { return 0; }
     return 1;      return 1;
 }  }
   
Line 302  sub internal_location { Line 313  sub internal_location {
     return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';      return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
 }  }
   
   sub submission_time_stamp {
       my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $submissiontime;
       my $version=$Apache::lonhomework::history{'resource.version'};
       for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
    if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
       $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
    }
       }
       my $result;
       if ($submissiontime) {
    my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
    my %slot=&Apache::lonnet::get_slot($slot_name);
    my $diff = $slot{'endtime'} - $submissiontime;
    my ($color,$when)=('#FF6666','after');
    if ($diff > 0) { ($color,$when)=('#336600','before'); }
    my $info;
    if ($diff%60) { $info=($diff%60).' seconds'; }
    $diff=int($diff/60);
    if ($diff%60) { $info=($diff%60).' minutes '.$info; }
    $diff=int($diff/60);
    if ($diff) {    $info=$diff.' hours '.$info; }
    $result='<p><font color="'.$color.'">'.
       &mt('Student submitted [_1] [_2] the deadline. 
                    (Submission was at [_3], end of period was [_4].)',
    $info,$when,scalar(localtime($submissiontime)),
    scalar(localtime($slot{'endtime'}))).
    '</font></p>';
       }
       return $result;
   }
   
   sub webgrade_standard_info {
       my ($version)=&get_version();
       my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
       my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
       my $file_list="<ul>\n";
       foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
    my $file=$file_url.$partial_file;
    $file=~s|/+|/|g;
    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
    $file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
       &Apache::loncommon::icon($file).'" border=0"> '.$file.
       '</a></nobr></li>'."\n";
       }
       $file_list.="</ul>\n";
   
       my %lt=&Apache::lonlocal::texthash('done' => 'Done',
          'stop' => 'Stop',
          );
          
       my $result=<<INFO;
   <div class="handininfo">
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
     $file_list
   </div>
   INFO
       return $result;
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {      if ($target ne 'webgrade') {
    &Apache::structuretags::init_problem_globals('Task');
  &Apache::structuretags::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
    if ($env{'request.state'} eq 'construct') {
       &Apache::structuretags::setup_rndseed($safeeval);
    }
     }       } 
   
     $Apache::lonhomework::parsing_a_task=1;      $Apache::lonhomework::parsing_a_task=1;
Line 316  sub start_Task { Line 392  sub start_Task {
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);   &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
           
     if ($target eq 'web') {      if ($target eq 'web' && $env{'request.state'} ne 'construct') {
  if ($Apache::lonhomework::modifygrades) {   if ($Apache::lonhomework::modifygrades) {
     $body_tag_start.='<form name="gradesubmission" method="POST" action="';      $body_tag_start.='<form name="gradesubmission" method="POST" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
Line 333  sub start_Task { Line 409  sub start_Task {
     }      }
  }   }
     }      }
       if ($target eq 'web' && $env{'request.state'} eq 'construct') {
    $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
       }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||      if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  my ($version,$previous)=&get_version();   my ($version,$previous)=&get_version();
Line 349  sub start_Task { Line 428  sub start_Task {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>'.$body_tag_start;   $result.= $head_tag_start.'</head>'.$body_tag_start;
    if ($env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
    }
  my $msg;   my $msg;
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';      $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
Line 360  sub start_Task { Line 442  sub start_Task {
  '</h1>'.&proctor_validation_screen($slot);   '</h1>'.&proctor_validation_screen($slot);
  } elsif ($status eq 'WAITING_FOR_GRADE') {   } elsif ($status eq 'WAITING_FOR_GRADE') {
     $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';      $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
    } elsif ($env{'form.donescreen'}) {
       my $title=&Apache::lonnet::gettitle();
       my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
       my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
       $result.=<<DONESCREEN;
   <h2>$title</h2>
   <p> Files submitted: $files </p>
   <p> You are now done with this Bridge Task </p>
   <hr />
   <p> <a href="/adm/logout">Logout</a> </p>
   <p> <a href="/adm/roles">Change to a different course</a> </p>
   DONESCREEN
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
Line 446  sub start_Task { Line 540  sub start_Task {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
  }   }
  if ($target eq 'webgrade' && defined($env{'form.queue'})) {   if ($target eq 'webgrade' && defined($env{'form.queue'})) {
       if ($webgrade eq 'yes') {
    $result.=&submission_time_stamp();
       }
     $result.=$form_tag_start;      $result.=$form_tag_start;
     $result.='<input type="hidden" name="webgrade" value="'.      $result.='<input type="hidden" name="webgrade" value="'.
  $webgrade.'" />';   $webgrade.'" />';
Line 455  sub start_Task { Line 552  sub start_Task {
  $result.='<input type="hidden" name="regrade" value="'.   $result.='<input type="hidden" name="regrade" value="'.
     $env{'form.regrade'}.'" />';      $env{'form.regrade'}.'" />';
     }      }
  }      if ($env{'form.chosensections'}) {
    my @chosen_sections=
       &Apache::loncommon::get_env_multiple('form.chosensections');
    foreach my $sec (@chosen_sections) {
       $result.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
       }
       if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    }
       } elsif ($target eq 'edit') {
    $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
       &Apache::structuretags::problem_edit_header();
    $Apache::lonxml::warnings_error_header=
       &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
    my $temp=&Apache::edit::insertlist($target,$token);
    $result.=$temp;
     } else {      } else {
  # page_start returned a starting result, delete it if we don't need it   # page_start returned a starting result, delete it if we don't need it
  $result = '';   $result = '';
Line 562  sub end_Task { Line 675  sub end_Task {
     my ($version,$previous)=&get_version();      my ($version,$previous)=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  if (   if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||  
     ($target eq 'answer') || ($target eq 'tex')  
    ) {  
     if ($target eq 'web') {      if ($target eq 'web') {
  if (&show_task($status,$previous)) {   if (&show_task($status,$previous)) {
     $result.=&Apache::lonxml::endredirection();      $result.=&Apache::lonxml::endredirection();
  }   }
  if ($status eq 'CAN_ANSWER' && !$previous) {   if ($status eq 'CAN_ANSWER' && !$previous && 
       !$env{'form.donescreen'}) {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector("$version.0",   &Apache::inputtags::file_selector("$version.0",
   "bridgetask","*",    "bridgetask","*",
Line 580  sub end_Task { Line 691  sub end_Task {
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').  <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
       $result.='</form>';
       $result.=<<DONEBUTTON;
   <form method="POST">
      <input type="hidden" name="donescreen" value="1" />
      <input type="submit" value="Done" />
   </form>
   DONEBUTTON
  }   }
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
Line 645  sub end_Task { Line 763  sub end_Task {
     $award;      $award;
  $Apache::lonhomework::results{"resource.0.submission"}=   $Apache::lonhomework::results{"resource.0.submission"}=
     $Apache::lonhomework::results{"resource.$version.0.submission"}='';      $Apache::lonhomework::results{"resource.$version.0.submission"}='';
       } else {
    delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
     }      }
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
Line 761  sub end_Task { Line 881  sub end_Task {
  #    &mt('Save Partial Grade and Continue Grading').'" /> ';   #    &mt('Save Partial Grade and Continue Grading').'" /> ';
  $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';   $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.=&Apache::response::meta_package_write('Task');
  #$result.=&Apache::response::meta_part_order();          $result.=&meta_stores_write('solved','string','Problem Status');
  #$result.=&Apache::response::meta_response_order();   $result.=&meta_stores_write('tries','int_zeropos',
       'Number of Attempts');
    $result.=&meta_stores_write('awarded','float',
       'Partial Credit Factor');
    $result.=&meta_stores_write('status','string',
       'Bridge Task Status');
     }      }
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
Line 885  sub show_queue { Line 1010  sub show_queue {
     &Apache::grades::init_perm();      &Apache::grades::init_perm();
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();      &Apache::grades::reset_perm();
       if (!(grep(/^all$/,@chosen_sections))) {
    $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
       '</tt>.</p> '."\n";
       }
   
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
Line 924  sub show_queue { Line 1053  sub show_queue {
  ($action,$description)=('unlock',&mt('Unlock'));   ($action,$description)=('unlock',&mt('Unlock'));
     }      }
  }   }
    my $seclist;
    foreach my $sec (@chosen_sections) {
       $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
  if (time > $slot_data{'endtime'}) {   if (time > $slot_data{'endtime'}) {
     $result.=(<<FORM);      $result.=(<<FORM);
 <td>  <td>
Line 934  sub show_queue { Line 1068  sub show_queue {
  <input type="hidden" name="webgrade" value="no" />   <input type="hidden" name="webgrade" value="no" />
  <input type="hidden" name="queuemode" value="selected" />   <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />   <input type="submit" name="submit" value="$description" />
    $seclist
 </form>  </form>
 </td>  </td>
 FORM  FORM
Line 1013  sub queue_key_locked { Line 1148  sub queue_key_locked {
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;      my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     foreach my $key (keys(%$queuedata)) {      foreach my $key (keys(%$queuedata)) {
    if ($key =~ /\0locked$/) { next; }
    if ($key =~ /\0timestamp$/) { next; }
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section=&Apache::lonnet::getsection($uname,$udom);
Line 1138  sub get_from_queue { Line 1275  sub get_from_queue {
   
 sub select_user {  sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();      my ($symb,$cid)=&Apache::lonxml::whichuser();
     my $result.='<table border="1">';  
   
     my @chosen_sections=      my @chosen_sections=
  &Apache::loncommon::get_env_multiple('form.chosensections');   &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();      &Apache::grades::init_perm();
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();      &Apache::grades::reset_perm();
       
       my $result;
       if (!(grep(/^all$/,@chosen_sections))) {
    $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
       '</tt>.</p> '."\n";
       }
       $result.='<table border="1">';
   
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {      foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
Line 1169  sub select_user { Line 1312  sub select_user {
     $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.      $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
  '</td><td>';   '</td><td>';
  } else {   } else {
       my $seclist;
       foreach my $sec (@chosen_sections) {
    $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
       }
     $result.=<<RESULT;      $result.=<<RESULT;
 <tr>  <tr>
   <td>    <td>
Line 1177  sub select_user { Line 1325  sub select_user {
       <input type="hidden" name="queue" value="$queue" />        <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />        <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />        <input type="hidden" name="regrade" value="yes" />
      <input type="submit" name="submit" value="Regrade" />        <input type="submit" name="submit" value="Regrade" />
         $seclist
     </form>      </form>
   <td>$fullname->{$student}</td>    <td>$fullname->{$student}</td>
   <td>    <td>
Line 1278  sub start_Dimension { Line 1427  sub start_Dimension {
 }  }
   
 sub get_instance {  sub get_instance {
     &Apache::response::pushrandomnumber();      my ($dim)=@_;
     my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});      my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $num=@order;      if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
     my $version=&get_version();   $rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
     my $which=($version-1)%$num;   $rand_alg eq '64bit4' ) {
     return $order[$which];   &Apache::response::pushrandomnumber();
    my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
    my $num=@order;
    my $version=&get_version();
    my $which=($version-1)%$num;
    return $order[$which];
       } else {
    my ($version,$previous) = &get_version();
    my $instance = 
       $Apache::lonhomework::history{"resource.$version.0.$dim.instance"};
    if (defined($instance)) { return $instance; }
   
    &Apache::response::pushrandomnumber();
    my @instances = @{$dimension{'instances'}};
    # remove disabled instances
    for (my $i=0; $i < $#instances; $i++) {
       if ($dimension{$instances[$i].'.disabled'}) {
    splice(@instances,$i,1);
    $i--;
       }
    }
    @instances = &Math::Random::random_permutation(@instances);
    $instance  = $instances[($version-1)%scalar(@instances)];
    $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
       $instance;
    &Apache::response::poprandomnumber();
    return $instance;
       }
 }  }
   
 {  {
Line 1292  sub get_instance { Line 1468  sub get_instance {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $result=&Apache::lonxml::endredirection();   my $result=&Apache::lonxml::endredirection();
  my $dim=&get_id($parstack,$safeeval);   my $dim=&get_id($parstack,$safeeval);
  my $instance=&get_instance();   my $instance=&get_instance($dim);
  my $version=&get_version();   my $version=&get_version();
  if ($target eq 'web') {   if ($target eq 'web') {
     @Apache::scripttag::parser_env = @_;      @Apache::scripttag::parser_env = @_;
     $result.=&Apache::scripttag::xmlparse($dimension{'intro'});      $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
     @Apache::scripttag::parser_env = @_;      my @instances = $instance;
     $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});      if (&Apache::response::showallfoils()) {
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||   @instances = @{$dimension{'instances'}};
  $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      }
       foreach my $instance (@instances) {
  my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};   @Apache::scripttag::parser_env = @_;
  my $mandatory='Mandatory';   $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
  if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {   if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
     $mandatory='Optional';      $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
  }  
  my $dim_info="<div class='$dim_status'>\n";      my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
  if ($dim_status eq 'pass') {      my $mandatory='Mandatory';
     $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';      if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
  }  
  if ($dim_status eq 'fail') {  
     $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';  
  }  
  my $man_count=0;  
  my $opt_count=0;  
  my $opt_passed=0;  
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {  
     if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}   
  eq 'N') {  
  $opt_count++;  
  if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {  
     $opt_passed++;  
  }  
     } else {  
  $man_count++;  
     }  
  }  
  my $opt_req=&Apache::lonxml::get_param('OptionalRequired',  
        $parstack,$safeeval);  
  if ($opt_req !~ /\S/) { $opt_req='0'; }  
  $dim_info.="\n<p>".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)."</p>\n</div>";  
   
  my $internal_location=&internal_location($dim);  
  $result=~s/\Q$internal_location\E/$dim_info/;  
   
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {  
     my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};  
     my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};  
     my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');  
     if ($mandatory) {  
  $mandatory='Mandatory';  
     } else {  
  $mandatory='Optional';   $mandatory='Optional';
     }      }
     if ($status eq 'fail') {      my $dim_info="<div class='$dim_status'>\n";
     } elsif ($status eq 'pass') {      if ($dim_status eq 'pass') {
     } else {   $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
  &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");  
     }      }
     my $status_display=$status;      if ($dim_status eq 'fail') {
     $status_display=~s/^([a-z])/uc($1)/e;   $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
     @Apache::scripttag::parser_env = @_;      }
     $result.='<div class="'.$status.'"><h4>'.$mandatory.      my $man_count=0;
  ' Criteria</h4><p>';      my $man_passed=0;
     @Apache::scripttag::parser_env = @_;      my $opt_count=0;
     $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});      my $opt_passed=0;
     $result.='</p><p class="grade">'.$status_display.'</p>';      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
     if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {   if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
  $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';      eq 'N') {
       $opt_count++;
       if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
    $opt_passed++;
       }
    } else {
       $man_count++;
       if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
    $man_passed++;
       }
    }
       }
       if ($man_passed eq $man_count) { $man_passed='all'; }
       my $opt_req=$dimension{$instance.'.optionalrequired'};
       if ($opt_req !~ /\S/) { $opt_req='0'; }
       $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
   
       my $internal_location=&internal_location($dim);
       $result=~s/\Q$internal_location\E/$dim_info/;
   
       foreach my $id (@{$dimension{$instance.'.criterias'}}) {
    my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
    my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
    my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
    if ($mandatory) {
       $mandatory='Mandatory';
    } else {
       $mandatory='Optional';
    }
    if ($status eq 'fail') {
    } elsif ($status eq 'pass') {
    } else {
       &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
    }
    my $status_display=$status;
    $status_display=~s/^([a-z])/uc($1)/e;
    @Apache::scripttag::parser_env = @_;
    $result.='<div class="'.$status.'"><h4>'.$mandatory.
       ' Criteria</h4><p>';
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
    $result.='</p><p class="grade">'.$status_display.'</p>';
    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
       $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
    }
    $result.='</div>';
     }      }
     $result.='</div>';  
  }   }
     }      }
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
Line 1394  sub get_instance { Line 1580  sub get_instance {
     '<td>'.      '<td>'.
     '<a href="#'.$last_link.'">Prev</a><br />'.      '<a href="#'.$last_link.'">Prev</a><br />'.
     '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.      '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
     '<input type="submit" name="next" value="'.  
     &mt('Done').'" /> '.  
     '<input type="submit" name="stop" value="'.  
     &mt('Stop').'" /> '.  
     '</td></tr>';      '</td></tr>';
  $result.='<tr><td colspan="4">';  
  my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();  
  my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';  
  foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {  
     my $file=$file_url.$partial_file;  
     $file=~s|/+|/|g;  
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);  
     $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.  
  &Apache::loncommon::icon($file).'" border=0"> '.$file.  
  '</a></nobr> ';  
  }  
  $result.='</td></tr>';  
  $last_link=$link;   $last_link=$link;
     }      }
  } elsif ($target eq 'grade' && $env{'form.webgrade'}) {   } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
Line 1451  sub get_instance { Line 1621  sub get_instance {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.$dim.status"}=
     'pass';      'pass';
     }      }
    } else {
       # any other targets no output
       undef($result);
  }   }
  return $result;   return $result;
     }      }
Line 1482  sub start_Instance { Line 1655  sub start_Instance {
     push(@Apache::bridgetask::instancelist,$id);      push(@Apache::bridgetask::instancelist,$id);
     $dimension{$id.'.optionalrequired'}=      $dimension{$id.'.optionalrequired'}=
  &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);   &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
       my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval);
       if (lc($disabled) eq 'yes') {
    $dimension{$id.'.disabled'}='1';
       }
     return '';      return '';
 }  }
   
Removed from v.1.59  
changed lines
  Added in v.1.76

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