--- loncom/homework/hint.pm 2001/10/05 17:01:05 1.19
+++ loncom/homework/hint.pm 2002/10/14 20:42:57 1.28
@@ -1,11 +1,39 @@
+# The LearningOnline Network with CAPA
+# implements the tags that control the hints
+#
+# $Id: hint.pm,v 1.28 2002/10/14 20:42:57 albertel Exp $
+#
+# 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;
use strict;
use Apache::lonnet;
use capa;
-sub BEGIN {
- &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
+BEGIN {
+ &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint'));
}
@@ -14,7 +42,7 @@ sub start_hintgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $skiptoend='0';
my $result;
-
+
if ($target eq 'web') {
my $id=$Apache::inputtags::part;
my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
@@ -27,9 +55,11 @@ sub start_hintgroup {
} else {
if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
}
- }
- if ($skiptoend) {
- &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ if ($skiptoend) {
+ &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ }
+ } elsif ($target eq 'tex') {
+ $result .= '\keephidden{';
}
@Apache::hint::which=();
return $result;
@@ -38,7 +68,7 @@ sub start_hintgroup {
sub end_hintgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
-
+
if ($target eq 'web') {
my $id=$Apache::inputtags::part;
my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
@@ -49,6 +79,10 @@ sub end_hintgroup {
if ( $numtries >= $hinttries ) {
$result='</td></tr></table>';
}
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_table();
+ } elsif ($target eq 'tex') {
+ $result .= '}';
}
@Apache::hint::which=();
return $result;
@@ -58,7 +92,39 @@ sub start_numericalhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
#do everything in end, so intervening <responseparams> work
&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 {
@@ -92,17 +158,49 @@ sub end_numericalhint {
$result='';
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('numericalhint');
+ } elsif ($target eq 'edit') {
+ $result.='</td></tr>'.&Apache::edit::end_table;
}
&Apache::response::end_hintresponse();
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
sub start_hintpart {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $show ='0';
-
+ my $result = '';
if ($target eq 'web') {
my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);
&Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
@@ -117,12 +215,27 @@ sub start_hintpart {
}
} elsif ($target eq 'grade') {
&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 {
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ return $result;
}
1;