--- loncom/interface/lonwhatsnew.pm	2005/05/23 23:06:23	1.13
+++ loncom/interface/lonwhatsnew.pm	2005/06/01 19:24:50	1.15
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.13 2005/05/23 23:06:23 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.15 2005/06/01 19:24:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,6 +85,7 @@ sub handler {
             (undef,'Course Action Items','Course_Action_Items_Display'));
     }
     &display_main_box($r,$command);
+    return OK;
 }
 
 #------------------------------
@@ -104,10 +105,13 @@ sub display_main_box {
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
     );
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
     if ($command eq 'chgthreshold') {
-        &display_config_box($r,$command,$tabbg,\%threshold_titles);
+        &display_config_box($r,$command,$tabbg,\%threshold_titles,$cdom,$crs);
     } else {
-        &display_actions_box($r,$command,\%threshold_titles);
+        &display_actions_box($r,$command,\%threshold_titles,$cdom,$crs);
     }
     $r->print(<<END_OF_BLOCK);
   </td>
@@ -145,7 +149,7 @@ ENDHEAD
 #-------------------------------
                                                                                 
 sub display_actions_box() {
-    my ($r,$command,$threshold_titles) = @_;
+    my ($r,$command,$threshold_titles,$cdom,$crs) = @_;
 
     my $rowColor1 = "#ffffff";
     my $rowColor2 = "#eeeeee";
@@ -186,8 +190,6 @@ sub display_actions_box() {
     }
 
     my $result;
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -288,7 +290,7 @@ END
     if (@warnings > 0) {
 #        @warnings = sort { &cmp_title($a,$b) } @warnings;
         $r->print('<form name="reset_tracking" method="post">'.
-                 '  <input type="hidden" name="action" value="reset"'."\n");
+                 '  <input type="hidden" name="action" value="reset" />'."\n");
         $r->print('<tr bgcolor="#cccccc"><td><b><small>Resource</small></b></td><td align="right"><b><small>Part</small></b></td><td align="right"><b><small>Num. students</small></b></td><td align="right"><b><small>Av. Attempts</small></b></td><td align="right"><b><small>Deg. Diff</small></b></td><td align="right"><b><small>Last Reset</small></b></td><td align="right"><b><small>Reset Count?</small></b></td></tr>');
         foreach my $res (@warnings) {
             if ($warningnum %2 == 1) {
@@ -436,7 +438,7 @@ END
 #-------------------------------
                                                                                 
 sub display_config_box() {
-    my ($r,$command,$tabbg,$threshold_titles) = @_;
+    my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_;
     my %threshold = ();
     my $rowColor1 = "#ffffff";
     my $rowColor2 = "#eeeeee";
@@ -448,7 +450,7 @@ sub display_config_box() {
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
                          );
-    &get_curr_thresholds(\%threshold);
+    &get_curr_thresholds(\%threshold,$cdom,$crs);
 
     $r->print('<br /><form name="thresholdform" method="post"><table border="0" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">
            <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
@@ -667,8 +669,8 @@ sub get_counter_resets {
     my $lastreset = 'None';
     if ($$resethash{'version'}) {
         for (my $version=1;$version<=$$resethash{'version'};$version++) {
-            if (exists($$resethash{$version.':'.$part.'prev_attempts'})) {
-                 $lastreset = $$resethash{$version.':timestamp'};
+            if (exists($$resethash{$version.':'.$part."\0".'prev_attempts'})) {
+                $lastreset = $$resethash{$version.':timestamp'};
             }
         }
     }
@@ -728,7 +730,7 @@ sub process_reset {
             $result =~ s/; $//;
             $result .= '<br />';
         } else {
-            $result = $title.' -part '.$part.': '.&mt('Unable to reset counters to zero due to ').$putresult.'.<br />'."\n";
+            $result = $title.' -part '.$part.': '.&mt('Unable to reset counters to zero due to [_1]',$putresult).'.<br />'."\n";
         }
     }
     return $result;
@@ -736,7 +738,7 @@ sub process_reset {
 
 sub process_update {
     my ($dom,$crs,$threshold_titles) = @_;
-    my $setoutput = '<b>Changes to threshold(s):</b><br />';
+    my $setoutput = '<b>Changes to threshold(s) for problem tracking:</b><br />';
     foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
@@ -747,10 +749,13 @@ sub process_update {
            
             my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/); 
             if ($put_result eq 'ok') {
-                $setoutput.=&mt('Set threshold for').' <b>'.$$threshold_titles{$shortname}.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
-            } else {
-                $setoutput.=&mt('Unable to set threshold for').' <b>'.$name.'</b> '.&mt('to').
-                    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
+                $setoutput.=&mt('Set threshold for [_1] to [_2]',
+				'<b>'.$$threshold_titles{$shortname}.'</b>',
+				'<b>'.$value.'</b>').'<br />';
+	    } else {
+                $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
+				'<b>'.$name.'</b>','<b>'.$value.'</b>',
+				'<tt>'.$put_result.'</tt>').'<br />';
             }
         }
     }