-/*
+ /*
* $Id$
*/
/**
/****************************************************************************/
+
+void embeddable_mini_calendar(int year, int month, char *urlformat)
+{
+ struct tm starting_tm;
+ struct tm tm;
+ time_t thetime;
+ int i, len;
+ time_t previous_month;
+ time_t next_month;
+ time_t colheader_time;
+ struct tm colheader_tm;
+ char colheader_label[32];
+ int weekstart = 0;
+ char weekstart_buf[16];
+ char url[256];
+ char div_id[256];
+ char escaped_urlformat[256];
+
+ snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
+
+ /* Determine what day to start.
+ */
+ get_preference("weekstart", weekstart_buf, sizeof weekstart_buf);
+ weekstart = atoi(weekstart_buf);
+
+ /*
+ * Now back up to the 1st of the month...
+ */
+ memset(&starting_tm, 0, sizeof(struct tm));
+
+ starting_tm.tm_year = year - 1900;
+ starting_tm.tm_mon = month - 1;
+ starting_tm.tm_mday = 1;
+ thetime = mktime(&starting_tm);
+
+ memcpy(&tm, &starting_tm, sizeof(struct tm));
+ while (tm.tm_mday != 1) {
+ thetime = thetime - (time_t)86400; /* go back 24 hours */
+ localtime_r(&thetime, &tm);
+ }
+
+ /** 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 the user's preferred start day */
+ localtime_r(&thetime, &tm);
+ while (tm.tm_wday != weekstart) {
+ thetime = thetime - (time_t)86400; /* go back 24 hours */
+ localtime_r(&thetime, &tm);
+ }
+
+ wprintf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
+
+ /* Previous month link */
+ localtime_r(&previous_month, &tm);
+ wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">«</a>",
+ (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+ wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
+ wprintf(" "
+ "<span class=\"mini_calendar_month_label\">"
+ "%s %d"
+ "</span>"
+ " ", colheader_label, year);
+
+ /* Next month link */
+ localtime_r(&next_month, &tm);
+ wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">»</a>",
+ (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+ wprintf("<table border=0 cellpadding=1 cellspacing=1 class=\"mini_calendar_days\">"
+ "<tr>");
+ colheader_time = thetime;
+ for (i=0; i<7; ++i) {
+ colheader_time = thetime + (i * 86400) ;
+ localtime_r(&colheader_time, &colheader_tm);
+ wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
+ wprintf("<th>%c</th>", colheader_label[0]);
+
+ }
+ wprintf("</tr>\n");
+
+
+ /** Now do 35 or 42 days */
+ for (i = 0; i < 42; ++i) {
+ localtime_r(&thetime, &tm);
+
+ if (i < 35) {
+
+ /** Before displaying Sunday, start a new row */
+ if ((i % 7) == 0) {
+ wprintf("<tr>");
+ }
+
+ if (tm.tm_mon == month-1) {
+ snprintf(url, sizeof url, urlformat,
+ tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
+ wprintf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+ }
+ else {
+ wprintf("<td> </td>");
+ }
+
+ /** After displaying one week, end the row */
+ if ((i % 7) == 6) {
+ wprintf("</tr>\n");
+ }
+
+ }
+
+ thetime += (time_t)86400; /** ahead 24 hours */
+ }
+
+ wprintf("</table>" /** end of inner table */
+ "</div>\n");
+
+ /* javascript for previous and next month */
+ len = strlen(urlformat);
+ for (i=0; i<len; ++i) {
+ sprintf(&escaped_urlformat[i*2], "%02X", urlformat[i]);
+ }
+
+ wprintf("<script type=\"text/javascript\"> "
+ " function minical_change_month(year, month) { "
+ " p = 'year=' + year + '&month=' + month "
+ " + '&urlformat=%s&r=' + CtdlRandomString(); "
+ " new Ajax.Updater('%s', 'mini_calendar', "
+ " { method: 'get', parameters: p, evalScripts: true } ); "
+ " } "
+ "</script>\n"
+ ,
+ escaped_urlformat, div_id
+ );
+
+}
+
+/* ajax embedder for the above mini calendar */
+void ajax_mini_calendar(void) {
+ char urlformat[256];
+ int i, len;
+ char *escaped_urlformat;
+
+ escaped_urlformat = bstr("urlformat");
+ len = strlen(escaped_urlformat) * 2 ;
+ for (i=0; i<len; ++i) {
+ urlformat[i] = xtoi(&escaped_urlformat[i*2], 2);
+ urlformat[i+1] = 0;
+ }
+
+ embeddable_mini_calendar( atoi(bstr("year")), atoi(bstr("month")), urlformat );
+}
+
+
/**
* \brief Display one day of a whole month view of a calendar
* \param thetime the month we want to see
*/
-void calendar_month_view_display_events(time_t thetime) {
+void calendar_month_view_display_events(int year, int month, int day)
+{
int i;
- struct tm today_tm;
icalproperty *p = NULL;
icalproperty *q = NULL;
struct icaltimetype t;
- int month, day, year;
+ struct icaltimetype end_t;
+ struct icaltimetype today_start_t;
+ struct icaltimetype today_end_t;
+ struct tm starting_tm;
+ struct tm ending_tm;
int all_day_event = 0;
- int multi_day_event = 0;
- int fill_day_event = 0;
int show_event = 0;
- time_t tt;
- time_t dst_day;
char buf[256];
- struct wcsession *WCC;
+ struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
struct disp_cal *Cal;
-
- WCC = WC;
+ time_t tt;
if (WCC->num_cal == 0) {
wprintf("<br /><br /><br />\n");
return;
}
- localtime_r(&thetime, &today_tm);
- month = today_tm.tm_mon + 1;
- day = today_tm.tm_mday;
- year = today_tm.tm_year + 1900;
- dst_day = thetime - 3600;
+ /* 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.
+ */
for (i=0; i<(WCC->num_cal); ++i) {
- fill_day_event = 0;
- multi_day_event = 0;
-
Cal = &WCC->disp_cal[i];
- all_day_event = Cal->start_hour == -1;
- show_event = thetime == Cal->start_day;
-// lprintf(1,"Date: %d %d %d %d\n", thetime, Cal->start_day, day, thetime - Cal->start_day);
- if (!all_day_event) {
-
- // are we in the range of the event?
- show_event = (Cal->start_day <= thetime) &&
- (Cal->end_day >= thetime);
- if (!show_event)
- // are we in the range of the event?
- show_event = (Cal->start_day <= dst_day) &&
- (Cal->end_day >= dst_day);
-
- // are we not start or end day?
- fill_day_event = (Cal->start_day < thetime) &&
- (Cal->end_day > thetime);
+ 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)
+ {
+ 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 we determined that this event occurs today, then display it.
+ */
if (show_event) {
- p = icalcomponent_get_first_property(
- Cal->cal,
- ICAL_SUMMARY_PROPERTY);
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
if (all_day_event) {
wprintf("<font size=-1>"
"<a href=\"display_edit_event?"
- "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
+ "msgnum=%ld&calview=month&year=%d&month=%d&day=%d\""
" btt_tooltext=\"",
WC->disp_cal[i].cal_msgnum,
- bstr("calview"),
- bstr("year"),
- bstr("month"),
- bstr("day")
- );
+ year, month, day
+ );
wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *)icalproperty_get_comment(p));
*/
if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
- q = icalcomponent_get_first_property(Cal->cal,
- ICAL_DTSTART_PROPERTY);
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
if (q != NULL) {
t = icalproperty_get_dtstart(q);
}
else {
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 1);
+ 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);
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
if (q != NULL) {
t = icalproperty_get_dtend(q);
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 1);
- wprintf("<i>%s</i> %s<br>",
- _("Ending date/time:"), buf);
+ webcit_fmt_date(buf, tt, 1);
+ wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
}
}
}
- q = icalcomponent_get_first_property(
- Cal->cal,
- ICAL_DESCRIPTION_PROPERTY);
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY);
if (q) {
wprintf("<i>%s</i> ", _("Notes:"));
escputs((char *)icalproperty_get_comment(q));
minutes=difftime % 60;
wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
"<font size=-1>"
- "<a href=\"display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+ "<a href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
daycolor,
hours, minutes,
daycolor,
WC->disp_cal[i].cal_msgnum,
- bstr("calview"),
bstr("year"),
bstr("month"),
bstr("day")
struct tm colheader_tm;
char colheader_label[32];
int chg_month = 0;
+ int weekstart = 0;
+ char weekstart_buf[16];
- /** Determine what day to start.
- * First, back up to the 1st of the month...
+ /* Determine what day to start.
+ */
+ get_preference("weekstart", weekstart_buf, sizeof weekstart_buf);
+ weekstart = atoi(weekstart_buf);
+
+ /*
+ * Now back up to the 1st of the month...
*/
memset(&starting_tm, 0, sizeof(struct tm));
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 the user's preferred start day */
localtime_r(&thetime, &tm);
- while (tm.tm_wday != 0) {
+ while (tm.tm_wday != weekstart) {
thetime = thetime - (time_t)86400; /* go back 24 hours */
localtime_r(&thetime, &tm);
}
colheader_time = thetime + (i * 86400) ;
localtime_r(&colheader_time, &colheader_tm);
wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
- wprintf("<td align=center width=14%%>"
+ wprintf("<th align=center width=14%%>"
"<font color=\"#FFFFFF\">%s</font></th>", colheader_label);
}
tm.tm_mday);
/** put the data here, stupid */
- calendar_month_view_display_events(thetime);
+ calendar_month_view_display_events(
+ tm.tm_year + 1900,
+ tm.tm_mon + 1,
+ tm.tm_mday
+ );
wprintf("</td>");
* \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
+ * \param dend dayend
*/
-void calendar_day_view_display_events(time_t thetime, int year, int month,
- int day, int hour,
- int inner, int dstart) {
+void calendar_day_view_display_events(time_t thetime,
+ int year,
+ int month,
+ int day,
+ int notime_events,
+ int dstart,
+ int dend)
+{
int i;
- icalproperty *p;
- time_t event_start;
- time_t event_end;
- icalproperty *l;
- icalproperty *n;
+ 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;
- struct wcsession *WCC;
+ int ongoing_event = 0;
+ struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
struct disp_cal *Cal;
-
- WCC = WC;
+ 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 (WCC->num_cal == 0) {
- // \todo FIXME wprintf("<br /><br /><br />\n");
+ /* nothing to display */
return;
}
- event_start = thetime + 60 * 60 * hour;
- event_end = thetime + 60 * 60 * (hour + 1);
-
+ /* 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.
+ */
for (i=0; i<(WCC->num_cal); ++i) {
Cal = &WCC->disp_cal[i];
- all_day_event = Cal->start_hour == -1;
- show_event = 0;
- if (! all_day_event && inner)
- {
- show_event = (thetime == Cal->start_day) &&
- (event_start <= Cal->start_hour) &&
- ((Cal->end_hour != -1)?
- (Cal->end_hour < event_end) : 1);
+ 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);
+ 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)
+ {
+ show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
}
else
{
- show_event = !inner && (Cal->start_day == thetime);
+ 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 (all_day_event) {
- wprintf("<dd><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
- Cal->cal_msgnum,year, month, day, hour);
+
+ if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1;
+
+ if (all_day_event && notime_events)
+ {
+ wprintf("<li class=\"event\"> "
+ "<a href=\"display_edit_event?"
+ "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
+ " class=\"event_title\" "
+ " btt_tooltext=\"",
+ Cal->cal_msgnum, year, month, day);
+ wprintf("<i>%s</i><br />", _("All day event"));
+ wprintf("<i>%s</i> ", _("Summary:"));
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("<br />");
+ q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+ if (q) {
+ 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);
+ 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 />");
+ }
+ wprintf("\">");
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("</a> <span>(");
+ wprintf(_("All day event"));
+ wprintf(")</span></li>\n");
+ }
+ else if (ongoing_event && notime_events)
+ {
+ wprintf("<li class=\"event\"> "
+ "<a href=\"display_edit_event?"
+ "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
+ " class=\"event_title\" "
+ "btt_tooltext=\"",
+ Cal->cal_msgnum, year, month, day);
+ wprintf("<i>%s</i><br />", _("Ongoing event"));
+ wprintf("<i>%s</i> ", _("Summary:"));
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("<br />");
+ q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+ if (q) {
+ wprintf("<i>%s</i> ", _("Location:"));
+ 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);
+ 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 />");
+ }
+ wprintf("\">");
escputs((char *) icalproperty_get_comment(p));
- wprintf("</a></dd>\n");
+ wprintf("</a> <span>(");
+ wprintf(_("Ongoing event"));
+ wprintf(")</span></li>\n");
}
- else {
+ else if (!all_day_event && !notime_events)
+ {
+ gap++;
+
+ if (event_te.tm_mday != day) event_te.tm_hour = 0;
+ if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
+
+ /* Calculate the location of the top of the box */
+ if (event_te.tm_hour < dstart) {
+ startmin = diffmin = event_te.tm_min / 6;
+ top = (event_te.tm_hour * 10) + startmin;
+ }
+ else if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend)) {
+ startmin = diffmin = (event_te.tm_min / 2);
+ top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin;
+ }
+ else if (event_te.tm_hour >dend) {
+ startmin = diffmin = event_te.tm_min / 6;
+ top = (dstart * 10) + ((dend - dstart - 1) * 30) + ((event_tm.tm_hour - dend + 1) * 10) + startmin ;
+ }
+ else {
+ /* should never get here */
+ }
+
+ /* Calculate the location of the bottom of the box */
+ if (event_tm.tm_hour < dstart) {
+ endmin = diffmin = event_tm.tm_min / 6;
+ bottom = (event_tm.tm_hour * 10) + endmin;
+ }
+ else if ((event_tm.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+ endmin = diffmin = (event_tm.tm_min / 2);
+ bottom = (dstart * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin ;
+ }
+ else if (event_tm.tm_hour >dend) {
+ endmin = diffmin = event_tm.tm_min / 6;
+ bottom = (dstart * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin;
+ }
+ else {
+ /* should never get here */
+ }
+
wprintf("<dd class=\"event\" "
"style=\"position: absolute; "
- "top:%dpx; left:100px; "
+ "top:%dpx; left:%dpx; "
"height:%dpx; \" >",
- (1 + (event_tm.tm_min / 2) + (event_te.tm_hour - hour) + (hour * 30) - (dstart * 30)),
- (((event_te.tm_min - event_tm.tm_min) / 2) +(event_te.tm_hour - hour) * 30)
+ top, (gap * 40), (bottom-top)
);
- }/*
- else {
- wprintf("<dd>");
- }* /
- );
- }
- else {
- wprintf("<dd>");
- }
- wprintf("<a href=\"display_edit_event?"
- "msgnum=%ld&calview=day&year=%d"
- "&month=%d&day=%d&hour=%d\""
- " btt_tooltext=\"",
- WC->disp_cal[i].cal_msgnum,
- year, month, day, hour
- );
- wprintf("<i>%s</i> ", _("Summary:"));
- escputs((char *)icalproperty_get_comment(p));
- wprintf("<br />");
-
- l = icalcomponent_get_first_property(
- WC->disp_cal[i].cal,
- ICAL_LOCATION_PROPERTY);
- if (l) {
- wprintf("<i>%s</i> ", _("Location:"));
- escputs((char *)icalproperty_get_comment(l));
- wprintf("<br />");
- }
- n = icalcomponent_get_first_property(
- WC->disp_cal[i].cal,
- ICAL_DESCRIPTION_PROPERTY);
- if (n) {
- wprintf("<i>%s</i> ", _("Notes:"));
- escputs((char *)icalproperty_get_comment(n));
- wprintf("<br />");
- }
- wprintf("\">");
- escputs((char *)
- icalproperty_get_comment(p));
- wprintf("</a></dd>\n");
-
- }
- }
- }
-
- }
+ wprintf("<a href=\"display_edit_event?"
+ "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+ "class=\"event_title\" "
+ "btt_tooltext=\"",
+ Cal->cal_msgnum, year, month, day, t.hour);
+ wprintf("<i>%s</i> ", _("Summary:"));
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("<br />");
+ q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+ if (q) {
+ wprintf("<i>%s</i> ", _("Location:"));
+ 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);
+ 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 />");
+ }
+ wprintf("\">");
- /* TODO: whats that? thierry, when do we need to show this?
- wprintf("<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
- WC->disp_cal[i].cal_msgnum,
- year, month, day, hour
- );
- escputs((char *)
- icalproperty_get_comment(p));
- wprintf("</a></dd>\n");
- */
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("</a></dd>\n");
+ }
}
}
}
-
-
/**
* \brief view one day
* \param year the year
char d_str[128];
int time_format;
time_t today_t;
-
+ int timeline = 30;
+ int extratimeline = 0;
+ int gap = 0;
+
time_format = get_time_format_cached ();
get_preference("daystart", daystart_str, sizeof daystart_str);
if (!IsEmptyStr(daystart_str)) daystart = atoi(daystart_str);
/** Today's date */
memset(&d_tm, 0, sizeof d_tm);
- if (WC->num_cal > 0)
- localtime_r(&WC->disp_cal[0].start_day, &d_tm);
-
d_tm.tm_year = year - 1900;
d_tm.tm_mon = month - 1;
d_tm.tm_mday = day;
wprintf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
/** Innermost cell (contains hours etc.) */
- wprintf("<td class=\"middle_of_the_day\" >");
- wprintf("<dl "
- "style=\" "
- " padding:0 ; "
- " margin: 0; "
- " position: absolute ; "
- " top: 0; "
- " left: 0; "
- " width: 500px; "
- " clip: rect(0px 500px %dpx 0px);"
- " clip: rect(0px, 500px, %dpx, 0px);"
- "\">",
- (dayend - daystart) * 30,
- (dayend - daystart) * 30
- );
- /** Now the middle of the day... */
- for (hour = 0; hour <= dayend; ++hour) { /* could do HEIGHT=xx */
- if (hour >= daystart) {
- wprintf("<dt><a href=\"display_edit_event?msgnum=0"
- "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
- year, month, day, hour
- );
+ wprintf("<td class=\"events_of_the_day\" >");
+ wprintf("<dl class=\"events\" >");
+
+ /** Now the middle of the day... */
+
+ extratimeline = timeline / 3;
+
+ for (hour = 0; hour < daystart; ++hour) { /* could do HEIGHT=xx */
+ wprintf("<dt class=\"extrahour\" "
+ "style=\" "
+ "position: absolute; "
+ "top: %dpx; left: 0px; "
+ "height: %dpx; "
+ "\" > "
+ "<a href=\"display_edit_event?msgnum=0"
+ "&calview=day&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+ (hour * extratimeline ), extratimeline,
+ year, month, day, hour
+ );
- if (time_format == WC_TIMEFORMAT_24) {
- wprintf("%2d:00</a> ", hour);
- }
- else {
- wprintf("%d:00%s</a> ",
- (hour <= 12 ? hour : hour-12),
- (hour < 12 ? "am" : "pm")
- );
- }
+ if (time_format == WC_TIMEFORMAT_24) {
+ wprintf("%2d:00</a> ", hour);
+ }
+ else {
+ wprintf("%d:00%s</a> ",
+ (hour <= 12 ? hour : hour-12),
+ (hour < 12 ? "am" : "pm")
+ );
+ }
wprintf("</dt>");
- }
+ }
- /* put the data here, stupid */
- calendar_day_view_display_events(today_t, year, month, day, hour, 1 , daystart);
+ gap = daystart * extratimeline;
+
+ for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */
+ wprintf("<dt class=\"hour\" "
+ "style=\" "
+ "position: absolute; "
+ "top: %dpx; left: 0px; "
+ "height: %dpx; "
+ "\" > "
+ "<a href=\"display_edit_event?msgnum=0&calview=day"
+ "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+ gap + ((hour - daystart) * timeline ), timeline,
+ year, month, day, hour
+ );
+
+ if (time_format == WC_TIMEFORMAT_24) {
+ wprintf("%2d:00</a> ", hour);
+ }
+ else {
+ wprintf("%d:00%s</a> ",
+ (hour <= 12 ? hour : hour-12),
+ (hour < 12 ? "am" : "pm")
+ );
+ }
+
+ wprintf("</dt>");
+ }
- }
+ gap = gap + ((dayend - daystart + 1) * timeline);
+
+ for (hour = (dayend + 1); hour < 24; ++hour) { /* could do HEIGHT=xx */
+ wprintf("<dt class=\"extrahour\" "
+ "style=\" "
+ "position: absolute; "
+ "top: %dpx; left: 0px; "
+ "height: %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,
+ year, month, day, hour
+ );
+
+ if (time_format == WC_TIMEFORMAT_24) {
+ wprintf("%2d:00</a> ", hour);
+ }
+ else {
+ wprintf("%d:00%s</a> ",
+ (hour <= 12 ? hour : hour-12),
+ (hour < 12 ? "am" : "pm")
+ );
+ }
+
+ wprintf("</dt>");
+ }
+
+ /* Display events with start and end times on this day */
+ calendar_day_view_display_events(today_t, year, month, day, 0, daystart, dayend);
wprintf("</dl>");
wprintf("</td>"); /* end of innermost table */
- /** Extra events on the middle */
+ /** Display extra events (start/end times not present or not today) in the middle column */
wprintf("<td class=\"extra_events\">");
- wprintf("<dl>");
-
- /** Display all-day events) */
- wprintf("<dt>All day events</dt>");
- calendar_day_view_display_events(today_t, year, month, day, -1, 0 , daystart);
+ wprintf("<ul>");
- /** Display events before daystart */
- wprintf("<dt>Before day start</dt>");
- for (hour = 0; hour <= (daystart-1); ++hour) {
- calendar_day_view_display_events(today_t, year, month, day, hour, 0, daystart );
- }
-
- /** Display events after dayend... */
- wprintf("<dt>After</dt>");
- for (hour = (dayend+1); hour <= 23; ++hour) {
- calendar_day_view_display_events(today_t, year, month, day, hour, 0, daystart );
- }
+ /** Display all-day events */
+ calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
- wprintf("</dl>");
+ wprintf("</ul>");
wprintf("</td>"); /** end extra on the middle */
- wprintf("<td width=20%% valign=top>"); /** begin stuff-on-the-right */
+ wprintf("<td width=20%% align=center valign=top>"); /** begin stuff-on-the-right */
/** Begin todays-date-with-left-and-right-arrows */
wprintf("<table border=0 width=100%% "
wprintf("</tr></table>\n");
/** End todays-date-with-left-and-right-arrows */
- /** \todo In the future we might want to put a month-o-matic here */
+ /** Embed a mini month calendar in this space */
+ wprintf("<br />\n");
+ embeddable_mini_calendar(year, month, "readfwd?calview=day&year=%d&month=%d&day=%d");
wprintf("</font></center>\n");
" setTimeout(\"btt_enableTooltips('inner_day')\", 1); "
"</script>\n"
);
+}
-}
/**
* \brief Display today's events.
*/
wprintf("</td>\n");
due = get_task_due_date(WC->disp_cal[i].cal);
- fmt_date(buf, due, 0);
+ webcit_fmt_date(buf, due, 0);
wprintf("<td><font");
if (due < time(NULL)) {
wprintf(" color=\"#FF0000\"");
wprintf("</i></center><br />\n");
}
+/**\brief stub for non-libical builds */
+void ajax_mini_calendar(void) {
+}
#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
projects / citadel.git / blobdiff