--- loncom/homework/bridgetask.pm 2005/03/28 19:26:10 1.4
+++ loncom/homework/bridgetask.pm 2005/04/08 19:21:52 1.12
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $
+# $Id: bridgetask.pm,v 1.12 2005/04/08 19:21:52 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,20 +37,33 @@ use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
use Time::HiRes qw( gettimeofday tv_interval );
+
BEGIN {
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
}
+sub initialize_bridgetask {
+ # id of current Dimension, 0 means that no dimension is current
+ # (inside <Task> only)
+ $Apache::bridgetask::dimension='';
+ # list of all Dimension ids seen
+ @Apache::bridgetask::dimensionlist=();
+ # list of all current Instance ids
+ @Apache::bridgetask::instance=();
+ # list of all Instance ids seen in this problem
+ @Apache::bridgetask::instancelist=();
+}
+
sub proctor_check_auth {
my ($slot)=@_;
- my $user=$ENV{'form.proctorname'};
- my $domain=$ENV{'form.proctordomain'};
+ my $user=$env{'form.proctorname'};
+ my $domain=$env{'form.proctordomain'};
my @allowed=split(",",$slot->{'proctor'});
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);
+ my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
if ($authhost ne 'no_host') {
$Apache::lonhomework::results{'resource.checkedin'}=
$user.'@'.$domain;
@@ -61,6 +74,14 @@ sub proctor_check_auth {
return 0;
}
+sub add_previous_version_button {
+ my $result;
+ $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
+<option>Pick one</option>
+</select>');
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -73,11 +94,14 @@ sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'web') {
+ $body_tag_start.=&add_previous_version_button();
+ }
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex') {
($status,$accessmsg,$slot) =
&Apache::lonhomework::check_task_access('0');
- push (@Apache::inputtags::status,$status);
+ push(@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
@@ -128,10 +152,10 @@ sub start_Task {
$body_tag_start \n $form_tag_start".
'<input type="hidden" name="submitted" value="yes" />';
# if we are viewing someone else preserve that info
- if (defined $ENV{'form.grade_symb'}) {
+ if (defined $env{'form.grade_symb'}) {
foreach my $field ('symb','courseid','domain','username') {
$result .= '<input type="hidden" name="grade_'.$field.
- '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+ '" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
}
@@ -149,14 +173,27 @@ sub end_Task {
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
- (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
($target eq 'answer') || ($target eq 'tex')
) {
if ($target eq 'web') {
+ if ($status eq 'CAN_ANSWER') {
+ $result.='<table border="1">'.
+ &Apache::inputtags::file_selector('0',"bridgetask","*",
+ 'portfolioonly').
+ "</table>";
+ $result.=&Apache::inputtags::gradestatus('0');
+ }
$result.=&Apache::lonxml::xmlend().'</html>';
}
}
if ($target eq 'grade') {
+ my $award='SUBMITTED';
+ &Apache::essayresponse::file_submission('0','bridgetask','portfiles',$award);
+ if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
+ $Apache::lonhomework::results{"resource.0.tries"}=
+ 1+$Apache::lonhomework::history{"resource.0.tries"};
+ }
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
}
@@ -173,7 +210,6 @@ sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
- $result='<table border="1"><tr><td>Closing</td></tr><tr><td>';
}
return $result;
}
@@ -182,17 +218,18 @@ sub end_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
- $result='</td></tr></table>';
}
return $result;
}
my %dimension;
-my $dim_id;
sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
undef(%dimension);
- $dim_id=$Apache::lonxml::curdepth;
+ my $dim_id=$Apache::lonxml::curdepth;
+ $Apache::bridgetask::dimension=$dim_id;
+ push(@Apache::bridgetask::dimensionlist,$dim_id);
+ undef(@Apache::bridgetask::instance);
return '';
}
@@ -203,16 +240,14 @@ sub end_Dimension {
#FIXME just grabbing the first one for now, need
#to randomly pick one until all have been seen
#then start repicking
- my $instance=$dimension{'instances'}->[0];
- $result=$dimension{'intro'}.
- $dimension{$instance.'.text'}.
- '<table border="1"><tr><td>Criteria</td></tr><tr><td>';
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- $result.=$dimension{$instance.'.criteria.'.$id}.
- '</td></tr><tr><td>';
- }
- $result=~s/<tr><td>$//;
- $result.='</table>';
+ &Apache::response::pushrandomnumber();
+ my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+ my $instance=$order[0];
+ $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+ #FIXME: don't show the criteria yet
+ #foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ # $result.=$dimension{$instance.'.criteria.'.$id};
+ #}
}
return $result;
}
@@ -223,8 +258,6 @@ sub start_IntroParagraph {
if ($target eq 'web') {
if ($tagstack->[-2] eq 'Dimension') {
&Apache::lonxml::startredirection();
- } else {
- $result='<table border="1"><tr><td>Intro</td></tr><tr><td>';
}
}
return $result;
@@ -236,18 +269,16 @@ sub end_IntroParagraph {
if ($target eq 'web') {
if ($tagstack->[-2] eq 'Dimension') {
$dimension{'intro'}=&Apache::lonxml::endredirection();
- } else {
- $result='</td></tr></table>';
}
}
return $result;
}
-my $instance_id;
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
- $instance_id=$Apache::lonxml::curdepth;
+ push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
+ push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
return '';
}
@@ -266,6 +297,7 @@ sub start_InstanceText {
sub end_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $instance_id=$Apache::bridgetask::instance[-1];
if ($target eq 'web') {
$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
}
@@ -282,6 +314,7 @@ sub start_Criteria {
sub end_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $instance_id=$Apache::bridgetask::instance[-1];
if ($target eq 'web') {
my $criteria=&Apache::lonxml::endredirection();
my $id=$Apache::lonxml::curdepth;
@@ -294,14 +327,11 @@ sub end_Criteria {
sub proctor_validation_screen {
my ($slot) = @_;
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
- my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));
- my $url="/uploaded/$domain/$user/internal/studentphoto.gif";
- my $tokenurl=&Apache::lonnet::tokenwrapper($url);
- my $dom=(&Apache::lonxml::whichuser())[2];
- my $user=$ENV{'form.proctorname'};
- if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
+ my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+ $user=$env{'form.proctorname'};
+ if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
my $msg;
- if ($ENV{'form.proctorpassword'}) {
+ if ($env{'form.proctorpassword'}) {
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
.'</font></p>';
}
@@ -309,17 +339,17 @@ 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>
<tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></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="$dom" /></td></tr>
+ <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />
Student who should be logged in is:<br />
-<img src="$tokenurl" /><br />
+<img src="$url" /><br />
</form>
ENDCHECKOUT
return $result;