--- loncom/homework/functionplotresponse.pm 2010/10/05 01:28:00 1.7
+++ loncom/homework/functionplotresponse.pm 2010/10/09 20:02:02 1.11
@@ -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.11 2010/10/09 20:02:02 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)=@_;
@@ -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";
@@ -267,10 +293,12 @@ 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);
- if (($order<2) || ($order>4)) { $order=2; }
+ if ($order<2) { $order=2; }
+ if ($order>8) { $order=8; }
$Apache::functionplotresponse::splineorder{$label}=$order;
my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
@@ -303,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='';
@@ -312,9 +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);
@@ -328,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
@@ -345,16 +409,33 @@ 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);
}
# 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