--- loncom/homework/bridgetask.pm 2005/11/15 19:50:22 1.77 +++ loncom/homework/bridgetask.pm 2006/02/20 22:57:41 1.112 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.77 2005/11/15 19:50:22 albertel Exp $ +# $Id: bridgetask.pm,v 1.112 2006/02/20 22:57:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,7 @@ sub initialize_bridgetask { } sub proctor_check_auth { - my ($slot_name,$slot)=@_; + my ($slot_name,$slot,$type)=@_; my $user=$env{'form.proctorname'}; my $domain=$env{'form.proctordomain'}; @@ -79,20 +79,33 @@ sub proctor_check_auth { $authenticated=1; } } - if ($authenticated) { + if ($authenticated && $type eq 'Task') { + # increment version my $version= - $Apache::lonhomework::results{'resource.version'}= - ++$Apache::lonhomework::history{'resource.version'}; - $Apache::lonhomework::results{"resource.$version.checkedin"}= - $user.'@'.$domain; - $Apache::lonhomework::results{"resource.$version.checkedin.slot"}= - $slot_name; + $Apache::lonhomework::history{'resource.0.version'}; + $version++; + + #clean out all current results foreach my $key (keys(%Apache::lonhomework::history)) { if ($key=~/^resource\.0\./) { $Apache::lonhomework::results{$key}=''; } } + + #setup new version and who did it + $Apache::lonhomework::results{'resource.0.version'}=$version; + $Apache::lonhomework::results{"resource.$version.0.checkedin"}= + $user.'@'.$domain; + $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= + $slot_name; + return 1; + } elsif ($authenticated && $type eq 'problem') { + &Apache::lonxml::debug("authed $slot_name"); + $Apache::lonhomework::results{"resource.0.checkedin"}= + $user.'@'.$domain; + $Apache::lonhomework::results{"resource.0.checkedin.slot"}= + $slot_name; } } } @@ -103,11 +116,11 @@ sub get_version { my ($version,$previous); if ($env{'form.previousversion'} && $env{'form.previousversion'} ne 'current' && - defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { + defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) { $version=$env{'form.previousversion'}; $previous=1; } else { - $version=$Apache::lonhomework::history{'resource.version'}; + $version=$Apache::lonhomework::history{'resource.0.version'}; $previous=0; } if (wantarray) { @@ -119,10 +132,10 @@ sub get_version { sub add_previous_version_button { my ($status)=@_; my $result; - if ($Apache::lonhomework::history{'resource.version'} eq '') { + if ($Apache::lonhomework::history{'resource.0.version'} eq '') { return ''; } - if ($Apache::lonhomework::history{'resource.version'} < 2 && + if ($Apache::lonhomework::history{'resource.0.version'} < 2 && $status ne 'NEEDS_CHECKIN') { return ''; } @@ -133,8 +146,8 @@ sub add_previous_version_button { "\n"; } my @to_show; - foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) { - if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) { + foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) { + if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) { push(@to_show,$test_version); } } @@ -175,19 +188,32 @@ 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.='
Specify a section: | '.$sec_select.' | '; + $result.=''.' '; - $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.=''; + $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, + 'gradingdomain'); + $result.=' '. + &Apache::loncommon::selectstudent_link('gradesubmission', + 'gradinguser', + 'gradingdomain'); + $result.=&Apache::loncommon::studentbrowser_javascript(); + } return $result; } @@ -316,7 +342,7 @@ sub internal_location { sub submission_time_stamp { my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); my $submissiontime; - my $version=$Apache::lonhomework::history{'resource.version'}; + my $version=$Apache::lonhomework::history{'resource.0.version'}; for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { $submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; @@ -324,7 +350,7 @@ sub submission_time_stamp { } my $result; if ($submissiontime) { - my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'}; + my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'}; my %slot=&Apache::lonnet::get_slot($slot_name); my $diff = $slot{'endtime'} - $submissiontime; my ($color,$when)=('#FF6666','after'); @@ -349,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="
".&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)."
".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."
\n"; my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; @@ -775,9 +881,12 @@ DONEBUTTON } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); - if ($award eq 'SUBMITTED') { - &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); + if ($award eq 'SUBMITTED' + && defined($Apache::inputtags::slot_name)) { + &add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]); } + } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { + &Apache::structuretags::finalize_storage(); } if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= @@ -790,7 +899,7 @@ DONEBUTTON &Apache::lonhomework::showhash(%Apache::lonhomework::results); foreach my $dim_id (@Apache::bridgetask::dimensionlist) { my $status= - $Apache::lonhomework::results{"resource.$version.$dim_id.status"}; + $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"}; my $mandatory= ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); if ($status eq 'pass') { @@ -809,10 +918,10 @@ DONEBUTTON $mandatory_failed++; } &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); - $Apache::lonhomework::results{'resource.grader'}= + $Apache::lonhomework::results{'resource.0.regrader'}= $env{'user.name'}.'@'.$env{'user.domain'}; if ($review) { - $Apache::lonhomework::results{"resource.$version.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."); @@ -820,7 +929,7 @@ DONEBUTTON &move_between_queues($env{'form.queue'},'reviewqueue'); } } elsif ($ungraded) { - $Apache::lonhomework::results{"resource.$version.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."); @@ -829,7 +938,7 @@ DONEBUTTON &check_queue_unlock($env{'form.queue'}); } } elsif ($mandatory_failed) { - $Apache::lonhomework::results{"resource.$version.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.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; @@ -847,7 +956,7 @@ DONEBUTTON ["$version.0.bridgetask"]); } } else { - $Apache::lonhomework::results{"resource.$version.status"}='pass'; + $Apache::lonhomework::results{"resource.$version.0.status"}='pass'; $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.awarded"}='1'; @@ -864,8 +973,8 @@ DONEBUTTON ["$version.0.bridgetask"]); } } - $Apache::lonhomework::results{"resource.status"}= - $Apache::lonhomework::results{"resource.$version.status"}; + $Apache::lonhomework::results{"resource.0.status"}= + $Apache::lonhomework::results{"resource.$version.0.status"}; if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { $Apache::lonhomework::results{"resource.0.award"}= $Apache::lonhomework::results{"resource.$version.0.award"}; @@ -874,10 +983,11 @@ DONEBUTTON $Apache::lonhomework::results{"resource.0.solved"}= $Apache::lonhomework::results{"resource.$version.0.solved"}; } + &minimize_storage(); &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="\nEmpty |
"; } - $result.=" | resource | user | type | data |
---|
Status | "; } + $result.=" | user | data |
---|---|---|---|
$title | $uname | "; - $result.='lock | '.$queue{$key}.' |
$uname | "; + $result.=''.$queue{$key}.' | ||
$title | "; - $result.=' | last queue modification time | '. + $result.=" |
"; + $result.=' | '. &Apache::lonlocal::locallocaltime($queue{$key})." | ||
- | $fullname->{$student} | +$fullname->{$student} ($studentdis) | RESULT } @@ -1356,6 +1549,9 @@ RESULT if ($status{'version'}) { $result .= ' '.&mt('Version').' '.$status{'version'}; } + if ($status{'grader'}) { + $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' '; + } $result.= ' | ';
if ($status{'reviewqueue'} eq 'enqueued') {
$result .= &mt('Awaiting Review');
@@ -1379,17 +1575,23 @@ RESULT
}
sub get_student_status {
- my ($symb,$cid,$udom,$uname)=@_;
- my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
- $udom,$uname);
+ my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
+
my %status;
- $status{'status'}=$record{'resource.status'};
- $status{'version'}=$record{'resource.version'};
- $status{'grader'}=$record{'resource.grader'};
- $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',
- &encode_queue_key($symb,$udom,$uname));
- $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',
- &encode_queue_key($symb,$udom,$uname));
+
+ if ($type eq 'Task') {
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $udom,$uname);
+ $status{'status'}=$record{'resource.0.status'};
+ $status{'version'}=$record{'resource.0.version'};
+ $status{'grader'}=$record{'resource.0.regrader'};
+ }
+ $status{'reviewqueue'}=
+ &check_queue_for_key($cdom,$cnum,'reviewqueue',
+ &encode_queue_key($symb,$udom,$uname));
+ $status{'gradingqueue'}=
+ &check_queue_for_key($cdom,$cnum,'gradingqueue',
+ &encode_queue_key($symb,$udom,$uname));
return %status;
}
@@ -1465,6 +1667,7 @@ sub get_instance {
$instance = $instances[($version-1)%scalar(@instances)];
$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =
$instance;
+ $Apache::lonhomework::results{'INTERNAL_store'} = 1;
&Apache::response::poprandomnumber();
return $instance;
}
@@ -1488,10 +1691,10 @@ sub get_instance {
foreach my $instance (@instances) {
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
- if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
- $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+ if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
+ $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
- my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
+ my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
my $mandatory='Mandatory';
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
$mandatory='Optional';
@@ -1511,12 +1714,12 @@ sub get_instance {
if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}
eq 'N') {
$opt_count++;
- if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+ if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
$opt_passed++;
}
} else {
$man_count++;
- if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+ if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
$man_passed++;
}
}
@@ -1530,8 +1733,8 @@ sub get_instance {
$result=~s/\Q$internal_location\E/$dim_info/;
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
- my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
+ my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+ my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
if ($mandatory) {
$mandatory='Mandatory';
@@ -1551,8 +1754,8 @@ sub get_instance {
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.=' '.$status_display.' '; - if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { - $result.=''.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.' '; + if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) { + $result.=''.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).' '; } $result.=''; } @@ -1566,29 +1769,29 @@ sub get_instance { &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $link='criteria_'.$instance.'_'.$id; - my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; - $result.=' |
'.
- ''.
- ''.
- ' | '.
- ''. - ''. - ' | '.
- ''.
- ' '. - ' '. - ' '. - ' '. - ' | '.
- ''.
- 'Prev '. - 'Next '. - ' |