projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
595d9fb
)
more work on the recurrence editor
author
Art Cancro
<ajc@citadel.org>
Tue, 21 Oct 2008 21:41:13 +0000
(21:41 +0000)
committer
Art Cancro
<ajc@citadel.org>
Tue, 21 Oct 2008 21:41:13 +0000
(21:41 +0000)
webcit/event.c
patch
|
blob
|
history
diff --git
a/webcit/event.c
b/webcit/event.c
index 2d942aba49fc5658135e9d65ebf76f38b7c6128a..82da8f4539ae7db48d0e3fb10802418d187e6b67 100644
(file)
--- a/
webcit/event.c
+++ b/
webcit/event.c
@@
-530,9
+530,16
@@
void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
);
int rrmday = t_start.day;
);
int rrmday = t_start.day;
- int rrmweek = 1; /* FIXME default to same as event start */
int rrmweekday = icaltime_day_of_week(t_start) - 1;
int rrmweekday = icaltime_day_of_week(t_start) - 1;
+ /* Figure out what week of the month we're in */
+ icaltimetype day1 = t_start;
+ day1.day = 1;
+ int weekbase = icaltime_week_number(day1);
+ int rrmweek = icaltime_week_number(t_start) - weekbase + 1;
+
+ /* Are we going by day of the month or week/day? */
+
if (recur.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
which_rrmonthtype_is_preselected = 0;
rrmday = recur.by_month_day[0];
if (recur.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
which_rrmonthtype_is_preselected = 0;
rrmday = recur.by_month_day[0];
@@
-581,9
+588,11
@@
void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
wprintf("</div>\n"); /* end 'monthday_selector' div */
wprintf("</div>\n"); /* end 'monthday_selector' div */
- int rrymweek = 1; /* FIXME default to same as event start */
- int rrymweekday = 1; /* FIXME default to same as event start */
- int rrymonth = 1; /* FIXME default to same as event start */
+ int rrymweek = rrmweek;
+ int rrymweekday = rrmweekday;
+ int rrymonth = t_start.month;
+
+ lprintf(9, "FIXME: RRYMWEEK %d, RRYMWEEKDAY %d, RRYMONTH %d\n", rrymweek, rrymweekday, rrymonth);
int which_rryeartype_is_preselected = 0;
int which_rryeartype_is_preselected = 0;