Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.29 and 1.32

version 1.29, 2001/11/12 20:36:41 version 1.32, 2001/12/13 23:36:39
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # mutliple choice style responses  # mutliple choice style responses
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 2/21 Guy  # 2/21 Guy
   
 package Apache::radiobuttonresponse;  package Apache::radiobuttonresponse;
Line 55  sub storesurvey { Line 80  sub storesurvey {
   if ( defined $ENV{'form.submitted'}) {    if ( defined $ENV{'form.submitted'}) {
     my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");      &Apache::lonxml::debug("Here I am!:$response:");
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[0-9]+/) {
       my $id = $Apache::inputtags::response['-1'];        my $id = $Apache::inputtags::response['-1'];
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;        my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
         my %responsehash;
         $responsehash{$whichfoils[$response]}=$response;
         $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';        $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
       &Apache::lonxml::debug("submitted a $response<br />\n");        &Apache::lonxml::debug("submitted a $response<br />\n");
     }      }
Line 65  sub storesurvey { Line 93  sub storesurvey {
   return '';    return '';
 }  }
   
   sub grade_response {
     my ($max,$answer)=@_;
     if (!defined($ENV{'form.submitted'})) { return; }
     my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
     if ( $response !~ /[0-9]+/) { return; }
     my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
     my @whichfoils=&whichfoils($max,$answer);
     my %responsehash;
     $responsehash{$whichfoils[$response]}=$response;
     my $responsestr=&Apache::lonnet::hash2str(%responsehash);
     my %previous=&Apache::response::check_for_previous($responsestr,
        $part,$id);
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
       $responsestr;
     &Apache::lonxml::debug("submitted a $response<br />\n");
     my $ad;
     if ($response == $answer) {
       $ad='EXACT_ANS';
     } else {
       $ad='INCORRECT';
     }
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
     &Apache::response::handle_previous(\%previous,$ad);
   }
   
 sub end_foilgroup {  sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
Line 72  sub end_foilgroup { Line 126  sub end_foilgroup {
   if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
     my $style = $Apache::lonhomework::type;      my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {      if ( $style eq 'survey' ) {
       if ($target eq 'web') {        if ($target eq 'web' || $target eq 'answer') {
  $result=&displayallfoils();   $result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {        } elsif ( $target eq 'grade' ) {
  $result=&storesurvey();   $result=&storesurvey();
Line 90  sub end_foilgroup { Line 144  sub end_foilgroup {
       } elsif ($target eq 'answer' ) {        } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$answer);   $result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
  if ( defined $ENV{'form.submitted'}) {   &grade_response($max,$answer);
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};  
   if ( $response =~ /[^\s]/) {  
     my $id = $Apache::inputtags::response['-1'];  
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;  
     &Apache::lonxml::debug("submitted a $response<br />\n");  
     if ($response == $answer) {  
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';  
     } else {  
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';  
     }  
   }  
  }  
       }        }
     }      }
   }    }
Line 135  sub displayallfoils { Line 177  sub displayallfoils {
   my $id=$Apache::inputtags::response['-1'];    my $id=$Apache::inputtags::response['-1'];
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};    my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     &Apache::lonhomework::showhash(%lastresponse);
   foreach my $name (@names) {    foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
       $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
       if ($lastresponse eq $temp) { $result .= 'checked="on"'; }        if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";        $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       $temp++;        $temp++;
     }      }
Line 200  sub displayfoils { Line 244  sub displayfoils {
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};      my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
       my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";         $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
       if ($lastresponse eq $temp) { $result .= 'checked="on"'; }        if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";        $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       $temp++;        $temp++;
     }      }

Removed from v.1.29  
changed lines
  Added in v.1.32


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