Index: openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp 4 Aug 2005 07:29:05 -0000 1.6 +++ openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp 24 Sep 2005 07:47:11 -0000 1.7 @@ -17,7 +17,7 @@

@currently_viewing;noquote@

View All

 - + Index: openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl 18 Aug 2005 10:56:07 -0000 1.8 +++ openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl 24 Sep 2005 07:47:11 -0000 1.9 @@ -18,6 +18,8 @@ { orderby course_name } { groupby course_name } + + {period_days 31} } @@ -285,4 +287,6 @@ } set next_month_template "[export_vars -exclude {date} -no_empty -base . $export]&date=\[ad_urlencode \$next_month\]" -set prev_month_template "[export_vars -exclude {date} -no_empty -base . $export]&date=\[ad_urlencode \$prev_month\]" \ No newline at end of file +set prev_month_template "[export_vars -exclude {date} -no_empty -base . $export]&date=\[ad_urlencode \$prev_month\]" + +set view [parameter::get -default month -parameter CalendarView] \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.adp 24 Sep 2005 07:47:11 -0000 1.1 @@ -0,0 +1,65 @@ + + + + +
+
+ + + + + +
+
@title@
+ 		+ #calendar.Events_over_a# + + #calendar.day_rolling_period# + + @form_vars;noquote@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#acs-datetime.Day_of_Week##calendar.Date_1##calendar.Start_Time##calendar.End_Time##calendar.Type_1#Title
@items.weekday@@items.start_date@@items.start_time@@items.end_time@@items.item_type@@items.calendar_name@ + +
+ + +#calendar.No_Items# + +
Index: openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/lib/view-list-display.tcl 24 Sep 2005 07:47:11 -0000 1.1 @@ -0,0 +1,200 @@ +if {[info exists url_stub_callback]} { + # This parameter is only set if this file is called from .LRN. + # This way I make sure that for the time being this adp/tcl + # snippet is backwards-compatible. + set portlet_mode_p 1 +} else { + set portlet_mode_p 0 +} + +if {[info exists portlet_mode_p] && $portlet_mode_p} { + set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id" + set url_stub_callback "calendar_portlet_display::get_url_stub" + set page_num_formvar [export_form_vars page_num] + set page_num "&page_num=$page_num" +} else { + set item_template "cal-item-view?cal_item_id=\$item_id" + set url_stub_callback "" + set page_num_formvar "" + set page_num "" + set base_url "" +} + +if { ![info exists url_template] } { + set url_template {?sort_by=$sort_by} +} + +if { ![info exists show_calendar_name_p] } { + set show_calendar_name_p 1 +} +if { ![exists_and_not_null sort_by] } { + set sort_by "start_date" +} +if { ![exists_and_not_null start_date] } { + set start_date [clock format [clock seconds] -format "%Y-%m-%d 00:00"] +} + +if { ![exists_and_not_null end_date] } { + set end_date [clock format [clock scan "+30 days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] +} + +if {[exists_and_not_null calendar_id_list]} { + set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] +} else { + set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] +} + +if { ![info exists period_days] } { + set period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 31] +} else { + set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] +} + +if {[exists_and_not_null page_num]} { + set page_num_formvar [export_form_vars page_num] + set page_num "&page_num=$page_num" +} else { + set page_num_formvar "" + set page_num "" +} + +set package_id [ad_conn package_id] +set user_id [ad_conn user_id] + +# The title +if {[empty_string_p $start_date] && [empty_string_p $end_date]} { + set title "" +} + +if {[empty_string_p $start_date] && ![empty_string_p $end_date]} { + set title "[_ acs-datetime.to] [lc_time_fmt $end_date "%q"]" +} + +if {![empty_string_p $start_date] && [empty_string_p $end_date]} { + set title "[_ acs-datetime.Items_from] [lc_time_fmt $start_date "%q"]" +} + +if {![empty_string_p $start_date] && ![empty_string_p $end_date]} { + set title "[_ acs-datetime.Items_from] [lc_time_fmt $start_date "%q"] [_ acs-datetime.to] [lc_time_fmt $end_date "%q"]" +} + +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]] + +set item_type_url "?view=list&sort_by=item_type&start_date=$start_date&period_days=$period_days$page_num" +set start_date_url "?view=list&sort_by=start_date&start_date=$start_date&period_days=$period_days$page_num" + +set view calendar +set form_vars [export_form_vars start_date sort_by view] + +set flip -1 + +multirow create items \ + event_name \ + event_url \ + calendar_name \ + item_type \ + weekday \ + start_date \ + end_date \ + start_time \ + end_time \ + flip \ + today + +set last_pretty_start_date "" +# Loop through the events, and add them + +set interval_limitation_clause [db_map dbqd.calendar.www.views.list_interval_limitation] +set order_by_clause " order by $sort_by" +set additional_limitations_clause "" + +if {[string match [db_type] "postgresql"]} { + set sysdate "now()" +} else { + set sysdate "sysdate" +} +set additional_select_clause " , to_char($sysdate, 'YYYY-MM-DD HH24:MI:SS') as ansi_today, recurrence_id" + +# DEDS +# always use course_name: section name as the name of the calendar +db_foreach get_adjusted_cal_names { + select distinct pep.value as adjusted_calendar_id, dc.course_name||': '||des.section_name as adjusted_calendar_name from dotlrn_catalog dc, dotlrn_ecommerce_section des, cr_items i, dotlrn_communities c, portal_pages pp, portal_element_map pem, portal_element_parameters pep where dc.course_id = i.live_revision and des.course_id = i.item_id and des.community_id = c.community_id and pp.portal_id = c.portal_id and pp.page_id = pem.page_id and pem.element_id = pep.element_id and pep.key = 'calendar_id' +} { + set calendar_names($adjusted_calendar_id) $adjusted_calendar_name +} + +db_foreach dbqd.calendar.www.views.select_items {} { + # Timezonize + set ansi_start_date [lc_time_system_to_conn $ansi_start_date] + set ansi_end_date [lc_time_system_to_conn $ansi_end_date] + set ansi_today [lc_time_system_to_conn $ansi_today] + + # Localize + set pretty_weekday [lc_time_fmt $ansi_start_date "%A"] + set pretty_start_date [lc_time_fmt $ansi_start_date "%x"] + set pretty_end_date [lc_time_fmt $ansi_end_date "%x"] + set pretty_start_time [lc_time_fmt $ansi_start_date "%X"] + set pretty_end_time [lc_time_fmt $ansi_end_date "%X"] + set pretty_today [lc_time_fmt $ansi_today "%x"] + + set start_date_seconds [clock scan [lc_time_fmt $ansi_start_date "%Y-%m-%d"]] + set today_seconds [clock scan [lc_time_fmt $ansi_today "%Y-%m-%d"]] + + # 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 + } + + # Give the row different appearance depending on whether it's before today, today, or after today + if {$start_date_seconds == $today_seconds} { + set today cal-row-hi + } elseif {$start_date_seconds < $today_seconds} { + set today cal-row-lo + } else { + set today "" + } + + # reset url stub + set url_stub "" + + # In case we need to dispatch to a different URL (ben) + if {![empty_string_p $url_stub_callback]} { + # Cache the stuff + if {![info exists url_stubs($calendar_id)]} { + set url_stubs($calendar_id) [$url_stub_callback $calendar_id] + } + set url_stub $url_stubs($calendar_id) + } + + if {[info exists calendar_names($calendar_id)]} { + set calendar_name $calendar_names($calendar_id) + } + multirow append items \ + $name \ + [subst $item_template] \ + $calendar_name \ + $item_type \ + $pretty_weekday \ + $pretty_start_date \ + $pretty_end_date \ + $pretty_start_time \ + $pretty_end_time \ + $flip \ + $today +}