--- loncom/interface/lonhelper.pm	2003/06/19 19:28:52	1.39
+++ loncom/interface/lonhelper.pm	2003/08/13 14:52:08	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.39 2003/06/19 19:28:52 bowersj2 Exp $
+# $Id: lonhelper.pm,v 1.43 2003/08/13 14:52:08 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1142,7 +1142,6 @@ sub end_choice {
 }
 
 sub render {
-    # START HERE: Replace this with correct choices code.
     my $self = shift;
     my $var = $self->{'variable'};
     my $buttons = '';
@@ -1275,6 +1274,154 @@ sub postprocess {
 }
 1;
 
+package Apache::lonhelper::dropdown;
+
+=pod
+
+=head2 Element: dropdown
+
+A drop-down provides a drop-down box instead of a radio button
+box. Because most people do not know how to use a multi-select
+drop-down box, that option is not allowed. Otherwise, the arguments
+are the same as "choices", except "allowempty" is also meaningless.
+
+<dropdown> takes an attribute "variable" to control which helper variable
+the result is stored in.
+
+B<SUB-TAGS>
+
+<choice>, which acts just as it does in the "choices" element.
+
+=back
+
+=cut
+
+no strict;
+@ISA = ("Apache::lonhelper::element");
+use strict;
+
+BEGIN {
+    &Apache::lonhelper::register('Apache::lonhelper::dropdown',
+                              ('dropdown'));
+}
+
+sub new {
+    my $ref = Apache::lonhelper::element->new();
+    bless($ref);
+}
+
+# CONSTRUCTION: Construct the message element from the XML
+sub start_dropdown {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    if ($target ne 'helper') {
+        return '';
+    }
+
+    # Need to initialize the choices list, so everything can assume it exists
+    $paramHash->{'variable'} = $token->[2]{'variable'} if (!defined($paramHash->{'variable'}));
+    $helper->declareVar($paramHash->{'variable'});
+    $paramHash->{CHOICES} = [];
+    return '';
+}
+
+sub end_dropdown {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    if ($target ne 'helper') {
+        return '';
+    }
+    Apache::lonhelper::dropdown->new();
+    return '';
+}
+
+sub render {
+    my $self = shift;
+    my $var = $self->{'variable'};
+    my $result = '';
+
+    if (defined $self->{ERROR_MSG}) {
+        $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+    }
+
+    my %checkedChoices;
+    my $checkedChoicesFunc;
+
+    if (defined($self->{DEFAULT_VALUE})) {
+        $checkedChoicesFunc = eval ($self->{DEFAULT_VALUE});
+        die 'Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@ if $@;
+    } else {
+        $checkedChoicesFunc = sub { return ''; };
+    }
+
+    # single choice
+    my $selectedChoice = &$checkedChoicesFunc($helper, $self);
+    
+    my $foundChoice = 0;
+    
+    # check that the choice is in the list of choices.
+    for my $choice (@{$self->{CHOICES}}) {
+	if ($choice->[1] eq $selectedChoice) {
+	    $checkedChoices{$choice->[1]} = 1;
+	    $foundChoice = 1;
+	}
+    }
+    
+    # If we couldn't find the choice, pick the first one 
+    if (!$foundChoice) {
+	$checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
+    }
+
+    $result .= "<select name='${var}.forminput'>\n";
+    foreach my $choice (@{$self->{CHOICES}}) {
+        $result .= "<option value='" . 
+            HTML::Entities::encode($choice->[1]) 
+            . "'";
+        if ($checkedChoices{$choice->[1]}) {
+            $result .= " selected";
+        }
+        my $choiceLabel = $choice->[0];
+        if ($choice->[4]) {  # if we need to evaluate this choice
+            $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
+                $choiceLabel . "}";
+            $choiceLabel = eval($choiceLabel);
+            $choiceLabel = &$choiceLabel($helper, $self);
+        }
+        $result .= ">" . $choiceLabel . "\n";
+    }
+    $result .= "</select>\n";
+
+    return $result;
+}
+
+# If a NEXTSTATE was given or a nextstate for this choice was
+# given, switch to it
+sub postprocess {
+    my $self = shift;
+    my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+
+    if (!defined($chosenValue) && !$self->{'allowempty'}) {
+        $self->{ERROR_MSG} = "You must choose one or more choices to" .
+            " continue.";
+        return 0;
+    }
+
+    if (defined($self->{NEXTSTATE})) {
+        $helper->changeState($self->{NEXTSTATE});
+    }
+    
+    foreach my $choice (@{$self->{CHOICES}}) {
+        if ($choice->[1] eq $chosenValue) {
+            if (defined($choice->[2])) {
+                $helper->changeState($choice->[2]);
+            }
+        }
+    }
+    return 1;
+}
+1;
+
 package Apache::lonhelper::date;
 
 =pod
@@ -2654,17 +2801,19 @@ sub render {
         }
     }
 
-    if (scalar(@results) == 0) {
-        return '';
-    }
-
-    my $result = "<ul>\n";
-    for my $re (@results) {
-        $result .= '    <li>' . $re . "</li>\n";
-    }
+    my $result;
 
-    if (!@results) {
-        $result .= '    <li>No changes were made to current settings.</li>';
+    if (scalar(@results) != 0) {
+	$result .= "<ul>\n";
+	for my $re (@results) {
+	    $result .= '    <li>' . $re . "</li>\n";
+	}
+	
+	if (!@results) {
+	    $result .= '    <li>No changes were made to current settings.</li>';
+	}
+	
+	$result .= '</ul>';
     }
 
     if ($self->{'restartCourse'}) {
@@ -2678,7 +2827,7 @@ sub render {
             "</form></center>";
     }
 
-    return $result . '</ul>';
+    return $result;
 }
 
 sub overrideForm {
@@ -2753,9 +2902,7 @@ sub render {
         $symb = 'a';
         $paramlevel = 'general';
     } elsif ($vars->{GRANULARITY} eq 'map') {
-        my $navmap = Apache::lonnavmaps::navmap->new(
-                           $ENV{"request.course.fn"}.".db",
-                           $ENV{"request.course.fn"}."_parms.db", 0, 0);
+        my $navmap = Apache::lonnavmaps::navmap->new();
         my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
         my $title = $res->compTitle();
         $symb = $res->symb();
@@ -2765,9 +2912,7 @@ sub render {
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'map';
     } else {
-        my $navmap = Apache::lonnavmaps::navmap->new(
-                           $ENV{"request.course.fn"}.".db",
-                           $ENV{"request.course.fn"}."_parms.db", 0, 0);
+        my $navmap = Apache::lonnavmaps::navmap->new();
         my $res = $navmap->getById($vars->{RESOURCE_ID});
         $symb = $res->symb();
         my $title = $res->compTitle();