--- loncom/homework/bridgetask.pm 2006/03/28 20:45:58 1.123
+++ loncom/homework/bridgetask.pm 2006/04/10 22:55:02 1.140
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.123 2006/03/28 20:45:58 albertel Exp $
+# $Id: bridgetask.pm,v 1.140 2006/04/10 22:55:02 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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/ &&
@@ -95,7 +95,7 @@ sub proctor_check_auth {
#setup new version and who did it
$Apache::lonhomework::results{'resource.0.version'}=$version;
$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
$slot_name;
@@ -103,7 +103,7 @@ sub proctor_check_auth {
} elsif ($authenticated && $type eq 'problem') {
&Apache::lonxml::debug("authed $slot_name");
$Apache::lonhomework::results{"resource.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
$slot_name;
}
@@ -259,64 +259,14 @@ sub preserve_grade_info {
}
sub style {
- return (<<STYLE);
-<style type="text/css">
-.LC_fail, .LC_pass, .LC_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);
-}
-
-.LC_fail h4, .LC_pass h4 {
- position:absolute;
- left: -4px;
- top: -8px;
- padding:2px;
- margin:0;
- background-color : rgb(255,240,225);
- border : thin solid;
-}
-
-.LC_fail {
- color: red;
-}
-
-.LC_pass {
- color : green;
-}
-
-.LC_neutral {
- color : blue;
-}
-
-.LC_question {
- border : thin solid black;
- padding : 4px;
- margin-bottom : 1em;
-}
-
-.LC_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 {
@@ -429,6 +379,7 @@ sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ $head_tag_start .= &style($target);
$body_tag_start .= '<div class="LC_task">'."\n";
if ($target eq 'web' || $target eq 'webgrade') {
@@ -547,7 +498,7 @@ DONESCREEN
}
} elsif ($target eq 'web') {
$result.="$head_tag_start</head>
- $body_tag_start \n".&style();
+ $body_tag_start \n";
$result.=&preserve_grade_info();
$result.=&internal_location();
@@ -559,7 +510,11 @@ DONESCREEN
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
- $result.=$head_tag_start.'</head>'.$body_tag_start;
+ $result.=$head_tag_start.
+ '</head>'.$body_tag_start.
+ "\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');
}
@@ -677,7 +632,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'}) &&
@@ -723,7 +678,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'}));
}
@@ -951,7 +906,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') {
@@ -1019,7 +974,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="'.
@@ -1028,8 +983,8 @@ DONEBUTTON
# &mt('Throw Away & Stop Grading').'" /> ';
#$result.='<input type="submit" name="save" value="'.
# &mt('Save Partial Grade and Continue Grading').'" /> ';
- $result.='</form>'."\n</div>\n".
- &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',
@@ -1067,11 +1022,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);
@@ -1134,7 +1089,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;
@@ -1180,7 +1135,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);
}
@@ -1229,7 +1184,7 @@ sub show_queue {
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'));
@@ -1263,7 +1218,7 @@ FORM
}
}
$result.= "<td>".$fullname->{$uname.':'.$udom}.
- " <tt>($uname\@$udom)</tt> </td>";
+ " <tt>($uname:$udom)</tt> </td>";
$result.='<td>Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
"</td></tr>";
@@ -1310,13 +1265,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);
}
@@ -1364,9 +1319,15 @@ sub pick_from_queue_data {
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;
}
@@ -1374,7 +1335,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; }
@@ -1394,7 +1355,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'};
@@ -1809,9 +1770,7 @@ sub get_instance {
my $link=&link($instance,$id);
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
- '<a name="'.$link.'" />'."\n".
- '<a name="next_'.$last_link.'" />'."\n".
- '<div class="LC_GRADING_criteriatext">'."\n";
+ '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='</div>'."\n".
@@ -1890,7 +1849,7 @@ sub grading_history {
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'});
+ split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
my $fullname = &Apache::loncommon::plainname($gname,$gdom);
$grader = &Apache::loncommon::aboutmewrapper($fullname,
$gname,$gdom);
@@ -1919,8 +1878,8 @@ sub start_IntroParagraph {
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);
+ } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ &Apache::lonxml::startredirection();
}
}
@@ -1928,6 +1887,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 {
@@ -2010,7 +1973,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>