--- loncom/homework/functionplotresponse.pm	2010/10/05 01:28:00	1.7
+++ loncom/homework/functionplotresponse.pm	2010/10/10 00:14:15	1.13
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.7 2010/10/05 01:28:00 www Exp $
+# $Id: functionplotresponse.pm,v 1.13 2010/10/10 00:14:15 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonlocal;
 use Apache::lonnet;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));
+  &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule'));
 }
 
 #
@@ -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)=@_;
@@ -125,8 +126,8 @@ sub update_script {
 function updatePointCoordinates_$id(coordinateName) {
             var x = document.ggbApplet_$id.getXcoord(coordinateName);
             var y = document.ggbApplet_$id.getYcoord(coordinateName);
-            coordinateMap_$id\[coordinateName + ".x"] = x;
-            coordinateMap_$id\[coordinateName + ".y"] = y;
+            document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_x"].value = x;
+            document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_y"].value = y;
         }
 // ]]>
 </script>
@@ -148,17 +149,42 @@ sub update_register {
 sub set_coordinate {
    my ($id,$variable,$x,$y)=@_;
    return (<<ENDSETVARIABLE);
-coordinateMap_$id\['$variable.x'] = $x;
-coordinateMap_$id\['$variable.y'] = $y;
-document.ggbApplet_$id.evalCommand("$variable=("+coordinateMap_$id\["$variable.x"]+","+coordinateMap_$id\["$variable.y"]+")");
+document.ggbApplet_$id.evalCommand("$variable=($x,$y)");
 ENDSETVARIABLE
 }
 
 #
+# Input field name for a coordinate variable
+#
+
+sub field_name {
+    my ($id,$variable,$name)=@_;
+    return "HWVAL_$id\_$variable\_$name";
+}
+
+#
+# Generate an input field for a coordinate variable
+#
+
+sub generate_input_field {
+    my ($id,$variable,$x,$y)=@_;
+    $Apache::functionplotresponse::inputfields.=
+       "<input type='hidden' name='".&field_name($id,$variable,'x')."' value='$x' />\n".
+       "<input type='hidden' name='".&field_name($id,$variable,'y')."' value='$y' />\n";
+}
+
+#
 # Initialize a new coordinate variable at set a listener on it
 #
 sub new_coordinate {
     my ($id,$variable,$x,$y)=@_;
+    if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'x')})) {
+       $x=$Apache::functionplotresponse::previous{&field_name($id,$variable,'x')};
+    }
+    if (defined($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);
 }
 
@@ -228,10 +254,10 @@ sub generate_spline {
    my @coords=();
    foreach my $i (1..$order) {
        $result.=&new_coordinate($id,$label.'P'.$i,$x,$y);
-       $x+=$sx/$order;
+       $x+=$sx/(2.*($order-1));
        push(@coords,$label.'P'.$i);
        $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy);
-       $x+=$sx/$order;
+       $x+=$sx/(2.*($order-1));
        push(@coords,$label.'S'.$i);
    }
    $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n";
@@ -250,14 +276,54 @@ sub start_backgroundplot {
    unless ($function) { $function="0"; }
    if ($target eq 'web') {
       $result.=&plot_script($internalid,$function,$fixed);
+   } elsif ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token,'Background Function Plot').
+             &Apache::edit::text_arg('Function:','function',
+                                     $token,'16').
+             &Apache::edit::select_arg('Fixed location:','fixed',
+                                  ['yes','no'],$token).
+             &Apache::edit::end_row();
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'function','fixed');
+    if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
+}
+
+sub end_backgroundplot {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   if ($target eq 'edit') {
+       $result=&Apache::edit::end_table();
    }
    return $result;
 }
 
-sub end_backgroundplot {
-   return '';
+#
+# <splinerule ... />
+#
+sub start_splinerule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
+   if ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
+                &Apache::edit::end_row();
+   }
+   return $result;
+}
+
+sub end_splinerule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   if ($target eq 'edit') {
+       $result=&Apache::edit::end_table();
+   }
+   return $result;
 }
 
+
 #
 # <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
 #
@@ -265,34 +331,70 @@ sub end_backgroundplot {
 #
 sub start_spline {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-   my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
-   $Apache::functionplotresponse::counter++;
-   unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
-
-   my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
-   if (($order<2) || ($order>4)) { $order=2; }
-   $Apache::functionplotresponse::splineorder{$label}=$order;
-
-   my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
-   unless ($x) { $x=0; }
-   $Apache::functionplotresponse::splineinitx{$label}=$x;
-
-   my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval);
-   unless ($y) { $y=0; }
-   $Apache::functionplotresponse::splineinity{$label}=$y;
-
-   my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval);
-   unless ($sx) { $sx=$order; }
-   $Apache::functionplotresponse::splinescalex{$label}=$sx;
-
-   my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval);
-   unless ($sy) { $sy=2; }
-   $Apache::functionplotresponse::splinescaley{$label}=$sy;
-   return '';
+   my $result='';
+   if ($target eq 'web') {
+      my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
+      $Apache::functionplotresponse::counter++;
+      if ($label=~/\W/) {
+         &Apache::lonxml::warning(&mt('Spline labels should only contain alphanumeric characters.'));
+      }
+      $label=~s/\W//gs;
+      unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
+      if ($Apache::functionplotresponse::splineorder{$label}) {
+         &Apache::lonxml::error(&mt('Spline labels must be unique.'));
+      }
+
+      my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
+      if ($order<2) { $order=2; }
+      if ($order>8) { $order=8; }
+      $Apache::functionplotresponse::splineorder{$label}=$order;
+
+      my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
+      unless ($x) { $x=0; }
+      $Apache::functionplotresponse::splineinitx{$label}=$x;
+
+      my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval);
+      unless ($y) { $y=0; }
+      $Apache::functionplotresponse::splineinity{$label}=$y;
+
+      my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval);
+      unless ($sx) { $sx=$order; }
+      $Apache::functionplotresponse::splinescalex{$label}=$sx;
+
+      my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval);
+      unless ($sy) { $sy=2; }
+      $Apache::functionplotresponse::splinescaley{$label}=$sy;
+   } elsif ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token,'Spline').
+             &Apache::edit::text_arg('Label:','label',
+                                     $token,'4').
+             &Apache::edit::select_arg('Order:','order',
+                                  ['2','3','4','5','6','7','8','9'],$token).
+             &Apache::edit::text_arg('Initial x-value:','initx',
+                                     $token,'4').
+             &Apache::edit::text_arg('Initial y-value:','inity',
+                                     $token,'4').
+             &Apache::edit::text_arg('Scale x:','scalex',
+                                     $token,'4').
+             &Apache::edit::text_arg('Scale y:','scaley',
+                                     $token,'4').
+             &Apache::edit::end_row();
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'label','order','initx','inity',
+                                                           'scalex','scaley');
+    if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
 }
 
 sub end_spline {
-   return '';
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   if ($target eq 'edit') {
+       $result=&Apache::edit::end_table();
+   }
+   return $result;
 }
  
 sub end_init_script {
@@ -303,6 +405,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='';
@@ -312,9 +439,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);
@@ -327,8 +463,40 @@ sub start_functionplotresponse {
   my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
   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 'edit') {
+    $result.=&Apache::edit::start_table($token)
+       .'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>'
+       .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+       .&Apache::edit::deletelist($target,$token)
+       .'</span></td>'
+       ."<td>&nbsp;"
+       .&Apache::edit::end_row()
+       .&Apache::edit::start_spanning_row()
+       ."\n";
+    $result.=&Apache::edit::text_arg('Minimum x-value:','xmin',
+                                     $token,'4').
+             &Apache::edit::text_arg('Maximum x-value:','xmax',
+                                     $token,'4').
+             &Apache::edit::select_arg('x-axis visible:','xaxisvisible',
+                                  ['yes','no'],$token).
+             &Apache::edit::text_arg('Minimum y-value:','ymin',
+                                     $token,'4').
+             &Apache::edit::text_arg('Maximum y-value:','ymax',
+                                     $token,'4').
+             &Apache::edit::select_arg('y-axis visible:','yaxisvisible',
+                                  ['yes','no'],$token).
+             &Apache::edit::select_arg('Grid visible:','gridvisible',
+                                  ['yes','no'],$token).
+             &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'xmin','xmax','ymin','ymax',
+                                                           'xaxisvisible','yaxisvisible','gridvisible');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+
+  } elsif ($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
@@ -345,16 +513,41 @@ 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 'grade'
+         && &Apache::response::submitted()
+         && $Apache::lonhomework::type eq 'exam') {
 
-#  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-  if ($target eq 'web') {
+        #&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;
+        my %previous=&Apache::response::check_for_previous($response,$partid,$id);
+#
+# Actually grade
+#
+        my $ad='INCORRECT';
+#
+# Store grading info
+#
+        $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+        &Apache::response::handle_previous(\%previous,$ad);
+   } 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);
      }
 # close the init script
      $result.=&end_init_script();
+# generate the input fields
+     $result.=$Apache::functionplotresponse::inputfields;
 # actually start the <applet>-tag
      $result.=&geogebra_startcode($internalid);
 # load the spline bytecode