]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
Big change to calendar view functions. We now declare
[citadel.git] / webcit / event.c
index 8fc91175034f3ef7f5fa76d1c36899fdbd3d459b..64ea2270737829cce3287a6f4550028327d8b9e0 100644 (file)
@@ -7,13 +7,14 @@
 #include "webcit.h"
 #include "webserver.h"
 
-
 /*
  * Display an event by itself (for editing)
  * supplied_vevent     the event to edit
  * msgnum              reference on the citserver
  */
-void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+       int unread, struct calview *calv)
+{
        icalcomponent *vevent;
        icalproperty *p;
        icalvalue *v;
@@ -29,11 +30,30 @@ 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];
+       long weekstart = 0;
+
+       get_pref_long("weekstart", &weekstart, 17);
+       if (weekstart > 6) weekstart = 0;
 
        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, "");
@@ -52,7 +72,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                        display_edit_individual_event(
                                icalcomponent_get_first_component(
                                        vevent, ICAL_VEVENT_COMPONENT), 
-                               msgnum, from, unread
+                               msgnum, from, unread, NULL
                        );
                        return;
                }
@@ -177,7 +197,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                t_start.is_utc = 1;
 
        }
-       display_icaltimetype_as_webform(&t_start, "dtstart");
+       display_icaltimetype_as_webform(&t_start, "dtstart", 0);
 
        wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
                "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
@@ -218,7 +238,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                        /* t_end = icaltime_from_timet(now, 0); */
                }
        }
-       display_icaltimetype_as_webform(&t_end, "dtend");
+       display_icaltimetype_as_webform(&t_end, "dtend", 0);
        wprintf("</TD></TR>\n");
 
        wprintf("<TR><TD><B>");
@@ -381,77 +401,204 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        struct icalrecurrencetype recur;
 
        rrule = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY);
+       if (rrule) {
+               recur = icalproperty_get_rrule(rrule);
+       }
+       else {
+               /* blank recurrence with some sensible defaults */
+               memset(&recur, 0, sizeof(struct icalrecurrencetype));
+               recur.count = 3;
+               recur.until = icaltime_null_time();
+               recur.interval = 1;
+               recur.freq = ICAL_WEEKLY_RECURRENCE;
+       }
 
        wprintf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
                "VALUE=\"yes\" "
-               /* "onclick=\"GreyOrUnGrayStuffFIXME();\"" */
+               "onclick=\"RecurrenceShowHide();\""
                " %s >%s",
                (rrule ? "CHECKED=\"CHECKED\"" : "" ),
-               _("This is a repeating event")
+               _("This is a recurring event")
        );
 
-       if (rrule) {
-               recur = icalproperty_get_rrule(rrule);
+       wprintf("<div id=\"rrule_div\">\n");            /* begin 'rrule_div' div */
 
-               wprintf("<table border=0 width=100%%>\n");      /* same table style as the event tab */
+       wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
 
-               /* Table row displaying raw RRULE data, FIXME remove when finished */
+       /* Table row displaying raw RRULE data, FIXME remove when finished */
+       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"),
-                       _("minutes"),
-                       _("hours"),
-                       _("days"),
-                       _("weeks"),
-                       _("months"),
-                       _("years"),
-                       _("never")
-               };
+       char *frequency_units[] = {
+               _("seconds"),
+               _("minutes"),
+               _("hours"),
+               _("days"),
+               _("weeks"),
+               _("months"),
+               _("years"),
+               _("never")
+       };
 
-               wprintf("<tr><td><b>");
-               wprintf(_("Repeats"));
-               wprintf("</b></td><td>");
-               if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
-               wprintf("%s ", _("every"));
-
-               wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
-               wprintf("value=\"%d\"> ", recur.interval);
-
-               wprintf("<select name=\"freq\" size=\"1\">\n");
-               for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
-                       wprintf("<option %s value=\"%d\">%s</option>\n",
-                               ((i == recur.freq) ? "selected" : ""),
-                               i,
-                               frequency_units[i]
-                       );
-               }
+       char *ordinals[] = {
+               "0",
+               _("first"),
+               _("second"),
+               _("third"),
+               _("fourth"),
+               _("fifth")
+       };
 
-               wprintf("</td></tr>\n");
+       wprintf("<tr><td><b>");
+       wprintf(_("Recurrence rule"));
+       wprintf("</b></td><td>");
 
-               wprintf("<tr><td><b>");
-               wprintf("byday");                                                       //FIXME
-               wprintf("</b></td><td>");
-               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);
-                                       }
+       if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
+       wprintf("%s ", _("Repeats every"));
+
+       wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
+       wprintf("value=\"%d\">&nbsp;", recur.interval);
+
+       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%svalue=\"%d\">%s</option>\n",
+                       ((i == recur.freq) ? "selected " : ""),
+                       (((i == recur.freq) || ((i>=3)&&(i<=5))) ? "" : "disabled "),
+                       i,
+                       frequency_units[i]
+               );
+       }
+       wprintf("</select>\n");
+
+       wprintf("<div id=\"weekday_selector\">");       /* begin 'weekday_selector' div */
+       wprintf("%s<br>", _("on these weekdays:"));
+
+       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=0; j<7; ++j) {
+                               if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j+1) {
+                                       weekday_is_selected[j] = 1;
                                }
                        }
                }
-               wprintf("</td></tr>\n");
+       }
 
-               wprintf("</table>\n");
+       for (j=0; j<7; ++j) {
+               i = ((j + (int)weekstart) % 7);
+               wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+               if (weekday_is_selected[i]) wprintf(" checked");
+               wprintf(">%s\n", weekday_labels[i]);
        }
+       wprintf("</div>\n");                            /* end 'weekday_selector' div */
+
+
+       int which_rrmonthtype_is_preselected = 0;       /* FIXME set default correctly */
+
+       wprintf("<div id=\"monthday_selector\">");      /* begin 'monthday_selector' div */
+
+       wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
+       );
+
+       char mdaybox[128];
+       snprintf(mdaybox, sizeof mdaybox,
+               "<input type=\"text\" name=\"rrmday\" id=\"rrmday\" maxlength=\"2\" size=\"2\" "
+               "value=\"%d\">", 0);                    /* FIXME set the correct default */
+       wprintf(_("on day %s of the month"), mdaybox);
+       wprintf("<br />\n");
+
+       wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrmonthtype_is_preselected == 1) ? "checked" : "")
+       );
+
+       wprintf(_("on the "));
+       wprintf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (i=1; i<=5; ++i) {
+               wprintf("<option %svalue=\"%d\">%s</option>\n",
+                       ((0) ? "selected " : ""),                       /* FIXME set correct default */
+                       i,
+                       ordinals[i]
+               );
+       }
+       wprintf("</select> \n");
+
+       wprintf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (j=0; j<7; ++j) {
+               i = ((j + (int)weekstart) % 7);
+               wprintf("<option %svalue=\"%d\">%s</option>\n",
+                       ((0) ? "selected " : ""),                       /* FIXME set correct default */
+                       i,
+                       weekday_labels[i]
+               );
+       }
+       wprintf("</select>");
+
+       wprintf(" %s<br />\n", _("of the month"));
+
+       wprintf("</div>\n");                            /* end 'monthday_selector' div */
+
+
+
+       wprintf("</td></tr>\n");
+
+
+       int which_rrend_is_preselected = 0;
+       if (!icaltime_is_null_time(recur.until)) which_rrend_is_preselected = 2;
+       if (recur.count > 0) which_rrend_is_preselected = 1;
+
+       wprintf("<tr><td><b>");
+       wprintf(_("Recurrence range"));
+       wprintf("</b></td><td>\n");
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 0) ? "checked" : "")
+       );
+       wprintf("%s<br />\n", _("No ending date"));
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 1) ? "checked" : "")
+       );
+       wprintf(_("Repeat this event"));
+       wprintf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+       wprintf("value=\"%d\"> ", recur.count);
+       wprintf(_("times"));
+       wprintf("<br />\n");
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 2) ? "checked" : "")
+       );
+       wprintf(_("Repeat this event until "));
+
+       if (icaltime_is_null_time(recur.until)) {
+               recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
+       }
+       display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
+       wprintf("<br />\n");
+
+       wprintf("</td></tr>\n");
+
+       wprintf("</table>\n");
+       wprintf("</div>\n");                            /* end 'rrule' div */
+
        end_tab(2, 3);
 
        /* submit buttons (common area beneath the tabs) */
@@ -474,11 +621,11 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf("</FORM>\n");
        end_tab(3, 3);
 
-       wprintf("</div>\n");
+       wprintf("</div>\n");                    /* end 'fix_scrollbar_bug' div */
 
-       wprintf("<script type=\"text/javascript\">"
-               "eventEditAllDay();"
-               "</script>\n"
+       StrBufAppendPrintf(WC->trailing_javascript,
+               "eventEditAllDay();     \n"
+               "RecurrenceShowHide();  \n"
        );
        address_book_popup();
        wDumpContent(1);
@@ -494,7 +641,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
  * supplied_vevent:    the event to save
  * msgnum:             the index on the citserver
  */
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+                       int unread, struct calview *calv) {
        char buf[SIZ];
        icalproperty *prop;
        icalcomponent *vevent, *encaps;
@@ -524,7 +672,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
                        save_individual_event(
                                icalcomponent_get_first_component(
                                        vevent, ICAL_VEVENT_COMPONENT), 
-                               msgnum, from, unread
+                               msgnum, from, unread, NULL
                        );
                        return;
                }
@@ -788,7 +936,7 @@ STARTOVER:  for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        check_attendee_availability(encaps);
 
                        /** This displays the form again, with our annotations */
-                       display_edit_individual_event(encaps, msgnum, from, unread);
+                       display_edit_individual_event(encaps, msgnum, from, unread, NULL);
 
                        icalcomponent_free(encaps);
                        encaps = NULL;