Index: openacs-4/packages/calendar/www/cal-dayview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-dayview.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-dayview.tcl 6 Sep 2001 06:30:43 -0000 1.2
+++ openacs-4/packages/calendar/www/cal-dayview.tcl 15 Sep 2001 07:14:32 -0000 1.3
@@ -26,9 +26,8 @@
# find out the user_id
set user_id [ad_verify_and_get_user_id]
-
set current_date $date
-set date_format "YYYY-MM-DD"
+set date_format "YYYY-MM-DD HH24:MI"
#get cal-item
set sql "
@@ -44,7 +43,7 @@
where e.timespan_id = s.timespan_id
and s.interval_id = t.interval_id
and e.activity_id = a.activity_id
-and start_date between
+and start_date between
to_date(:current_date,:date_format) and
to_date(:current_date,:date_format) + (24 - 1/3600)/24
and e.event_id
@@ -86,7 +85,6 @@
set set_id [ns_set new day_items]
-
#-------------------------------------------------
# verifiy if the calendar_list has elements or not
@@ -106,10 +104,11 @@
# otherwise, get the calendar_name for the give_id
set calendar_name [calendar_get_name $calendar_id]
}
-
+
db_foreach get_day_items $sql {
ns_set put $set_id $start_hour "
- $pretty_start_date - $pretty_end_date $name ($calendar_name)
+ $pretty_start_date - $pretty_end_date $name ($calendar_name)
+
"
}
} else {
@@ -133,8 +132,8 @@
db_foreach get_day_items $sql {
ns_set put $set_id $start_hour "
- $pretty_start_date - $pretty_end_date $name ($calendar_name)
-
"
+ $pretty_start_time - $pretty_end_date $name ($calendar_name)
+
"
}
}
@@ -211,15 +210,14 @@
while {$cal_item_index > -1} {
append row_html "[ns_set value $set_id $cal_item_index]"
-
ns_set delete $set_id $cal_item_index
set cal_item_index [ns_set find $set_id $cal_hour]
}
append row_html "
-
+
"
Index: openacs-4/packages/calendar/www/cal-item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item-create.tcl 23 Apr 2001 23:09:38 -0000 1.1
+++ openacs-4/packages/calendar/www/cal-item-create.tcl 15 Sep 2001 07:14:32 -0000 1.2
@@ -20,7 +20,7 @@
}
if { $date == "now" } {
- set date [dt_sysdate]
+ set date [dt_sysdate]
}
@@ -29,8 +29,10 @@
#
set start_datetime [calendar_make_datetime [array get event_date] [array get start_time]]
+
set end_datetime [calendar_make_datetime [array get event_date] [array get end_time]]
+
#-----------------------------------------------------------------
# validate time interval ( start_time <= end_time )
@@ -146,4 +148,3 @@
-
Index: openacs-4/packages/calendar/www/cal-item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item-edit.tcl 23 Apr 2001 23:09:38 -0000 1.1
+++ openacs-4/packages/calendar/www/cal-item-edit.tcl 15 Sep 2001 07:14:32 -0000 1.2
@@ -39,6 +39,7 @@
# extract the time info
set start_datetime [calendar_make_datetime [array get event_date] [array get start_time]]
+
set end_datetime [calendar_make_datetime [array get event_date] [array get end_time]]
Index: openacs-4/packages/calendar/www/cal-item-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item-postgresql.xql 24 Aug 2001 01:47:36 -0000 1.1
+++ openacs-4/packages/calendar/www/cal-item-postgresql.xql 15 Sep 2001 07:14:32 -0000 1.2
@@ -6,8 +6,8 @@
- select to_char(start_date, 'MM/DD/YYYY') as start_date,
- to_char(start_date, 'HH24:MI') as start_time,
+ select to_char(start_date, 'HH24:MI') as start_time,
+ to_char(start_date, 'MM/DD/YYYY') as start_date,
to_char(end_date, 'HH24:MI') as end_time,
coalesce(a. name, e.name) as name,
coalesce(e.description, a.description) as description
Index: openacs-4/packages/calendar/www/cal-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item.tcl 23 Apr 2001 23:09:38 -0000 1.1
+++ openacs-4/packages/calendar/www/cal-item.tcl 15 Sep 2001 07:14:32 -0000 1.2
@@ -48,10 +48,9 @@
if {$date == "now"} {
set start_date "now"
} else {
- set start_date $date
+ set start_date $date
}
-
#------------------------------------------------
# check the permission on the party to the object
# then set up the variable to the template
@@ -78,8 +77,8 @@
# get data time
db_1row get_item_data {
- select to_char(start_date, 'MM/DD/YYYY') as start_date,
- to_char(start_date, 'HH24:MI') as start_time,
+ select to_char(start_date,'HH24:MI')as start_time,
+ to_char(start_date, 'MM/DD/YYYY') as start_date,
to_char(end_date, 'HH24:MI') as end_time,
nvl(a. name, e.name) as name,
nvl(e.description, a.description) as description
@@ -146,4 +145,3 @@
-
Index: openacs-4/packages/calendar/www/cal-listview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-listview.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-listview.tcl 7 Sep 2001 04:39:26 -0000 1.3
+++ openacs-4/packages/calendar/www/cal-listview.tcl 15 Sep 2001 07:14:32 -0000 1.4
@@ -21,7 +21,7 @@
}
set current_date $date
-set date_format "YYYY-MM-DD"
+set date_format "YYYY-MM-DD HH24:MI"
set items ""
@@ -38,7 +38,7 @@
#get cal-item
set sql "
-select to_char(start_date, 'j') as start_date,
+select to_char(start_date, 'J') as start_date,
to_char(start_date, 'HH24:MI') as pretty_start_date,
to_char(end_date, 'HH24:MI') as pretty_end_date,
coalesce(e.name, a.name) as name,
Index: openacs-4/packages/calendar/www/cal-monthview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-monthview.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-monthview.tcl 6 Sep 2001 06:30:43 -0000 1.2
+++ openacs-4/packages/calendar/www/cal-monthview.tcl 15 Sep 2001 07:14:32 -0000 1.3
@@ -19,15 +19,13 @@
month_items
}
-
-
# find out the user_id
set user_id [ad_verify_and_get_user_id]
# extract all the cal-item that's occuring within the given month
set sql "
-select to_char(start_date, 'j') as start_date,
+select to_char(start_date, 'J') as start_date,
coalesce(e.name, a.name) as name,
coalesce(e.description, a.description) as description,
e.event_id as item_id
Index: openacs-4/packages/calendar/www/cal-weekview-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-weekview-postgresql.xql 7 Sep 2001 02:49:18 -0000 1.2
+++ openacs-4/packages/calendar/www/cal-weekview-postgresql.xql 15 Sep 2001 07:14:32 -0000 1.3
@@ -8,9 +8,9 @@
select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D')
as day_of_the_week,
- to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'SUNDAY'),'DAY')
+ to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'SUNDAY'),'YYYY-MM-DD')
as sunday_of_the_week,
- to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday'),'DAY')
+ to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday'),'YYYY-MM-DD')
as saturday_of_the_week
from dual
Index: openacs-4/packages/calendar/www/cal-weekview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-weekview.tcl 7 Sep 2001 02:49:18 -0000 1.3
+++ openacs-4/packages/calendar/www/cal-weekview.tcl 15 Sep 2001 07:14:32 -0000 1.4
@@ -27,7 +27,7 @@
set user_id [ad_verify_and_get_user_id]
set current_date $date
-set date_format "YYYY-MM-DD"
+set date_format "YYYY-MM-DD HH24:MI"
# get the week info from oracle
# this should be part of the proc