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 all_day_event = 0;
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.
*/
if (all_day_event)
{
- show_event = ((t.year == year) && (t.month == month) && (t.day == day));
+ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
}
else
{
*/
if (show_event) {
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 (p != NULL) {
if (all_day_event) {
q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
if (q != NULL) {
+ int no_end = 0;
+
t = icalproperty_get_dtstart(q);
-
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+ if (q != NULL) {
+ end_t = icalproperty_get_dtend(q);
+ }
+ else {
+ /*
+ * events with starting date/time equal
+ * ending date/time might get only
+ * DTSTART but no DTEND
+ */
+ no_end = 1;
+ }
+
if (t.is_date) {
+ /* all day event */
struct tm d_tm;
- char d_str[32];
+
+ if (!no_end) {
+ /* end given, have to adjust it */
+ icaltime_adjust(&end_t, -1, 0, 0, 0);
+ }
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("<i>%s</i> %s<br>",
- _("Date:"), d_str);
+ wc_strftime(buf, sizeof buf, "%x", &d_tm);
+
+ if (no_end || !icaltime_compare(t, end_t)) {
+ wprintf("<i>%s</i> %s<br>",
+ _("Date:"), buf);
+ }
+ else {
+ wprintf("<i>%s</i> %s<br>",
+ _("Starting date:"), buf);
+ d_tm.tm_year = end_t.year - 1900;
+ d_tm.tm_mon = end_t.month - 1;
+ d_tm.tm_mday = end_t.day;
+ wc_strftime(buf, sizeof buf, "%x", &d_tm);
+ wprintf("<i>%s</i> %s<br>",
+ _("Ending date:"), buf);
+ }
}
else {
tt = icaltime_as_timet(t);
- webcit_fmt_date(buf, tt, 1);
- wprintf("<i>%s</i> %s<br>",
- _("Starting date/time:"), buf);
-
- /*
- * Embed the 'show end date/time' loop inside here so it
- * only executes if this is NOT an all day event.
- */
- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
- if (q != NULL) {
- t = icalproperty_get_dtend(q);
- tt = icaltime_as_timet(t);
- webcit_fmt_date(buf, tt, 1);
+ webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
+ if (no_end || !icaltime_compare(t, end_t)) {
+ wprintf("<i>%s</i> %s<br>",
+ _("Date/time:"), buf);
+ }
+ else {
+ wprintf("<i>%s</i> %s<br>",
+ _("Starting date/time:"), buf);
+ tt = icaltime_as_timet(end_t);
+ webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
}
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);
+ }
e = icalcomponent_get_first_property(
Cal->cal,
ICAL_DTEND_PROPERTY);
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 endmin = 0;
char buf[256];
- struct tm d_tm;
- char d_str[32];
if (GetCount(WCC->disp_cal_items) == 0) {
/* nothing to display */
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);
else {
memset(&t, 0, sizeof t);
}
+
+ 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);
- event_tte = icaltime_as_timet(end_t);
- localtime_r(&event_tte, &event_tm);
}
else {
- memset(&end_t, 0, sizeof end_t);
+ /* no end given means end = start */
+ memcpy(&end_t, &t, sizeof(struct icaltimetype));
}
- if (t.is_date) all_day_event = 1;
if (all_day_event)
{
- show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
+ 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
{
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)) {
wprintf("<i>%s</i> ", _("Location:"));
escputs((char *)icalproperty_get_comment(q));
wprintf("<br />");
- }
- 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("<i>%s</i> %s<br>",_("Date:"), d_str);
+ }
+ if (!icaltime_compare(t, end_t)) { /* one day only */
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+ wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
+ }
+ else {
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+ wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
+ wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
+ }
q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
if (q) {
wprintf("<i>%s</i> ", _("Notes:"));
escputs((char *)icalproperty_get_comment(q));
wprintf("<br />");
}
- webcit_fmt_date(buf, event_tt, 1);
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
- webcit_fmt_date(buf, event_tte, 1);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
if (q) {
escputs((char *)icalproperty_get_comment(q));
wprintf("<br />");
}
- webcit_fmt_date(buf, event_tt, 1);
- wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
- webcit_fmt_date(buf, event_tte, 1);
- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+ if (!icaltime_compare(t, end_t)) { /* one day only */
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+ wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
+ }
+ else {
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+ wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
+ wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+ }
q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
if (q) {
wprintf("<i>%s</i> ", _("Notes:"));
int timeline = TIMELINE;
int extratimeline = EXTRATIMELINE;
int gap = 0;
+ int hourlabel;
+ int extrahourlabel;
time_format = get_time_format_cached ();
get_pref_long("daystart", &daystart, 8);
/* Now the middle of the day... */
+ extrahourlabel = extratimeline - 2;
+ hourlabel = extrahourlabel * 150 / 100;
+ if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
+
for (hour = 0; hour < daystart; ++hour) { /* could do HEIGHT=xx */
wprintf("<dt class=\"extrahour\" "
"style=\" "
"?calview=day?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
(hour * extratimeline ),
extratimeline,
- extratimeline - 2,
+ extrahourlabel,
year, month, day, hour
);
}
else {
wprintf("%d:00%s</a> ",
- (hour <= 12 ? hour : hour-12),
+ ((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)),
(hour < 12 ? "am" : "pm")
);
}
"?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
gap + ((hour - daystart) * timeline ),
timeline,
- timeline - 2,
+ hourlabel,
year, month, day, hour
);
"position: absolute; "
"top: %ldpx; left: 0px; "
"height: %dpx; "
+ "font-size: %dpx; "
"\" > "
"<a href=\"display_edit_event?msgnum=0?calview=day"
"?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
- gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
+ gap + ((hour - dayend - 1) * extratimeline ),
+ extratimeline,
+ extrahourlabel,
year, month, day, hour
);
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);
) {
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) {
/*
* Helper function for do_tasks_view(). Returns the due date/time of a vtodo.
*/
-time_t get_task_due_date(icalcomponent *vtodo) {
+time_t get_task_due_date(icalcomponent *vtodo, int *is_date) {
icalproperty *p;
if (vtodo == NULL) {
return get_task_due_date(
icalcomponent_get_first_component(
vtodo, ICAL_VTODO_COMPONENT
- )
+ ), is_date
);
}
p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
if (p != NULL) {
- return(icaltime_as_timet(icalproperty_get_due(p)));
+ struct icaltimetype t = icalproperty_get_due(p);
+
+ if (is_date)
+ *is_date = t.is_date;
+ return(icaltime_as_timet(t));
}
else {
return(0L);
time_t t1;
time_t t2;
- t1 = get_task_due_date(Task1->cal);
- t2 = get_task_due_date(Task2->cal);
+ t1 = get_task_due_date(Task1->cal, NULL);
+ t2 = get_task_due_date(Task2->cal, NULL);
if (t1 < t2) return(-1);
if (t1 > t2) return(1);
return(0);
Pos = GetNewHashPos(WCC->disp_cal_items, 0);
while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
icalproperty_status todoStatus;
+ int is_date;
Cal = (disp_cal*)vCal;
wprintf("<tr><td>");
wprintf("</a>\n");
wprintf("</td>\n");
- due = get_task_due_date(Cal->cal);
+ due = get_task_due_date(Cal->cal, &is_date);
wprintf("<td><span");
if (due > 0) {
- webcit_fmt_date(buf, due, 0);
+ webcit_fmt_date(buf, SIZ, due, is_date ? DATEFMT_RAWDATE : DATEFMT_FULL);
wprintf(">%s",buf);
}
else {