--- loncom/homework/functionplotresponse.pm	2010/10/09 00:00:04	1.9
+++ loncom/homework/functionplotresponse.pm	2010/10/09 17:43:25	1.10
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.9 2010/10/09 00:00:04 www Exp $
+# $Id: functionplotresponse.pm,v 1.10 2010/10/09 17:43:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,6 +116,7 @@ ENDGGBINIT
 
 #
 # Each Geogebra applet is supposed to call this when parameters change
+# Changes the hidden fields on the web page
 #
 sub update_script {
     my ($id)=@_;
@@ -177,6 +178,12 @@ sub generate_input_field {
 #
 sub new_coordinate {
     my ($id,$variable,$x,$y)=@_;
+    if ($Apache::functionplotresponse::previous{&field_name($id,$variable,'x')}) {
+       $x=$Apache::functionplotresponse::previous{&field_name($id,$variable,'x')};
+    }
+    if ($Apache::functionplotresponse::previous{&field_name($id,$variable,'y')}) {
+       $y=$Apache::functionplotresponse::previous{&field_name($id,$variable,'y')};
+    }
     &generate_input_field($id,$variable,$x,$y);
     return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
 }
@@ -286,6 +293,7 @@ sub start_spline {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
    $Apache::functionplotresponse::counter++;
+   $label=~s/\W//gs;
    unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
 
    my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
@@ -323,6 +331,31 @@ sub end_init_script {
 ENDENDINIT
 }
 
+#
+# Storing and restoring spline coordinates from part answers
+#
+sub decode_previous_answer {
+   my ($answer)=@_;
+   foreach my $coordinate (split(/\,/,$answer)) {
+      my ($key,$value)=split(/\=/,$coordinate);
+      $Apache::functionplotresponse::previous{$key}=$value;
+   }
+}
+
+sub get_answer_from_form_fields {
+   my ($id)=@_;
+   my $answer='';
+   my %coords=();
+   foreach my $field (keys(%env)) {
+      if ($field=~/^form\.HWVAL\_$id/) {
+         $field=~/^form\.(.*)$/;
+         $coords{$1}=$env{$field};
+      }
+   }
+   $answer=join(',',map { $_.'='.$coords{$_} } (sort(keys(%coords))));
+   return ($answer,%coords);
+}
+
 sub start_functionplotresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
@@ -332,10 +365,18 @@ sub start_functionplotresponse {
   undef %Apache::functionplotresponse::splineinity;
   undef %Apache::functionplotresponse::splinescalex;
   undef %Apache::functionplotresponse::splinescaley;
+# Remember input fields, etc
+  undef %Apache::functionplotresponse::previous;
   $Apache::functionplotresponse::inputfields='';
   $Apache::functionplotresponse::counter=0;
+# Part and ID
+  my $partid=$Apache::inputtags::part;
+  my $id=&Apache::response::start_response($parstack,$safeeval);
 # Internal ID to mark the applet and its coordinates
-  my $internalid = $Apache::inputtags::part.'_'.&Apache::response::start_response($parstack,$safeeval);
+  my $internalid = $partid.'_'.$id;
+# Previous answer
+  &decode_previous_answer($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+
 # Parameters of <functionplotresponse>
   my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
   $xmin=($xmin?$xmin:-10);
@@ -349,7 +390,9 @@ sub start_functionplotresponse {
   my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
   my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
 
-  if ($target eq 'web') {
+    if ($target eq 'meta') {
+       $result=&Apache::response::meta_package_write('functionplotresponse');
+    } elsif ($target eq 'web') {
 # paste in the update routine to receive stuff back from the applet
      $result.=&update_script($internalid);
 # start the initscript for this applet
@@ -366,10 +409,25 @@ sub end_functionplotresponse {
   &Apache::response::end_response;
 
   my $result;
-  my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
+  my $id=$Apache::inputtags::response[-1];
+  my $partid=$Apache::inputtags::part;
+  my $internalid = $partid.'_'.$id;
 
 #  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-  if ($target eq 'web') {
+    if ($target eq 'grade'
+         && &Apache::response::submitted()
+         && $Apache::lonhomework::type eq 'exam') {
+
+        #&Apache::response::scored_response($partid,$id);
+
+    } elsif ($target eq 'grade'
+         && &Apache::response::submitted()
+         && $Apache::lonhomework::type ne 'exam') {
+        my ($response,%coords)=&get_answer_from_form_fields($internalid);
+        $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+        $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='INCORRECT';
+
+   } elsif ($target eq 'web') {
 # Now is the time to render all of the stored splines
      foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
         $result.=&generate_spline($internalid,$label);