--- loncom/homework/bridgetask.pm 2005/08/15 19:41:16 1.41
+++ loncom/homework/bridgetask.pm 2005/09/29 19:15:47 1.54
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.41 2005/08/15 19:41:16 albertel Exp $
+# $Id: bridgetask.pm,v 1.54 2005/09/29 19:15:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -148,8 +148,6 @@ sub add_grading_button {
&mt("Get a submission to grade").'" />';
$result.='';
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
- # FIXME need a permission for limiting this to 'powerful users'
-
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
$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);
@@ -160,6 +158,8 @@ sub add_grading_button {
$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.='
';
- if (!$previous) {
- $result.=&add_request_another_attempt_button();
- }
- }
- if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
- $result.='
'.&mt('Passed').'
';
- }
$result.=$form_tag_start.
'';
$result.=&preserve_grade_info();
-
+ $result.=&internal_location();
+ &Apache::lonxml::startredirection();
}
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
$result.=$head_tag_start.$body_tag_start;
- $result.=' Review'.&show_queue('reviewqueue');
- $result.=' Grade'.&show_queue('gradingqueue');
+ #$result.=' Review'.&show_queue('reviewqueue');
+ #$result.=' Grade'.&show_queue('gradingqueue');
}
# FIXME Blast! still need to reorg this, need to reshow the
# queue being reviewed once done with the grade pass...
@@ -323,7 +388,6 @@ sub start_Task {
# there isn't reshow the queue....
my ($todo,$status_code)=&get_key_todo($target);
- &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
if ($todo) {
&setup_env_for_other_user($todo,$safeeval);
my ($symb,$uname,$udom)=&decode_queue_key($todo);
@@ -336,7 +400,7 @@ sub start_Task {
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
if ($target eq 'webgrade') {
- $result.=' After -'.&show_queue($env{'form.queue'});
+ #$result.=' After -'.&show_queue($env{'form.queue'});
$result.="\n".'
';
if ($status_code eq 'selected') {
$form_tag_start.=
@@ -355,6 +419,8 @@ sub start_Task {
$result.=&show_queue($env{'form.queue'},1);
} elsif ($status_code eq 'show_list') {
$result.=&show_queue($env{'form.queue'},1);
+ } elsif ($status_code eq 'select_user') {
+ $result.=&select_user();
} else {
$result.=''.&mt("No user to be graded.").'';
}
@@ -368,6 +434,10 @@ sub start_Task {
$webgrade.'" />';
$result.='';
+ if ($env{'form.regrade'}) {
+ $result.='';
+ }
}
} else {
# page_start returned a starting result, delete it if we don't need it
@@ -381,7 +451,7 @@ sub get_key_todo {
my $todo;
if (defined($env{'form.reviewasubmission'})) {
- &Apache::lonnet::logthis("review a submission....");
+ &Apache::lonxml::debug("review a submission....");
$env{'form.queue'}='reviewqueue';
return (undef,'show_list');
}
@@ -392,6 +462,12 @@ sub get_key_todo {
return (undef,'show_list');
}
+ if (defined($env{'form.regradeasubmission'})) {
+ &Apache::lonxml::debug("regrade a grading....");
+ $env{'form.queue'}='none';
+ return (undef,'select_user');
+ }
+
my $queue=$env{'form.queue'};
if (!defined($queue)) {
@@ -400,6 +476,20 @@ sub get_key_todo {
my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+ if ($env{'form.queue'} eq 'none') {
+ if (defined($env{'form.gradingkey'})) {
+ if ($target eq 'webgrade') {
+ if ($env{'form.stop'}) {
+ return (undef,'stop');
+ } elsif ($env{'form.next'}) {
+ return (undef,'show_list');
+ }
+ }
+ return ($gradingkey,'selected');
+ } else {
+ return (undef,'show_list');
+ }
+ }
if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
&& !defined($env{'form.gradingaction'})
&& $env{'form.queuemode'} eq 'selected') {
@@ -460,14 +550,62 @@ sub end_Task {
($target eq 'answer') || ($target eq 'tex')
) {
if ($target eq 'web') {
+ if (&show_task($status,$previous)) {
+ $result.=&Apache::lonxml::endredirection();
+ }
if ($status eq 'CAN_ANSWER' && !$previous) {
$result.="\n".'
'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'
').
"
";
$result.=&Apache::inputtags::gradestatus('0');
}
+ if (&show_task($status,$previous)) {
+ my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
+ my $title=&Apache::lonnet::gettitle();
+ my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
+ my $description=&Apache::slotrequest::get_description($Apache::inputtags::slot_name,\%slot);
+
+ my $status;
+ $status.="\n
\n";
+
+ if ($bt_status eq 'pass') {
+ $status.='
You passed the '.$title.' given on '.
+ $description.'.
';
+ }
+ if ($bt_status eq 'fail') {
+ $status.='
You did not pass the '.$title.' given on '.
+ $description.'.
';
+ if (!$previous) {
+ $status.=&add_request_another_attempt_button();
+ }
+ }
+ my $man_count=0;
+ my $opt_count=0;
+ my $opt_passed=0;
+ foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+ if ($Apache::bridgetask::dimensionmandatory{$dim_id}
+ eq 'N') {
+ $opt_count++;
+ if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
+ $opt_passed++;
+ }
+ } else {
+ $man_count++;
+ }
+ }
+ my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
+ $parstack,$safeeval);
+ if ($opt_req !~ /\S/) { $opt_req='0'; }
+ $status.="\n
".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."
\n";
+
+ my $internal_location=&internal_location();
+ $result=~s/\Q$internal_location\E/$status/;
+ }
}
if ($target eq 'web' || $target eq 'webgrade') {
$result.=&Apache::lonxml::xmlend().'