[LON-CAPA-cvs] cvs: loncom(version_1_0_2) /homework edit.pm

[albertel]

albertel		Wed Oct 15 17:19:46 2003 EDT

  Modified files:              (Branch: version_1_0_2)
    /loncom/homework	edit.pm 
  Log:
  - backport 1.61
  
  
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.57.2.2 loncom/homework/edit.pm:1.57.2.3
--- loncom/homework/edit.pm:1.57.2.2	Mon Oct  6 16:11:38 2003
+++ loncom/homework/edit.pm	Wed Oct 15 17:19:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.57.2.2 2003/10/06 20:11:38 albertel Exp $
+# $Id: edit.pm,v 1.57.2.3 2003/10/15 21:19:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -458,17 +458,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;
@@ -508,6 +512,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;
 }