--- loncom/homework/lonsimpleproblemedit.pm	2009/04/06 12:59:07	1.21
+++ 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.21 2009/04/06 12:59:07 bisitz 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 {
@@ -95,6 +96,19 @@ sub hint {
 ENDHINT
 }
 
+sub script {
+    my $text=$qparms{$prefix.'numericalscript'};
+    my $ht=&mt('Scripting (optional)');
+    return (<<ENDSCRIPT);
+<table bgcolor="#ccccaa" cellspacing="4" cellpadding="2">
+<tr><td><b>$ht</b><br />
+<textarea style="width:100%" name="numericalscript" cols="80" rows="4">$text</textarea>
+</td></tr>
+</table>
+<br />
+ENDSCRIPT
+}
+
 sub foil {
     my $number=shift;
     my %values='';
@@ -178,6 +192,9 @@ sub handler {
 
 # ------------------------------------------------ Prefix for everything stored
     $prefix=$env{'request.course.id'}.'.'.$symb.'.0.';
+#------------------------------------------------- Prefix for storing weight of Problem Parts
+    $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';
+    
 # ---------------------------------------------------------- Anything to store?
 
     if (($symb) && (defined($env{'form.questiontype'}))) {
@@ -203,11 +220,25 @@ sub handler {
 		$storecontent{$prefix.$parm}=~s/\s+$//s;
 	    }
 	}
+# ---------------------------------------------------- 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;
+
+
 	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'});
+
     }
 # ------------------------------------------------------------------- Read Data
 
@@ -222,18 +253,14 @@ sub handler {
 					     $spell_header));
     if ($symb) {
 	$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
-        $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>'
-        );
         my $displaylink = &get_parent_uri($symb);
         if ($displaylink ne '') {
-            $r->print(&Apache::lontemplate::start_functionslist()
-                     .&Apache::lontemplate::item_functionslist(
-                          '<a href="'.$displaylink.'">'.&mt('Student View').'</a>')
-                     .&Apache::lontemplate::end_functionslist()
-            );
+            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('<p class="LC_error">'
                      .&mt('An error occurred retrieving the link to this problem.')
@@ -243,17 +270,23 @@ sub handler {
                      .'</p>'
             );
         }
+        $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">');
+        $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');
+                           'essay'  => 'Essay, open end',
+                           'numerical' => 'Numerical response');
         $qtype=$qparms{$prefix.'questiontype'};
         unless (defined($qtype)) { $qtype='radio'; }
         unless ($questiontypes{$qtype}) { $qtype='radio'; }
@@ -262,6 +295,10 @@ sub handler {
 	                               ($qtype,'questiontype',%questiontypes).
   '</b><br /><input type="submit" value="'.&mt('Save and Edit').
   '" /><p>&nbsp;</p>');
+# Script
+        if ($qtype eq 'numerical') {
+           $r->print(&script());
+        }
 # Question Text
         $r->print(&questiontext());
 # Radio, Option ===
@@ -323,13 +360,31 @@ sub handler {
             unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
 	    $r->print(
 		  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
-	          '<tr><td>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" />&nbsp;&nbsp;'.
+	          '<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'; }
+
+           $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());
+        }
 # Store Button
 	$r->print(
   '<input type="submit" value="'.&mt('Save and Edit').'" /></form>');