--- loncom/homework/response.pm	2001/08/09 15:35:47	1.42
+++ loncom/homework/response.pm	2001/12/04 14:53:18	1.52
@@ -9,13 +9,18 @@ package Apache::response;
 use strict;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse'));
+  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
 }
 
 sub start_response {
   my ($parstack,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+  if ($#Apache::inputtags::import > -1) {
+    &Apache::lonxml::debug("Turning :$id: into");
+    $id = join('_',@Apache::inputtags::import).'_'.$id;
+    &Apache::lonxml::debug("New  :$id:");
+  }
   push (@Apache::inputtags::response,$id);
   push (@Apache::inputtags::responselist,$id);
   @Apache::inputtags::inputlist=();
@@ -44,7 +49,13 @@ sub end_hintresponse {
 # used by response to set the non-safe space random number generator to something
 # that is stable and unique based on the part number and response number
 sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
+  my $rndseed;
+  if ($ENV{'request.state'} eq "construct") {
+    $rndseed=$ENV{'form.rndseed'};
+    if (!$rndseed) { $rndseed=time; }
+  } else {
+    $rndseed=&Apache::lonnet::rndseed();
+  }
   &Apache::lonxml::debug("randseed $rndseed");
 #  $rndseed=unpack("%32i",$rndseed);
   $rndseed=$rndseed
@@ -173,6 +184,13 @@ sub start_stringresponse {
   return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
+sub start_formularesponse {
+  require Apache::caparesponse;
+  import Apache::caparesponse;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::caparesponse::start_formularesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+}
+
 sub start_numericalresponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
@@ -209,9 +227,71 @@ sub start_essayresponse {
   return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
+sub view_or_modify {
+  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+  my $myself=0;
+  if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) {
+    $myself=1;
+  }
+  my $vgr=&Apache::lonnet::allowed('vgr',$courseid);
+  my $mgr=&Apache::lonnet::allowed('vgr',$courseid);
+  if ($mgr) { return "M"; }
+  if ($vgr) { return "V"; }
+  if ($myself) { return "V"; }
+  return '';
+}
+
+sub start_dataresponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $id = &Apache::response::start_response($parstack,$safeeval);
+  my $result;
+  if ($target eq 'web') {
+    $result = $token->[2]->{'display'}.':';
+  } elsif ($target eq 'meta') {
+    $result = &Apache::response::meta_stores_write($token->[2]->{'name'},
+						   $token->[2]->{'type'},
+						   $token->[2]->{'display'});
+    $result .= &Apache::response::meta_package_write('dataresponse');
+  }
+  return $result;
+}
+
+sub end_dataresponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $result;
+  if ( $target eq 'web' ) {
+  } elsif ($target eq 'grade' ) {
+    if ( defined $ENV{'form.submitted'}) {
+      my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
+      my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
+      if ($allowed) {
+	&Apache::response::setup_params('datasubmission');
+	my $partid = $Apache::inputtags::part;
+	my $id = $Apache::inputtags::response['-1'];
+	my $response = $ENV{'form.HWVAL'.$id};
+	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ( $response =~ /[^\s]/) {
+	  $Apache::lonhomework::results{"resource.$partid.$id.$name"}=
+	    $response;
+	  $Apache::lonhomework::results{
+					"resource.$partid.$id.submission"}=
+					  $response;
+	  $Apache::lonhomework::results{
+					"resource.$partid.$id.awarddetail"}=
+					  'SUBMITTED';
+	}
+      } else {
+	$result='Not Permitted to change values.'
+      }
+    }
+  }
+  &Apache::response::end_response;
+  return $result;
+}
+
 sub start_responseparam {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $result=''
+  my $result='';
   if ($target eq 'meta') {
     $result = &meta_parameter_write($token->[2]->{'name'},
 				    $token->[2]->{'type'},
@@ -234,6 +314,12 @@ sub start_responseparam {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
+  } elsif ($target eq 'grade') {
+    if ($ENV{'request.state'} eq 'construct') {
+      my $name    = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
+      $Apache::inputtags::params{$name}=$default;
+    }
   }
   return $result;
 }
@@ -247,15 +333,16 @@ sub end_responseparam {
 sub setup_params {
   my ($tag) = @_;
 
+  if ($ENV{'request.state'} eq 'construct') { return; }
   @Apache::inputtags::params=();
-  my @paramlist=();
+  my %paramlist=();
   foreach my $key (keys(%Apache::lonnet::packagetab)) {
     if ($key =~ /^$tag/) {
       my ($package,$name) = split(/&/,$key);
-      push(@paramlist,$name);
+      $paramlist{$name}=1;
     }
   }
-  foreach my $key (@paramlist) {
+  foreach my $key (keys(%paramlist)) {
     my $entry= 'resource.'.$Apache::inputtags::part;
     if (defined($Apache::inputtags::response[-1])) {
       $entry.='_'.$Apache::inputtags::response[-1];
@@ -274,6 +361,41 @@ sub setup_params {
   }
 }
 
+sub answer_header {
+  my ($type) = @_;
+  my $result;
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
+    $result = '<table border="1"><tr><th>Answer for Part:'.
+      $Apache::inputtags::part. '</th></tr><tr>'."\n";
+  } else {
+    $result = '<table border="1"><tr><td>Answer for Part:'.
+      $Apache::inputtags::part. '</td>'."\n";
+  }
+  return $result;
+}
+
+sub answer_part {
+  my ($type,$answer) = @_;
+  my $result;
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+    $result = '<td>'.$answer.'</td>';
+  } else {
+    $result = '<td>'.$answer.'</td>';
+  }
+  return $result;
+}
+
+sub answer_footer {
+  my ($type) = @_;
+  my $result;
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+    $result = '</tr></table>';
+  } else {
+    $result = '</tr></table>';
+  }
+  return $result;
+}
+
 1;
 __END__