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

Diff for /loncom/homework/bridgetask.pm between versions 1.178 and 1.184.2.3

version 1.178, 2006/06/23 22:32:39 version 1.184.2.3, 2006/11/06 16:55:53
Line 43  use LONCAPA; Line 43  use LONCAPA;
     
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph'));      &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','ClosingParagraph'));
 }  }
   
 my %dimension;  my %dimension;
Line 152  sub create_new_version { Line 152  sub create_new_version {
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
  &Apache::lonxml::debug("authed $slot_name");   &Apache::lonxml::debug("authed $slot_name");
     }      }
       if (!defined($user) || !defined($domain)) {
     if (defined($user) && defined($domain)) {   $user = $env{'user.name'};
  $Apache::lonhomework::results{"resource.$id.checkedin"}=   $domain = $env{'user.domain'};
     $user.':'.$domain;  
     }      }
   
       $Apache::lonhomework::results{"resource.$id.checkedin"}=
    $user.':'.$domain;
   
     if (defined($slot_name)) {      if (defined($slot_name)) {
  $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=   $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
     $slot_name;      $slot_name;
Line 323  sub style { Line 326  sub style {
     my ($target) = @_;      my ($target) = @_;
     if ($target eq 'web'      if ($target eq 'web'
  || $target eq 'webgrade') {   || $target eq 'webgrade') {
  return (<<STYLE);   my $style = (<<STYLE);
 <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />  <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
 STYLE  STYLE
           if ($env{'browser.type'} eq 'explorer'
       && $env{'browser.os'} eq 'win' ) {
       if ($env{'browser.version'} < 7) {
    $style .= (<<STYLE);
   <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" />
   STYLE
               } else {
    $style .= (<<STYLE);
   <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" />
   STYLE
       }
    }
   
     }      }
     return;      return;
 }  }
Line 372  sub nested_parse { Line 388  sub nested_parse {
     @Apache::scripttag::parser_env = @old_env;      @Apache::scripttag::parser_env = @old_env;
     if ($args->{'delayed_dim_results'}) {      if ($args->{'delayed_dim_results'}) {
  my $dim = &get_dim_id();   my $dim = &get_dim_id();
    &Apache::lonxml::debug(" tossing out $result ");
    &Apache::lonxml::debug(" usining out $dim 's  ". $dimension{$dim}{'result'});
  return $dimension{$dim}{'result'};   return $dimension{$dim}{'result'};
     }      }
     return $result;      return $result;
Line 387  sub submission_time_stamp { Line 405  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;
  }   }
     }      }
     my $result;      my $result;
Line 399  sub submission_time_stamp { Line 419  sub submission_time_stamp {
  my ($color,$when)=('#FF6666','after');   my ($color,$when)=('#FF6666','after');
  if ($diff > 0) { ($color,$when)=('#336600','before'); }   if ($diff > 0) { ($color,$when)=('#336600','before'); }
  my $info;   my $info;
    $diff = abs($diff);
  if ($diff%60) { $info=($diff%60).' seconds'; }   if ($diff%60) { $info=($diff%60).' seconds'; }
  $diff=int($diff/60);   $diff=int($diff/60);
  if ($diff%60) { $info=($diff%60).' minutes '.$info; }   if ($diff%60) { $info=($diff%60).' minutes '.$info; }
  $diff=int($diff/60);   $diff=int($diff/60);
  if ($diff) {    $info=$diff.' hours '.$info; }   if ($diff) {    $info=$diff.' hours '.$info; }
  $result='<p><font color="'.$color.'">'.   $result='<p><font color="'.$color.'">'.
     &mt('Student submitted [_1] [_2] the deadline.       &mt('Student submitted [_1] [_2] the deadline. '.
                  (Submission was at [_3], end of period was [_4].)',   '(Submission was at [_3], end of period was [_4].)',
  $info,$when,scalar(localtime($submissiontime)),   $info,$when,
  scalar(localtime($slot{'endtime'}))).   &Apache::lonlocal::locallocaltime($submissiontime),
    &Apache::lonlocal::locallocaltime($slot{'endtime'})).
  '</font></p>';   '</font></p>';
     }      }
     return $result;      return $result;
Line 530  sub start_Task { Line 552  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 1058  DONEBUTTON Line 1080  DONEBUTTON
     &Apache::loncommon::end_page({'discussion' => 1});      &Apache::loncommon::end_page({'discussion' => 1});
     }      }
  }   }
   
    my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
    my %queue_data = ('type' => 'Task',
     'time' => time,);
    if (defined($Apache::inputtags::slot_name)) {
       $queue_data{'slot'} = $Apache::inputtags::slot_name;
    } elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
       $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
    }
   
   
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {   if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
     my $award='SUBMITTED';      my $award='SUBMITTED';
     &Apache::essayresponse::file_submission("$version.0",'bridgetask',      &Apache::essayresponse::file_submission("$version.0",'bridgetask',
Line 1080  DONEBUTTON Line 1113  DONEBUTTON
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
     if ($award eq 'SUBMITTED') {      if ($award eq 'SUBMITTED') {
  my $useslots = &Apache::lonnet::EXT("resource.0.useslots");   &add_to_queue('gradingqueue',\%queue_data);
  if ($useslots =~ /^\s*no\s*$/i) {  
     &add_to_queue('gradingqueue',  
   {'type' => 'Task',  
    'time' => time});  
  } elsif (defined($Apache::inputtags::slot_name)) {  
     &add_to_queue('gradingqueue',  
   {'type' => 'Task',  
    'time' => time,  
    'slot' => $Apache::inputtags::slot_name});  
  }  
     }      }
  } 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 1134  DONEBUTTON Line 1155  DONEBUTTON
  $env{'user.name'}.':'.$env{'user.domain'};   $env{'user.name'}.':'.$env{'user.domain'};
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.0.status"}='review';   $Apache::lonhomework::results{"resource.$version.0.status"}='review';
  if ($env{'form.queue'} eq 'reviewqueue') {  
     &check_queue_unlock($env{'form.queue'});  
     &Apache::lonxml::debug(" still needs review not changing status.");  
  } else {  
     &move_between_queues($env{'form.queue'},'reviewqueue');  
  }  
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';   $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
  if ($env{'form.queue'} eq 'reviewqueue' ||  
     $env{'form.queue'} eq 'none' ) {  
     &Apache::lonxml::debug("moving back.");  
     &move_between_queues($env{'form.queue'},'gradingqueue');  
  } else {  
     &check_queue_unlock($env{'form.queue'});  
  }  
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.0.status"}='fail';   $Apache::lonhomework::results{"resource.$version.0.status"}='fail';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
  $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';   $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
  &remove_from_queue($env{'form.queue'});   
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
   
  if ($env{'form.regrade'} ne 'yes') {   if ($env{'form.regrade'} ne 'yes') {
Line 1172  DONEBUTTON Line 1178  DONEBUTTON
  $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
  $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';   $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
  &remove_from_queue($env{'form.queue'});  
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  if ($env{'form.regrade'} ne 'yes') {   if ($env{'form.regrade'} ne 'yes') {
     $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
Line 1197  DONEBUTTON Line 1201  DONEBUTTON
     }      }
     &minimize_storage();      &minimize_storage();
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
       
       # data stored, now handle queue
       if ($review) {
    if ($env{'form.queue'} eq 'reviewqueue') {
       &check_queue_unlock($env{'form.queue'});
       &Apache::lonxml::debug(" still needs review not changing status.");
    } else {
       if ($env{'form.queue'} ne 'none') {
    &move_between_queues($env{'form.queue'},'reviewqueue');
       } else {
    &add_to_queue('reviewqueue',\%queue_data);
       }
    }
       } elsif ($ungraded) {
    if ($env{'form.queue'} eq 'reviewqueue') {
       &Apache::lonxml::debug("moving back.");
       &move_between_queues($env{'form.queue'},
    'gradingqueue');
    } elsif ($env{'form.queue'} eq 'none' ) {
       &add_to_queue('gradingqueue',\%queue_data);
    } else {
       &check_queue_unlock($env{'form.queue'});
    }
       } elsif ($mandatory_failed) {
    &remove_from_queue($env{'form.queue'}); 
       } else {
    &remove_from_queue($env{'form.queue'});
       }
    }
    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>";
Line 1220  DONEBUTTON Line 1256  DONEBUTTON
       'Partial Credit Factor');        'Partial Credit Factor');
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
       } elsif ($target eq 'edit') {
    &Apache::structuretags::reset_problem_globals('Task');
    undef($Apache::lonhomework::parsing_a_task);
    return ('','no');
     }      }
       &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Line 1540  sub get_queue_counts { Line 1581  sub get_queue_counts {
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   if (!defined($classlist->{$uname.':'.$udom})) { next; }
   
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
Line 2137  sub get_criteria { Line 2177  sub get_criteria {
  } else {   } else {
     my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};      my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
     my $mandatory='Mandatory';      my $mandatory='Mandatory';
     if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {      if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
  $mandatory='Optional';   $mandatory='Optional';
     }      }
     my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";      my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
Line 2184  sub get_criteria { Line 2224  sub get_criteria {
     $result.=$dimension{$id}{'result'};      $result.=$dimension{$id}{'result'};
     next;      next;
  }   }
  my $status= &get_criteria('status', $version,$dim,$id);  
  my $comment=&get_criteria('comment',$version,$dim,$id);  
  my $mandatory=($dimension{$dim}{'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;  
  $result.=  
     '<div class="LC_'.$status.' LC_criteria"><h4>'  
     .$mandatory.' Criteria</h4><p>';  
  $result.=  
     &nested_parse(\$dimension{$dim}{'criteria.'.$id},  
   [@_],{'set_dim_id' => $id});  
  $result.='</p><p class="LC_grade">'.$status_display.'</p>';  
  if ($comment) {  
     $result.='<p class="LC_comment">'.  
  &mt('Comment: [_1]',$comment).'</p>';  
  }  
  $result.='</div>';  
     }      }
  }   }
     }      }
Line 2220  sub get_criteria { Line 2233  sub get_criteria {
     &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);      &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
     $result.=      $result.=
  &nested_parse(\$dimension{$dim}{'questiontext'},[@_],   &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
       {'set_dim_id'        => undef,        {'set_dim_id'          => undef,
        'delay_dim_results' => 1});         'delayed_dim_results' => 1});
     foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},      foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
     @{$dimension{$dim}{'criterias'}} ) {      @{$dimension{$dim}{'criterias'}} ) {
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};   my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
Line 2258  sub get_criteria { Line 2271  sub get_criteria {
  $result.=&grading_history($version,$dim,$id);   $result.=&grading_history($version,$dim,$id);
  $last_link=$link;   $last_link=$link;
     }      }
     if (&delay_result()) {      if (&nest()) {
  &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});   &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
  $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;   $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
  undef($result);   undef($result);
Line 2468  sub end_InstanceText { Line 2481  sub end_InstanceText {
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);      my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
       my $result = '';
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
  my $dim = &get_dim_id();   my $dim = &get_dim_id();
  my $id=&get_id($parstack,$safeeval);   my $id=&get_id($parstack,$safeeval);
Line 2485  sub start_Criteria { Line 2499  sub start_Criteria {
     $dimension{$dim}{'criteria.'.$id.'.mandatory'}=      $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     push(@{$dimension{$dim}{'criterias'}},$id);      push(@{$dimension{$dim}{'criterias'}},$id);
   
       my $version=&get_version();
       my $task_status = 
    $Apache::lonhomework::history{"resource.$version.0.status"};
       if ($target eq 'web' 
    && ($task_status eq 'pass' || $task_status eq 'fail')) {
    my $status= &get_criteria('status', $version,$dim,$id);
    my $comment=&get_criteria('comment',$version,$dim,$id);
    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
    if ($mandatory) {
       $mandatory='Mandatory';
    } else {
       $mandatory='Optional';
    }
    my $status_display=$status;
    $status_display=~s/^([a-z])/uc($1)/e;
    $result.=
       '<div class="LC_'.$status.' LC_criteria"><h4>'
       .$mandatory.' Criteria</h4><p>';
    $result.=
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);
    $result.='</p><p class="LC_grade">'.$status_display.'</p>';
    if ($comment =~ /\w/) {
       $result.='<p class="LC_comment">'.
    &mt('Comment: [_1]',$comment).'</p>';
    }
    $result.='</div>';
       }
  }   }
     }      }
     return '';      return $result;
 }  }
   
 sub end_Criteria {  sub end_Criteria {
 }  }
   
   sub start_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       
       if ($target eq 'webgrade') {
    return '<div class="LC_GRADING_gradernote"><b>'.
       &mt('Note to graders:').'</b>';
       }
       my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
       return;
   }
   
   sub end_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       if ($target eq 'webgrade') {
    return '</div>';
       }
       return;
   }
   
   
   
 sub proctor_validation_screen {  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
Removed from v.1.178  
changed lines
  Added in v.1.184.2.3

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