--- loncom/homework/bridgetask.pm 2005/04/08 19:21:52 1.12
+++ loncom/homework/bridgetask.pm 2005/05/10 16:44:35 1.21
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.12 2005/04/08 19:21:52 albertel Exp $
+# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,10 +48,14 @@ sub initialize_bridgetask {
$Apache::bridgetask::dimension='';
# list of all Dimension ids seen
@Apache::bridgetask::dimensionlist=();
+ # mandatory attribute of all Dimensions seen
+ %Apache::bridgetask::dimensionmandatory=();
# list of all current Instance ids
@Apache::bridgetask::instance=();
# list of all Instance ids seen in this problem
@Apache::bridgetask::instancelist=();
+ # key of queud user data that we are currently grading
+ $Apache::bridgetask::queue_key='';
}
sub proctor_check_auth {
@@ -82,26 +86,43 @@ sub add_previous_version_button {
return $result;
}
+sub add_grading_button {
+ my $result;
+ $result.=' ';
+ $result.='';
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- &Apache::structuretags::initialize_storage();
- &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-
my ($status,$accessmsg,$slot);
+ if ($target ne 'webgrade') {
+ &Apache::structuretags::initialize_storage();
+ &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ }
+
$Apache::lonhomework::parsing_a_task=1;
#should get back a 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);
-
+
if ($target eq 'web') {
$body_tag_start.=&add_previous_version_button();
+ if ($Apache::lonhomework::modifygrades) {
+ $body_tag_start.='
';
+ }
+ my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+ }
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -178,25 +225,91 @@ sub end_Task {
) {
if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
- $result.='