Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/view-list-display.tcl	26 May 2003 10:00:10 -0000	1.1
+++ openacs-4/packages/calendar/www/view-list-display.tcl	21 Jul 2003 19:21:36 -0000	1.2
@@ -3,18 +3,20 @@
 # no data whatsoever.
 if {[empty_string_p $calendar_id_list]} {
     set calendar_id_list [list [calendar_have_private_p -return_id 1 [ad_get_user_id]]]
+    set calendar_where_clause " and e.event_id in ([join $calendar_id_list ","])"
+} else {
+    set calendar_where_clause ""
 }
 
 # sort by cannot be empty
 if {[empty_string_p $sort_by]} {
-    set sort_by "item_type"
+    set sort_by "start_date"
 }
 
 set date_format "YYYY-MM-DD HH24:MI"
 
 # The title
 if {[empty_string_p $start_date] && [empty_string_p $end_date]} {
-    #This used to be All Items but that was just taking up space and not adding value so now we assume All Items and only give a title if its something else. - Caroline@meekshome.com
     set title ""
 }
 
@@ -30,63 +32,51 @@
     set title "Items from [util_AnsiDatetoPrettyDate $start_date] to [util_AnsiDatetoPrettyDate $end_date]"
 }
 
-set return_html ""
+set today_date [dt_sysdate]    
+set today_ansi_list [dt_ansi_to_list $today_date]
+set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
 
-# Prepare the templates
-set url_template "view?view=list&sort_by=\$sort_by"
-set real_sort_by $sort_by
-set sort_by "item_type"
-set item_type_url [subst $url_template]
-set sort_by "start_date"
-set start_date_url [subst $url_template]
+set item_type_url "view?view=list&sort_by=item_type&start_date=$start_date"
+set start_date_url "view?view=list&sort_by=start_date&start_date=$start_date"
+set view list
+set form_vars [export_form_vars start_date sort_by view]
 
-# initialize the item_type so we can do intermediate titles
-set old_item_type ""
+set flip -1
 
-set flip 0
+multirow create calendar_items calendar_name item_id name item_type pretty_weekday pretty_start_date pretty_end_date pretty_start_time pretty_end_time flip today
 
+set last_pretty_start_date ""
 # Loop through the events, and add them
-foreach calendar_id $calendar_id_list {
-    set calendar_name [calendar_get_name $calendar_id]
     
-    db_foreach select_list_items {} {
-	set item_details "<a href=\"cal-item-view?cal_item_id=$item_id\">$name</a> ($calendar_name)"
-	# Adjust the display of no-time items
-	if {[dt_no_time_p -start_time $pretty_start_date -end_time $pretty_end_date]} {
-	    set start_time "--"
-	    set end_time "--"
-	}
-	
-	# Do we need a title?
-	if {$real_sort_by == "item_type" && $item_type != "$old_item_type"} {
-	    if {[empty_string_p $item_type]} {
-		set item_type_for_title "(No Item Type)"
-	    } else {
-		set item_type_for_title $item_type
-	    }
-	    append return_html "<tr class=\"table-title\"><td colspan=5><b>$item_type_for_title</b></td></tr>\n"
-	    set flip 0
-	}
-	
-	set old_item_type $item_type
-	
-	if {[expr $flip % 2] == 0} {
-	    set z_class odd
-	} else {
-	    set z_class even
-	}
-	
-	append return_html "
-        <tr class=$z_class><td>$pretty_weekday</td><td>$pretty_start_date</td><td>$pretty_start_date</td><td>$pretty_end_date</td>"
-	
-	if {$real_sort_by != "item_type"} {
-	    append return_html "<td>$item_type</td>"
-	}
-	
-	append return_html "<td>$item_details</td></tr>\n"
-	incr flip
+db_foreach select_list_items {} {
+    # Adjust the display of no-time items
+    if {[dt_no_time_p -start_time $pretty_start_date -end_time $pretty_end_date]} {
+        set pretty_start_time "--"
+        set pretty_end_time "--"
     }
-}	
 
+    if {[string equal $pretty_start_time "00:00"]} {
+        set pretty_start_time "--"
+    }
 
+    if {[string equal $pretty_end_time "00:00"]} {
+        set pretty_end_time "--"
+    }
 
+    if {![string equal $pretty_start_date $last_pretty_start_date]} {
+        set last_pretty_start_date $pretty_start_date
+        incr flip
+    }
+
+    if {$julian_start_date == $today_julian_date} {
+        set today row-hi
+    } elseif {$julian_start_date < $today_julian_date} {
+        set today row-lo
+    } else {
+        set today ""
+    }
+
+    multirow append calendar_items $calendar_name $item_id $name $item_type $pretty_weekday $pretty_start_date $pretty_end_date $pretty_start_time $pretty_end_time $flip $today
+
+}
+