--- loncom/homework/bridgetask.pm 2005/08/15 19:41:43 1.42
+++ loncom/homework/bridgetask.pm 2005/10/24 18:40:21 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.42 2005/08/15 19:41:43 albertel Exp $
+# $Id: bridgetask.pm,v 1.73 2005/10/24 18:40:21 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,8 +68,18 @@ sub proctor_check_auth {
foreach my $possible (@allowed) {
my ($puser,$pdom)=(split('@',$possible));
if ($puser eq $user && $pdom eq $domain) {
- my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
- if ($authhost ne 'no_host') {
+ my $authenticated=0;
+ if ( $slot->{'secret'} =~ /\S/ &&
+ $env{'form.proctorpassword'} eq $slot->{'secret'} ) {
+ $authenticated=1;
+ } else {
+
+ my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
+ if ($authhost ne 'no_host') {
+ $authenticated=1;
+ }
+ }
+ if ($authenticated) {
my $version=
$Apache::lonhomework::results{'resource.version'}=
++$Apache::lonhomework::history{'resource.version'};
@@ -144,11 +154,28 @@ sub add_previous_version_button {
}
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 $size=5;
+ if (scalar(keys(%sections)) < 3) {
+ $size=scalar(keys(%sections))+2;
+ }
+ my $sec_select = '<select 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='none'>none</option></select>\n";
+
my $result=' <input type="submit" name="gradeasubmission" value="'.
&mt("Get a submission to grade").'" />';
$result.='<input type="hidden" name="grade_target" value="webgrade" />';
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
+ $result.='<p>Specify a section: '.$sec_select.'</p>';
$result.='<p>'.&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.=' <input type="submit" name="reviewagrading" value="'.
@@ -158,6 +185,8 @@ sub add_grading_button {
$result.='<p>'.&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.=' <input type="submit" name="reviewasubmission" value="'.
&mt("Select an entry from the review queue").'" /> </p>'."\n";
+ $result.=' <input type="submit" name="regradeasubmission" value="'.
+ &mt("Select a user to regrade.").'" /> </p>'."\n";
}
return $result;
}
@@ -202,11 +231,155 @@ sub preserve_grade_info {
return $result;
}
+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>
+STYLE
+
+}
+
+sub show_task {
+ my ($status,$previous)=@_;
+ if (!$previous && (
+ ( $status eq 'CLOSED' ) ||
+ ( $status eq 'BANNED') ||
+ ( $status eq 'UNAVAILABLE') ||
+ ( $status eq 'NOT_IN_A_SLOT') ||
+ ( $status eq 'NEEDS_CHECKIN') ||
+ ( $status eq 'WAITING_FOR_GRADE') ||
+ ( $status eq 'INVALID_ACCESS') )) {
+ return 0;
+ }
+ if ($env{'form.donescreen'}) { return 0; }
+ return 1;
+}
+
+sub internal_location {
+ my ($id)=@_;
+ return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
+}
+
+sub submission_time_stamp {
+ my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $submissiontime;
+ my $version=$Apache::lonhomework::history{'resource.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'};
+ }
+ }
+ my $result;
+ if ($submissiontime) {
+ my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ my $diff = $slot{'endtime'} - $submissiontime;
+ my ($color,$when)=('#FF6666','after');
+ if ($diff > 0) { ($color,$when)=('#336600','before'); }
+ my $info;
+ if ($diff%60) { $info=($diff%60).' seconds'; }
+ $diff=int($diff/60);
+ if ($diff%60) { $info=($diff%60).' minutes '.$info; }
+ $diff=int($diff/60);
+ if ($diff) { $info=$diff.' hours '.$info; }
+ $result='<p><font color="'.$color.'">'.
+ &mt('Student submitted [_1] [_2] the deadline.
+ (Submission was at [_3], end of period was [_4].)',
+ $info,$when,scalar(localtime($submissiontime)),
+ scalar(localtime($slot{'endtime'}))).
+ '</font></p>';
+ }
+ return $result;
+}
+
+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="<ul>\n";
+ foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+ my $file=$file_url.$partial_file;
+ $file=~s|/+|/|g;
+ &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
+ $file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+ &Apache::loncommon::icon($file).'" border=0"> '.$file.
+ '</a></nobr></li>'."\n";
+ }
+ $file_list.="</ul>\n";
+
+ my %lt=&Apache::lonlocal::texthash('done' => 'Done',
+ 'stop' => 'Stop',
+ );
+
+ my $result=<<INFO;
+<div class="handininfo">
+ <input type="submit" name="next" value="$lt{'done'}" />
+ <input type="submit" name="stop" value="$lt{'stop'}" />
+ $file_list
+</div>
+INFO
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my ($status,$accessmsg,$slot);
if ($target ne 'webgrade') {
+ &Apache::structuretags::init_problem_globals('Task');
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
}
@@ -245,14 +418,7 @@ sub start_Task {
&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");
$body_tag_start.=&add_previous_version_button($status);
- if (!$previous && (
- ( $status eq 'CLOSED' ) ||
- ( $status eq 'BANNED') ||
- ( $status eq 'UNAVAILABLE') ||
- ( $status eq 'NOT_IN_A_SLOT') ||
- ( $status eq 'NEEDS_CHECKIN') ||
- ( $status eq 'WAITING_FOR_GRADE') ||
- ( $status eq 'INVALID_ACCESS') )) {
+ if (!&show_task($status,$previous)) {
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'</head>'.$body_tag_start;
@@ -267,6 +433,18 @@ sub start_Task {
'</h1>'.&proctor_validation_screen($slot);
} elsif ($status eq 'WAITING_FOR_GRADE') {
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+ } 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>';
+ $result.=<<DONESCREEN;
+<h2>$title</h2>
+<p> Files submitted: $files </p>
+<p> You are now done with this Bridge Task </p>
+<hr />
+<p> <a href="/adm/logout">Logout</a> </p>
+<p> <a href="/adm/roles">Change to a different course</a> </p>
+DONESCREEN
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
}
@@ -289,30 +467,21 @@ sub start_Task {
} 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";
+ $body_tag_start \n".&style();
- my ($version,$previous)=&get_version();
- if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
- $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
- if (!$previous) {
- $result.=&add_request_another_attempt_button();
- }
- }
- if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
- $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
- }
+ $result.=&preserve_grade_info();
+ $result.=&internal_location();
$result.=$form_tag_start.
'<input type="hidden" name="submitted" value="yes" />';
- $result.=&preserve_grade_info();
-
+ &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.='<br />Review'.&show_queue('reviewqueue');
- $result.='<br />Grade'.&show_queue('gradingqueue');
+ #$result.='<br />Review'.&show_queue('reviewqueue');
+ #$result.='<br />Grade'.&show_queue('gradingqueue');
}
# FIXME Blast! still need to reorg this, need to reshow the
# queue being reviewed once done with the grade pass...
@@ -321,7 +490,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);
@@ -334,7 +502,7 @@ sub start_Task {
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
if ($target eq 'webgrade') {
- $result.='<br />After -'.&show_queue($env{'form.queue'});
+ #$result.='<br />After -'.&show_queue($env{'form.queue'});
$result.="\n".'<table width="100%" style="width:100%" border="1">';
if ($status_code eq 'selected') {
$form_tag_start.=
@@ -353,6 +521,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.='<b>'.&mt("No user to be graded.").'</b>';
}
@@ -361,11 +531,27 @@ sub start_Task {
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
}
if ($target eq 'webgrade' && defined($env{'form.queue'})) {
+ if ($webgrade eq 'yes') {
+ $result.=&submission_time_stamp();
+ }
$result.=$form_tag_start;
$result.='<input type="hidden" name="webgrade" value="'.
$webgrade.'" />';
$result.='<input type="hidden" name="queue" value="'.
$env{'form.queue'}.'" />';
+ if ($env{'form.regrade'}) {
+ $result.='<input type="hidden" name="regrade" value="'.
+ $env{'form.regrade'}.'" />';
+ }
+ if ($env{'form.chosensections'}) {
+ my @chosen_sections=
+ &Apache::loncommon::get_env_multiple('form.chosensections');
+ foreach my $sec (@chosen_sections) {
+ $result.='<input type="hidden" name="chosensections"
+ value="'.$sec.'" />';
+ }
+ }
+ if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
}
} else {
# page_start returned a starting result, delete it if we don't need it
@@ -379,7 +565,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');
}
@@ -390,6 +576,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)) {
@@ -398,6 +590,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,'select_user');
+ }
+ }
+ return ($gradingkey,'selected');
+ } else {
+ return (undef,'select_user');
+ }
+ }
if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
&& !defined($env{'form.gradingaction'})
&& $env{'form.queuemode'} eq 'selected') {
@@ -453,18 +659,73 @@ sub end_Task {
my ($version,$previous)=&get_version();
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
- if (
- (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
- ($target eq 'answer') || ($target eq 'tex')
- ) {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
if ($target eq 'web') {
- if ($status eq 'CAN_ANSWER' && !$previous) {
+ if (&show_task($status,$previous)) {
+ $result.=&Apache::lonxml::endredirection();
+ }
+ if ($status eq 'CAN_ANSWER' && !$previous &&
+ !$env{'form.donescreen'}) {
$result.="\n".'<table border="1">'.
&Apache::inputtags::file_selector("$version.0",
"bridgetask","*",
- 'portfolioonly').
+ 'portfolioonly',
+ '
+<h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
+<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
"</table>";
$result.=&Apache::inputtags::gradestatus('0');
+ $result.='</form>';
+ $result.=<<DONEBUTTON;
+<form method="POST">
+ <input type="hidden" name="donescreen" value="1" />
+ <input type="submit" value="Done" />
+</form>
+DONEBUTTON
+ }
+ if (&show_task($status,$previous) &&
+ $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
+ 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 $start_time=
+ &Apache::lonlocal::locallocaltime($slot{'starttime'});
+
+ my $status;
+ $status.="\n<div class='$bt_status'>\n";
+
+ if ($bt_status eq 'pass') {
+ $status.='<h2>You passed the '.$title.' given on '.
+ $start_time.'.</h2>';
+ }
+ if ($bt_status eq 'fail') {
+ $status.='<h2>You did not pass the '.$title.' given on '.
+ $start_time.'.</h2>';
+ 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<p>".&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)."</p></div>\n";
+
+ my $internal_location=&internal_location();
+ $result=~s/\Q$internal_location\E/$status/;
}
}
if ($target eq 'web' || $target eq 'webgrade') {
@@ -484,6 +745,10 @@ sub end_Task {
$Apache::lonhomework::results{"resource.0.award"}=
$Apache::lonhomework::results{"resource.$version.0.award"}=
$award;
+ $Apache::lonhomework::results{"resource.0.submission"}=
+ $Apache::lonhomework::results{"resource.$version.0.submission"}='';
+ } else {
+ delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
}
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
@@ -513,7 +778,9 @@ sub end_Task {
$ungraded++;
} elsif ($status eq 'review') {
$review++;
- }
+ } else {
+ $ungraded++;
+ }
}
if ($optional_passed < $optional_required) {
$mandatory_failed++;
@@ -527,13 +794,14 @@ sub end_Task {
&check_queue_unlock($env{'form.queue'});
&Apache::lonxml::debug(" still needs review not changing status.");
} else {
- &move_between_queues('gradingqueue','reviewqueue');
+ &move_between_queues($env{'form.queue'},'reviewqueue');
}
} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
- if ($env{'form.queue'} eq 'reviewqueue') {
+ if ($env{'form.queue'} eq 'reviewqueue' ||
+ $env{'form.queue'} eq 'none' ) {
&Apache::lonxml::debug("moving back.");
- &move_between_queues('reviewqueue','gradingqueue');
+ &move_between_queues($env{'form.queue'},'gradingqueue');
} else {
&check_queue_unlock($env{'form.queue'});
}
@@ -545,13 +813,16 @@ sub end_Task {
&remove_from_queue($env{'form.queue'});
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
- $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
- $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
- &Apache::grades::version_portfiles(
- \%Apache::lonhomework::results,
- ["$version.0.bridgetask"],$courseid,
- $symb,$udom,$uname,
- ["$version.0.bridgetask"]);
+
+ if ($env{'form.regrade'} ne 'yes') {
+ $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+ $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+ &Apache::grades::version_portfiles(
+ \%Apache::lonhomework::results,
+ ["$version.0.bridgetask"],$courseid,
+ $symb,$udom,$uname,
+ ["$version.0.bridgetask"]);
+ }
} else {
$Apache::lonhomework::results{"resource.$version.status"}='pass';
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
@@ -560,23 +831,25 @@ sub end_Task {
&remove_from_queue($env{'form.queue'});
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
- $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
- $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
- &Apache::grades::version_portfiles(
- \%Apache::lonhomework::results,
- ["$version.0.bridgetask"],$courseid,
- $symb,$udom,$uname,
- ["$version.0.bridgetask"]);
+ if ($env{'form.regrade'} ne 'yes') {
+ $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+ $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+ &Apache::grades::version_portfiles(
+ \%Apache::lonhomework::results,
+ ["$version.0.bridgetask"],$courseid,
+ $symb,$udom,$uname,
+ ["$version.0.bridgetask"]);
+ }
}
$Apache::lonhomework::results{"resource.status"}=
$Apache::lonhomework::results{"resource.$version.status"};
if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
$Apache::lonhomework::results{"resource.0.award"}=
- $Apache::lonhomework::results{"resource.$version.award"};
+ $Apache::lonhomework::results{"resource.$version.0.award"};
$Apache::lonhomework::results{"resource.0.awarded"}=
- $Apache::lonhomework::results{"resource.$version.awarded"};
+ $Apache::lonhomework::results{"resource.$version.0.awarded"};
$Apache::lonhomework::results{"resource.0.solved"}=
- $Apache::lonhomework::results{"resource.$version.solved"};
+ $Apache::lonhomework::results{"resource.$version.0.solved"};
}
&Apache::structuretags::finalize_storage();
}
@@ -592,9 +865,14 @@ sub end_Task {
# &mt('Save Partial Grade and Continue Grading').'" /> ';
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
} elsif ($target eq 'meta') {
- $result.='<parameter part="0" package="Task"></parameter>'."\n";
- #$result.=&Apache::response::meta_part_order();
- #$result.=&Apache::response::meta_response_order();
+ $result.=&Apache::response::meta_package_write('Task');
+ $result.=&meta_stores_write('solved','string','Problem Status');
+ $result.=&meta_stores_write('tries','int_zeropos',
+ 'Number of Attempts');
+ $result.=&meta_stores_write('awarded','float',
+ 'Partial Credit Factor');
+ $result.=&meta_stores_write('status','string',
+ 'Bridge Task Status');
}
undef($Apache::lonhomework::parsing_a_task);
return $result;
@@ -602,8 +880,13 @@ sub end_Task {
sub move_between_queues {
my ($src_queue,$dest_queue)=@_;
- my $cur_data=&get_queue_data($src_queue);
- if (!$cur_data) { return 'not_exist'; }
+ my $cur_data;
+ if ($src_queue ne 'none') {
+ $cur_data=&get_queue_data($src_queue);
+ if (!$cur_data) { return 'not_exist'; }
+ } else {
+ $cur_data = ['none'];
+ }
my $result=&add_to_queue($dest_queue,$cur_data->[0]);
if ($result ne 'ok') {
return $result;
@@ -614,6 +897,7 @@ sub move_between_queues {
sub check_queue_unlock {
my ($queue,$key,$allow_not_me)=@_;
+ if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
if (!defined($key)) {
$key="$symb\0queue\0$uname\@$udom";
@@ -633,6 +917,7 @@ sub check_queue_unlock {
sub remove_from_queue {
my ($queue)=@_;
+ if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
@@ -665,8 +950,30 @@ sub get_queue_data {
return undef;
}
+sub check_queue_for_key {
+ my ($cid,$queue,$todo)=@_;
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my %results=
+ &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
+
+ if (exists($results{$todo}) && ref($results{$todo})) {
+ if (defined($results{"$todo\0locked"})) {
+ return 'locked';
+ }
+ my $slot=$results{$todo}->[0];
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ if ($slot_data{'endtime'} > time) {
+ return 'in_progress';
+ }
+ return 'enqueued';
+ }
+ return undef;
+}
+
sub add_to_queue {
my ($queue,$slot_name)=@_;
+ if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
@@ -681,6 +988,17 @@ sub show_queue {
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
+
+ my @chosen_sections=
+ &Apache::loncommon::get_env_multiple('form.chosensections');
+ &Apache::grades::init_perm();
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
+ &Apache::grades::reset_perm();
+ if (!(grep(/^all$/,@chosen_sections))) {
+ $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+ '</tt>.</p> '."\n";
+ }
+
my $regexp="^$symb\0";
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
my ($tmp)=%queue;
@@ -691,8 +1009,9 @@ sub show_queue {
if ($with_selects) { $result.="<th></th>"; }
$result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
foreach my $key (sort(keys(%queue))) {
+ my ($symb,$uname,$udom) = &decode_queue_key($key);
+ if (!defined($classlist->{$uname.':'.$udom})) { next; }
if ($key=~/locked$/ && !$with_selects) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr><td>$title</td><td>$uname</td>";
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
@@ -703,7 +1022,6 @@ sub show_queue {
$result.='<td>last queue modification time</td><td>'.
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
} elsif ($key!~/(timestamp|locked)$/) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr>";
my $slot=$queue{$key}->[0];
@@ -719,6 +1037,11 @@ sub show_queue {
($action,$description)=('unlock',&mt('Unlock'));
}
}
+ my $seclist;
+ foreach my $sec (@chosen_sections) {
+ $seclist.='<input type="hidden" name="chosensections"
+ value="'.$sec.'" />';
+ }
if (time > $slot_data{'endtime'}) {
$result.=(<<FORM);
<td>
@@ -729,6 +1052,7 @@ sub show_queue {
<input type="hidden" name="webgrade" value="no" />
<input type="hidden" name="queuemode" value="selected" />
<input type="submit" name="submit" value="$description" />
+ $seclist
</form>
</td>
FORM
@@ -778,6 +1102,11 @@ sub get_queue_counts {
return ($entries,$ready_to_grade,$locks);
}
+sub encode_queue_key {
+ my ($symb,$udom,$uname)=@_;
+ return "$symb\0queue\0$uname\@$udom";
+}
+
sub decode_queue_key {
my ($key)=@_;
my ($symb,undef,$user) = split("\0",$key);
@@ -803,6 +1132,8 @@ sub queue_key_locked {
sub pick_from_queue_data {
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
foreach my $key (keys(%$queuedata)) {
+ if ($key =~ /\0locked$/) { next; }
+ if ($key =~ /\0timestamp$/) { next; }
my ($symb,$uname,$udom)=&decode_queue_key($key);
if ($check_section) {
my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -926,6 +1257,118 @@ sub get_from_queue {
return $todo;
}
+sub select_user {
+ my ($symb,$cid)=&Apache::lonxml::whichuser();
+
+ my @chosen_sections=
+ &Apache::loncommon::get_env_multiple('form.chosensections');
+ &Apache::grades::init_perm();
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
+ &Apache::grades::reset_perm();
+
+ my $result;
+ if (!(grep(/^all$/,@chosen_sections))) {
+ $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+ '</tt>.</p> '."\n";
+ }
+ $result.='<table border="1">';
+
+ foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ my ($uname,$udom) = split(/:/,$student);
+
+ my %status = &get_student_status($symb,$cid,$udom,$uname);
+ my $queue = 'none';
+ my $cannot_grade;
+ if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
+ $queue = 'reviewqueue';
+ if ($status{'reviewqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
+ } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
+ $queue = 'gradingqueue';
+ if ($status{'gradingqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
+ }
+ my $todo =
+ &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+ if ($cannot_grade) {
+ $result.='<tr><td> </td><td>'.$fullname->{$student}.
+ '</td><td>';
+ } else {
+ my $seclist;
+ foreach my $sec (@chosen_sections) {
+ $seclist.='<input type="hidden" name="chosensections"
+ value="'.$sec.'" />';
+ }
+ $result.=<<RESULT;
+<tr>
+ <td>
+ <form method="POST">
+ <input type="hidden" name="gradingkey" value="$todo" />
+ <input type="hidden" name="queue" value="$queue" />
+ <input type="hidden" name="webgrade" value="no" />
+ <input type="hidden" name="regrade" value="yes" />
+ <input type="submit" name="submit" value="Regrade" />
+ $seclist
+ </form>
+ <td>$fullname->{$student}</td>
+ <td>
+RESULT
+ }
+ if ($status{'status'} eq 'pass') {
+ $result .= '<font color="green">'.&mt('Passed').'</font>';
+ } elsif ($status{'status'} eq 'fail') {
+ $result .= '<font color="red">'.&mt('Failed').'</font>';
+ } elsif ($status{'status'} eq 'review') {
+ $result .= '<font color="blue">'.&mt('Under Review').'</font>';
+ } elsif ($status{'status'} eq 'ungraded') {
+ $result .= &mt('Ungraded');
+ } elsif ($status{'status'} ne '') {
+ $result .= '<font color="orange">'.&mt('Unknown Status').'</font>';
+ } else {
+ $result.=" ";
+ }
+ if ($status{'version'}) {
+ $result .= ' '.&mt('Version').' '.$status{'version'};
+ }
+ $result.= '</td><td>';
+ if ($status{'reviewqueue'} eq 'enqueued') {
+ $result .= &mt('Awaiting Review');
+ } elsif ($status{'reviewqueue'} eq 'locked') {
+ $result .= &mt('Under Review');
+ } elsif ($status{'reviewqueue'} eq 'in_progress') {
+ $result .= &mt('Still being worked on.');
+ } elsif ($status{'gradingqueue'} eq 'enqueued') {
+ $result .= &mt('Awaiting Grading');
+ } elsif ($status{'gradingqueue'} eq 'locked') {
+ $result .= &mt('Being Graded');
+ } elsif ($status{'gradingqueue'} eq 'in_progress') {
+ $result .= &mt('Still being worked on.');
+ } else {
+ $result.=" ";
+ }
+ $result.= '</td></tr>';
+ }
+ $result.='</table>';
+ return $result;
+}
+
+sub get_student_status {
+ my ($symb,$cid,$udom,$uname)=@_;
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $udom,$uname);
+ 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));
+ return %status;
+}
+
sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -963,7 +1406,8 @@ sub start_Dimension {
undef(@Apache::bridgetask::instance);
$Apache::bridgetask::dimensionmandatory{$dim_id}=
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
- return '';
+ &Apache::lonxml::startredirection();
+ return &internal_location($dim_id);
}
sub get_instance {
@@ -979,48 +1423,107 @@ sub get_instance {
my $last_link;
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
+ my $result=&Apache::lonxml::endredirection();
my $dim=&get_id($parstack,$safeeval);
my $instance=&get_instance();
my $version=&get_version();
if ($target eq 'web') {
- $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+ @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') {
+
+ my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
+ my $mandatory='Mandatory';
+ if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
+ $mandatory='Optional';
+ }
+ my $dim_info="<div class='$dim_status'>\n";
+ if ($dim_status eq 'pass') {
+ $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
+ }
+ if ($dim_status eq 'fail') {
+ $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
+ }
+ my $man_count=0;
+ my $man_passed=0;
+ my $opt_count=0;
+ my $opt_passed=0;
+ foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}
+ eq 'N') {
+ $opt_count++;
+ if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+ $opt_passed++;
+ }
+ } else {
+ $man_count++;
+ if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+ $man_passed++;
+ }
+ }
+ }
+ if ($man_passed eq $man_count) { $man_passed='all'; }
+ my $opt_req=$dimension{$instance.'.optionalrequired'};
+ 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.$dim.$instance.$id.status"};
my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
- $result.='<table border="1"><tr><td>';
+ my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+ if ($mandatory) {
+ $mandatory='Mandatory';
+ } else {
+ $mandatory='Optional';
+ }
if ($status eq 'fail') {
- $result.='<font color="red">'.&mt('Did not pass').'</font>';
} elsif ($status eq 'pass') {
- $result.='<font color="green">'.&mt('Passed').'</font>';
} else {
- &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
+ &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
}
- $result.='</td></tr><tr><td>';
+ my $status_display=$status;
+ $status_display=~s/^([a-z])/uc($1)/e;
+ @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.$dim.$instance.$id.comment"}) {
- $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
+ $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
}
- $result.=$dimension{$instance.'.criteria.'.$id}.
- '</td></tr></table>';
+ $result.='</div>';
}
}
} elsif ($target eq 'webgrade') {
+ # in case of any side effects that we need
+ @Apache::scripttag::parser_env = @_;
+ &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.$dim.$instance.$id.status"};
$result.='<tr><td width="100%" valign="top">'.
'<a name="'.$link.'" />'.
'<a name="next_'.$last_link.'" />'.
- '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
+ '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+ $result.='</textarea>'.
#$dimension{$instance.'.criteria.'.$id}.
'</td>'.
'<td><nobr>Additional Comment for Student</nobr> <br />'.
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
'</td>'.
'<td>'.
- '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.
+ '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
@@ -1028,22 +1531,7 @@ sub get_instance {
'<td>'.
'<a href="#'.$last_link.'">Prev</a><br />'.
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
- '<input type="submit" name="next" value="'.
- &mt('Done').'" /> '.
- '<input type="submit" name="stop" value="'.
- &mt('Stop').'" /> '.
'</td></tr>';
- $result.='<tr><td colspan="4">';
- my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
- my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
- foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
- my $file=$file_url.$partial_file;
- &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
- $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
- &Apache::loncommon::icon($file).'" border=0"> '.$file.
- '</a>';
- }
- $result.='</td></tr>';
$last_link=$link;
}
} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1064,7 +1552,7 @@ sub get_instance {
} elsif ($status eq 'ungraded') {
$ungraded++;
} else {
- &Apache::lonxml::error("got weird status --$status--");
+ $ungraded++;
}
}
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
@@ -1084,6 +1572,9 @@ sub get_instance {
$Apache::lonhomework::results{"resource.$version.$dim.status"}=
'pass';
}
+ } else {
+ # any other targets no output
+ undef($result);
}
return $result;
}
@@ -1093,22 +1584,18 @@ sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web' || $target eq 'webgrade') {
- if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
- &Apache::lonxml::startredirection();
+ if ($tagstack->[-2] eq 'Dimension') {
+ $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
+
+ } elsif ($target eq 'webgrade') {
+ &Apache::lonxml::get_all_text('/introparagraph',$parser);
}
+
}
return $result;
}
sub end_IntroParagraph {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- if ($target eq 'web' || $target eq 'webgrade') {
- if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
- $dimension{'intro'}=&Apache::lonxml::endredirection();
- }
- }
- return $result;
}
sub start_Instance {
@@ -1123,40 +1610,27 @@ sub start_Instance {
}
sub end_Instance {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- return '';
}
sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $instance_id=$Apache::bridgetask::instance[-1];
+ my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
if ($target eq 'web' || $target eq 'webgrade') {
- &Apache::lonxml::startredirection();
+ $dimension{$instance_id.'.text'}=$text;
}
return '';
}
sub end_InstanceText {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $instance_id=$Apache::bridgetask::instance[-1];
- if ($target eq 'web' || $target eq 'webgrade') {
- $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
- }
return '';
}
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
- &Apache::lonxml::startredirection();
- }
- return '';
-}
-
-sub end_Criteria {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];
+ my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
- my $criteria=&Apache::lonxml::endredirection();
my $id=&get_id($parstack,$safeeval);
$dimension{$instance_id.'.criteria.'.$id}=$criteria;
$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
@@ -1166,17 +1640,21 @@ sub end_Criteria {
return '';
}
+sub end_Criteria {
+}
+
sub proctor_validation_screen {
my ($slot) = @_;
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
- $user=$env{'form.proctorname'};
- if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
+ my $name=&Apache::loncommon::plainname($user,$domain);
+
my $msg;
if ($env{'form.proctorpassword'}) {
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
.'</font></p>';
}
+ if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
my $result= (<<ENDCHECKOUT);
<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>
@@ -1185,13 +1663,22 @@ sub proctor_validation_screen {
<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />
<table>
- <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
+ <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
<tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
- <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
+ <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />
-Student who should be logged in is:<br />
-<img src="$url" /><br />
+<table border="1">
+ <tr><td>
+ <table>
+ <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 colspan="2"><img src="$url" /></td></tr>
+ </table>
+ </tr></td>
+</table>
</form>
ENDCHECKOUT
return $result;