Index: openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql,v
diff -u -r1.8 -r1.8.10.1
--- openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql	12 Jun 2006 02:49:50 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql	3 Oct 2015 18:26:39 -0000	1.8.10.1
@@ -27,13 +27,6 @@
       </querytext>
 </fullquery>
 
-<fullquery name="as::assessment::check::intervals.intervals">
-      <querytext>
-	
-      select to_date(sysdate,'YYYY-MM-DD') as today, to_date(sysdate-1,'YYYY-MM-DD') as yesterday,  to_date (sysdate-2,'YYYY-MM-DD') as two_days,to_date (sysdate-7,'YYYY-MM-DD') as last_week, to_date (sysdate-30,'YYYY-MM-DD') as last_month from dual 
-      </querytext>
-</fullquery>
-
 <fullquery name="as::assessment::check::manual_action_exec.update_actions_log">
       <querytext>
       update as_actions_log set failed_p=:failed_p,date_processed=(select sysdate from dual),finally_executed_by=:user_id,approved_p='t' where action_log_id=:action_log_id
Index: openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql,v
diff -u -r1.12 -r1.12.14.1
--- openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql	3 Mar 2005 22:46:41 -0000	1.12
+++ openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql	3 Oct 2015 18:26:39 -0000	1.12.14.1
@@ -22,11 +22,6 @@
 	select as_inter_item_check__delete (:check_id)
       </querytext>
 </fullquery>
-<fullquery name="as::assessment::check::intervals.intervals">
-      <querytext>
-      select to_date(now(),'YYYY-MM-DD') as today, to_date(to_date(now(),'YYYY-MM-DD')-1,'YYYY-MM-DD') as yesterday,  to_date (to_date(now(),'YYYY-MM-DD')-2,'YYYY-MM-DD') as two_days,to_date (to_date(now(),'YYYY-MM-DD')-7,'YYYY-MM-DD') as last_week, to_date (to_date(now(),'YYYY-MM-DD')-30,'YYYY-MM-DD') as last_month 
-      </querytext>
-</fullquery>
 
 <fullquery name="as::assessment::check::manual_action_exec.update_actions_log">
       <querytext>
@@ -53,4 +48,4 @@
 </fullquery>
 
 
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v
diff -u -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/assessment/tcl/as-checks-procs.tcl	10 Sep 2015 08:27:56 -0000	1.28.2.1
+++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl	3 Oct 2015 18:26:39 -0000	1.28.2.2
@@ -43,10 +43,18 @@
 } {
     Return the time intervals
 } {
-    db_1row intervals {}
+    set today [clock format [clock seconds] -format %Y-%m-%d]
+    set yesterday [clock format [clock scan yesterday] -format %Y-%m-%d]
+    set two_days [clock format [clock scan "2 days ago"] -format %Y-%m-%d]
+    set last_week [clock format [clock scan "1 week ago"] -format %Y-%m-%d]
+    set last_month [clock format [clock scan "1 month ago"] -format %Y-%m-%d]
     
-    set intervals [list [list "[_ assessment.all]" "all"] [list "[_ assessment.today]" $today]  [list "[_ assessment.yesterday]" $yesterday] [list "[_ assessment.two_days]" $two_days] [list "[_ assessment.last_week]" $last_week] [list "[_ assessment.last_month]" $last_month]]
-    
+    return [list [list [_ assessment.all] "all"] \
+                [list [_ assessment.today]      $today] \
+                [list [_ assessment.yesterday]  $yesterday] \
+                [list [_ assessment.two_days]   $two_days] \
+                [list [_ assessment.last_week]  $last_week] \
+                [list [_ assessment.last_month] $last_month]]
 }
 
 ad_proc -public as::assessment::check::add_check_return_url {
Index: openacs-4/packages/assessment/www/asm-admin/admin-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-request.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/assessment/www/asm-admin/admin-request.tcl	10 Sep 2015 08:28:02 -0000	1.4.2.1
+++ openacs-4/packages/assessment/www/asm-admin/admin-request.tcl	3 Oct 2015 18:26:39 -0000	1.4.2.2
@@ -66,13 +66,13 @@
 
 if {([info exists interval] && $interval ne "") && $interval!="all"} {
     set d_interval $interval
-    set interval_query "and to_date(al.date_requested,'YYYY-MM-DD') >= to_date('$interval','YYYY-MM-DD')"
+    set interval_query "and date_trunc('day', al.date_requested) >= to_date('$interval','YYYY-MM-DD')"
     set date_query ""
 }
 
 if {([info exists date] && $date ne "")} {
     set d_date $date
-    set date_query "and to_date(al.date_requested,'YYYY-MM-DD') = to_date('$date','YYYY-MM-DD')"
+    set date_query "and date_trunc('day', al.date_requested) = to_date('$date','YYYY-MM-DD')"
     set interval_query ""
 }