--- loncom/homework/lonsimpleproblemedit.pm	2010/01/29 15:44:41	1.20.2.4
+++ loncom/homework/lonsimpleproblemedit.pm	2009/09/24 00:50:03	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.20.2.4 2010/01/29 15:44:41 raeburn Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.26 2009/09/24 00:50:03 truskell Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use LONCAPA;
 
 my %qparms;
 my $prefix;
+my $weightprefix;
 my $qtype;
 
 sub evaloptionhash {
@@ -110,19 +111,13 @@ ENDSCRIPT
 
 sub foil {
     my $number=shift;
-    my (%values,%defaultvalues,%customvalues);
-    %defaultvalues = &Apache::lonlocal::texthash(
-                         'unused' => 'Not shown, not used'
-                     );
+    my %values='';
     if ($qtype eq 'radio') {
-        %customvalues = &Apache::lonlocal::texthash(
-                                       'true' => 'True',
-                                       'false' => 'False'
-        );
+	%values=('true' => 'True', 'false' => 'False');
     } elsif ($qtype eq 'option') {
-        %customvalues=&evaloptionhash($qparms{$prefix.'options'});
+	%values=&evaloptionhash($qparms{$prefix.'options'});
     }
-    %values = (%defaultvalues,%customvalues);
+    $values{'unused'}='Not shown, not used';
     my $value=$qparms{$prefix.'value'.$number};
     unless (defined($value)) { $value='unused'; }
     unless ($values{$value}) { $value='unused'; }
@@ -134,14 +129,10 @@ sub foil {
     unless ($positions{$position}) {
 	$position='random';
     }
-    my $selectvalue=&Apache::loncommon::select_form(
-                        $value,
-                        'value'.$number,
-                        &Apache::lonlocal::texthash(%values));
-    my $selectposition=&Apache::loncommon::select_form(
-                           $position,
-                           'position'.$number,
-                           &Apache::lonlocal::texthash(%positions));
+    my $selectvalue=&Apache::loncommon::select_form
+	                                ($value,'value'.$number,%values);
+    my $selectposition=&Apache::loncommon::select_form
+                               ($position,'position'.$number,%positions);
     my $text=$qparms{$prefix.'text'.$number};
     my %lt=&Apache::lonlocal::texthash('foil'  => 'Foil',
 				       'value' => 'Value',
@@ -201,8 +192,9 @@ sub handler {
 
 # ------------------------------------------------ Prefix for everything stored
     $prefix=$env{'request.course.id'}.'.'.$symb.'.0.';
-#----------------------------------- Prefix for storing weight of Problem Parts
-    my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';
+#------------------------------------------------- Prefix for storing weight of Problem Parts
+    $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';
+    
 # ---------------------------------------------------------- Anything to store?
 
     if (($symb) && (defined($env{'form.questiontype'}))) {
@@ -230,22 +222,24 @@ sub handler {
 	}
 # ---------------------------------------------------- Set weights of hidden parts to zero
 # ------------------------------------------------------ and used part to 1
-        $storecontent{$weightprefix.'essay.weight'}=0;
-        $storecontent{$weightprefix.'numerical.weight'}=0;
-        $storecontent{$weightprefix.'option.weight'}=0;
-        $storecontent{$weightprefix.'radio.weight'}=0;
-        $storecontent{$weightprefix.'string.weight'}=0;
-        $storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1;
+	$storecontent{$weightprefix.'essay.weight'}=0;
+	$storecontent{$weightprefix.'numerical.weight'}=0;
+	$storecontent{$weightprefix.'option.weight'}=0;
+	$storecontent{$weightprefix.'radio.weight'}=0;
+	$storecontent{$weightprefix.'string.weight'}=0;
+	$storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1;
+
 
 	my $reply=&Apache::lonnet::cput
 	    ('resourcedata',\%storecontent,
 	     $env{'course.'.$env{'request.course.id'}.'.domain'},
 	     $env{'course.'.$env{'request.course.id'}.'.num'});
+
+        &Apache::lonnet::devalidatecourseresdata(
+                            $env{'course.'.$env{'request.course.id'}.'.num'},
+                            $env{'course.'.$env{'request.course.id'}.'.domain'});
+
     }
-        
-    &Apache::lonnet::devalidatecourseresdata(
-                        $env{'course.'.$env{'request.course.id'}.'.num'},
-                        $env{'course.'.$env{'request.course.id'}.'.domain'});
 # ------------------------------------------------------------------- Read Data
 
     %qparms=&Apache::lonnet::dump('resourcedata',
@@ -259,34 +253,46 @@ sub handler {
 					     $spell_header));
     if ($symb) {
 	$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
-	$r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>');
         my $displaylink = &get_parent_uri($symb);
-        if ($displaylink ne '') {      
-            $r->print('<a href="'.$displaylink.'">'.&mt('Student View').'</a> - ');
+        if ($displaylink ne '') {
+            my $functions=&Apache::lonhtmlcommon::start_funclist()
+                         .&Apache::lonhtmlcommon::add_item_funclist(
+                              '<a href="'.$displaylink.'">'
+                             .&mt('Student View').'</a>')
+                             .&Apache::lonhtmlcommon::end_funclist();
+            $r->print(&Apache::loncommon::head_subbox($functions));
         } else {
-            $r->print('<span class="LC_error">'.&mt('An error occurred retrieving the link to this problem').'<br />'.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.','<a href="/adm/roles">','</a>').'</span><br />'); 
+            $r->print('<p class="LC_error">'
+                     .&mt('An error occurred retrieving the link to this problem.')
+                     .'<br />'
+                     .&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.'
+                         ,'<a href="/adm/roles">','</a>')
+                     .'</p>'
+            );
         }
-        $r->print(&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
-		  &Apache::loncommon::help_open_topic('Caching').'</td></tr></table>');
+        $r->print('<p class="LC_warning">'
+                 .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
+                 .&Apache::loncommon::help_open_topic('Caching')
+                 .'</p>'
+        );
+
 	$r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
                   &rawrendering($symb).
                   '</td></tr></table><br />');
         $r->print('<form name="simpleedit" method="post">');
-# Question Type
-        my %questiontypes=(
-               'radio'     => '1 out of N multiple choice (radio button)',
-               'option'    => 'Option Response',
-               'string'    => 'Short string response',
-               'essay'     => 'Essay, open end',
-               'numerical' => 'Numerical Response');
+# Question Type        
+	my %questiontypes=('radio'  => 
+                               '1 out of N multiple choice (radio button)',
+			   'option' => 'Option response',
+                           'string' => 'Short string response',
+                           'essay'  => 'Essay, open end',
+                           'numerical' => 'Numerical response');
         $qtype=$qparms{$prefix.'questiontype'};
         unless (defined($qtype)) { $qtype='radio'; }
         unless ($questiontypes{$qtype}) { $qtype='radio'; }
-        $r->print('<b>'.&mt('Question Type').': '
-           .&Apache::loncommon::select_form(
-                $qtype,
-                'questiontype',
-                &Apache::lonlocal::texthash(%questiontypes)).
+        $r->print('<b>'.&mt('Question Type').
+		  ': '.&Apache::loncommon::select_form
+	                               ($qtype,'questiontype',%questiontypes).
   '</b><br /><input type="submit" value="'.&mt('Save and Edit').
   '" /><p>&nbsp;</p>');
 # Script
@@ -302,9 +308,8 @@ sub handler {
             unless (defined($maxfoils)) { $maxfoils=10; }
             unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
             if ($maxfoils<=0) { $maxfoils=10; }
-            my %randomizes=(
-                   'yes' => 'Display foils in random order',
-                   'no'  => 'Display foils in order given');
+	    my %randomizes=('yes' => 'Display foils in random order',
+			    'no'  => 'Display foils in order given');
 	    my $randomize=$qparms{$prefix.'randomize'};
             unless (defined($randomize)) { $randomize='yes'; }
             unless ($randomizes{$randomize}) { $randomize='yes'; }
@@ -312,10 +317,8 @@ sub handler {
 		  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
 	          '<tr><td>'.&mt('Max number of foils displayed').
 ': <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" />&nbsp;&nbsp;'.
-                      &Apache::loncommon::select_form(
-                          $randomize,
-                          'randomize',
-                          &Apache::lonlocal::texthash(%randomizes)).
+		      &Apache::loncommon::select_form
+		      ($randomize,'randomize',%randomizes).
 		  '</td></tr><tr><td bgcolor="#AAAAAA">');
 # Option Response: Options
 	    if ($qtype eq 'option') {
@@ -357,32 +360,30 @@ sub handler {
             unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
 	    $r->print(
 		  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
-                  '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>&nbsp;&nbsp;'.
-                      &Apache::loncommon::select_form(
-                          $stringtype,
-                          'stringtype',
-                          &Apache::lonlocal::texthash(%stringtypes)).
+	          '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>&nbsp;&nbsp;'.
+		      &Apache::loncommon::select_form
+		      ($stringtype,'stringtype',%stringtypes).
 		  '</td></tr></table><br />');
 # Hint
 	    $r->print(&hint());
 	}
         if ($qtype eq 'numerical') {
-            my $numericalanswer=$qparms{$prefix.'numericalanswer'};
-            unless (defined($numericalanswer)) { $numericalanswer=''; }
-            my $numericaltolerance=$qparms{$prefix.'numericaltolerance'};
-            unless (defined($numericaltolerance)) { $numericaltolerance='5%'; }
-            my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'};
-            unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; }
+           my $numericalanswer=$qparms{$prefix.'numericalanswer'};
+           unless (defined($numericalanswer)) { $numericalanswer=''; }
+           my $numericaltolerance=$qparms{$prefix.'numericaltolerance'};
+           unless (defined($numericaltolerance)) { $numericaltolerance='5%'; }
+           my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'};
+           unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; }
 
-            $r->print(
-                '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
+           $r->print(
+                  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
                   '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Unit').':  <input type="text" size="5" name="numericalunit" value="'.$qparms{$prefix.'numericalunit'}.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Format').':  <input type="text" size="5" name="numericalformat" value="'.$qparms{$prefix.'numericalformat'}.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Tolerance').':  <input type="text" size="5" name="numericaltolerance" value="'.$numericaltolerance.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Significant digits').':  <input type="text" size="5" name="numericalsigfigs" value="'.$numericalsigfigs.'" /></label>'.
-                   '</td></tr></table><br />');
-            $r->print(&hint());
+                  '</td></tr></table><br />');
+           $r->print(&hint());
         }
 # Store Button
 	$r->print(