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

Diff for /loncom/homework/bridgetask.pm between versions 1.249 and 1.255

version 1.249, 2009/05/06 16:19:26 version 1.255, 2010/10/12 16:07:43
Line 545  sub done_screen { Line 545  sub done_screen {
     my $title=&Apache::lonnet::gettitle($env{'request.uri'});      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();      my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';      my ($msg,$files,$shown);
     my $msg;      if (@files > 0) {
     foreach my $file (@files) {          $files = '<ul>';
  my $url="/uploaded/$domain/$user/portfolio$file";          foreach my $file (@files) {
  if (! &Apache::lonnet::stat_file($url)) {      my $url="/uploaded/$domain/$user/portfolio$file";
     $file = '<span class="LC_error">'      if (! &Apache::lonnet::stat_file($url)) {
                    .&mt('[_1]Nonexistent file:[_2]'          $file = '<span class="LC_error">'
                        ,'<span class="LC_error"> '                         .&mt('[_1]Nonexistent file:[_2]'
                        ,'</span> <span class="LC_filename">'.$file.'</span>');                             ,'<span class="LC_error"> '
     $msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";                             ,'</span> <span class="LC_filename">'.$file.'</span>');
  } else {          $msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
     $file = '<span class="LC_filename">'.$file.'</span>';      } else {
     $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";          $file = '<span class="LC_filename">'.$file.'</span>';
  }          $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
  $files .= '<li>'.$file.'</li>';      }
       $files .= '<li>'.$file.'</li>';
           }
           $files.='</ul>';
           $shown = '<p>'.&mt('Files submitted: [_1]',$files).'</p>'
                   .'<p>'.&mt('You are now done with this Bridge Task').'</p>'
                   .'<hr />'
                   .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
                   .'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>';
       } else {
           $msg = &mt("Submission status: no files currently submitted, when 'Done' was indicated.");
           $shown = '<p class="LC_error">'.
                    &mt('You did not submit any files.  Please try again.').'</span>'.
                    '</p><p><a href="javascript:history.go(-1);">'.&mt('Back to Bridge Task').'</a></p><hr />';
     }      }
     $files.='</ul>';  
     my $subject = &mt('Submission message for [_1]',$title);      my $subject = &mt('Submission message for [_1]',$title);
     my ($message_status,$comment_status);      my ($message_status,$comment_status);
     my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};      my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
Line 581  sub done_screen { Line 593  sub done_screen {
  $comment_status = '<p>'.&mt('Message sent to instructor: [_1]',   $comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
     $comment_status).' </p>';      $comment_status).' </p>';
     }      }
    
     return "<h2>$title</h2>"      return "<h2>$title</h2>"
           .'<p>'.&mt('Files submitted: [_1]',$files).'</p>'            .$shown
           .'<p>'.&mt('You are now done with this Bridge Task').'</p>'            .$message_status
           .'<hr />'            .$comment_status;
           .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'  
 .'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'  
 .$message_status  
 .$comment_status;  
   
 }  }
   
 sub start_Task {  sub start_Task {
Line 784  sub start_Task { Line 792  sub start_Task {
     $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;      $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
  } elsif ($status_code eq 'cancel') {   } elsif ($status_code eq 'cancel') {
     $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;      $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
                   } elsif ($status_code eq 'terminated') {
                       $result.= '<b>'.&mt('Terminated grading').'</b><br />'.
                                 '<span class="LC_error">'.
                                 &mt('Grading for [_1] has not been saved because of a grading key mismatch.',
                                 '<tt>'.$env{'form.terminated'}.'</tt>').'</span><br />'.$back;
  } elsif ($status_code eq 'never_versioned') {   } elsif ($status_code eq 'never_versioned') {
     $result.='<b>'.      $result.='<b>'.
  &mt("Requested user has never accessed the task.").   &mt("Requested user has never accessed the task.").
Line 1004  sub get_key_todo { Line 1017  sub get_key_todo {
     return (undef,'stop');      return (undef,'stop');
  } elsif ($env{'form.cancel'}) {   } elsif ($env{'form.cancel'}) {
     return (undef,'cancel');      return (undef,'cancel');
                   } elsif ($env{'form.terminated'}) {
                       return (undef, 'terminated');
  } elsif ($env{'form.next'}) {   } elsif ($env{'form.next'}) {
     return (undef,'select_user');      return (undef,'select_user');
  }   }
Line 1049  sub get_key_todo { Line 1064  sub get_key_todo {
   
     if ($env{'form.queuemode'} ne 'selected') {      if ($env{'form.queuemode'} ne 'selected') {
  # don't get something new from the queue if they hit the stop button   # don't get something new from the queue if they hit the stop button
     if (!(($env{'form.cancel'} || $env{'form.stop'})       if (!(($env{'form.cancel'} || $env{'form.stop'} || $env{'form.terminated'}) 
       && $target eq 'webgrade')         && $target eq 'webgrade') 
     && !$env{'form.gradingaction'}) {      && !$env{'form.gradingaction'}) {
     &Apache::lonxml::debug("Getting anew $queue");      &Apache::lonxml::debug("Getting anew $queue");
     return (&get_from_queue($queue));      return (&get_from_queue($queue));
  } else {   } else {
     return (undef,'stop');              if ($env{'form.terminated'}) {
                   return (undef,'terminated');
               } else {
                   return (undef,'stop');
               }
  }   }
     }      }
     return (undef,undef)      return (undef,undef)
Line 1085  sub end_Task { Line 1104  sub end_Task {
  }   }
  if ($status eq 'CAN_ANSWER' && !$previous &&    if ($status eq 'CAN_ANSWER' && !$previous && 
     !$env{'form.donescreen'}) {      !$env{'form.donescreen'}) {
     $result.="\n".'<table border="1">'.                      my ($portheader,$porttext);
                       if ($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}) {
                           $portheader = &mt('Submit Additional Portfolio Files for Grading');
                           $porttext = &mt('Indicate which additional files from your portfolio are to be evaluated in grading this task.');
                       } else {
                           $portheader = &mt('Submit Portfolio Files for Grading');
                           $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
                       }
       $result.="\n".'<p>'.&Apache::lonhtmlcommon::start_pick_box().
  &Apache::inputtags::file_selector("$version.0",   &Apache::inputtags::file_selector("$version.0",
   "bridgetask","*",    "bridgetask","*",
   'portfolioonly',    'portfolioonly',
   '                                                            '<h3>'.$portheader.'</h3><br />'.
 <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>                                                            $porttext.'<br />').
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').   &Apache::lonhtmlcommon::end_pick_box().'</p>';
   "</table>";  
  }   }
  if (!$previous && $status ne 'SHOW_ANSWER' &&   if (!$previous && $status ne 'SHOW_ANSWER' &&
     &show_task($status,$previous)) {      &show_task($status,$previous)) {
Line 1191  DONEBUTTON Line 1217  DONEBUTTON
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous   if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
     && $status eq 'CAN_ANSWER') {      && $status eq 'CAN_ANSWER') {
     my $award='SUBMITTED';      my $award='SUBMITTED';
               my $uploadedflag=0;
               my $totalsize=0;
               my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$version.'_0_bridgetask_delete');
     &Apache::essayresponse::file_submission("$version.0",'bridgetask',      &Apache::essayresponse::file_submission("$version.0",'bridgetask',
     'portfiles',\$award);      \$award,\$uploadedflag,\$totalsize,\@deletions);
     if ($award eq 'SUBMITTED' &&      if ($award eq 'SUBMITTED' &&
  $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {   $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
  $Apache::lonhomework::results{"resource.0.tries"}=   $Apache::lonhomework::results{"resource.0.tries"}=
Line 1205  DONEBUTTON Line 1234  DONEBUTTON
  $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 {      } else {
  delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});                  unless($uploadedflag) {
                       delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
                   }
  $award = '';   $award = '';
     }      }
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
Line 1308  DONEBUTTON Line 1339  DONEBUTTON
     $Apache::lonhomework::results{"resource.$version.0.solved"};      $Apache::lonhomework::results{"resource.$version.0.solved"};
     }      }
     &minimize_storage();      &minimize_storage();
     &Apache::structuretags::finalize_storage();              my ($canstore,$domain,$name);
                   if ($env{'form.gradingkey'}) {
     # data stored, now handle queue                  (my $symb,my $courseid,$domain,$name) =
     if ($review) {                      &Apache::lonnet::whichuser();
  if ($env{'form.queue'} eq 'reviewqueue') {                  my $todo=&unescape($env{'form.gradingkey'});
     &check_queue_unlock($env{'form.queue'});                  my ($keysymb,$uname,$udom)=&decode_queue_key($todo);
     &Apache::lonxml::debug(" still needs review not changing status.");                  if ($symb eq $keysymb) {
  } else {                      if (($domain eq $udom) && ($name eq $uname)) {
     if ($env{'form.queue'} ne 'none') {                          $canstore = 1;           
  &move_between_queues($env{'form.queue'},'reviewqueue');                      }
                   }
               }
               if ($canstore) {
           &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 {      } else {
  &add_to_queue('reviewqueue',\%queue_data);          if ($env{'form.queue'} ne 'none') {
       &move_between_queues($env{'form.queue'},'reviewqueue');
           } else {
       &add_to_queue('reviewqueue',\%queue_data);
           }
     }      }
  }          } elsif ($ungraded) {
     } elsif ($ungraded) {      if ($env{'form.queue'} eq 'reviewqueue') {
  if ($env{'form.queue'} eq 'reviewqueue') {          &Apache::lonxml::debug("moving back.");
     &Apache::lonxml::debug("moving back.");          &move_between_queues($env{'form.queue'},
     &move_between_queues($env{'form.queue'},       'gradingqueue');
  'gradingqueue');      } elsif ($env{'form.queue'} eq 'none' ) {
  } elsif ($env{'form.queue'} eq 'none' ) {          &add_to_queue('gradingqueue',\%queue_data);
     &add_to_queue('gradingqueue',\%queue_data);      } else {
  } else {          &check_queue_unlock($env{'form.queue'});
     &check_queue_unlock($env{'form.queue'});      }
  }          } elsif ($mandatory_failed) {
     } elsif ($mandatory_failed) {      &remove_from_queue($env{'form.queue'}); 
  &remove_from_queue($env{'form.queue'});           } else {
     } else {      &remove_from_queue($env{'form.queue'});
  &remove_from_queue($env{'form.queue'});          }
     }              } else {
  }                  &check_queue_unlock($env{'form.queue'});
                   $env{'form.terminated'} = $name.':'.$domain;
               }
           }
  if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {   if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
     # instance generation occurred and hasn't yet been stored      # instance generation occurred and hasn't yet been stored
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
Line 1395  DONEBUTTON Line 1442  DONEBUTTON
     }      }
     &Apache::structuretags::reset_problem_globals('Task');      &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
       if ( ($target eq 'grade' && $env{'form.webgrade'}) ||
             $target eq 'webgrade') {
           delete($env{'form.grade_symb'});
           delete($env{'form.grade_domain'});
           delete($env{'form.grade_username'});
           delete($env{'form.grade_courseid'});
       }
     return $result;      return $result;
 }  }
   
Line 3157  sub proctor_validation_screen { Line 3211  sub proctor_validation_screen {
                             'vali'  => 'Validate',                              'vali'  => 'Validate',
                             'stui'  => "Student who should be logged in is:",                              'stui'  => "Student who should be logged in is:",
                             'name'  => "Name:",                              'name'  => "Name:",
                             'sid'   => "Student/Employee ID:",                              'sid'   => "Student/Employee ID",
                             'unam'  => "Username:",                              'unam'  => "Username:",
                            );                             );
     my $result= (<<ENDCHECKOUT);      my $result= (<<ENDCHECKOUT);
Removed from v.1.249  
changed lines
  Added in v.1.255

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