--- loncom/homework/bridgetask.pm 2006/02/09 22:34:35 1.105 +++ loncom/homework/bridgetask.pm 2006/03/02 21:20:30 1.115 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.105 2006/02/09 22:34:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.115 2006/03/02 21:20:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -155,7 +155,7 @@ sub add_previous_version_button { join("\n\n"; $list.=''; - $result.='
'. @@ -188,20 +188,23 @@ sub add_grading_button { $result.=''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); - $result.='

Specify a section: '.$sec_select.'

'; - $result.='

'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); + $result.=''; + $result.=''; + $result.=''."\n"; ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); - $result.='

'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); - $result.='

'."\n"; - $result.='

'."\n"; + $result.=''."\n"; + $result.='
Specify a section: '.$sec_select.''.' '; - $result.='

'."\n"; + $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'
'. + ' '; + $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", + $entries,$ready,$locks).'
'."\n"; $result.='

'."\n"; + &mt("Regrade specific user:").'" />'."\n"; $result.=''; $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, 'gradingdomain'); @@ -233,7 +236,7 @@ STUFF if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&Apache::lonnet::escape($symb); - $result.=''. + $result.=''. ''. ''. '\n"; + my $file_list="

\n"; @@ -388,11 +391,11 @@ sub webgrade_standard_info { ); my $result=< - - +
+ + +
$file_list - INFO return $result; } @@ -417,18 +420,27 @@ sub start_Task { if ($target eq 'web' && $env{'request.state'} ne 'construct') { if ($Apache::lonhomework::modifygrades) { - $body_tag_start.=''.&add_grading_button().""; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { - $body_tag_start.='
'. + $body_tag_start.=''. ''. ''. ''. '
'; + my $target_id = + &Apache::lonstathelpers::make_target_id({symb => $symb, + part => '0'}); + $body_tag_start.='
'. + ''. + ''. + ''. + '
'; } } } @@ -468,7 +480,20 @@ sub start_Task { } elsif ($env{'form.donescreen'}) { my $title=&Apache::lonnet::gettitle(); my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); - my $files=''; + my (undef,undef,$domain,$user)= + &Apache::lonxml::whichuser(); + my $files = ''; + $result.=<$title

Files submitted: $files

@@ -516,7 +541,7 @@ DONESCREEN $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.$body_tag_start; + $result.=$head_tag_start.''.$body_tag_start; #$result.='
Review'.&show_queue('reviewqueue'); #$result.='
Grade'.&show_queue('gradingqueue'); } @@ -538,13 +563,9 @@ DONESCREEN $Apache::bridgetask::queue_key=$todo; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); - if ($target eq 'webgrade') { - #$result.='
After -'.&show_queue($env{'form.queue'}); - $result.="\n".''; - if ($status_code eq 'selected') { - $form_tag_start.= - ''; - } + if ($target eq 'webgrade' && $status_code eq 'selected') { + $form_tag_start.= + ''; } } else { if ($target eq 'webgrade') { @@ -598,6 +619,9 @@ DONESCREEN } if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } } + if ($target eq 'webgrade') { + $result.="\n".'
'; + } } elsif ($target eq 'edit') { $result.=$head_tag_start."".$body_tag_start.$form_tag_start. &Apache::structuretags::problem_edit_header(); @@ -791,8 +815,9 @@ sub end_Task { &show_task($status,$previous)) { $result.=&Apache::inputtags::gradestatus('0'); $result.=''; + my $action = &Apache::lonenc::check_encrypted($env{'request.uri'}); $result.=< +
@@ -976,7 +1001,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="
\n
"; + $result.="\n
"; #$result.=' '; #$result.=' +
@@ -1510,7 +1535,7 @@ sub select_user { $result.=< - + @@ -1759,28 +1784,29 @@ sub get_instance { foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $link='criteria_'.$instance.'_'.$id; my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; - $result.=''. - ''. - ''. - '
'. + $result.=''."\n". #$dimension{$instance.'.criteria.'.$id}. - ''. - 'Additional Comment for Student
'. - ''. - ''. - ''. - '
'. - '
'. - '
'. - '
'. - ''. - ''. - 'Prev
'. - 'Next


'. - ''; + '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n". + ''."\n". + '
    '."\n". + '
  • Prev
    • '."\n". + '
  • Next
    • '."\n". + '
'."\n". + ''."\n"; + $result.=&grading_history($version,$dim,$instance,$id); $last_link=$link; } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { @@ -1829,6 +1855,38 @@ sub get_instance { } } +sub grading_history { + my ($version,$dim,$instance,$criteria) = @_; + if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + return ''; + } + my ($result,$grader); + my $scope="resource.$version.0.$dim.$instance.$criteria"; + foreach my $t (1..$Apache::lonhomework::history{'version'}) { + if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { + my ($gname,$gdom) = + split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'}); + my $fullname = &Apache::loncommon::plainname($gname,$gdom); + $grader = &Apache::loncommon::aboutmewrapper($fullname, + $gname,$gdom); + } + my $entry; + if (exists($Apache::lonhomework::history{"$t:$scope.status"})) { + $entry.="".$Apache::lonhomework::history{"$t:$scope.status"}.''; + } + if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) { + $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; + } + if ($entry) { + $result.= "
  • $grader : $entry
    • "; + } + } + if ($result) { + return '
      '.$result.'
    '; + } + return ''; +} + sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -1912,7 +1970,7 @@ sub proctor_validation_screen {

    Proctor Validation

    Your room's proctor needs to validate your access to this resource.

    $msg - +