--- loncom/html/adm/helper/resettimes.helper	2005/01/16 08:21:49	1.2
+++ loncom/html/adm/helper/resettimes.helper	2007/09/01 00:41:34	1.6
@@ -4,8 +4,8 @@
       <message_text>Select </message_text>
     </message>
     <choices variable="harry">
-      <choice computer='1' nextstate="Student">Reset times on one or more maps for a single student.</choice>
-      <choice computer='0' nextstate="Class">Reset times on a single map for a section or whole clase.</choice>
+      <choice computer='1' nextstate="Student">Reset times on one or more folders/maps for a single student.</choice>
+      <choice computer='0' nextstate="Class">Reset times on a single folder/map for a section or whole class.</choice>
       </choices>
   </state>
   <state name="Student" title="Select Student">
@@ -17,13 +17,13 @@
 
   <state name="SelectAccess">
     <message nextstate="ConfirmStu">
-       <message_text>This is a list of maps and times they were accessed, plese select those you want deleted.</message_text>
+       <message_text>This is a list of folders/maps and times they were accessed, plese select those you want deleted.</message_text>
     </message>
     <choices variable='delete' multichoice='true'>
       <exec>
          my ($uname,$udom,$sec,$fullname)=split(':',$helper->{'VARS'}{'stu1'});
          my %times=&Apache::lonnet::dump('firstaccesstimes',$udom,$uname,
-					 "^$ENV{'request.course.id'}\0");
+					 "^$env{'request.course.id'}\0");
          foreach my $res (sort(keys(%times))) {
 	     my (undef,$symb)=split("\0",$res);
 	     my $escsymb=&Apache::lonnet::escape($symb);
@@ -45,7 +45,7 @@
         if (!$fullname) { $fullname="$uname\@$udom"; }
         return '<li>'.$fullname.'</li>';
     </eval>
-    <message><message_text></ul> for maps <ul></message_text></message>
+    <message><message_text></ul> for folders/maps <ul></message_text></message>
     <eval>
 	my $list;
 	my @symbs=split(/\|\|\|/,$helper->{'VARS'}{'delete'});
@@ -63,7 +63,7 @@
         &Apache::lonnet::logthis($helper->{'VARS'}{'delete'});
         if ($helper->{'STATE'} ne 'FinishStu') { return; }
         my $result;
-        my $courseid=$ENV{'request.course.id'};
+        my $courseid=$env{'request.course.id'};
         my ($uname,$udom,$sec,$fullname)=split(':',$helper->{'VARS'}{'stu1'});
         &Apache::lonnet::logthis($helper->{'VARS'}{'delete'});
         foreach my $escsymb (split(/\|\|\|/,$helper->{'VARS'}{'delete'})) {
@@ -82,15 +82,13 @@
 
   <state name="Class">
     <message nextstate="SelectMap">
-	<message_text>Select:<br /></message_text>
     </message>
     <student variable='stu1' coursepersonnel='true' activeonly='true' multichoice='true' />
   </state>
 
-  <state name="SelectMap" title="Select a map">
-    <message><message_text>Choose a resource</message_text></message>
-    <resource variable="res2">
-      <filterfunc>return $res->is_map()</filterfunc>
+  <state name="SelectMap" title="Select a folder/map">
+    <resource variable="res2" includecourse="true">
+      <filterfunc>return ($res->is_map() && $res->map_contains_problem());</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>
       <nextstate>ShowPlan</nextstate>
     </resource>    
@@ -121,7 +119,7 @@
         if ($helper->{'STATE'} ne 'FINISH') { return; }
         my $result;
         my $symb=$helper->{'VARS'}{'res2'};
-        my $key=$ENV{'request.course.id'}."\0".$symb;
+        my $key=$env{'request.course.id'}."\0".$symb;
 	my @names=split(/\|\|\|/,$helper->{'VARS'}{'stu1'});
 	foreach my $name (@names) {
 	    my ($uname,$udom,$sec,$fullname)=split(':',$name);