--- loncom/html/adm/helper/resettimes.helper	2005/01/16 08:21:49	1.2
+++ loncom/html/adm/helper/resettimes.helper	2012/04/01 16:12:42	1.9
@@ -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, resources or the course for a single student.</choice>
+      <choice computer='0' nextstate="Class">Reset times on a single folder/map, resource or the course for a section or the whole class.</choice>
       </choices>
   </state>
   <state name="Student" title="Select Student">
@@ -17,17 +17,19 @@
 
   <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 first access times and what was accessed, please 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);
-	     my $title=&Apache::lonnet::gettitle($symb);
+	     my $title = 
+		 ($symb ne 'course') ? &Apache::lonnet::gettitle($symb)
+	                             : $env{'course.'.$env{'request.course.id'}.'.description'};
 	     my $time=&Apache::lonlocal::locallocaltime($times{$res});
 	     my $description="<a href='/adm/navmaps?postsymb=".&Apache::lonnet::escape($symb)."'>$title</a> on $time";
 	     push(@{$state->{CHOICES}},[$description,$escsymb]);
@@ -45,13 +47,16 @@
         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 <ul></message_text></message>
     <eval>
 	my $list;
 	my @symbs=split(/\|\|\|/,$helper->{'VARS'}{'delete'});
 	foreach my $escsymb (@symbs) {
 	    my $symb=&Apache::lonnet::unescape($escsymb);
-	    $list.='<li>'.&Apache::lonnet::gettitle($symb).'</li>';
+	    my $title = 
+		($symb ne 'course') ? &Apache::lonnet::gettitle($symb)
+	                            : $env{'course.'.$env{'request.course.id'}.'.description'};
+	    $list.='<li>'.$title.'</li>';
 	}
 	return $list;
     </eval>
@@ -60,18 +65,24 @@
   <state name="FinishStu" title="Processing">
     <final>
       <finalcode>
-        &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'})) {
 	    my $symb=&Apache::lonnet::unescape($escsymb);
+            my $key = "$courseid\0$symb";
+            my $title =    
+                ($symb ne 'course') ? &Apache::lonnet::gettitle($symb)
+                                    : $env{'course.'.$courseid.'.description'};
 	    my $res=&Apache::lonnet::del('firstaccesstimes',
-					 ["$courseid\0$symb"],$udom,$uname);
-	    $result.="Removing access time from ".
-		      &Apache::lonnet::gettitle($symb).": ".$res.'</li><li>';
+					 [$key],$udom,$uname);
+            $result.="Removing access time from ".
+                      $title.": ".$res.'</li><li>';
+            if ($res eq 'ok') {
+                &Apache::lonnet::del('timerinterval',[$key],$udom,$uname);
+            }
 	}
         $result=~s/<li>$//;
         return $result;
@@ -82,15 +93,14 @@
 
   <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()) 
+                          ||$res->is_problem() );</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>
       <nextstate>ShowPlan</nextstate>
     </resource>    
@@ -121,7 +131,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);
@@ -134,8 +144,13 @@
 		$result.="Removing access times ".
 		    &Apache::lonlocal::locallocaltime($times{$key}).
 		    " found for student ".$fullname.": ";
-		$result.=&Apache::lonnet::del('firstaccesstimes',
+		my $delres=&Apache::lonnet::del('firstaccesstimes',
 					      [$key],$udom,$uname);
+                $result.=$delres;
+                if ($delres eq 'ok') {
+                    &Apache::lonnet::del('timerinterval',
+                                         [$key],$udom,$uname);
+                }
 	    }
 	    $result.="</li>\n<li>";
 	}