--- loncom/homework/bridgetask.pm 2006/05/25 19:55:10 1.156
+++ loncom/homework/bridgetask.pm 2006/06/01 19:31:12 1.161
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.156 2006/05/25 19:55:10 albertel Exp $
+# $Id: bridgetask.pm,v 1.161 2006/06/01 19:31:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,9 +38,12 @@ use Apache::lonlocal;
use Apache::lonxml;
use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
BEGIN {
- &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph'));
+ &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Instance','InstanceText','Criteria','ClosingParagraph'));
}
sub initialize_bridgetask {
@@ -263,7 +266,7 @@ STUFF
}
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
- $symb=&Apache::lonnet::escape($symb);
+ $symb=&escape($symb);
$result.='<form method="post" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="'.$action.'" />'.
@@ -362,9 +365,9 @@ sub file_list {
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.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+ &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
+ '</a></span></li>'."\n";
}
$file_list.="</ul>\n";
return $file_list;
@@ -574,7 +577,7 @@ DONESCREEN
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
$form_tag_start.=
'<input type="hidden" name="gradingkey" value="'.
- &Apache::lonnet::escape($todo).'" />';
+ &escape($todo).'" />';
$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
@@ -705,7 +708,7 @@ sub get_key_todo {
my $who=&queue_key_locked($queue,$gradingkey);
if ($who eq $me) {
#already have the lock
- $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
+ $env{'form.gradingkey'}=&escape($gradingkey);
return ($gradingkey);
}
@@ -730,7 +733,7 @@ sub get_key_todo {
$env{'form.queue'}=$queue='gradingqueue';
}
- my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+ my $gradingkey=&unescape($env{'form.gradingkey'});
if ($env{'form.queue'} eq 'none') {
if (defined($env{'form.gradingkey'})) {
@@ -1202,8 +1205,14 @@ sub get_limited_classlist {
my ($sections) = @_;
my $classlist = &Apache::loncoursedata::get_classlist();
+ foreach my $student (keys(%$classlist)) {
+ if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()]
+ ne 'Active') {
+ delete($classlist->{$student});
+ }
+ }
- if (!grep('all',@{ $sections })) {
+ if (ref($sections) && !grep('all',@{ $sections })) {
foreach my $student (keys(%$classlist)) {
my $section =
$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
@@ -1248,12 +1257,20 @@ sub show_queue {
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
my ($tmp)=%queue;
if ($tmp=~/^error: 2 /) {
- return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
+ return "\n<h3>Current Queue - $queue</h3>".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().
+ '<td>'.&mt('Empty').'</td>'.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
}
my $title=&Apache::lonnet::gettitle($symb);
- $result.="\n<h3>Current Queue - $title $queue </h3><table border='1'><tr>";
+ $result.="\n<h3>Current Queue - $title $queue </h3>".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row();
if ($with_selects) { $result.="<th>Status</th><th></th>"; }
- $result.="<th>user</th><th>data</th></tr>";
+ $result.="<th>user</th><th>data</th>".
+ &Apache::loncommon::end_data_table_header_row();
foreach my $key (sort(keys(%queue))) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
if (!defined($classlist->{$uname.':'.$udom})) { next; }
@@ -1268,14 +1285,15 @@ sub show_queue {
}
if ($key=~/locked$/ && !$with_selects) {
- $result.="<tr><td>$uname</td>";
+ $result.= &Apache::loncommon::start_data_table_row().
+ "<td>$uname</td>";
$result.='<td>'.$queue{$key}.'</td></tr>';
} elsif ($key=~/timestamp$/ && !$with_selects) {
- $result.="<tr><td></td>";
+ $result.=&Apache::loncommon::start_data_table_row()."<td></td>";
$result.='<td>'.
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
} elsif ($key!~/(timestamp|locked)$/) {
- $result.="<tr>";
+ $result.= &Apache::loncommon::start_data_table_row();
my ($end_time,$slot_text);
if (my $slot=&slotted_access($queue{$key})) {
my %slot_data=&Apache::lonnet::get_slot($slot);
@@ -1286,7 +1304,7 @@ sub show_queue {
$slot_text = '';
}
if ($with_selects) {
- my $ekey=&Apache::lonnet::escape($key);
+ my $ekey=&escape($key);
my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {
my $me=$env{'user.name'}.':'.$env{'user.domain'};
@@ -1327,10 +1345,10 @@ FORM
" <tt>($uname:$udom)</tt> </td>";
$result.='<td>'.$slot_text.' End time: '.
&Apache::lonlocal::locallocaltime($end_time).
- "</td></tr>";
+ "</td>".&Apache::loncommon::end_data_table_row();
}
}
- $result.="</table><hr />\n";
+ $result.= &Apache::loncommon::end_data_table()."<hr />\n";
return $result;
}
@@ -1341,7 +1359,7 @@ sub get_queue_counts {
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $classlist=&Apache::loncoursedata::get_classlist();
+ my $classlist=&get_limited_classlist();
my $regexp="^$symb\0";
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
@@ -1485,7 +1503,7 @@ sub pick_from_queue_data {
sub find_mid_grade {
my ($queue,$symb,$cdom,$cnum)=@_;
- my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
+ my $todo=&unescape($env{'form.gradingkey'});
my $me=$env{'user.name'}.':'.$env{'user.domain'};
if ($todo) {
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
@@ -1526,7 +1544,7 @@ sub get_queue_symb_status {
$cnum=$env{'course.'.$cid.'.num'};
$cdom=$env{'course.'.$cid.'.domain'};
}
- my $classlist=&Apache::loncoursedata::get_classlist();
+ my $classlist=&get_limited_classlist();
my $regexp="^$symb\0";
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
@@ -1554,7 +1572,7 @@ sub get_from_queue {
if ($todo) { return $todo; }
my $attempts=0;
- my $classlist=&Apache::loncoursedata::get_classlist();
+ my $classlist=&get_limited_classlist();
while (1) {
if ($attempts > 2) {
@@ -1634,7 +1652,7 @@ sub select_user {
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
'</tt>.</p> '."\n";
}
- $result.='<table border="1">';
+ $result.=&Apache::loncommon::start_data_table();
foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
my ($uname,$udom) = split(/:/,$student);
@@ -1657,9 +1675,10 @@ sub select_user {
}
}
my $todo =
- &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+ &escape(&encode_queue_key($symb,$udom,$uname));
if ($cannot_grade) {
- $result.='<tr><td> </td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
+ $result.=&Apache::loncommon::start_data_table_row().
+ '<td> </td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
'</td><td>';
} else {
my $seclist;
@@ -1667,8 +1686,8 @@ sub select_user {
$seclist.='<input type="hidden" name="chosensections"
value="'.$sec.'" />';
}
+ $result.=&Apache::loncommon::start_data_table_row();
$result.=<<RESULT;
-<tr>
<td>
<form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$todo" />
@@ -1717,9 +1736,9 @@ RESULT
} else {
$result.=" ";
}
- $result.= '</td></tr>';
+ $result.= '</td>'.&Apache::loncommon::end_data_table_row();
}
- $result.='</table>';
+ $result.=&Apache::loncommon::end_data_table();
return $result;
}
@@ -1786,6 +1805,20 @@ sub start_Dimension {
return &internal_location($dim_id);
}
+sub start_QuestionText {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $dim_id=$Apache::bridgetask::dimension;
+ my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+ $dimension{'questiontext'}=$text;
+ }
+ return '';
+}
+
+sub end_QuestionText {
+ return '';
+}
+
sub get_instance {
my ($dim)=@_;
my $rand_alg=&Apache::lonnet::get_rand_alg();
@@ -1846,9 +1879,12 @@ sub get_instance {
if (&Apache::response::showallfoils()) {
@instances = @{$dimension{'instances'}};
}
+ my $shown_question_text;
foreach my $instance (@instances) {
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'questiontext'});
if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
@@ -1933,6 +1969,8 @@ sub get_instance {
&Apache::scripttag::xmlparse($dimension{'intro'});
@Apache::scripttag::parser_env = @_;
&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+ @Apache::scripttag::parser_env = @_;
+ &Apache::scripttag::xmlparse($dimension{'questiontext'});
foreach my $id (@{$dimension{$instance.'.criterias'}},
@{$dimension{'criterias'}} ) {
my $link=&link($id);
@@ -1968,11 +2006,14 @@ sub get_instance {
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+ @Apache::scripttag::parser_env = @_;
+ &Apache::scripttag::xmlparse($dimension{'questiontext'});
+
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');