--- loncom/homework/response.pm	2001/08/04 19:19:17	1.33
+++ loncom/homework/response.pm	2001/08/20 23:48:05	1.46
@@ -3,17 +3,17 @@
 
 # 11/23,11/24,11/28 Gerd Kortemeyer
 # Guy Albertelli
-# 08/04 Gerd Kortemeyer
+# 08/04,08/07 Gerd Kortemeyer
 
 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','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
 }
 
 sub start_response {
-  my ($parstack,$safeeval)=@_;  
+  my ($parstack,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::response,$id);
@@ -28,6 +28,19 @@ sub end_response {
   return '';
 }
 
+sub start_hintresponse {
+  my ($parstack,$safeeval)=@_;
+  my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+  push (@Apache::inputtags::response,$id);
+  return $id;
+}
+
+sub end_hintresponse {
+  pop @Apache::inputtags::response;
+  return '';
+}
+
 # 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 {
@@ -35,8 +48,11 @@ sub setrandomnumber {
   &Apache::lonxml::debug("randseed $rndseed");
 #  $rndseed=unpack("%32i",$rndseed);
   $rndseed=$rndseed
-    +(&Apache::lonnet::numval($Apache::inputtags::part) << 10)
+    +(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+  if (defined($Apache::inputtags::response['-1'])) {
+    $rndseed=$rndseed
       +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+  }
   srand($rndseed);
   &Apache::lonxml::debug("randseed $rndseed");
   return '';
@@ -44,30 +60,43 @@ sub setrandomnumber {
 
 sub meta_parameter_write {
     my ($name,$type,$default,$display)=@_;
-    return '<parameter part="'.$Apache::inputtags::part.
-	            '" name="'.$name.
-                    '" type="'.$type.
-                 '" default="'.$default.
-	         '" display="'.$display.
-                          ' [Part: '.$Apache::inputtags::part.']"></parameter>'
-     ."\n";
+    my $partref=$Apache::inputtags::part;
+    my $result='<parameter part="'.$Apache::inputtags::part.'"';
+    if (defined($Apache::inputtags::response[-1])) {
+      $result.=            ' id="'.$Apache::inputtags::response[-1].'"';
+      $partref.='_'.$Apache::inputtags::response[-1];
+    }
+    $result.=            ' name="'.$name.'"'.
+                         ' type="'.$type.'"'.
+($default?' default="'.$default.'"':'').
+($display?' display="'.$display.' [Part: '.$partref.']"':'')
+             .'></parameter>'
+             ."\n";
+    return $result;
 }
 
 sub meta_package_write {
     my $name=shift;
-    return '<parameter part="'.$Apache::inputtags::part.
-	         '" package="'.$name.'"></parameter>'
-     ."\n";
+    my $result = '<parameter part="'.$Apache::inputtags::part.'"';
+    if(defined($Apache::inputtags::response[-1])) {
+      $result.=              ' id="'.$Apache::inputtags::response[-1].'"';
+    }
+    $result.=' package="'.$name.'"></parameter>'."\n";
+    return $result;
 }
 
 sub meta_stores_write {
     my ($name,$type,$display)=@_;
-    return '<stores part="'.$Apache::inputtags::part.
-	         '" name="'.$name.
-                 '" type="'.$type.
-	      '" display="'.$display.
-                       ' [Part: '.$Apache::inputtags::part.']"></stores>'
-     ."\n";
+    my $partref=$Apache::inputtags::part;
+    my $result = '<stores part="'.$Apache::inputtags::part.'"';
+    if (defined($Apache::inputtags::response[-1])) {
+      $result.=           ' id="'.$Apache::inputtags::response[-1].'"';
+      $partref.='_'.$Apache::inputtags::response[-1];
+    }	
+    $result.=          ' name="'.$name.'"'.
+                       ' type="'.$type.'"'.
+	            ' display="'.$display.' [Part: '.$partref.']"'.
+		      "></stores>\n";
 }
 
 sub mandatory_part_meta {
@@ -78,17 +107,17 @@ sub mandatory_part_meta {
 # of each part
 #
  return
-    &meta_parameter_write('opendate','date_start','',
-                          'Opening Date').
-    &meta_parameter_write('duedate','date_end','',
-                          'Due Date').
-    &meta_parameter_write('answerdate','date_start','',
-                          'Show Answer Date').
-    &meta_parameter_write('weight','int_zeropos','',
-                          'Available Points').
-    &meta_parameter_write('maxtries','int_pos','',
-                          'Maximum Number of Tries').
-
+#    &meta_parameter_write('opendate','date_start','',
+#                          'Opening Date').
+#    &meta_parameter_write('duedate','date_end','',
+#                          'Due Date').
+#    &meta_parameter_write('answerdate','date_start','',
+#                          'Show Answer Date').
+#    &meta_parameter_write('weight','int_zeropos','',
+#                          'Available Points').
+#    &meta_parameter_write('maxtries','int_pos','',
+#                          'Maximum Number of Tries').
+    &meta_package_write('part').
     &meta_stores_write('solved','string',
                           'Problem Status').
     &meta_stores_write('tries','int_zeropos',
@@ -148,7 +177,8 @@ sub start_numericalresponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  return &Apache::caparesponse::start_numericalresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+  return &Apache::caparesponse::start_numericalresponse
+    ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_radiobuttonresponse {
@@ -179,38 +209,86 @@ sub start_essayresponse {
   return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
-sub start_responseparam {
+sub view_or_modify {
+  my ($symb,$courseid,$domain,$name) = &Apache::lonhomework::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)=@_;
-  if ($target eq 'grade' || $target eq 'web') {
-    my $default= &Apache::lonxml::get_param('default',$parstack,$safeeval);
-    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-    &Apache::lonxml::debug("looking for resource.$Apache::inputtags::part.$name");
-    my $value = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.$name");
-    &Apache::lonxml::debug("$name has value :$value: and default :$default:");
-    if ($value eq '' || $value eq 'con_lost') {
-      &Apache::lonxml::debug("defaulting");
-      $Apache::inputtags::params{$name}=$default;
-    } else {
-      &Apache::lonxml::debug("using value");
-      $Apache::inputtags::params{$name}=$value;
-    }
-    return '';
+  my $id = &Apache::response::start_response($parstack,$safeeval);
+  my $result;
+  if ($target eq 'web') {
+    $result = $token->[2]->{'display'}.':';
   } elsif ($target eq 'meta') {
-    return &meta_parameter_write($token->[2]->{'name'},
-				 $token->[2]->{'type'},
-				 $token->[2]->{'default'},
-				 $token->[2]->{'description'});
+    $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::lonhomework::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='';
+  if ($target eq 'meta') {
+    $result = &meta_parameter_write($token->[2]->{'name'},
+				    $token->[2]->{'type'},
+				    $token->[2]->{'default'},
+				    $token->[2]->{'description'});
   } elsif ($target eq 'edit') {
-    my $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    $result.=&Apache::edit::tag_start($target,$token,
+				      &Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::text_arg('Type:','type',$token).
 	&Apache::edit::text_arg('Description:','description',$token).
 	  &Apache::edit::text_arg('Default:','default',$token).
 	    "</td></tr>";
     $result.=&Apache::edit::end_table;
-    return $result;
   } elsif ($target eq 'modified') {
-    my $result;
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'name','type','description',
 						 'default');
@@ -218,11 +296,8 @@ sub start_responseparam {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
-    return $result;
-
-  } else {
-    return '';
   }
+  return $result;
 }
 
 sub end_responseparam {
@@ -231,6 +306,36 @@ sub end_responseparam {
   return '';
 }
 
+sub setup_params {
+  my ($tag) = @_;
+
+  @Apache::inputtags::params=();
+  my %paramlist=();
+  foreach my $key (keys(%Apache::lonnet::packagetab)) {
+    if ($key =~ /^$tag/) {
+      my ($package,$name) = split(/&/,$key);
+      $paramlist{$name}=1;
+    }
+  }
+  foreach my $key (keys(%paramlist)) {
+    my $entry= 'resource.'.$Apache::inputtags::part;
+    if (defined($Apache::inputtags::response[-1])) {
+      $entry.='_'.$Apache::inputtags::response[-1];
+    }
+    $entry.='.'.$key;
+    &Apache::lonxml::debug("looking for $entry");
+    my $value = &Apache::lonnet::EXT("$entry");
+    &Apache::lonxml::debug("$key has value :$value:");
+    if ($value eq 'con_lost' || $value =~ /^error:/) {
+      &Apache::lonxml::debug("using nothing");
+      $Apache::inputtags::params{$key}='';
+    } else {
+      &Apache::lonxml::debug("using value");
+      $Apache::inputtags::params{$key}=$value;
+    }
+  }
+}
+
 1;
 __END__