/****************************************************************************/
+
+/**
+ */
+void embeddable_mini_calendar(int year, int month, char *urlformat)
+{
+ struct tm starting_tm;
+ struct tm tm;
+ time_t thetime;
+ int i;
+ 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];
+
+ 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);
+
+ localtime_r(&previous_month, &tm);
+
+ wprintf("<a href=\"javascript:minical_previous_month();\">«</a>");
+ wprintf(" ");
+/* previous month
+ wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+ (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+ wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+*/
+
+ wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
+ wprintf(" "
+ "<span class=\"mini_calendar_month_label\">"
+ "%s %d"
+ "</span>"
+ " ", colheader_label, year);
+
+ wprintf(" ");
+ wprintf("<a href=\"javascript:minical_next_month();\">»</a>");
+/*
+ localtime_r(&next_month, &tm);
+ wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+ (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+ wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+*/
+
+ 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");
+}
+
+
/**
* \brief Display one day of a whole month view of a calendar
* \param thetime the month we want to see
struct tm event_tm;
int show_event = 0;
int all_day_event = 0;
+ int ongoing_event = 0;
struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
struct disp_cal *Cal;
struct icaltimetype t;
struct icaltimetype today_end_t;
struct tm starting_tm;
struct tm ending_tm;
-
+ int top = 0;
+ int height = 0;
if (WCC->num_cal == 0) {
// \todo FIXME wprintf("<br /><br /><br />\n");
event_end = thetime + 60 * 60 * (hour + 1);
- /* Create an imaginary event which spans the 24 hours of today. Any events which
+ /* Create an imaginary event which spans the current hour. Any events which
* overlap with this one take place at least partially in this day.
*/
memset(&starting_tm, 0, sizeof(struct tm));
ending_tm.tm_hour = hour;
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;*/
+ today_end_t.is_utc = 1;
/* Now loop through our list of events to see which ones occur today.
*/
Cal = &WCC->disp_cal[i];
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);
else
{
show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
- localtime_r(&event_tt, &event_te);
}
+
/* 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)
+
+ if ((event_te.tm_mday != today_start_t.day) && (event_tm.tm_mday != today_start_t.day)) ongoing_event = 1;
+
+ if (all_day_event)
{
- wprintf("<dd><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+ wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
Cal->cal_msgnum, year, month, day, hour);
escputs((char *) icalproperty_get_comment(p));
- wprintf("</a></dd>\n");
+ wprintf("</a> (");
+ wprintf(_("All day event"));
+ wprintf(")</li>\n");
+ }
+ else if (ongoing_event && (hour == -1))
+ {
+ wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+ Cal->cal_msgnum, year, month, day, hour);
+ escputs((char *) icalproperty_get_comment(p));
+ wprintf("</a> (");
+ wprintf(_("Ongoing event"));
+ wprintf(")</li>\n");
}
else
{
- event_tte = icaltime_as_timet(end_t);
- localtime_r(&event_tte, &event_tm);
- if (hour == event_te.tm_hour) {
+ if ((hour == event_te.tm_hour) && ! ongoing_event ) {
+
+ if (event_te.tm_mday != today_start_t.day) event_te.tm_hour = 0;
+ if (event_tm.tm_mday != today_start_t.day) event_tm.tm_hour = 24;
+
+ if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
+ top = (event_te.tm_hour * 11) -1;
+ height= (event_tm.tm_hour - event_te.tm_hour) * 11;
+ }
+ if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
+ top = (event_te.tm_hour * 11) - 1;
+ height = ((dstart - event_te.tm_hour) * 11) + ((event_tm.tm_hour - dstart) * 31);
+ }
+ if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
+ top = (event_te.tm_hour * 11) - 1;
+ height = ((dstart - event_te.tm_hour) * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 10);
+ }
+ if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+ top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+ height = ((event_tm.tm_hour - event_te.tm_hour) * 31);
+ }
+ if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
+ top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+ height = (((dend - event_te.tm_hour + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 11));
+ }
+ if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
+ top = (dstart * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - event_te.tm_hour) * 11) - 1;
+ height = ((event_tm.tm_hour - event_te.tm_hour) * 11);
+ }
wprintf("<dd class=\"event\" "
"style=\"position: absolute; "
"top:%dpx; left:100px; "
"height:%dpx; \" >",
- ((dstart * 11) + (event_te.tm_hour - dstart) * (event_te.tm_hour < dstart? 11 : 31)),
- ((event_tm.tm_hour - event_te.tm_hour) * 30)
+ top, height
);
wprintf("<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d&case=%d\">",
Cal->cal_msgnum, year, month, day, t.hour, hour);
/** Extra events on the middle */
wprintf("<td class=\"extra_events\">");
- wprintf("<dl>");
+ wprintf("<ul>");
/** Display all-day events) */
- wprintf("<dt>All day events</dt>");
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");