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

Diff for /loncom/homework/bridgetask.pm between versions 1.128.2.12 and 1.129

version 1.128.2.12, 2006/06/24 01:32:25 version 1.129, 2006/03/29 14:03:08
Line 349  sub webgrade_standard_info { Line 349  sub webgrade_standard_info {
   
     my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',      my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
        'stop' => 'Quit Grading',         'stop' => 'Quit Grading',
        'fail' => 'Fail Rest',  
        );         );
                 
     my $result=<<INFO;      my $result=<<INFO;
   <div class="LC_GRADING_maincontrols">    <div class="LC_GRADING_maincontrols">
     <input type="submit" name="next" value="$lt{'done'}" />      <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />      <input type="submit" name="stop" value="$lt{'stop'}" />
     <input type="button" name="fail" value="$lt{'fail'}"   
            onclick="javascript:onFailRest()" />  
   </div>    </div>
   $file_list    $file_list
 INFO  INFO
Line 368  sub start_Task { Line 365  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
     &Apache::structuretags::init_problem_globals('Task');  
     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') {   if ($env{'request.state'} eq 'construct') {
Line 456  sub start_Task { Line 453  sub start_Task {
     my (undef,undef,$domain,$user)=      my (undef,undef,$domain,$user)=
  &Apache::lonxml::whichuser();   &Apache::lonxml::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
     my $msg;  
     foreach my $file (@files) {      foreach my $file (@files) {
  my $url="/uploaded/$domain/$user/portfolio$file";   my $url="/uploaded/$domain/$user/portfolio$file";
  $file = '<tt>'.$file.'</tt>';   $file = '<tt>'.$file.'</tt>';
  $files .= '<li>'.$file.'</li>';   $files .= '<li>'.$file.'</li>';
  $msg .= "<p>Submitted file $file</p>\n";  
     }      }
     $files.='</ul>';      $files.='</ul>';
     my $subject = "Submission message for $title";  
     my ($message_status,$comment_status);  
     my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};  
     $setting =~ s/^\s*(\S*)\s*$/$1/;  
     $setting = lc($setting);  
     if ($setting eq 'only_student'  
  || $setting eq 'student_and_user_notes_screen') {  
  $message_status =  
     &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);  
  $message_status = '<p>'.&mt('Message sent to user: [_1]',  
     $message_status).' </p>';  
     }  
     if ($setting eq 'student_and_user_notes_screen') {  
  $comment_status =  
     &Apache::lonmsg::store_instructor_comment($subject.'<br />'.  
       $msg,$user,$domain);  
  $comment_status = '<p>'.&mt('Message sent to instructor: [_1]',  
     $comment_status).' </p>';  
     }  
   
     $result.=<<DONESCREEN;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
Line 491  sub start_Task { Line 467  sub start_Task {
 <hr />  <hr />
 <p> <a href="/adm/logout">Logout</a> </p>  <p> <a href="/adm/logout">Logout</a> </p>
 <p> <a href="/adm/roles">Change to a different course</a> </p>  <p> <a href="/adm/roles">Change to a different course</a> </p>
 $message_status  
 $comment_status  
 DONESCREEN  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 996  DONEBUTTON Line 970  DONEBUTTON
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</div>";   $result.="</div>\n<hr />";
  #$result.='<input type="submit" name="next" value="'.   #$result.='<input type="submit" name="next" value="'.
  #    &mt('Save &amp; Next').'" /> ';   #    &mt('Save &amp; Next').'" /> ';
  #$result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="end" value="'.
Line 1018  DONEBUTTON Line 992  DONEBUTTON
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
     }      }
     &Apache::structuretags::reset_problem_globals('Task');  
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Line 1342  sub pick_from_queue_data { Line 1315  sub pick_from_queue_data {
     if (@possible) {      if (@possible) {
         # sort entries in order by slot end time          # sort entries in order by slot end time
  @possible = sort { $a->[1] <=> $b->[1] } @possible;   @possible = sort { $a->[1] <=> $b->[1] } @possible;
  # pick one of the entries in the top 10% in small queues and one   # pick one of the first ten entries
  # of the first ten entries in large queues   my $max=($#possible < 10) ? $#possible : 10;
  #my $ten_percent = int($#possible * 0.1);   return $possible[int(rand($max))][0];
  #if ($ten_percent < 1 ) { $ten_percent = 1;  }  
  #if ($ten_percent > 10) { $ten_percent = 10; }  
  #my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;  
   
  #return $possible[int(rand($max))][0];  
  return $possible[0][0];  
     }      }
     return undef;      return undef;
 }  }
Line 1793  sub get_instance { Line 1760  sub get_instance {
  my $link=&link($instance,$id);   my $link=&link($instance,$id);
  my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};   my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
  $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".   $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
     '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";      '<a name="'.$link.'" />'."\n".
       '<a name="next_'.$last_link.'" />'."\n".
       '<div class="LC_GRADING_criteriatext">'."\n";
  @Apache::scripttag::parser_env = @_;   @Apache::scripttag::parser_env = @_;
  $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});   $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
  $result.='</div>'."\n".   $result.='</div>'."\n".
Line 1820  sub get_instance { Line 1789  sub get_instance {
     my $mandatory_failed=0;      my $mandatory_failed=0;
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
   
     @Apache::scripttag::parser_env = @_;  
     $result.=&Apache::scripttag::xmlparse($dimension{'intro'});  
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  @Apache::scripttag::parser_env = @_;  
  $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex  
 t'});  
  my $link=&link($instance,$id);   my $link=&link($instance,$id);
  my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};   my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
  $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};   $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
Line 1903  sub grading_history { Line 1866  sub grading_history {
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  if ($tagstack->[-2] eq 'Dimension') {   if ($tagstack->[-2] eq 'Dimension') {
     $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);      $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
   
  } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {   } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
    } else {
       &Apache:;lonxml::error("Invalid use of <IntroParagraph> inside of <".$tagstack->[-2].">");
       &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
  }   }
   
     }      }
Line 1944  sub start_InstanceText { Line 1910  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);      my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $dimension{$instance_id.'.text'}=$text;   $dimension{$instance_id.'.text'}=$text;
     }      }
     return '';      return '';
Removed from v.1.128.2.12  
changed lines
  Added in v.1.129

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