[BACK]Return to functionplotresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/functionplotresponse.pm between versions 1.9 and 1.10

version 1.9, 2010/10/09 00:00:04 version 1.10, 2010/10/09 17:43:25
Line 116  ENDGGBINIT Line 116  ENDGGBINIT
   
 #  #
 # Each Geogebra applet is supposed to call this when parameters change  # Each Geogebra applet is supposed to call this when parameters change
   # Changes the hidden fields on the web page
 #  #
 sub update_script {  sub update_script {
     my ($id)=@_;      my ($id)=@_;
Line 177  sub generate_input_field { Line 178  sub generate_input_field {
 #  #
 sub new_coordinate {  sub new_coordinate {
     my ($id,$variable,$x,$y)=@_;      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);      &generate_input_field($id,$variable,$x,$y);
     return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);      return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
 }  }
Line 286  sub start_spline { Line 293  sub start_spline {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);     my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
    $Apache::functionplotresponse::counter++;     $Apache::functionplotresponse::counter++;
      $label=~s/\W//gs;
    unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }     unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
   
    my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);     my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
Line 323  sub end_init_script { Line 331  sub end_init_script {
 ENDENDINIT  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 {  sub start_functionplotresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
Line 332  sub start_functionplotresponse { Line 365  sub start_functionplotresponse {
   undef %Apache::functionplotresponse::splineinity;    undef %Apache::functionplotresponse::splineinity;
   undef %Apache::functionplotresponse::splinescalex;    undef %Apache::functionplotresponse::splinescalex;
   undef %Apache::functionplotresponse::splinescaley;    undef %Apache::functionplotresponse::splinescaley;
   # Remember input fields, etc
     undef %Apache::functionplotresponse::previous;
   $Apache::functionplotresponse::inputfields='';    $Apache::functionplotresponse::inputfields='';
   $Apache::functionplotresponse::counter=0;    $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  # 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>  # Parameters of <functionplotresponse>
   my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);    my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
   $xmin=($xmin?$xmin:-10);    $xmin=($xmin?$xmin:-10);
Line 349  sub start_functionplotresponse { Line 390  sub start_functionplotresponse {
   my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$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');    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  # paste in the update routine to receive stuff back from the applet
      $result.=&update_script($internalid);       $result.=&update_script($internalid);
 # start the initscript for this applet  # start the initscript for this applet
Line 366  sub end_functionplotresponse { Line 409  sub end_functionplotresponse {
   &Apache::response::end_response;    &Apache::response::end_response;
   
   my $result;    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 '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  # Now is the time to render all of the stored splines
      foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {       foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
         $result.=&generate_spline($internalid,$label);          $result.=&generate_spline($internalid,$label);
Removed from v.1.9  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>