\n"); return; } - localtime_r(&thetime, &today_tm); - month = today_tm.tm_mon + 1; - day = today_tm.tm_mday; - year = today_tm.tm_year + 1900; - - for (i=0; i<(WC->num_cal); ++i) { - fill_day_event = 0; - multi_day_event = 0; - 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); - event_tt = icaltime_as_timet(t); - if (t.is_date) all_day_event = 1; - else all_day_event = 0; + /* + * Create an imaginary event which spans the 24 hours of today. Any events which + * overlap with this one take place at least partially in this day. We have to + * convert it from a struct tm in order to make it UTC. + */ + 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; + + /* + * 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; + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); + if (q != NULL) { + t = icalproperty_get_dtstart(q); + } + else { + memset(&t, 0, sizeof t); + } + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (q != NULL) { + end_t = icalproperty_get_dtend(q); + } + else { + memset(&end_t, 0, sizeof end_t); + } + if (t.is_date) all_day_event = 1; - if (all_day_event) { - gmtime_r(&event_tt, &event_tm); - event_tm.tm_sec = 0; - event_tm.tm_min = 0; - event_tm.tm_hour = 0; - // are we today? - event_tt_stripped = mktime (&event_tm); - show_event = thetime == event_tt_stripped; - } - else { - localtime_r(&event_tt, &event_tm); - // we're not interested in the hours. - // we just want the date for easy comparison. - event_tm.tm_min = 0; - event_tm.tm_hour = 0; - event_tt_stripped = mktime (&event_tm); - if (pe != NULL) // do we have a span? - { - struct tm event_ttm; - time_t event_end_stripped; - - t = icalproperty_get_dtend(pe); - event_tte = icaltime_as_timet(t); - gmtime_r(&event_tte, &event_ttm); - event_ttm.tm_sec = 0; - event_ttm.tm_min = 0; - event_ttm.tm_hour = 0; - event_end_stripped = mktime(&event_ttm); - - // do we span ore than one day? - multi_day_event = event_tt_stripped != event_end_stripped; - - // are we in the range of the event? - show_event = ((event_tt_stripped <= thetime) && - (event_end_stripped >= thetime)); - - // are we not start or end day? - fill_day_event = ((event_tt_stripped < thetime) && - (event_end_stripped > thetime)); - } - else { - // are we today? - show_event = event_tt_stripped == thetime; - } - } + if (all_day_event) + { + show_event = ((t.year == year) && (t.month == month) && (t.day == day)); + } + else + { + show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t); + } - if (show_event) { - p = icalcomponent_get_first_property( - WC->disp_cal[i].cal, - ICAL_SUMMARY_PROPERTY); - if (p != NULL) { + /* + * If we determined that this event occurs today, then display it. + */ + if (show_event) { + p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY); + if (p != NULL) { - if (all_day_event) { - wprintf("
"
" \n
\n");
- /** Inner table (the real one) */
+ /* Inner table (the real one) */
wprintf("
" /** end of inner table */
- "" /** end of outer table */
+ wprintf("" /* end of inner table */
+ "" /* end of outer table */
"
\n");
- /**
+ /*
* Initialize the bubble tooltips.
*
* Yes, this is as stupid as it looks. Instead of just making the call
@@ -471,17 +614,13 @@ void calendar_month_view(int year, int month, int day) {
* being rendered. See http://www.shaftek.org/blog/archives/000212.html
* for more information.
*/
- wprintf("\n"
+ StrBufAppendPrintf(WC->trailing_javascript,
+ " setTimeout(\"btt_enableTooltips('inner_month')\", 1); \n"
);
}
-/**
- * \brief view one month. brief view
- * \param year the year
- * \param month the month
- * \param day the actual day we want to see
+/*
+ * view one month. brief view
*/
void calendar_brief_month_view(int year, int month, int day) {
struct tm starting_tm;
@@ -492,7 +631,7 @@ void calendar_brief_month_view(int year, int month, int day) {
time_t next_month;
char month_label[32];
- /** Determine what day to start.
+ /* Determine what day to start.
* First, back up to the 1st of the month...
*/
memset(&starting_tm, 0, sizeof(struct tm));
@@ -507,18 +646,18 @@ void calendar_brief_month_view(int year, int month, int day) {
localtime_r(&thetime, &tm);
}
- /** Determine previous and next months ... for links */
+ /* Determine previous and next months ... for links */
previous_month = thetime - (time_t)864000L; /* back 10 days */
next_month = thetime + (time_t)(31L * 86400L); /* ahead 31 days */
- /** Now back up until we're on a Sunday */
+ /* Now back up until we're on a Sunday */
localtime_r(&thetime, &tm);
while (tm.tm_wday != 0) {
thetime = thetime - (time_t)86400; /* go back 24 hours */
localtime_r(&thetime, &tm);
}
- /** Outer table (to get the background color) */
+ /* Outer table (to get the background color) */
wprintf("| "); @@ -374,7 +519,7 @@ void calendar_month_view(int year, int month, int day) { wprintf(" | ");
localtime_r(&previous_month, &tm);
- wprintf("",
+ wprintf("",
(int)(tm.tm_year)+1900, tm.tm_mon + 1);
wprintf("![](\"static/prevdate_32x.gif\") \n");
@@ -386,13 +531,13 @@ void calendar_month_view(int year, int month, int day) {
" ", colheader_label, year);
localtime_r(&next_month, &tm);
- wprintf("",
+ wprintf("",
(int)(tm.tm_year)+1900, tm.tm_mon + 1);
wprintf("![](\"static/nextdate_32x.gif\") \n");
wprintf(" |
| " + wprintf(" | " "%s | ", colheader_label); } wprintf("
|---|---|
",
- ((tm.tm_mon != month-1) ? "out" :
+ wprintf(" | ");
-
- /** After displaying Saturday, end the row */
- if ((i % 7) == 6) {
- wprintf("",
+ ((tm.tm_mon != month-1) ? "out" :
((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" :
- "day"))
+ "day"))
);
- if ((i==0) || (tm.tm_mday == 1)) {
- wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
- wprintf("%s ", colheader_label);
- }
- wprintf(""
- "%d ",
- tm.tm_year + 1900,
- tm.tm_mon + 1,
- tm.tm_mday,
- tm.tm_mday);
+ if ((i==0) || (tm.tm_mday == 1)) {
+ wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
+ wprintf("%s ", colheader_label);
+ }
+ wprintf(""
+ "%d",
+ tm.tm_year + 1900,
+ tm.tm_mon + 1,
+ tm.tm_mday,
+ tm.tm_mday);
- /** put the data here, stupid */
- calendar_month_view_display_events(thetime);
+ /* put the data here, stupid */
+ calendar_month_view_display_events(
+ tm.tm_year + 1900,
+ tm.tm_mon + 1,
+ tm.tm_mday
+ );
- wprintf(" |
"
"
\n");
- /** Inner table (the real one) */
+ /* Inner table (the real one) */
wprintf("
" /** end of outer table */
+ wprintf("" /* end of inner table */
+ "" /* end of outer table */
"
\n");
}
-/**
- * \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("| \n"); @@ -528,7 +667,7 @@ void calendar_brief_month_view(int year, int month, int day) { wprintf(" | ");
localtime_r(&previous_month, &tm);
- wprintf("",
+ wprintf("",
(int)(tm.tm_year)+1900, tm.tm_mon + 1);
wprintf("\n");
@@ -540,19 +679,19 @@ void calendar_brief_month_view(int year, int month, int day) {
" ", month_label, year);
localtime_r(&next_month, &tm);
- wprintf("",
+ wprintf("",
(int)(tm.tm_year)+1900, tm.tm_mon + 1);
wprintf("\n");
wprintf(" |
| \n"); + wprintf(" | |||||||||||||||||||||||
\n");
- /** Now do 35 days */
+ /* Now do 35 days */
for (i = 0; i < 35; ++i) {
char weeknumber[255];
char weekday_name[32];
@@ -560,239 +699,367 @@ void calendar_brief_month_view(int year, int month, int day) {
localtime_r(&thetime, &tm);
- /** Before displaying Sunday, start a new CELL */
+ /* Before displaying Sunday, start a new CELL */
if ((i % 7) == 0) {
wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
- wprintf("
| |||||||||||||||||||||||
\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 - * \param inner a flag to display between daystart and dayend - * (Specify inner to 1 to show inner events) - * (Specify inner to 0 to show "all day events and events after dayend) - * \param dstart daystart + * + * 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 inner, int dstart) { - int i; - icalproperty *p; - icalproperty *l; - icalproperty *n; - 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 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]; + struct tm d_tm; + char d_str[32]; + + 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; + + /* 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); + } + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (q != NULL) { + end_t = icalproperty_get_dtend(q); + event_tte = icaltime_as_timet(end_t); + localtime_r(&event_tte, &event_tm); + } + else { + memset(&end_t, 0, sizeof end_t); + } + if (t.is_date) all_day_event = 1; - if (all_day_event) { - gmtime_r(&event_tt, &event_tm); - gmtime_r(&event_tt, &event_te); + if (all_day_event) + { + show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events)); + } + else + { + show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t); + } + + /* If we determined that this event occurs today, then display it. + */ + p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY); + + 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) + { + wprintf("
", _("All day event")); + wprintf("%s: %s
", _("From"), Cal->from); + wprintf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wprintf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wprintf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + memset(&d_tm, 0, sizeof d_tm); + d_tm.tm_year = t.year - 1900; + d_tm.tm_mon = t.month - 1; + d_tm.tm_mday = t.day; + wc_strftime(d_str, sizeof d_str, "%x", &d_tm); + wprintf("%s %s
",_("Date:"), d_str); + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wprintf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + wprintf("\">"); + escputs((char *) icalproperty_get_comment(p)); + wprintf(" ("); + wprintf(_("All day event")); + wprintf(")
", _("Ongoing event")); + wprintf("%s: %s
", _("From"), Cal->from); + wprintf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wprintf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wprintf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + webcit_fmt_date(buf, event_tt, 1); + wprintf("%s %s
", _("Starting date/time:"), buf); + webcit_fmt_date(buf, event_tte, 1); + wprintf("%s %s
", _("Ending date/time:"), buf); + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wprintf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + wprintf("\">"); + escputs((char *) icalproperty_get_comment(p)); + wprintf(" ("); + wprintf(_("Ongoing event")); + wprintf(")
"); - - l = icalcomponent_get_first_property( - WC->disp_cal[i].cal, - ICAL_LOCATION_PROPERTY); - if (l) { - wprintf("%s ", _("Location:")); - escputs((char *)icalproperty_get_comment(l)); - wprintf("
"); - } - n = icalcomponent_get_first_property( - WC->disp_cal[i].cal, - ICAL_DESCRIPTION_PROPERTY); - if (n) { - wprintf("%s ", _("Notes:")); - escputs((char *)icalproperty_get_comment(n)); - wprintf("
"); - } - wprintf("\">"); - escputs((char *) - icalproperty_get_comment(p)); - wprintf("
", _("From"), Cal->from); + wprintf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + wprintf("
"); + q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); + if (q) { + wprintf("%s ", _("Location:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + webcit_fmt_date(buf, event_tt, 1); + wprintf("%s %s
", _("Starting date/time:"), buf); + webcit_fmt_date(buf, event_tte, 1); + wprintf("%s %s
", _("Ending date/time:"), buf); + q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); + if (q) { + wprintf("%s ", _("Notes:")); + escputs((char *)icalproperty_get_comment(q)); + wprintf("
"); + } + wprintf("\">"); + + escputs((char *) icalproperty_get_comment(p)); + wprintf("
");
- /** Inner table (the real one) */
+ /* Inner table (the real one) */
wprintf("
" /** end of inner table */
+ wprintf("" /* end of inner table */
"
");
- wprintf("\n"
+ StrBufAppendPrintf(WC->trailing_javascript,
+ " setTimeout(\"btt_enableTooltips('inner_day')\", 1); \n"
);
+}
-}
-/**
- * \brief Display today's events.
+/*
+ * Display today's events.
*/
void calendar_summary_view(void) {
- int i;
+ long hklen;
+ const char *HashKey;
+ void *vCal;
+ HashPos *Pos;
+ disp_cal *Cal;
icalproperty *p;
struct icaltimetype t;
time_t event_tt;
@@ -952,17 +1257,19 @@ void calendar_summary_view(void) {
time_t now;
int all_day_event = 0;
char timestring[SIZ];
+ wcsession *WCC = WC;
- if (WC->num_cal == 0) {
+ if (GetCount(WC->disp_cal_items) == 0) {
return;
}
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);
@@ -982,99 +1289,146 @@ 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)
- ) {
-
+ && (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);
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
- escputs((char *)
- icalproperty_get_comment(p));
- wprintf(" (%s)");
- wprintf("
| "); /** end extra on the middle */
+ wprintf(""); /* begin stuff-on-the-right */ - wprintf(" | "); /** begin stuff-on-the-right */
-
- /** Begin todays-date-with-left-and-right-arrows */
+ /* Begin todays-date-with-left-and-right-arrows */
wprintf("
\n"); + embeddable_mini_calendar(year, month, "readfwd?calview=day?year=%d?month=%d?day=%d"); wprintf("\n"); - wprintf(" |
![](\"static/nextdate_32x.gif\"")
\n", timestring); + + + if (WCC->wc_view == VIEW_TASKS) { + wprintf(""); + } + else { + wprintf(""); + } + escputs((char *) icalproperty_get_comment(p)); + wprintf(" (%s)
\n", timestring); } } } } - free_calendar_buffer(); + DeleteHashPos(&Pos); + DeleteHash(&WC->disp_cal_items); } - -/** - * \brief clean up ical memory - * \todo this could get troubel with future ical versions - */ -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; -} - - - -/** - * \brief do the whole calendar page - * view any part of the calender. decide which way, etc. +/* + * Parse the URL variables in order to determine the scope and display of a calendar view */ -void do_calendar_view(void) { +void parse_calendar_view_request(struct calview *c) { time_t now; struct tm tm; - int year, month, day; - char calview[SIZ]; + char calview[32]; + int span = 3888000; - /** 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; + 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 (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year")); - if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month")); - if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day")); + /* 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 (!IsEmptyStr(bstr("calview"))) { + /* How would you like that cooked? */ + if (havebstr("calview")) { strcpy(calview, bstr("calview")); } else { strcpy(calview, "month"); } - /** Display the selected view */ + /* Display the selected view */ if (!strcasecmp(calview, "day")) { - calendar_day_view(year, month, day); + c->view = calview_day; } else if (!strcasecmp(calview, "week")) { - calendar_week_view(year, month, day); + c->view = calview_week; + } + else if (!strcasecmp(calview, "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); + c->view = calview_brief; } else { - calendar_month_view(year, month, day); + c->view = calview_month; } } - /** Free the calendar stuff */ - free_calendar_buffer(); + /* 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 + */ + + 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; + + c->lower_bound = now - span; + c->upper_bound = now + span; } -/** - * \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. + +/* + * Render a calendar view from data previously loaded into memory + */ +void render_calendar_view(struct calview *c) +{ + if (c->view == calview_day) { + calendar_day_view(c->year, c->month, c->day); + } + else if (c->view == calview_week) { + calendar_week_view(c->year, c->month, c->day); + } + else { + if (WC->wc_view == VIEW_CALBRIEF) { + calendar_brief_month_view(c->year, c->month, c->day); + } + else { + calendar_month_view(c->year, c->month, c->day); + } + } + + /* Free the in-memory list of calendar items */ + DeleteHash(&WC->disp_cal_items); +} + + +/* + * Helper function for do_tasks_view(). Returns the due date/time of a vtodo. */ time_t get_task_due_date(icalcomponent *vtodo) { icalproperty *p; @@ -1083,7 +1437,7 @@ time_t get_task_due_date(icalcomponent *vtodo) { 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. @@ -1092,8 +1446,8 @@ time_t get_task_due_date(icalcomponent *vtodo) { return get_task_due_date( icalcomponent_get_first_component( vtodo, ICAL_VTODO_COMPONENT - ) - ); + ) + ); } p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY); @@ -1106,108 +1460,132 @@ time_t get_task_due_date(icalcomponent *vtodo) { } -/** - * \brief Compare the due dates of two tasks (this is for sorting) - * \param task1 first task to compare - * \param task2 second task to compare +/* + * Compare the due dates of two tasks (this is for sorting) */ -int task_due_cmp(const void *task1, const void *task2) { +int task_due_cmp(const void *vtask1, const void *vtask2) { + disp_cal * Task1 = (disp_cal *)GetSearchPayload(vtask1); + disp_cal * Task2 = (disp_cal *)GetSearchPayload(vtask2); + 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); - + t1 = get_task_due_date(Task1->cal); + t2 = get_task_due_date(Task2->cal); if (t1 < t2) return(-1); if (t1 > t2) return(1); return(0); } +/* + * qsort filter to move completed tasks to bottom of task list + */ +int task_completed_cmp(const void *vtask1, const void *vtask2) { + disp_cal * Task1 = (disp_cal *)GetSearchPayload(vtask1); +/* disp_cal * Task2 = (disp_cal *)GetSearchPayload(vtask2); */ + + icalproperty_status t1 = icalcomponent_get_status((Task1)->cal); + /* icalproperty_status t2 = icalcomponent_get_status(((struct disp_cal *)task2)->cal); */ + + if (t1 == ICAL_STATUS_COMPLETED) + return 1; + return 0; +} -/** - * \brief do the whole task view stuff +/* + * do the whole task view stuff */ void do_tasks_view(void) { - int i; + long hklen; + const char *HashKey; + void *vCal; + disp_cal *Cal; + HashPos *Pos; + int nItems; time_t due; - int bg = 0; char buf[SIZ]; icalproperty *p; + wcsession *WCC = WC; wprintf("
"
- "\n
\n");
-/**\brief stub for non-libical builds */
-void do_tasks_view(void) {
- wprintf("| "); + wprintf(_("Completed?")); + wprintf(" | "); wprintf(_("Name of task")); wprintf(" | "); wprintf(_("Date due")); - wprintf(" | "); + wprintf(_("Category")); + wprintf(" () | \n", + _("Show All")); - /** Sort them if necessary */ - if (WC->num_cal > 1) { - qsort(WC->disp_cal, - WC->num_cal, - sizeof(struct disp_cal), - task_due_cmp - ); + nItems = GetCount(WC->disp_cal_items); + + /* Sort them if necessary + if (nItems > 1) { + SortByPayload(WC->disp_cal_items, task_due_cmp); } + * this shouldn't be neccessary, since we sort by the start time. + */ - if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) { + /* And then again, by completed */ + if (nItems > 1) { + SortByPayload(WC->disp_cal_items, + task_completed_cmp); + } - bg = 1 - bg; - wprintf("||
|---|---|---|---|---|---|
",
- (bg ? "DDDDDD" : "FFFFFF")
- );
+ Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+ while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ icalproperty_status todoStatus;
- p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
- ICAL_SUMMARY_PROPERTY);
- wprintf("disp_cal[i].cal_msgnum );
- urlescputs(WC->wc_roomname);
+ Cal = (disp_cal*)vCal;
+ wprintf("| ");
+ todoStatus = icalcomponent_get_status(Cal->cal);
+ wprintf("\n | ");
+ p = icalcomponent_get_first_property(Cal->cal,
+ ICAL_SUMMARY_PROPERTY);
+ wprintf("cal_msgnum);
+ urlescputs(ChrPtr(WC->wc_roomname));
wprintf("\">");
- wprintf(" | \n");
- due = get_task_due_date(WC->disp_cal[i].cal);
- fmt_date(buf, due, 0);
- wprintf(" | ");
+ wprintf(""); + p = icalcomponent_get_first_property(Cal->cal, + ICAL_CATEGORIES_PROPERTY); + if (p != NULL) { + escputs((char *)icalproperty_get_categories(p)); + } + wprintf(" | "); + wprintf("
\n"); -} + wprintf("
\n"); + /* Free the list */ + DeleteHash(&WC->disp_cal_items); + DeleteHashPos(&Pos); } - -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */ - -/** @} */