");
+ /* Outer table (to get the background color) */
+ wc_printf("
|
![](\"static/prevdate_32x.gif\")
![\"%s\"](\"static/webcit_icons/essen/32x32/back.png\"){kind=icon}
\n", _("previous"));
wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
- wprintf(" "
- ""
+ wc_printf(" "
+ ""
"%s %d"
""
" ", colheader_label, year);
localtime_r(&next_month, &tm);
- wprintf("![](\"static/nextdate_32x.gif\")
![\"%s\"](\"static/webcit_icons/essen/32x32/forward.png\"){kind=icon}
\n", _("next"));
- wprintf(""
- "
" /* end of inner table */
+ "\n" /* end of outer table */
+ );
}
-/**
- * \brief view one week
- * this should view just one week, but it's not here yet.
- * \todo ny implemented
- * \param year the year
- * \param month the month
- * \param day the day which we want to see the week around
+/*
+ * Calendar week view -- not implemented yet, this is a stub function
*/
void calendar_week_view(int year, int month, int day) {
- wprintf("week view FIXME
\n"); + wc_printf("week view FIXME
\n"); } -/** - * \brief display one day +/* + * display one day * Display events for a particular hour of a particular day. * (Specify hour < 0 to show "all day" events) - * \param year the year - * \param month the month - * \param day the day - * \param hour the hour we want to start displaying????? + * + * dstart and dend indicate which hours our "daytime" begins and end */ -void calendar_day_view_display_events(int year, int month, - int day, int hour) { - int i; - icalproperty *p; - icalproperty *pe = NULL; - struct icaltimetype t; - struct icaltimetype te; +void calendar_day_view_display_events(time_t thetime, + int year, + int month, + int day, + int notime_events, + int dstart, + int dend) +{ + long hklen; + const char *HashKey; + void *vCal; + HashPos *Pos; + icalproperty *p = NULL; + icalproperty *q = NULL; time_t event_tt; time_t event_tte; struct tm event_te; struct tm event_tm; + int show_event = 0; int all_day_event = 0; - - if (WC->num_cal == 0) { - // \todo FIXME wprintf("
\n"); + int ongoing_event = 0; + wcsession *WCC = WC; + disp_cal *Cal; + struct icaltimetype t; + struct icaltimetype end_t; + struct icaltimetype today_start_t; + struct icaltimetype today_end_t; + struct icaltimetype today_t; + struct tm starting_tm; + struct tm ending_tm; + int top = 0; + int bottom = 0; + int gap = 1; + int startmin = 0; + int diffmin = 0; + int endmin = 0; + + char buf[256]; + + if (GetCount(WCC->disp_cal_items) == 0) { + /* nothing to display */ return; } - for (i=0; i<(WC->num_cal); ++i) { - p = icalcomponent_get_first_property(WC->disp_cal[i].cal, - ICAL_DTSTART_PROPERTY); - pe = icalcomponent_get_first_property(WC->disp_cal[i].cal, - ICAL_DTEND_PROPERTY); - if (p != NULL) { - t = icalproperty_get_dtstart(p); + /* Create an imaginary event which spans the current day. Any events which + * overlap with this one take place at least partially in this day. + */ + memset(&starting_tm, 0, sizeof(struct tm)); + starting_tm.tm_year = year - 1900; + starting_tm.tm_mon = month - 1; + starting_tm.tm_mday = day; + starting_tm.tm_hour = 0; + starting_tm.tm_min = 0; + today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone()); + today_start_t.is_utc = 1; + + memset(&ending_tm, 0, sizeof(struct tm)); + ending_tm.tm_year = year - 1900; + ending_tm.tm_mon = month - 1; + ending_tm.tm_mday = day; + ending_tm.tm_hour = 23; + ending_tm.tm_min = 59; + today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone()); + today_end_t.is_utc = 1; + + /* + * Create another one without caring about the timezone for all day events. + */ + today_t = icaltime_null_date(); + today_t.year = year; + today_t.month = month; + today_t.day = day; + + /* Now loop through our list of events to see which ones occur today. + */ + Pos = GetNewHashPos(WCC->disp_cal_items, 0); + while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) { + Cal = (disp_cal*)vCal; + + all_day_event = 0; + ongoing_event=0; + + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); + if (q != NULL) { + t = icalproperty_get_dtstart(q); event_tt = icaltime_as_timet(t); - if (t.is_date) { - all_day_event = 1; - } - else { - all_day_event = 0; - } + localtime_r(&event_tt, &event_te); + } + else { + memset(&t, 0, sizeof t); + } - if (all_day_event) { - gmtime_r(&event_tt, &event_tm); - gmtime_r(&event_tt, &event_te); + if (t.is_date) all_day_event = 1; + + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (q != NULL) { + end_t = icalproperty_get_dtend(q); + } + else { + /* no end given means end = start */ + memcpy(&end_t, &t, sizeof(struct icaltimetype)); + } + + if (all_day_event) + { + show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time()); + if (icaltime_compare(t, end_t)) { + /* + * the end date is non-inclusive so adjust it by one + * day because our test is inclusive, note that a day is + * not to much because we are talking about all day + * events + */ + icaltime_adjust(&end_t, -1, 0, 0, 0); } - else { - localtime_r(&event_tt, &event_tm); - if (pe != NULL) - { - te = icalproperty_get_dtend(pe); - event_tte = icaltime_as_timet(te); - localtime_r(&event_tte, &event_te); + } + else + { + show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t); + } + + event_tte = icaltime_as_timet(end_t); + localtime_r(&event_tte, &event_tm); + + /* If we determined that this event occurs today, then display it. + */ + p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY); + if (p == NULL) { + p = icalproperty_new_summary(_("Untitled Event")); + icalcomponent_add_property(Cal->cal, p); + } + + if ((show_event) && (p != NULL)) { + + if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1; + + if (all_day_event && notime_events) + { + wc_printf(" "
+ ""
+ ,
+ (Cal->unread)?"_unread":"_read",
+ Cal->cal_msgnum, year, month, day
+ );
+ escputs((char *) icalproperty_get_comment(p));
+ wc_printf("");
+ wc_printf("%s
", _("All day event")); + wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wc_printf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wc_printf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + if (!icaltime_compare(t, end_t)) { /* one day only */ + webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Date:"), buf); } - else - localtime_r(&event_tt, &event_te); + else { + webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Starting date:"), buf); + webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Ending date:"), buf); + } + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wc_printf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + wc_printf(""); + wc_printf(" ("); + wc_printf(_("All day event")); + wc_printf(") \n");
}
-
- if (((event_tm.tm_year <= (year-1900))
- && (event_tm.tm_mon <= (month-1))
- && (event_tm.tm_mday <= day)
- && (event_te.tm_year >= (year-1900))
- && (event_te.tm_mon >= (month-1))
- && (event_te.tm_mday >= day))
- && (
- // are we in the start hour?
- ((event_tm.tm_mday == day)
- && (event_tm.tm_hour == hour)
- && (!t.is_date))
- // are we an all day event?
- || ((hour<0)&&(t.is_date))
- // does it span multible days and we're not at the start day?
- || ((hour<0)
- && (event_tm.tm_mday < day)
- && (event_te.tm_mday >= day))
- ))
+ else if (ongoing_event && notime_events)
{
- p = icalcomponent_get_first_property(
- WC->disp_cal[i].cal,
- ICAL_SUMMARY_PROPERTY);
- if (p != NULL) {
-
- if (all_day_event) {
- wprintf("",
+ (Cal->unread)?"_unread":"_read",
+ top, (gap * 40), (bottom-top)
+ );
+ wc_printf(""
+ ,
+ Cal->cal_msgnum, year, month, day, t.hour
+ );
+ escputs((char *) icalproperty_get_comment(p));
+ wc_printf("");
+ wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wc_printf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wc_printf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + if (!icaltime_compare(t, end_t)) { /* one day only */ + webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Date/time:"), buf); + } + else { + webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Starting date/time:"), buf); + webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Ending date/time:"), buf); + } + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wc_printf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + wc_printf(""); + wc_printf(" \n");
+ }
}
}
+ DeleteHashPos(&Pos);
}
-
-/**
- * \brief view one day
- * \param year the year
- * \param month the month
- * \param day the day we want to display
+/*
+ * view one day
*/
void calendar_day_view(int year, int month, int day) {
int hour;
struct icaltimetype today, yesterday, tomorrow;
- int daystart = 8;
- int dayend = 17;
- char daystart_str[16], dayend_str[16];
+ long daystart;
+ long dayend;
struct tm d_tm;
- char d_str[128];
+ char d_str[160];
int time_format;
-
+ time_t today_t;
+ int timeline = TIMELINE;
+ int extratimeline = EXTRATIMELINE;
+ int gap = 0;
+ int hourlabel;
+ int extrahourlabel;
+
time_format = get_time_format_cached ();
- get_preference("daystart", daystart_str, sizeof daystart_str);
- if (!IsEmptyStr(daystart_str)) daystart = atoi(daystart_str);
- get_preference("dayend", dayend_str, sizeof dayend_str);
- if (!IsEmptyStr(dayend_str)) dayend = atoi(dayend_str);
-
+ get_pref_long("daystart", &daystart, 8);
+ get_pref_long("dayend", &dayend, 17);
- /** Figure out the dates for "yesterday" and "tomorrow" links */
+ /* when loading daystart/dayend, replace missing, corrupt, or impossible values with defaults */
+ if ((daystart < 0) || (dayend < 2) || (daystart >= 23) || (dayend > 23) || (dayend <= daystart)) {
+ daystart = 9;
+ dayend = 17;
+ }
+
+ /* Today's date */
+ memset(&d_tm, 0, sizeof d_tm);
+ d_tm.tm_year = year - 1900;
+ d_tm.tm_mon = month - 1;
+ d_tm.tm_mday = day;
+ today_t = mktime(&d_tm);
+
+ /* Figure out the dates for "yesterday" and "tomorrow" links */
memset(&today, 0, sizeof(struct icaltimetype));
today.year = year;
@@ -760,133 +1165,170 @@ void calendar_day_view(int year, int month, int day) {
++tomorrow.day;
tomorrow = icaltime_normalize(tomorrow);
+ /* Inner table (the real one) */
+ wc_printf("
\n"); /* end of inner table */
}
-/**
- * \brief Display today's events.
+
+/*
+ * Display today's events. Returns the number of items displayed.
*/
-void calendar_summary_view(void) {
- int i;
+int calendar_summary_view(void) {
+ long hklen;
+ const char *HashKey;
+ void *vCal;
+ HashPos *Pos;
+ disp_cal *Cal;
icalproperty *p;
struct icaltimetype t;
time_t event_tt;
@@ -895,17 +1337,20 @@ void calendar_summary_view(void) {
time_t now;
int all_day_event = 0;
char timestring[SIZ];
+ wcsession *WCC = WC;
+ int num_displayed = 0;
- if (WC->num_cal == 0) {
- return;
+ if (GetCount(WC->disp_cal_items) == 0) {
+ return(0);
}
now = time(NULL);
localtime_r(&now, &today_tm);
- for (i=0; i<(WC->num_cal); ++i) {
- p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
- ICAL_DTSTART_PROPERTY);
+ Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+ while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ Cal = (disp_cal*)vCal;
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t = icalproperty_get_dtstart(p);
event_tt = icaltime_as_timet(t);
@@ -915,7 +1360,7 @@ void calendar_summary_view(void) {
else {
all_day_event = 0;
}
- fmt_time(timestring, event_tt);
+ fmt_time(timestring, SIZ, event_tt);
if (all_day_event) {
gmtime_r(&event_tt, &event_tm);
@@ -925,215 +1370,179 @@ void calendar_summary_view(void) {
}
if ( (event_tm.tm_year == today_tm.tm_year)
- && (event_tm.tm_mon == today_tm.tm_mon)
- && (event_tm.tm_mday == today_tm.tm_mday)
- ) {
-
-
- p = icalcomponent_get_first_property(
- WC->disp_cal[i].cal,
- ICAL_SUMMARY_PROPERTY);
- if (p != NULL) {
- escputs((char *)
- icalproperty_get_comment(p));
- wprintf(" (%s)
\n", timestring); + && (event_tm.tm_mon == today_tm.tm_mon) + && (event_tm.tm_mday == today_tm.tm_mday) + ) { + + p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY); + if (p == NULL) { + p = icalproperty_new_summary(_("Untitled Task")); + icalcomponent_add_property(Cal->cal, p); + } + if (p != NULL) + { + if (WCC->CurRoom.view == VIEW_TASKS) { + wc_printf(""); + } + else { + wc_printf(""); + } + escputs((char *) icalproperty_get_comment(p)); + if (!all_day_event) { + wc_printf(" (%s)", timestring); + } + wc_printf("
\n"); + ++num_displayed; } } } } - free_calendar_buffer(); + DeleteHashPos(&Pos); + DeleteHash(&WC->disp_cal_items); + return(num_displayed); } - -/** - * \brief clean up ical memory - * \todo this could get troubel with future ical versions +/* + * Parse the URL variables in order to determine the scope and display of a calendar view */ -void free_calendar_buffer(void) { - int i; - if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) { - icalcomponent_free(WC->disp_cal[i].cal); - } - WC->num_cal = 0; - free(WC->disp_cal); - WC->disp_cal = NULL; -} +int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, + void **ViewSpecific, + long oper, + char *cmd, + long len, + char *filter, + long flen) +{ + wcsession *WCC = WC; + calview *c; + time_t now; + struct tm tm; + char cv[32]; + int span = 3888000; + c = (calview*) malloc(sizeof(calview)); + memset(c, 0, sizeof(calview)); + *ViewSpecific = (void*)c; -/** - * \brief do the whole calendar page - * view any part of the calender. decide which way, etc. - */ -void do_calendar_view(void) { - time_t now; - struct tm tm; - int year, month, day; - char calview[SIZ]; + Stat->load_seen = 1; + strcpy(cmd, "MSGS ALL"); + Stat->maxmsgs = 32767; - /** In case no date was specified, go with today */ + /* In case no date was specified, go with today */ now = time(NULL); localtime_r(&now, &tm); - year = tm.tm_year + 1900; - month = tm.tm_mon + 1; - day = tm.tm_mday; - - /** Now see if a date was specified */ - if (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year")); - if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month")); - if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day")); - - /** How would you like that cooked? */ - if (!IsEmptyStr(bstr("calview"))) { - strcpy(calview, bstr("calview")); + c->year = tm.tm_year + 1900; + c->month = tm.tm_mon + 1; + c->day = tm.tm_mday; + + /* Now see if a date was specified */ + if (havebstr("year")) c->year = ibstr("year"); + if (havebstr("month")) c->month = ibstr("month"); + if (havebstr("day")) c->day = ibstr("day"); + + /* How would you like that cooked? */ + if (havebstr("calview")) { + strcpy(cv, bstr("calview")); } else { - strcpy(calview, "month"); + strcpy(cv, "month"); } - /** Display the selected view */ - if (!strcasecmp(calview, "day")) { - calendar_day_view(year, month, day); + /* Display the selected view */ + if (!strcasecmp(cv, "day")) { + c->view = calview_day; + } + else if (!strcasecmp(cv, "week")) { + c->view = calview_week; } - else if (!strcasecmp(calview, "week")) { - calendar_week_view(year, month, day); + else if (!strcasecmp(cv, "summary")) { /* shouldn't ever happen, but just in case */ + c->view = calview_day; } else { - if (WC->wc_view == VIEW_CALBRIEF) { - calendar_brief_month_view(year, month, day); + if (WCC->CurRoom.view == VIEW_CALBRIEF) { + c->view = calview_brief; } else { - calendar_month_view(year, month, day); + c->view = calview_month; } } - /** Free the calendar stuff */ - free_calendar_buffer(); - -} - - -/** - * \brief get task due date - * Helper function for do_tasks_view(). - * \param vtodo a task to get the due date - * \return the date/time due. - */ -time_t get_task_due_date(icalcomponent *vtodo) { - icalproperty *p; - - if (vtodo == NULL) { - return(0L); - } - - /** - * If we're looking at a fully encapsulated VCALENDAR - * rather than a VTODO component, recurse into the data - * structure until we get a VTODO. + /* Now try and set the lower and upper bounds so that we don't + * burn too many cpu cycles parsing data way in the past or future */ - if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) { - return get_task_due_date( - icalcomponent_get_first_component( - vtodo, ICAL_VTODO_COMPONENT - ) - ); - } - p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY); - if (p != NULL) { - return(icaltime_as_timet(icalproperty_get_due(p))); - } - else { - return(0L); - } -} + tm.tm_year = c->year - 1900; + tm.tm_mon = c->month - 1; + tm.tm_mday = c->day; + now = mktime(&tm); + if (c->view == calview_month) span = 3888000; + if (c->view == calview_brief) span = 3888000; + if (c->view == calview_week) span = 604800; + if (c->view == calview_day) span = 86400; + if (c->view == calview_summary) span = 86400; -/** - * \brief Compare the due dates of two tasks (this is for sorting) - * \param task1 first task to compare - * \param task2 second task to compare - */ -int task_due_cmp(const void *task1, const void *task2) { - time_t t1; - time_t t2; - - t1 = get_task_due_date(((struct disp_cal *)task1)->cal); - t2 = get_task_due_date(((struct disp_cal *)task2)->cal); - - if (t1 < t2) return(-1); - if (t1 > t2) return(1); - return(0); + c->lower_bound = now - span; + c->upper_bound = now + span; + return 200; } - -/** - * \brief do the whole task view stuff +/* + * Render a calendar view from data previously loaded into memory */ -void do_tasks_view(void) { - int i; - time_t due; - int bg = 0; - char buf[SIZ]; - icalproperty *p; - - wprintf("
\n");
+ /* Outer table (to get the background color) */
+ wc_printf("
| |||||||||||||||||||||||||||||
\n"); + wc_printf("
\n"); } -/** - * \brief display one day +/* + * display one day * Display events for a particular hour of a particular day. * (Specify hour < 0 to show "all day" events) - * \param year the year - * \param month the month - * \param day the day - * \param hour the hour we want to start displaying????? + * + * dstart and dend indicate which hours our "daytime" begins and end */ -void calendar_day_view_display_events(int year, int month, - int day, int hour) { - int i; - icalproperty *p; - icalproperty *pe = NULL; - struct icaltimetype t; - struct icaltimetype te; +void calendar_day_view_display_events(time_t thetime, + int year, + int month, + int day, + int notime_events, + int dstart, + int dend) +{ + long hklen; + const char *HashKey; + void *vCal; + HashPos *Pos; + icalproperty *p = NULL; + icalproperty *q = NULL; time_t event_tt; time_t event_tte; struct tm event_te; struct tm event_tm; + int show_event = 0; int all_day_event = 0; - - if (WC->num_cal == 0) { - // \todo FIXME wprintf("
\n"); + int ongoing_event = 0; + wcsession *WCC = WC; + disp_cal *Cal; + struct icaltimetype t; + struct icaltimetype end_t; + struct icaltimetype today_start_t; + struct icaltimetype today_end_t; + struct icaltimetype today_t; + struct tm starting_tm; + struct tm ending_tm; + int top = 0; + int bottom = 0; + int gap = 1; + int startmin = 0; + int diffmin = 0; + int endmin = 0; + + char buf[256]; + + if (GetCount(WCC->disp_cal_items) == 0) { + /* nothing to display */ return; } - for (i=0; i<(WC->num_cal); ++i) { - p = icalcomponent_get_first_property(WC->disp_cal[i].cal, - ICAL_DTSTART_PROPERTY); - pe = icalcomponent_get_first_property(WC->disp_cal[i].cal, - ICAL_DTEND_PROPERTY); - if (p != NULL) { - t = icalproperty_get_dtstart(p); + /* Create an imaginary event which spans the current day. Any events which + * overlap with this one take place at least partially in this day. + */ + memset(&starting_tm, 0, sizeof(struct tm)); + starting_tm.tm_year = year - 1900; + starting_tm.tm_mon = month - 1; + starting_tm.tm_mday = day; + starting_tm.tm_hour = 0; + starting_tm.tm_min = 0; + today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone()); + today_start_t.is_utc = 1; + + memset(&ending_tm, 0, sizeof(struct tm)); + ending_tm.tm_year = year - 1900; + ending_tm.tm_mon = month - 1; + ending_tm.tm_mday = day; + ending_tm.tm_hour = 23; + ending_tm.tm_min = 59; + today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone()); + today_end_t.is_utc = 1; + + /* + * Create another one without caring about the timezone for all day events. + */ + today_t = icaltime_null_date(); + today_t.year = year; + today_t.month = month; + today_t.day = day; + + /* Now loop through our list of events to see which ones occur today. + */ + Pos = GetNewHashPos(WCC->disp_cal_items, 0); + while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) { + Cal = (disp_cal*)vCal; + + all_day_event = 0; + ongoing_event=0; + + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); + if (q != NULL) { + t = icalproperty_get_dtstart(q); event_tt = icaltime_as_timet(t); - if (t.is_date) { - all_day_event = 1; - } - else { - all_day_event = 0; - } + localtime_r(&event_tt, &event_te); + } + else { + memset(&t, 0, sizeof t); + } - if (all_day_event) { - gmtime_r(&event_tt, &event_tm); - gmtime_r(&event_tt, &event_te); + if (t.is_date) all_day_event = 1; + + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (q != NULL) { + end_t = icalproperty_get_dtend(q); + } + else { + /* no end given means end = start */ + memcpy(&end_t, &t, sizeof(struct icaltimetype)); + } + + if (all_day_event) + { + show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time()); + if (icaltime_compare(t, end_t)) { + /* + * the end date is non-inclusive so adjust it by one + * day because our test is inclusive, note that a day is + * not to much because we are talking about all day + * events + */ + icaltime_adjust(&end_t, -1, 0, 0, 0); } - else { - localtime_r(&event_tt, &event_tm); - if (pe != NULL) - { - te = icalproperty_get_dtend(pe); - event_tte = icaltime_as_timet(te); - localtime_r(&event_tte, &event_te); + } + else + { + show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t); + } + + event_tte = icaltime_as_timet(end_t); + localtime_r(&event_tte, &event_tm); + + /* If we determined that this event occurs today, then display it. + */ + p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY); + if (p == NULL) { + p = icalproperty_new_summary(_("Untitled Event")); + icalcomponent_add_property(Cal->cal, p); + } + + if ((show_event) && (p != NULL)) { + + if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1; + + if (all_day_event && notime_events) + { + wc_printf("
", _("All day event")); + wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wc_printf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wc_printf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + if (!icaltime_compare(t, end_t)) { /* one day only */ + webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Date:"), buf); } - else - localtime_r(&event_tt, &event_te); + else { + webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Starting date:"), buf); + webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE); + wc_printf("%s %s
", _("Ending date:"), buf); + } + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wc_printf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + wc_printf(""); + wc_printf(" ("); + wc_printf(_("All day event")); + wc_printf(")
", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wc_printf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wc_printf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + if (!icaltime_compare(t, end_t)) { /* one day only */ + webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Date/time:"), buf); + } + else { + webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Starting date/time:"), buf); + webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF); + wc_printf("%s %s
", _("Ending date/time:"), buf); + } + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wc_printf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wc_printf("
"); + } + wc_printf(""); + wc_printf("
| \n"); + /* Innermost cell (contains hours etc.) */ + wc_printf(" | ");
+ wc_printf("
"
+ "%A | ",
+ &d_tm
+ );
+ wc_printf("%s", d_str);
+
+ /* Right arrow */
+ wc_printf("" + "%B " + "%d " + "%Y " + " ");
+ wc_printf("",
+ tomorrow.year, tomorrow.month, tomorrow.day);
+ wc_printf(" | ");
+ wc_printf("![\"%s\"](\"static/webcit_icons/essen/32x32/forward.png\""){kind=icon} \n", _("next"));
+ wc_printf(" |
![](\"static/nextdate_32x.gif\"")
\n"); + embeddable_mini_calendar(year, month); + wc_printf("
\n", timestring); + && (event_tm.tm_mon == today_tm.tm_mon) + && (event_tm.tm_mday == today_tm.tm_mday) + ) { + + p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY); + if (p == NULL) { + p = icalproperty_new_summary(_("Untitled Task")); + icalcomponent_add_property(Cal->cal, p); + } + if (p != NULL) + { + if (WCC->CurRoom.view == VIEW_TASKS) { + wc_printf(""); + } + else { + wc_printf(""); + } + escputs((char *) icalproperty_get_comment(p)); + if (!all_day_event) { + wc_printf(" (%s)", timestring); + } + wc_printf("
\n"); + ++num_displayed; } } } } - free_calendar_buffer(); + DeleteHashPos(&Pos); + DeleteHash(&WC->disp_cal_items); + return(num_displayed); } - -/** - * \brief clean up ical memory - * \todo this could get troubel with future ical versions +/* + * Parse the URL variables in order to determine the scope and display of a calendar view */ -void free_calendar_buffer(void) { - int i; - if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) { - icalcomponent_free(WC->disp_cal[i].cal); - } - WC->num_cal = 0; - free(WC->disp_cal); - WC->disp_cal = NULL; -} +int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, + void **ViewSpecific, + long oper, + char *cmd, + long len, + char *filter, + long flen) +{ + wcsession *WCC = WC; + calview *c; + time_t now; + struct tm tm; + char cv[32]; + int span = 3888000; + c = (calview*) malloc(sizeof(calview)); + memset(c, 0, sizeof(calview)); + *ViewSpecific = (void*)c; -/** - * \brief do the whole calendar page - * view any part of the calender. decide which way, etc. - */ -void do_calendar_view(void) { - time_t now; - struct tm tm; - int year, month, day; - char calview[SIZ]; + Stat->load_seen = 1; + strcpy(cmd, "MSGS ALL"); + Stat->maxmsgs = 32767; - /** In case no date was specified, go with today */ + /* In case no date was specified, go with today */ now = time(NULL); localtime_r(&now, &tm); - year = tm.tm_year + 1900; - month = tm.tm_mon + 1; - day = tm.tm_mday; - - /** Now see if a date was specified */ - if (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year")); - if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month")); - if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day")); - - /** How would you like that cooked? */ - if (!IsEmptyStr(bstr("calview"))) { - strcpy(calview, bstr("calview")); + c->year = tm.tm_year + 1900; + c->month = tm.tm_mon + 1; + c->day = tm.tm_mday; + + /* Now see if a date was specified */ + if (havebstr("year")) c->year = ibstr("year"); + if (havebstr("month")) c->month = ibstr("month"); + if (havebstr("day")) c->day = ibstr("day"); + + /* How would you like that cooked? */ + if (havebstr("calview")) { + strcpy(cv, bstr("calview")); } else { - strcpy(calview, "month"); + strcpy(cv, "month"); } - /** Display the selected view */ - if (!strcasecmp(calview, "day")) { - calendar_day_view(year, month, day); + /* Display the selected view */ + if (!strcasecmp(cv, "day")) { + c->view = calview_day; + } + else if (!strcasecmp(cv, "week")) { + c->view = calview_week; } - else if (!strcasecmp(calview, "week")) { - calendar_week_view(year, month, day); + else if (!strcasecmp(cv, "summary")) { /* shouldn't ever happen, but just in case */ + c->view = calview_day; } else { - if (WC->wc_view == VIEW_CALBRIEF) { - calendar_brief_month_view(year, month, day); + if (WCC->CurRoom.view == VIEW_CALBRIEF) { + c->view = calview_brief; } else { - calendar_month_view(year, month, day); + c->view = calview_month; } } - /** Free the calendar stuff */ - free_calendar_buffer(); - -} - - -/** - * \brief get task due date - * Helper function for do_tasks_view(). - * \param vtodo a task to get the due date - * \return the date/time due. - */ -time_t get_task_due_date(icalcomponent *vtodo) { - icalproperty *p; - - if (vtodo == NULL) { - return(0L); - } - - /** - * If we're looking at a fully encapsulated VCALENDAR - * rather than a VTODO component, recurse into the data - * structure until we get a VTODO. + /* Now try and set the lower and upper bounds so that we don't + * burn too many cpu cycles parsing data way in the past or future */ - if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) { - return get_task_due_date( - icalcomponent_get_first_component( - vtodo, ICAL_VTODO_COMPONENT - ) - ); - } - p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY); - if (p != NULL) { - return(icaltime_as_timet(icalproperty_get_due(p))); - } - else { - return(0L); - } -} + tm.tm_year = c->year - 1900; + tm.tm_mon = c->month - 1; + tm.tm_mday = c->day; + now = mktime(&tm); + if (c->view == calview_month) span = 3888000; + if (c->view == calview_brief) span = 3888000; + if (c->view == calview_week) span = 604800; + if (c->view == calview_day) span = 86400; + if (c->view == calview_summary) span = 86400; -/** - * \brief Compare the due dates of two tasks (this is for sorting) - * \param task1 first task to compare - * \param task2 second task to compare - */ -int task_due_cmp(const void *task1, const void *task2) { - time_t t1; - time_t t2; - - t1 = get_task_due_date(((struct disp_cal *)task1)->cal); - t2 = get_task_due_date(((struct disp_cal *)task2)->cal); - - if (t1 < t2) return(-1); - if (t1 > t2) return(1); - return(0); + c->lower_bound = now - span; + c->upper_bound = now + span; + return 200; } - -/** - * \brief do the whole task view stuff +/* + * Render a calendar view from data previously loaded into memory */ -void do_tasks_view(void) { - int i; - time_t due; - int bg = 0; - char buf[SIZ]; - icalproperty *p; - - wprintf("
"
- "\n
\n");
-
- /** Free the list */
- free_calendar_buffer();
-
+ /* Free the in-memory list of calendar items */
+ DeleteHash(&WC->disp_cal_items);
+ return 0;
}
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/** @} */
+void
+InitModule_CALENDAR_VIEW
+(void)
+{
+ WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+}
| "); - wprintf(_("Name of task")); - wprintf(" | "); - wprintf(_("Date due")); - wprintf(" |
|---|---|
| ",
- (bg ? "DDDDDD" : "FFFFFF")
- );
-
- p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
- ICAL_SUMMARY_PROPERTY);
- wprintf("disp_cal[i].cal_msgnum );
- urlescputs(WC->wc_roomname);
- wprintf("\">");
- wprintf(" | \n");
-
- due = get_task_due_date(WC->disp_cal[i].cal);
- fmt_date(buf, due, 0);
- wprintf("