X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=ae1d7b1c2a14f5527f4a1af98bb30f5b5cbc218a;hb=46518f4c016c411e9703b0c2f527d08f7650c8a9;hp=7e5337f45e68473ff1385af5b372862884701230;hpb=9927d6cde236ca75477abbbd6010f02800166caf;p=citadel.git
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 7e5337f45..ae1d7b1c2 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -642,7 +642,8 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
struct icaltimetype today_end_t;
struct tm starting_tm;
struct tm ending_tm;
-
+ int top;
+ int height;
if (WCC->num_cal == 0) {
// \todo FIXME wprintf("
\n");
@@ -723,12 +724,35 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
event_tte = icaltime_as_timet(end_t);
localtime_r(&event_tte, &event_tm);
if (hour == event_te.tm_hour) {
+ if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
+ top = (event_te.tm_hour * 11) -1;
+ height= (event_tm.tm_hour - event_te.tm_hour) * 11;
+ }
+ if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
+ top = (event_te.tm_hour * 11) - 1;
+ height = ((dstart - event_te.tm_hour) * 11) + ((event_tm.tm_hour - dstart) * 31);
+ }
+ if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
+ top = (event_te.tm_hour * 11) - 1;
+ height = ((dstart - event_te.tm_hour) * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 10);
+ }
+ if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+ top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+ height = ((event_tm.tm_hour - event_te.tm_hour) * 31);
+ }
+ if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
+ top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+ height = (((dend - event_te.tm_hour + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 11));
+ }
+ if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
+ top = (dstart * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - event_te.tm_hour) * 11) - 1;
+ height = ((event_tm.tm_hour - event_te.tm_hour) * 11);
+ }
wprintf("