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

Diff for /loncom/homework/hint.pm between versions 1.18 and 1.31

version 1.18, 2001/08/17 21:42:19 version 1.31, 2002/10/29 06:02:20
Line 1 Line 1
   # The LearningOnline Network with CAPA 
   # implements the tags that control the hints
   #
   # $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/
   #
   
 package Apache::hinttags;   package Apache::hinttags; 
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use capa;  use capa;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
 }  }
   
   
Line 14  sub start_hintgroup { Line 42  sub start_hintgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $skiptoend='0';    my $skiptoend='0';
   my $result;    my $result;
     
   if ($target eq 'web') {    if ($target eq 'web') {
     my $id=$Apache::inputtags::part;      my $id=$Apache::inputtags::part;
     my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};      my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
Line 27  sub start_hintgroup { Line 55  sub start_hintgroup {
     } else {      } else {
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}        if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
     }      }
   }      if ($skiptoend) {
   if ($skiptoend) {        &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
     &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);      }
     } elsif ($target eq 'tex') {
       $result .= '\keephidden{'; 
   }    }
   @Apache::hint::which=();    @Apache::hint::which=();
   return $result;    return $result;
Line 46  sub end_hintgroup { Line 76  sub end_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");      my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }      if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");      &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
     if ( $numtries => $hinttries ) {      if ( $numtries >= $hinttries ) {
       if ($target eq 'web') {$result='</td></tr></table>';}        $result='</td></tr></table>';
     }      }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {
       $result .= '}'; 
   }    }
   @Apache::hint::which='';    @Apache::hint::which=();
   return $result;    return $result;
 }  }
   
Line 58  sub start_numericalhint { Line 92  sub start_numericalhint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   #do everything in end, so intervening <responseparams> work    #do everything in end, so intervening <responseparams> work
   &Apache::response::start_hintresponse($parstack,$safeeval);    &Apache::response::start_hintresponse($parstack,$safeeval);
   return '';    my $result;
     if ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Name:','name',$token);
       $result.=&Apache::edit::text_arg('Answer:','answer',$token);
       if ($token->[1] eq 'numericalhint') {
         $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
         $result.=&Apache::edit::text_arg('Format:','format',$token,4);
       } elsif ($token->[1] eq 'stringhint') {
         $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);
       } elsif ($token->[1] eq 'formulahint') {
         $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
       }
       $result.=&Apache::edit::end_row();
       $result.=&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
       my $constructtag;
       if ($token->[1] eq 'numericalhint') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'name','answer','unit','format');
       } elsif ($token->[1] eq 'stringhint') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'name','answer','type');
       } elsif ($token->[1] eq 'formulahint') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'name','answer','samples');
       }
       if ($constructtag) {
         $result  = &Apache::edit::rebuild_tag($token);
         $result .= &Apache::edit::handle_insert();
       }
     }
     return $result;
 }  }
   
 sub end_numericalhint {  sub end_numericalhint {
Line 92  sub end_numericalhint { Line 158  sub end_numericalhint {
     $result='';      $result='';
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalhint');      $result=&Apache::response::meta_package_write('numericalhint');
     } elsif ($target eq 'edit') {
       $result.='</td></tr>'.&Apache::edit::end_table;
   }    }
   &Apache::response::end_hintresponse();    &Apache::response::end_hintresponse();
   return $result;    return $result;
 }  }
   
   sub start_stringhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('stringhint');
     } else {
       $result.=&start_numericalhint(@_);
     }
     return $result;
   }
   
   sub end_stringhint {
     return end_numericalhint(@_);
   }
   
   sub start_formulahint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('formulahint');
     } else {
       $result.=&start_numericalhint(@_);
     }
     return $result;
   }
   
   sub end_formulahint {
     return end_numericalhint(@_);
   }
   
 # a part shows if it is on, if no specific parts are on, then default shows  # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {  sub start_hintpart {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $show ='0';    my $show ='0';
     my $result = '';
   if ($target eq 'web') {    if ($target eq 'web') {
     my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);      my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);
     &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");      &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
Line 117  sub start_hintpart { Line 215  sub start_hintpart {
     }      }
   } elsif ($target eq 'grade') {    } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);      &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
     } elsif ($target eq 'edit') {
       $result.= &Apache::edit::tag_start($target,$token);
       $result.= &Apache::edit::text_arg('On:','on',$token);
       $result.= &Apache::edit::end_row();
       $result.= &Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'on');
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
         $result.=&Apache::edit::handle_insert();
       }
   }    }
   return '';    return $result;
 }  }
   
 sub end_hintpart {  sub end_hintpart {
   return '';      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
       return $result;
   }
   
   sub start_optionhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       &Apache::response::start_hintresponse($parstack,$safeeval);
       if ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::text_arg('Name:','name',$token);
    $result.=&Apache::edit::text_arg('Answer:','answer',$token,40);
    $result.=&Apache::edit::text_arg('Concept:','concept',$token,50);
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name',
        'answer','concept');
    if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
    }
       } elsif ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('numericalhint');
       }
       return $result;
   }
   
   sub end_optionhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq 'web') {
    my ($foilmatch,$conceptmatch)=(-1,-1);
    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
    my $partid=$Apache::inputtags::part;
    #id submissions occured under
    my $submitid=$Apache::inputtags::response['-2'];
    my $part_id="$partid.$submitid";
    my %answer;
    my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
    if ($answer) {
       eval('%answer ='.$answer);
       &Apache::lonhomework::showhash(%answer);
       my $response = $Apache::lonhomework::history{
               "resource.$part_id.submission"};
       my %response=&Apache::lonnet::str2hash($response);
       &Apache::lonhomework::showhash(%response);
       foreach my $foil (keys(%answer)) {
    $foilmatch=1;
    if ($answer{$foil} ne $response{$foil}) {$foilmatch=0;last;}
       }
    }
    my %concept;
    my $constr=&Apache::lonxml::get_param('concept',$parstack,$safeeval);
    if ( $constr ) { eval('%concept ='.$constr); }
    my $response = $Apache::lonhomework::history{
    "resource.$part_id.submissiongrading"};
    my %response=&Apache::lonnet::str2hash($response);
    foreach my $concept (keys(%concept)) {
       my $compare;
       if ($concept{$concept} eq 'correct') {$compare=1}else{$compare=0}
       $conceptmatch=1;
       if (ref($Apache::hint::option{"$part_id.concepts"})) {
    foreach my $foil (@{ $Apache::hint::option{"$part_id.concept.$concept"} }) {
       &Apache::lonxml::debug("compare -$foil- -$response{$foil}-$compare-");
       if ( exists($response{$foil}) && 
    $response{$foil} ne $compare) {$conceptmatch=0;last;}
    }
       } else {
    $conceptmatch=0;
       }
       if ($conceptmatch eq '0') { last; }
    }
    if ( ($conceptmatch eq '-1' || $conceptmatch eq '1') &&
        ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {
       push(@Apache::hint::which,$name);
    }
       } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
       if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
       &Apache::response::end_hintresponse();
       return $result;
 }  }
   
   sub start_radiobuttonhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       &Apache::response::start_hintresponse($parstack,$safeeval);
       if ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::text_arg('Name:','name',$token);
    $result.=&Apache::edit::text_arg('Answer:','answer',$token);
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name',
        'answer');
    if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
    }
       } elsif ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('numericalhint');
       }
       return $result;
   }
   
   sub end_radiobuttonhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq 'web') {
    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
    my @answer;
    my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
    eval('@answer ='.$answer);
    my $partid=$Apache::inputtags::part;
    #id submissions occured under
    my $submitid=$Apache::inputtags::response['-2'];
    my $part_id="$partid.$submitid";
    my $response = $Apache::lonhomework::history{
       "resource.$part_id.submission"};
    ($response)=&Apache::lonnet::str2hash($response);
    if ($answer[0] eq 'foil' && $response eq $answer[1]) {
       push (@Apache::hint::which,$name);
    } elsif ($answer[0] eq 'concept') {
       if (ref($Apache::hint::radiobutton{"$part_id.concept.".$answer[1]})) {
    my @names=@{ $Apache::hint::radiobutton{"$part_id.concept.".$answer[1]} };
    if (grep(/^\Q$response\E$/,@names)) {
       push(@Apache::hint::which,$name);
    }
       }
    }
       } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
       &Apache::response::end_hintresponse();
       return $result;
   }
 1;  1;
 __END__  __END__
Removed from v.1.18  
changed lines
  Added in v.1.31

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