]> code.citadel.org Git - citadel.git/blobdiff - webcit/calendar_view.c
* minor cleanup
[citadel.git] / webcit / calendar_view.c
index b6bff018dca64f4feb9649c4380ab9d7a4a4e367..28550be8e48cc5ff91c37aa94cc7b9d503fd2ed9 100644 (file)
@@ -66,8 +66,17 @@ void calendar_month_view_display_events(time_t thetime) {
                                                        WC->disp_cal[i],
                                                        ICAL_SUMMARY_PROPERTY);
                                if (p != NULL) {
+                                       wprintf("<FONT SIZE=-1>"
+                                               "<A HREF=\"/display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+                                               WC->cal_msgnum[i],
+                                               bstr("calview"),
+                                               bstr("year"),
+                                               bstr("month"),
+                                               bstr("day")
+                                       );
                                        escputs((char *)
                                                icalproperty_get_comment(p));
+                                       wprintf("</A></FONT><BR>\n");
                                }
 
                        }
@@ -92,15 +101,13 @@ void calendar_month_view(int year, int month, int day) {
         */
        memset(&starting_tm, 0, sizeof(struct tm));
        starting_tm.tm_year = year - 1900;
-       starting_tm.tm_mon = month;
+       starting_tm.tm_mon = month - 1;
        starting_tm.tm_mday = day;
        thetime = mktime(&starting_tm);
-       lprintf(9, "Starting at %s", asctime(localtime(&thetime)));
 
        tm = &starting_tm;
        while (tm->tm_mday != 1) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
-               lprintf(9, "Backing off to %s", asctime(localtime(&thetime)));
                tm = localtime(&thetime);
        }
 
@@ -114,7 +121,6 @@ void calendar_month_view(int year, int month, int day) {
        tm = localtime(&thetime);
        while (tm->tm_wday != 0) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
-               lprintf(9, "Backing off to %s", asctime(localtime(&thetime)));
                tm = localtime(&thetime);
        }
 
@@ -122,25 +128,33 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#4444FF><TR><TD>\n");
 
-       wprintf("<CENTER><H3>");
+       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0>"
+               "<TR><TD align=left><font color=#FFFFFF>"
+               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0\">"
+               "Add new calendar event</A>"
+               "</font></TD>\n");
+
+       wprintf("<TD><CENTER><H3>");
 
        tm = localtime(&previous_month);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
-               (int)(tm->tm_year)+1900, tm->tm_mon);
+               (int)(tm->tm_year)+1900, tm->tm_mon + 1);
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
                "<FONT COLOR=#FFFFFF>"
                "%s %d"
                "</FONT>"
-               "&nbsp;&nbsp;", months[month], year);
+               "&nbsp;&nbsp;", months[month-1], year);
 
        tm = localtime(&next_month);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
                (int)(tm->tm_year)+1900, tm->tm_mon + 1);
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\" BORDER=0></A>\n");
 
-       wprintf("</H3>");
+       wprintf("</H3></TD><TD align=right><font color=#FFFFFF size=-2>"
+               "Click on any date for day view&nbsp;"
+               "</FONT></TD></TR></TABLE>\n");
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
@@ -191,16 +205,128 @@ void calendar_week_view(int year, int month, int day) {
 }
 
 
+/*
+ * Display events for a particular hour of a particular day.
+ * (Specify hour < 0 to show "all day" events)
+ */
+void calendar_day_view_display_events(int year, int month,
+                                       int day, int hour) {
+       int i;
+       icalproperty *p;
+       struct icaltimetype t;
+
+       if (WC->num_cal == 0) {
+               wprintf("<BR><BR><BR>\n");
+               return;
+       }
+
+       for (i=0; i<(WC->num_cal); ++i) {
+               p = icalcomponent_get_first_property(WC->disp_cal[i],
+                                               ICAL_DTSTART_PROPERTY);
+               if (p != NULL) {
+                       t = icalproperty_get_dtstart(p);
+                       if ((t.year == year)
+                          && (t.month == month)
+                          && (t.day == day)
+                          && ( (t.hour == hour) || ((hour<0)&&(t.is_date)) )
+                          ) {
+
+                               p = icalcomponent_get_first_property(
+                                                       WC->disp_cal[i],
+                                                       ICAL_SUMMARY_PROPERTY);
+                               if (p != NULL) {
+                                       wprintf("<FONT SIZE=-1>"
+                                               "<A HREF=\"/display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d\">",
+                                               WC->cal_msgnum[i],
+                                               year, month, day
+                                       );
+                                       escputs((char *)
+                                               icalproperty_get_comment(p));
+                                       wprintf("</A></FONT><BR>\n");
+                               }
+
+                       }
+
+
+               }
+       }
+}
+
+
+
 void calendar_day_view(int year, int month, int day) {
-       wprintf("<CENTER><I>FIXME day view for %02d/%02d/%04d</I></CENTER><BR>\n", month, day, year);
+       int hour;
 
+       /* Outer table (to get the background color) */
+       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
+               "bgcolor=#4444FF><TR><TD>\n");
+
+       /* Inner table (the real one) */
+       wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
+               "bgcolor=#4444FF><TR>\n");
+
+       wprintf("<TD WIDTH=50%% VALIGN=top>");  /* begin stuff-on-the-left */
+
+       wprintf("<CENTER><H3><FONT COLOR=#FFFFFF>"
+               "%s %d, %d"
+               "</FONT></H3></CENTER>\n",
+               months[month-1], day, year);
+
+       wprintf("<CENTER><font color=#FFFFFF>"
+               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0\">"
+               "Add new calendar event</A>"
+               "<BR><BR>\n");
 
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">"
-               "Back to month view</A><BR>\n", year, month);
+               "Back to month view</A>\n", year, month);
+
+       wprintf("</FONT></CENTER>\n");
+
+       wprintf("</TD>");                       /* end stuff-on-the-left */
+
+       /* Innermost table (contains hours etc.) */
+       wprintf("<TD WIDTH=50%%>"
+               "<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
+               "bgcolor=#4444FF>\n");
+
+       /* Display events before 8:00 (hour=-1 is all-day events) */
+       wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+       for (hour = (-1); hour <= 7; ++hour) {
+               calendar_day_view_display_events(year, month, day, hour);
+       }
+       wprintf("</TD></TR>\n");
+
+       /* Now the middle of the day... */      
+       for (hour = 8; hour <= 17; ++hour) {    /* could do HEIGHT=xx */
+               wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               wprintf("%d:00 ", hour);
+
+               /* put the data here, stupid */
+               calendar_day_view_display_events(year, month, day, hour);
+
+               wprintf("</TD></TR>\n");
+       }
+
+       /* Display events after 5:00... */
+       wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+       for (hour = 18; hour <= 23; ++hour) {
+               calendar_day_view_display_events(year, month, day, hour);
+       }
+       wprintf("</TD></TR>\n");
+
+
+       wprintf("</TABLE>"                      /* end of innermost table */
+               "</TD></TR></TABLE>"            /* end of inner table */
+               "</TD></TR></TABLE>"            /* end of outer table */
+       );
+
+
+
 }
 
 
 
+
 void do_calendar_view(void) {
        int i;
        time_t now;
@@ -212,7 +338,7 @@ void do_calendar_view(void) {
        now = time(NULL);
        tm = localtime(&now);
        year = tm->tm_year + 1900;
-       month = tm->tm_mon;
+       month = tm->tm_mon + 1;
        day = tm->tm_mday;
 
        /* Now see if a date was specified */
@@ -244,7 +370,10 @@ void do_calendar_view(void) {
                icalcomponent_free(WC->disp_cal[i]);
        }
        WC->num_cal = 0;
+       free(WC->disp_cal);
        WC->disp_cal = NULL;
+       free(WC->cal_msgnum);
+       WC->cal_msgnum = NULL;
 }