[LON-CAPA-cvs] cvs: loncom /homework edit.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 08 Sep 2003 21:10:53 -0000
albertel Mon Sep 8 17:10:53 2003 EDT
Modified files:
/loncom/homework edit.pm
Log:
- adding new type of arg, checked_arg
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.60 loncom/homework/edit.pm:1.61
--- loncom/homework/edit.pm:1.60 Thu Aug 14 15:30:34 2003
+++ loncom/homework/edit.pm Mon Sep 8 17:10:53 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.60 2003/08/14 19:30:34 www Exp $
+# $Id: edit.pm,v 1.61 2003/09/08 21:10:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -465,17 +465,21 @@
# Returns a 1 if the token has been modified and you should rebuild the tag
# side-effects, will modify the $token if new values are found
sub get_new_args {
- my ($token,$parstack,$safeeval,@args)=@_;
- my $rebuild=0;
- foreach my $arg (@args) {
+ my ($token,$parstack,$safeeval,@args)=@_;
+ my $rebuild=0;
+ foreach my $arg (@args) {
#just want the string that it was set to
my $value=$token->[2]->{$arg};
my $element=&html_element_name($arg);
my $newvalue=$ENV{"form.$element"};
&Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
if (defined($newvalue) && $value ne $newvalue) {
- $token->[2]->{$arg}=$newvalue;
- $rebuild=1;
+ if (ref($newvalue) eq 'ARRAY') {
+ $token->[2]->{$arg}=join(',',@$newvalue);
+ } else {
+ $token->[2]->{$arg}=$newvalue;
+ }
+ $rebuild=1;
}
}
return $rebuild;
@@ -515,6 +519,36 @@
my $arg=$token->[2]{$name};
$result='<input name="'.&html_element_name($name).
'" type="hidden" value="'.$arg.'" />';
+ return $result;
+}
+
+sub checked_arg {
+ my ($description,$name,$list,$token) = @_;
+ my $result;
+ my $optionlist="";
+ my $allselected=$token->[2]{$name};
+ $result=$description;
+ foreach my $option (@$list) {
+ my ($value,$text);
+ if ( ref($option) eq 'ARRAY') {
+ $value='value="'.$$option[0].'"';
+ $text=$$option[1];
+ $option=$$option[0];
+ } else {
+ $text=$option;
+ $value='value="'.$option.'"';
+ }
+ $result.="<nobr><input type='checkbox' $value name='".
+ &html_element_name($name)."'";
+ foreach my $selected (split(/,/,$allselected)) {
+ &Apache::lonxml::error("wha $selected $option<br />");
+ if ( $selected eq $option ) {
+ $result.=" checked='on' ";
+ last;
+ }
+ }
+ $result.=" />$text</nobr>\n";
+ }
return $result;
}