--- loncom/homework/bridgetask.pm 2006/02/09 23:02:51 1.106
+++ loncom/homework/bridgetask.pm 2006/02/21 22:41:29 1.114
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.106 2006/02/09 23:02:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.114 2006/02/21 22:41:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -193,7 +193,7 @@ sub add_grading_button {
$result.='
'.' ';
- $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks);' '."\n";
+ $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' '."\n";
($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
$result.=''.
@@ -375,13 +375,13 @@ 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="\n";
+ my $file_list="\n";
@@ -391,11 +391,11 @@ sub webgrade_standard_info {
);
my $result=<
-
-
+
+
+
+
$file_list
-
INFO
return $result;
}
@@ -426,12 +426,21 @@ sub start_Task {
$body_tag_start.=$uri.'">'.&add_grading_button()."";
my $symb=&Apache::lonnet::symbread();
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
- $body_tag_start.='';
+ my $target_id =
+ &Apache::lonstathelpers::make_target_id({symb => $symb,
+ part => '0'});
+ $body_tag_start.='';
}
}
}
@@ -471,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 = '';
+ foreach my $file (@files) {
+ my $url="/uploaded/$domain/$user/portfolio$file";
+ if (! &Apache::lonnet::stat_file($url)) {
+ $file = &mt(' Nonexistant file: [_1] ',$file);
+ } else {
+ $file = ''.$file.' ';
+ }
+ $files .= ''.$file.' ';
+ }
+ $files.=' ';
+
$result.=<$title
Files submitted: $files
@@ -519,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');
}
@@ -541,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') {
@@ -601,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();
@@ -979,7 +1000,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="
\n ";
+ $result.="\n ";
#$result.=' ';
#$result.=''.
- ' '.
- ' '.
- ' '.
- 'Additional Comment for Student '.
- ''.
- ' '.
- ''.
- ' '.&mt('Ungraded').' '.
- ' '.&mt('Pass').' '.
- ' '.&mt('Fail').' '.
- ' '.&mt('Review').' '.
- ' '.
- ''.
- 'Prev '.
- 'Next '.
- ' ';
+ ''."\n".
+ ' '.&mt('Ungraded').' '."\n".
+ ' '.&mt('Fail').' '."\n".
+ ' '.&mt('Pass').' '."\n".
+ ' '.&mt('Review').' '."\n".
+ '
'."\n".
+ ''."\n".
+ ''."\n".
+ ''."\n";
+ $result.=&grading_history($version,$dim,$instance,$id);
$last_link=$link;
}
} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1832,6 +1854,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 '';
+ }
+ return '';
+}
+
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;