--- loncom/homework/bridgetask.pm 2006/02/20 22:57:41 1.112
+++ loncom/homework/bridgetask.pm 2006/05/25 19:39:13 1.155
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.112 2006/02/20 22:57:41 albertel Exp $
+# $Id: bridgetask.pm,v 1.155 2006/05/25 19:39:13 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@ use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
- &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
+ &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph'));
}
sub initialize_bridgetask {
@@ -66,7 +66,7 @@ sub proctor_check_auth {
my @allowed=split(",",$slot->{'proctor'});
foreach my $possible (@allowed) {
- my ($puser,$pdom)=(split('@',$possible));
+ my ($puser,$pdom)=(split(':',$possible));
if ($puser eq $user && $pdom eq $domain) {
my $authenticated=0;
if ( $slot->{'secret'} =~ /\S/ &&
@@ -79,39 +79,56 @@ sub proctor_check_auth {
$authenticated=1;
}
}
- if ($authenticated && $type eq 'Task') {
- # increment version
- my $version=
- $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;
-
+ if ($authenticated) {
+ &create_new_version($type,$user,$domain,$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;
}
}
}
return 0;
}
+sub create_new_version {
+ my ($type,$user,$domain,$slot_name) = @_;
+ if ($type eq 'Task') {
+ # increment version
+ my $version=
+ $Apache::lonhomework::history{'resource.0.version'};
+ $version++;
+ &Apache::lonxml::debug("Making 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;
+ if (defined($user) && defined($domain)) {
+ $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+ $user.':'.$domain;
+ } else {
+ $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+ $env{'user.name'}.':'.$env{'user.domain'};
+ }
+ if (defined($slot_name)) {
+ $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
+ $slot_name;
+ }
+ } elsif ($type eq 'problem') {
+ &Apache::lonxml::debug("authed $slot_name");
+ if (defined($user) && defined($domain)) {
+ $Apache::lonhomework::results{"resource.0.checkedin"}=
+ $user.':'.$domain;
+ }
+ if (defined($slot_name)) {
+ $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
+ $slot_name;
+ }
+ }
+}
+
sub get_version {
my ($version,$previous);
if ($env{'form.previousversion'} &&
@@ -120,7 +137,11 @@ sub get_version {
$version=$env{'form.previousversion'};
$previous=1;
} else {
- $version=$Apache::lonhomework::history{'resource.0.version'};
+ if (defined($Apache::lonhomework::results{'resource.0.version'})) {
+ $version=$Apache::lonhomework::results{'resource.0.version'};
+ } elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
+ $version=$Apache::lonhomework::history{'resource.0.version'};
+ }
$previous=0;
}
if (wantarray) {
@@ -155,7 +176,7 @@ sub add_previous_version_button {
join("</option>\n<option>",@to_show).
"</option>\n";
$list.='<option value="current">'.&mt('Current').'</option>';
- $result.='<form name="getprevious" method="POST" action="';
+ $result.='<form name="getprevious" method="post" action="';
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$result.=$uri.'">'.
@@ -170,16 +191,16 @@ sub add_grading_button {
my (undef,$cid)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my %sections;
- my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
+ my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+
my $size=5;
if (scalar(keys(%sections)) < 3) {
$size=scalar(keys(%sections))+2;
}
- my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+ my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
$sec_select .= "<option value='all' selected='selected'>all</option>\n";
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
- $sec_select .= "<option name=\"$sec\">$sec</option>\n";
+ $sec_select .= "<option value=\"$sec\">$sec</option>\n";
}
$sec_select .= "<option value='none'>none</option></select>\n";
@@ -213,7 +234,8 @@ sub add_grading_button {
'gradinguser',
'gradingdomain');
$result.=&Apache::loncommon::studentbrowser_javascript();
- }
+ $result.= '</p>';
+ }
return $result;
}
@@ -222,6 +244,12 @@ sub add_request_another_attempt_button {
if (!$text) { $text="Request another attempt"; }
my $result;
my $symb=&Apache::lonnet::symbread();
+ # not a slot access based resource
+ my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
+ if ($useslots =~ /^\s*no\s*$/i) {
+ return '';
+ }
+
my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
my $action='get_reservation';
if ($slot_name) {
@@ -236,7 +264,7 @@ STUFF
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
$symb=&Apache::lonnet::escape($symb);
- $result.='<form method="POST" action="/adm/slotrequest">'.
+ $result.='<form method="post" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="'.$action.'" />'.
'<input type="submit" name="requestattempt" value="'.
@@ -258,64 +286,14 @@ sub preserve_grade_info {
}
sub style {
- return (<<STYLE);
-<style type="text/css">
-.fail, .pass, .neutral {
- position: relative;
- margin : 5px;
- margin-bottom :10px;
- padding : 4px;
- padding-left : 75px;
- border : thin solid;
- font-weight : bolder;
- font-size: smaller;
- font-family: Arial;
- background-color : rgb(255,240,225);
-}
-
-.fail h4, .pass h4 {
- position:absolute;
- left: -4px;
- top: -8px;
- padding:2px;
- margin:0;
- background-color : rgb(255,240,225);
- border : thin solid;
-}
-
-.fail {
- color: red;
-}
-
-.pass {
- color : green;
-}
-
-.neutral {
- color : blue;
-}
-
-.question {
- border : thin solid black;
- padding : 4px;
- margin-bottom : 1em;
-}
-
-.grade {
- font-size: x-large;
- font-family: Arial;
- position:absolute;
- left: 5px;
- top: -5px;
- width: 70px;
-}
-
-div#feedback h1 {
- color : inherit;
-}
-</style>
+ my ($target) = @_;
+ if ($target eq 'web'
+ || $target eq 'webgrade') {
+ return (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
STYLE
-
+ }
+ return;
}
sub show_task {
@@ -327,7 +305,8 @@ sub show_task {
( $status eq 'NOT_IN_A_SLOT') ||
( $status eq 'NEEDS_CHECKIN') ||
( $status eq 'WAITING_FOR_GRADE') ||
- ( $status eq 'INVALID_ACCESS') )) {
+ ( $status eq 'INVALID_ACCESS') ||
+ ( &get_version() eq ''))) {
return 0;
}
if ($env{'form.donescreen'}) { return 0; }
@@ -371,12 +350,15 @@ sub submission_time_stamp {
return $result;
}
-sub webgrade_standard_info {
- my ($version)=&get_version();
- my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+sub file_list {
+ my ($files,$uname,$udom) = @_;
+ if (!defined($uname) || !defined($udom)) {
+ (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+ }
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
- my $file_list="<ul class=\"handininfo\">\n";
- foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+
+ my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
+ foreach my $partial_file (split(',',$files)) {
my $file=$file_url.$partial_file;
$file=~s|/+|/|g;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
@@ -385,15 +367,25 @@ sub webgrade_standard_info {
'</a></nobr></li>'."\n";
}
$file_list.="</ul>\n";
+ return $file_list;
+}
+
+sub webgrade_standard_info {
+ my ($version)=&get_version();
+
+ my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
- my %lt=&Apache::lonlocal::texthash('done' => 'Done',
- 'stop' => 'Stop',
+ my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
+ 'stop' => 'Quit Grading',
+ 'fail' => 'Fail Rest',
);
my $result=<<INFO;
- <div class="maincontrols">
+ <div class="LC_GRADING_maincontrols">
<input type="submit" name="next" value="$lt{'done'}" />
<input type="submit" name="stop" value="$lt{'stop'}" />
+ <input type="button" name="fail" value="$lt{'fail'}"
+ onclick="javascript:onFailRest()" />
</div>
$file_list
INFO
@@ -414,19 +406,32 @@ sub start_Task {
}
$Apache::lonhomework::parsing_a_task=1;
- #should get back a <html> or the neccesary stuff to start XML/MathML
- my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
- &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-
+
+ my $name;
+ if ($target eq 'web' || $target eq 'webgrade') {
+ $name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
+ }
+
+ my ($result,$form_tag_start);
+ if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+ || $target eq 'edit') {
+ ($result,$form_tag_start) =
+ &Apache::structuretags::page_start($target,$token,$tagstack,
+ $parstack,$parser,$safeeval,
+ $name,&style($target));
+ $result .= '<div class="LC_task">'."\n";
+ }
+
if ($target eq 'web' && $env{'request.state'} ne 'construct') {
- if ($Apache::lonhomework::modifygrades) {
- $body_tag_start.='<form name="gradesubmission" method="POST" action="';
+ if ($Apache::lonhomework::queuegrade
+ || $Apache::lonhomework::modifygrades) {
+ $result.='<form name="gradesubmission" method="post" action="';
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
- $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
+ $result.=$uri.'">'.&add_grading_button()."</form>";
my $symb=&Apache::lonnet::symbread();
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
- $body_tag_start.='<form method="POST" name="slotrequest" action="/adm/slotrequest">'.
+ $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="showslots" />'.
'<input type="submit" name="requestattempt" value="'.
@@ -435,7 +440,7 @@ sub start_Task {
my $target_id =
&Apache::lonstathelpers::make_target_id({symb => $symb,
part => '0'});
- $body_tag_start.='<form method="POST" name="gradingstatus" action="/adm/statistics">'.
+ $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
'<input type="submit" name="grading" value="'.
@@ -452,17 +457,24 @@ sub start_Task {
my ($version,$previous)=&get_version();
($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_slot_access('0','Task');
+ if ($status eq 'CAN_ANSWER' && $version eq '') {
+ &create_new_version('Task',undef,undef,$slot_name);
+ &add_to_queue('gradingqueue',{'type' => 'Task',
+ 'time' => time,
+ 'slot' => $slot_name});
+ ($version,$previous)=&get_version();
+ }
+
push(@Apache::inputtags::status,$status);
$Apache::inputtags::slot_name=$slot_name;
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");
- $body_tag_start.=&add_previous_version_button($status);
+ $result.=&add_previous_version_button($status);
if (!&show_task($status,$previous)) {
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
if ( $target eq "web" ) {
- $result.= $head_tag_start.'</head>'.$body_tag_start;
if ($env{'request.state'} eq 'construct') {
$result.=$form_tag_start;
}
@@ -480,7 +492,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='<ul><li>'.join('</li><li>',@files).'</li></ul>';
+ my (undef,undef,$domain,$user)=
+ &Apache::lonxml::whichuser();
+ my $files = '<ul>';
+ foreach my $file (@files) {
+ my $url="/uploaded/$domain/$user/portfolio$file";
+ if (! &Apache::lonnet::stat_file($url)) {
+ $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
+ } else {
+ $file = '<tt>'.$file.'</tt>';
+ }
+ $files .= '<li>'.$file.'</li>';
+ }
+ $files.='</ul>';
+
$result.=<<DONESCREEN;
<h2>$title</h2>
<p> Files submitted: $files </p>
@@ -507,17 +532,18 @@ DONESCREEN
if ($status eq 'NEEDS_CHECKIN') {
if(&proctor_check_auth($slot_name,$slot,'Task')
&& defined($Apache::inputtags::slot_name)) {
- my $result=&add_to_queue('gradingqueue',
- [$Apache::inputtags::slot_name]);
+ my $result=
+ &add_to_queue('gradingqueue',
+ {'type' => 'Task',
+ 'time' => time,
+ 'slot' =>
+ $Apache::inputtags::slot_name});
&Apache::lonxml::debug("add_to_queue said $result");
}
}
}
} elsif ($target eq 'web') {
- my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
- $result.="$head_tag_start<title>$name</title></head>
- $body_tag_start \n".&style();
-
+
$result.=&preserve_grade_info();
$result.=&internal_location();
$result.=$form_tag_start.
@@ -528,7 +554,9 @@ DONESCREEN
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
- $result.=$head_tag_start.'</head>'.$body_tag_start;
+ $result.= "\n".'<div class="LC_GRADING_task">'."\n".
+ '<script type="text/javascript"
+ src="/res/adm/includes/task_grading.js"></script>';
#$result.='<br />Review'.&show_queue('reviewqueue');
#$result.='<br />Grade'.&show_queue('gradingqueue');
}
@@ -607,10 +635,10 @@ DONESCREEN
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
}
if ($target eq 'webgrade') {
- $result.="\n".'<div id="criterialist">';
+ $result.="\n".'<div id="LC_GRADING_criterialist">';
}
} elsif ($target eq 'edit') {
- $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+ $result.=$form_tag_start.
&Apache::structuretags::problem_edit_header();
$Apache::lonxml::warnings_error_header=
&mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
@@ -646,7 +674,7 @@ sub get_key_todo {
}
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
#need to try both queues..
if (defined($env{'form.regradeaspecificsubmission'}) &&
@@ -692,7 +720,7 @@ sub get_key_todo {
#otherwise (defined($who) && $who ne $me) some else has it...
return (undef,'not_allowed',
&mt('Another user ([_1]) currently has the record for [_2] locked.',
- $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));
+ $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
}
@@ -802,8 +830,9 @@ sub end_Task {
&show_task($status,$previous)) {
$result.=&Apache::inputtags::gradestatus('0');
$result.='</form>';
+ my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
$result.=<<DONEBUTTON;
-<form method="POST">
+<form name="done" method="post" action="$action">
<input type="hidden" name="donescreen" value="1" />
<input type="submit" value="Done" />
</form>
@@ -814,13 +843,21 @@ DONEBUTTON
my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
my $title=&Apache::lonnet::gettitle();
+ my $start_time;
+
my $slot_name=
$Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
- my %slot=&Apache::lonnet::get_slot($slot_name);
- my $start_time=
- &Apache::lonlocal::locallocaltime($slot{'starttime'});
+ if ($slot_name) {
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+
+ $start_time=$slot{'starttime'}
+ } else {
+ $start_time=
+ &Apache::lonnet::EXT('resource.0.opendate');
+ }
+ $start_time=&Apache::lonlocal::locallocaltime($start_time);
- my $status = "\n<div class='$bt_status'>\n";
+ my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
if ($bt_status eq 'pass') {
$status.='<h2>You passed the '.$title.' given on '.
@@ -847,6 +884,7 @@ DONEBUTTON
$man_count++;
}
}
+
my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
$parstack,$safeeval);
if ($opt_req !~ /\S/) { $opt_req='0'; }
@@ -855,9 +893,8 @@ DONEBUTTON
my $internal_location=&internal_location();
$result=~s/\Q$internal_location\E/$status/;
}
- }
- if ($target eq 'web' || $target eq 'webgrade') {
- $result.=&Apache::lonxml::xmlend().'</html>';
+ $result.="\n</div>\n".
+ &Apache::loncommon::end_page({'discussion' => 1});
}
}
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
@@ -881,9 +918,18 @@ DONEBUTTON
}
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
- if ($award eq 'SUBMITTED'
- && defined($Apache::inputtags::slot_name)) {
- &add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]);
+ if ($award eq 'SUBMITTED') {
+ my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+ if ($useslots =~ /^\s*no\s*$/i) {
+ &add_to_queue('gradingqueue',
+ {'type' => 'Task',
+ 'time' => time});
+ } elsif (defined($Apache::inputtags::slot_name)) {
+ &add_to_queue('gradingqueue',
+ {'type' => 'Task',
+ 'time' => time,
+ 'slot' => $Apache::inputtags::slot_name});
+ }
}
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
&Apache::structuretags::finalize_storage();
@@ -919,7 +965,7 @@ DONEBUTTON
}
&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.0.regrader'}=
- $env{'user.name'}.'@'.$env{'user.domain'};
+ $env{'user.name'}.':'.$env{'user.domain'};
if ($review) {
$Apache::lonhomework::results{"resource.$version.0.status"}='review';
if ($env{'form.queue'} eq 'reviewqueue') {
@@ -987,7 +1033,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="</div>\n<hr />";
+ $result.="</div>";
#$result.='<input type="submit" name="next" value="'.
# &mt('Save & Next').'" /> ';
#$result.='<input type="submit" name="end" value="'.
@@ -996,7 +1042,8 @@ DONEBUTTON
# &mt('Throw Away & Stop Grading').'" /> ';
#$result.='<input type="submit" name="save" value="'.
# &mt('Save Partial Grade and Continue Grading').'" /> ';
- $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
+ $result.='</form>'."\n</div>\n</div>\n".
+ &Apache::loncommon::end_page();
} elsif ($target eq 'meta') {
$result.=&Apache::response::meta_package_write('Task');
$result.=&Apache::response::meta_stores_write('solved','string',
@@ -1021,7 +1068,7 @@ sub move_between_queues {
} else {
$cur_data = ['none'];
}
- my $result=&add_to_queue($dest_queue,[$cur_data->[0]]);
+ my $result=&add_to_queue($dest_queue,$cur_data);
if ($result ne 'ok') {
return $result;
}
@@ -1034,11 +1081,11 @@ sub check_queue_unlock {
if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
if (!defined($key)) {
- $key="$symb\0queue\0$uname\@$udom";
+ $key="$symb\0queue\0$uname:$udom";
}
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
if ($who eq $me) {
return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
@@ -1101,7 +1148,7 @@ sub get_queue_data {
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $todo="$symb\0queue\0$uname\@$udom";
+ my $todo="$symb\0queue\0$uname:$udom";
my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
if ($key eq $todo && ref($value)) {
return $value;
@@ -1120,17 +1167,17 @@ sub check_queue_for_key {
if (defined($results{"$todo\0locked"})) {
return 'locked';
}
- my $slot;
- if (ref($results{$todo}) eq 'ARRAY') {
- $slot = $results{$todo}[0];
- } elsif (ref($results{$todo}) eq 'HASH') {
- $slot = $results{$todo}{'slot'};
- }
- if (defined($slot)) {
+ if (my $slot=&slotted_access($results{$todo})) {
my %slot_data=&Apache::lonnet::get_slot($slot);
if ($slot_data{'endtime'} > time) {
return 'in_progress';
}
+ } else {
+ my ($symb) = &decode_queue_key($todo);
+ my $due_date = &Apache::lonhomework::due_date('0',$symb);
+ if ($due_date > time) {
+ return 'in_progress';
+ }
}
return 'enqueued';
}
@@ -1147,7 +1194,7 @@ sub add_to_queue {
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
my %data;
- $data{"$symb\0queue\0$uname\@$udom"}=$user_data;
+ $data{"$symb\0queue\0$uname:$udom"}=$user_data;
return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
}
@@ -1190,13 +1237,20 @@ sub show_queue {
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
} elsif ($key!~/(timestamp|locked)$/) {
$result.="<tr>";
- my $slot=$queue{$key}->[0];
- my %slot_data=&Apache::lonnet::get_slot($slot);
+ my ($end_time,$slot_text);
+ if (my $slot=&slotted_access($queue{$key})) {
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ $end_time = $slot_data{'endtime'};
+ $slot_text = &mt('Slot: [_1]',$slot);
+ } else {
+ $end_time = &Apache::lonhomework::due_date('0',$symb);
+ $slot_text = '';
+ }
if ($with_selects) {
my $ekey=&Apache::lonnet::escape($key);
my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
$status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
if ($me eq $queue{"$key\0locked"}) {
($action,$description)=('resume',&mt('Resume'));
@@ -1209,11 +1263,11 @@ sub show_queue {
$seclist.='<input type="hidden" name="chosensections"
value="'.$sec.'" />';
}
- if (time > $slot_data{'endtime'}) {
+ if ($end_time ne '' && time > $end_time) {
$result.=(<<FORM);
<td>$status</td>
<td>
-<form style="display: inline" method="POST">
+<form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$ekey" />
<input type="hidden" name="queue" value="$queue" />
<input type="hidden" name="gradingaction" value="$action" />
@@ -1226,13 +1280,13 @@ sub show_queue {
FORM
} else {
- $result.='<td>'.&mt("In Progress").'</td>'
+ $result.='<td>'.&mt("In Progress").'</td><td> </td>'
}
}
$result.= "<td>".$fullname->{$uname.':'.$udom}.
- " <tt>($uname\@$udom)</tt> </td>";
- $result.='<td>Slot: '.$slot.' End time: '.
- &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+ " <tt>($uname:$udom)</tt> </td>";
+ $result.='<td>'.$slot_text.' End time: '.
+ &Apache::lonlocal::locallocaltime($end_time).
"</td></tr>";
}
}
@@ -1262,13 +1316,19 @@ sub get_queue_counts {
} elsif ($key!~/(timestamp|locked)$/) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
$entries++;
- my $slot=$queue{$key}->[0];
- if (!exists($slot_cache{$slot})) {
- my %slot_data=&Apache::lonnet::get_slot($slot);
- $slot_cache{$slot} = \%slot_data;
- }
- if (time > $slot_cache{$slot}{'endtime'}) {
- $ready_to_grade++;
+ if (my $slot=&slotted_access($queue{$key})) {
+ if (!exists($slot_cache{$slot})) {
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ $slot_cache{$slot} = \%slot_data;
+ }
+ if (time > $slot_cache{$slot}{'endtime'}) {
+ $ready_to_grade++;
+ }
+ } else {
+ my $due_date = &Apache::lonhomework::due_date('0',$symb);
+ if ($due_date ne '' && time > $due_date) {
+ $ready_to_grade++;
+ }
}
}
}
@@ -1277,13 +1337,13 @@ sub get_queue_counts {
sub encode_queue_key {
my ($symb,$udom,$uname)=@_;
- return "$symb\0queue\0$uname\@$udom";
+ return "$symb\0queue\0$uname:$udom";
}
sub decode_queue_key {
my ($key)=@_;
my ($symb,undef,$user) = split("\0",$key);
- my ($uname,$udom) = split('@',$user);
+ my ($uname,$udom) = split(':',$user);
return ($symb,$uname,$udom);
}
@@ -1302,6 +1362,22 @@ sub queue_key_locked {
return undef;
}
+sub slotted_access {
+ my ($queue_entry) = @_;
+ if (ref($queue_entry) eq 'ARRAY') {
+ if (defined($queue_entry->[0])) {
+ return $queue_entry->[0];
+ }
+ return undef;
+ } elsif (ref($queue_entry) eq 'HASH') {
+ if (defined($queue_entry->{'slot'})) {
+ return $queue_entry->{'slot'};
+ }
+ return undef;
+ }
+ return undef;
+}
+
sub pick_from_queue_data {
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
my @possible; # will hold queue entries that are valid to be selected
@@ -1316,24 +1392,44 @@ sub pick_from_queue_data {
next;
}
}
- my $slot=$queuedata->{$key}[0];
- my %slot_data=&Apache::lonnet::get_slot($slot);
- if ($slot_data{'endtime'} > time) {
- &Apache::lonxml::debug("not time");
- next;
+ my $end_time;
+ if (my $slot=&slotted_access($queuedata->{$key})) {
+ &Apache::lonxml::debug("looking at slot $slot");
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ if ($slot_data{'endtime'} < time) {
+ $end_time = $slot_data{'endtime'};
+ } else {
+ &Apache::lonxml::debug("not time ".$slot_data{'endtime'});
+ next;
+ }
+ } else {
+ my $due_date = &Apache::lonhomework::due_date('0',$symb);
+ if ($due_date < time) {
+ $end_time = $due_date;
+ } else {
+ &Apache::lonxml::debug("not time $due_date");
+ next;
+ }
}
+
if (exists($queuedata->{"$key\0locked"})) {
&Apache::lonxml::debug("someone already has um.");
next;
}
- push(@possible,[$key,$slot_data{'endtime'}]);
+ push(@possible,[$key,$end_time]);
}
if (@possible) {
# sort entries in order by slot end time
@possible = sort { $a->[1] <=> $b->[1] } @possible;
- # pick one of the first ten entries
- my $max=($#possible < 10) ? $#possible : 10;
- return $possible[int(rand($max))][0];
+ # pick one of the entries in the top 10% in small queues and one
+ # of the first ten entries in large queues
+ #my $ten_percent = int($#possible * 0.1);
+ #if ($ten_percent < 1 ) { $ten_percent = 1; }
+ #if ($ten_percent > 10) { $ten_percent = 10; }
+ #my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;
+
+ #return $possible[int(rand($max))][0];
+ return $possible[0][0];
}
return undef;
}
@@ -1341,7 +1437,7 @@ sub pick_from_queue_data {
sub find_mid_grade {
my ($queue,$symb,$cdom,$cnum)=@_;
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
if ($todo) {
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
if ($who eq $me) { return $todo; }
@@ -1361,7 +1457,7 @@ sub find_mid_grade {
sub lock_key {
my ($queue,$todo)=@_;
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
my (undef,$cid)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
@@ -1516,12 +1612,10 @@ sub select_user {
$seclist.='<input type="hidden" name="chosensections"
value="'.$sec.'" />';
}
- my $studentdis = $student;
- $studentdis =~ tr/:/@/;
$result.=<<RESULT;
<tr>
<td>
- <form style="display: inline" method="POST">
+ <form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$todo" />
<input type="hidden" name="queue" value="$queue" />
<input type="hidden" name="webgrade" value="no" />
@@ -1529,7 +1623,7 @@ sub select_user {
<input type="submit" name="submit" value="Regrade" />
$seclist
</form>
- <td>$fullname->{$student} <tt>($studentdis)</tt></td>
+ <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>
<td>
RESULT
}
@@ -1623,6 +1717,7 @@ sub get_id {
}
my %dimension;
+sub start_Question { return &start_Dimension(@_); }
sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
undef(%dimension);
@@ -1665,9 +1760,11 @@ sub get_instance {
}
@instances = &Math::Random::random_permutation(@instances);
$instance = $instances[($version-1)%scalar(@instances)];
- $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =
- $instance;
- $Apache::lonhomework::results{'INTERNAL_store'} = 1;
+ if ($version =~ /^\d$/) {
+ $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =
+ $instance;
+ $Apache::lonhomework::results{'INTERNAL_store'} = 1;
+ }
&Apache::response::poprandomnumber();
return $instance;
}
@@ -1675,6 +1772,12 @@ sub get_instance {
{
my $last_link;
+ sub link {
+ my ($id) = @_;
+ $id =~ s/\./_/g;
+ return 'LC_GRADING_criteria_'.$id;
+ }
+ sub end_Question { return &end_Dimension(@_); }
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result=&Apache::lonxml::endredirection();
@@ -1699,7 +1802,7 @@ sub get_instance {
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
$mandatory='Optional';
}
- my $dim_info="<div class='$dim_status'>\n";
+ my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
if ($dim_status eq 'pass') {
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
}
@@ -1710,11 +1813,12 @@ sub get_instance {
my $man_passed=0;
my $opt_count=0;
my $opt_passed=0;
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}
+ foreach my $id ( @{$dimension{$instance.'.criterias'}},
+ @{$dimension{'criterias'}} ) {
+ if ($dimension{'criteria.'.$id.'.mandatory'}
eq 'N') {
$opt_count++;
- if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+ if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') {
$opt_passed++;
}
} else {
@@ -1725,17 +1829,24 @@ sub get_instance {
}
}
if ($man_passed eq $man_count) { $man_passed='all'; }
+
my $opt_req=$dimension{$instance.'.optionalrequired'};
- if ($opt_req !~ /\S/) { $opt_req='0'; }
+ if ($opt_req !~ /\S/) {
+ $opt_req=
+ &Apache::lonxml::get_param('OptionalRequired',
+ $parstack,$safeeval);
+ if ($opt_req !~ /\S/) { $opt_req = 0; }
+ }
$dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
my $internal_location=&internal_location($dim);
$result=~s/\Q$internal_location\E/$dim_info/;
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- 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');
+ foreach my $id (@{$dimension{$instance.'.criterias'}},
+ @{$dimension{'criterias'}}) {
+ my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
+ my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"};
+ my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
if ($mandatory) {
$mandatory='Mandatory';
} else {
@@ -1748,14 +1859,14 @@ sub get_instance {
}
my $status_display=$status;
$status_display=~s/^([a-z])/uc($1)/e;
+ $result.=
+ '<div class="LC_'.$status.' LC_criteria"><h4>'
+ .$mandatory.' Criteria</h4><p>';
@Apache::scripttag::parser_env = @_;
- $result.='<div class="'.$status.'"><h4>'.$mandatory.
- ' Criteria</h4><p>';
- @Apache::scripttag::parser_env = @_;
- $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
- $result.='</p><p class="grade">'.$status_display.'</p>';
- if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
- $result.='<p class="comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
+ $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
+ $result.='</p><p class="LC_grade">'.$status_display.'</p>';
+ if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) {
+ $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>';
}
$result.='</div>';
}
@@ -1767,31 +1878,31 @@ sub get_instance {
&Apache::scripttag::xmlparse($dimension{'intro'});
@Apache::scripttag::parser_env = @_;
&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- my $link='criteria_'.$instance.'_'.$id;
- my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
- $result.='<div class="criteria" id="'.$link.'">'."\n".
- '<a name="'.$link.'" />'."\n".
- '<a name="next_'.$last_link.'" />'."\n".
- '<div class="criteriatext">'."\n";
+ foreach my $id (@{$dimension{$instance.'.criterias'}},
+ @{$dimension{'criterias'}} ) {
+ my $link=&link($id);
+ my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
+ $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
+ '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
@Apache::scripttag::parser_env = @_;
- $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+ $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
$result.='</div>'."\n".
- #$dimension{$instance.'.criteria.'.$id}.
- '<div class="grade">'."\n".
- '<label class="ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
- '<label class="fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
- '<label class="pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
- '<label class="review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+ #$dimension{'criteria.'.$id}.
+ '<div class="LC_GRADING_grade">'."\n".
+ '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+ '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+ '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+ '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
'</div>'."\n".
- '<label class="comment">'.&mt('Additional Comment for Student')."\n".
- '<textarea class="comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+ '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
+ '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</textarea>'."\n".
'</label>'."\n".
- '<ul class="navbuttons">'."\n".
+ '<ul class="LC_GRADING_navbuttons">'."\n".
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
'<li><a href="#next_'.$link.'">Next</a></li>'."\n".
'</ul>'."\n".
'</div>'."\n";
+ $result.=&grading_history($version,$dim,$id);
$last_link=$link;
}
} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1799,10 +1910,17 @@ sub get_instance {
my $mandatory_failed=0;
my $ungraded=0;
my $review=0;
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
- $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
- my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+ foreach my $id (@{$dimension{$instance.'.criterias'}},
+ @{$dimension{'criterias'}}) {
+ my $link=&link($id);
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+ my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
+ $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
+ my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
if ($status eq 'pass') {
if (!$mandatory) { $optional_passed++; }
} elsif ($status eq 'fail') {
@@ -1815,7 +1933,15 @@ sub get_instance {
$ungraded++;
}
}
- if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+ # FIXME optional required can apply to only <instance> right now...
+ my $opt_req=$dimension{$instance.'.optionalrequired'};
+ if ($opt_req !~ /\S/) {
+ $opt_req=
+ &Apache::lonxml::get_param('OptionalRequired',
+ $parstack,$safeeval);
+ if ($opt_req !~ /\S/) { $opt_req = 0; }
+ }
+ if ($optional_passed < $opt_req) {
$mandatory_failed++;
}
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
@@ -1840,15 +1966,48 @@ sub get_instance {
}
}
+sub grading_history {
+ my ($version,$dim,$id) = @_;
+ if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+ return '';
+ }
+ my ($result,$grader);
+ my $scope="resource.$version.0.$dim.$id";
+ 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.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
+ }
+ if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
+ $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
+ }
+ if ($entry) {
+ $result.= "<li>$grader : $entry </li>";
+ }
+ }
+ if ($result) {
+ return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
+ }
+ return '';
+}
+
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'web' || $target eq 'webgrade') {
- if ($tagstack->[-2] eq 'Dimension') {
- $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
-
- } elsif ($target eq 'webgrade') {
- &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+ if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
+ $dimension{'intro'}=
+ &Apache::lonxml::get_all_text('/introparagraph',
+ $parser,$style);
+ } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ &Apache::lonxml::startredirection();
}
}
@@ -1856,6 +2015,10 @@ sub start_IntroParagraph {
}
sub end_IntroParagraph {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ my $result = &Apache::lonxml::endredirection();
+ }
}
sub start_Instance {
@@ -1880,7 +2043,7 @@ sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
- if ($target eq 'web' || $target eq 'webgrade') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
$dimension{$instance_id.'.text'}=$text;
}
return '';
@@ -1892,14 +2055,21 @@ sub end_InstanceText {
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $instance_id=$Apache::bridgetask::instance[-1];
my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
my $id=&get_id($parstack,$safeeval);
- $dimension{$instance_id.'.criteria.'.$id}=$criteria;
- $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
- &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
- push(@{$dimension{$instance_id.'.criterias'}},$id);
+ if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
+ my $instance_id=$Apache::bridgetask::instance[-1];
+ $dimension{"criteria.$instance_id.$id"}=$criteria;
+ $dimension{"criteria.$instance_id.$id.mandatory"}=
+ &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id");
+ } else {
+ $dimension{'criteria.'.$id}=$criteria;
+ $dimension{'criteria.'.$id.'.mandatory'}=
+ &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ push(@{$dimension{'criterias'}},$id);
+ }
}
return '';
}
@@ -1923,7 +2093,7 @@ sub proctor_validation_screen {
<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>
$msg
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="post" action="$env{'request.uri'}">
<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />
<table>
@@ -1938,7 +2108,7 @@ sub proctor_validation_screen {
<tr><td colspan="2">Student who should be logged in is:</td></tr>
<tr><td>Name:</td><td>$name</td></tr>
<tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
- <tr><td>Usename</td><td>$user\@$domain</td></tr>
+ <tr><td>Usename</td><td>$user:$domain</td></tr>
<tr><td colspan="2"><img src="$url" /></td></tr>
</table>
</tr></td>