recurrence editor

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index 9c90b8332bf63b2c81394956548020f82af303a0..dcce662e2cf2b3774984dc25a87b46d2a526b6f2 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -7,7 +7,6 @@
 #include "webcit.h"
 #include "webserver.h"
 
-
 /*
  * Display an event by itself (for editing)
  * supplied_vevent     the event to edit
@@ -29,11 +28,26 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        int organizer_is_me = 0;
        int i, j = 0;
        int sequence = 0;
+       char weekday_labels[7][32];
 
        lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
                msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
        );
 
+       /* populate the weekday names - begin */
+       now = time(NULL);
+       localtime_r(&now, &tm_now);
+       while (tm_now.tm_wday != 0) {
+               now -= 86400L;
+               localtime_r(&now, &tm_now);
+       }
+       for (i=0; i<7; ++i) {
+               localtime_r(&now, &tm_now);
+               wc_strftime(weekday_labels[i], 32, "%A", &tm_now);
+               now += 86400L;
+       }
+       /* populate the weekday names - end */
+
        now = time(NULL);
        strcpy(organizer_string, "");
        strcpy(attendee_string, "");
@@ -385,8 +399,11 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                recur = icalproperty_get_rrule(rrule);
        }
        else {
+               /* blank recurrence with some sensible defaults */
                memset(&recur, 0, sizeof(struct icalrecurrencetype));
-               // FIXME create a sane blank recurrence here
+               recur.count = 3;
+               recur.interval = 1;
+               recur.freq = ICAL_WEEKLY_RECURRENCE;
        }
 
        wprintf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
@@ -399,15 +416,16 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("<div id=\"rrule\">\n");                /* begin 'rrule' div */
 
-
        wprintf("<table border=0 width=100%%>\n");      /* same table style as the event tab */
 
        /* Table row displaying raw RRULE data, FIXME remove when finished */
-       wprintf("<tr><td><b>");
-       wprintf("Raw data");
-       wprintf("</b></td><td>");
-       wprintf("<tt>%s</tt>", icalrecurrencetype_as_string(&recur));
-       wprintf("</td></tr>\n");
+       if (rrule) {
+               wprintf("<tr><td><b>");
+               wprintf("Raw data");
+               wprintf("</b></td><td>");
+               wprintf("<tt>%s</tt>", icalrecurrencetype_as_string(&recur));
+               wprintf("</td></tr>\n");
+       }
 
        char *frequency_units[] = {
                _("seconds"),
@@ -415,9 +433,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                _("hours"),
                _("days"),
                _("weeks"),
-       _("months"),
-       _("years"),
-       _("never")
+               _("months"),
+               _("years"),
+               _("never")
        };
 
        wprintf("<tr><td><b>");
@@ -429,7 +447,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
        wprintf("value=\"%d\"> ", recur.interval);
 
-       wprintf("<select name=\"freq\" size=\"1\">\n");
+       wprintf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
        for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
                wprintf("<option %s value=\"%d\">%s</option>\n",
                        ((i == recur.freq) ? "selected" : ""),
@@ -440,22 +459,37 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("</td></tr>\n");
 
+
+       wprintf("<div id=\"weekday_selector\">\n");             /* begin 'weekday_selector' div */
        wprintf("<tr><td><b>");
-       wprintf("byday");                                                       //FIXME
+       wprintf("%s", _("on these weekdays:"));
        wprintf("</b></td><td>");
+
+       char weekday_is_selected[7];
+       memset(weekday_is_selected, 0, 7);
+
        for (i=0; i<ICAL_BY_DAY_SIZE; ++i) {
                if (recur.by_day[i] == ICAL_RECURRENCE_ARRAY_MAX) {
                        i = ICAL_RECURRENCE_ARRAY_MAX;                  /* all done */
                }
                else {
-                       for (j=1; j<=ICAL_SATURDAY_WEEKDAY; ++j) {
-                               if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j) {
-                                       wprintf("day%d, ", j);
+                       for (j=0; j<7; ++j) {
+                               if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j+1) {
+                                       weekday_is_selected[j] = 1;
                                }
                        }
                }
        }
+
+       for (i=0; i<7; ++i) {
+               wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+               if (weekday_is_selected[i]) wprintf(" checked");
+               wprintf(">%s</input>\n", weekday_labels[i]);
+       }
+
        wprintf("</td></tr>\n");
+       wprintf("</div>\n");                            /* end 'weekday_selector' div */
+
        wprintf("</table>\n");
        wprintf("</div>\n");                            /* end 'rrule' div */