}
wprintf("<font size=-1>"
- "<a href=\"display_edit_event?"
- "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
+ "<a class=\"event%s\" href=\"display_edit_event?"
+ "msgnum=%ld&calview=month&year=%d&month=%d&day=%d\""
" btt_tooltext=\"",
+ (Cal->unread)?"_unread":"_read",
WC->disp_cal[i].cal_msgnum,
- bstr("calview"),
- bstr("year"),
- bstr("month"),
- bstr("day")
- );
+ year, month, day
+ );
- wprintf("<i>%s</i> ", _("Summary:"));
+ wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+ wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *)icalproperty_get_comment(p));
wprintf("<br />");
}
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);
if (q != NULL) {
t = icalproperty_get_dtend(q);
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 1);
+ webcit_fmt_date(buf, tt, 1);
wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
}
time_t event_tt;
time_t event_tts;
time_t event_tte;
+ struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
struct tm event_tms;
struct tm event_tme;
struct tm today_tm;
icalproperty *p;
icalproperty *e;
struct icaltimetype t;
+ struct disp_cal *Cal;
int month, day, year;
int all_day_event = 0;
char *timeformat;
year = today_tm.tm_year + 1900;
for (i=0; i<(WC->num_cal); ++i) {
- p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
+ Cal = &WCC->disp_cal[i];
+ p = icalcomponent_get_first_property(Cal->cal,
ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t = icalproperty_get_dtstart(p);
hours=(int)(difftime / 60);
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\">",
- daycolor,
- hours, minutes,
- daycolor,
- WC->disp_cal[i].cal_msgnum,
- bstr("calview"),
- bstr("year"),
- bstr("month"),
- bstr("day")
- );
+ "<font size=-1>"
+ "<a class=\"event%s\" href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
+ daycolor,
+ hours, minutes,
+ (Cal->unread)?"_unread":"_read",
+ daycolor,
+ WC->disp_cal[i].cal_msgnum,
+ bstr("year"),
+ bstr("month"),
+ bstr("day")
+ );
escputs((char *)
icalproperty_get_comment(p));
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);
}
* \param dstart daystart
* \param dend dayend
*/
-void calendar_day_view_display_events(time_t thetime, int year, int month,
- int day, int hour,
- int dstart, int dend) {
+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 = NULL;
icalproperty *q = NULL;
- time_t event_start;
- time_t event_end;
time_t event_tt;
time_t event_tte;
struct tm event_te;
struct tm starting_tm;
struct tm ending_tm;
int top = 0;
- int height = 0;
+ int bottom = 0;
int gap = 1;
int startmin = 0;
int diffmin = 0;
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 hour. Any events which
+ /* 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 = hour;
+ 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;
ending_tm.tm_year = year - 1900;
ending_tm.tm_mon = month - 1;
ending_tm.tm_mday = day;
- ending_tm.tm_hour = hour;
+ 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;
if (all_day_event)
{
- show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (hour == -1));
+ 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 != today_start_t.day) && (event_tm.tm_mday != today_start_t.day)) ongoing_event = 1;
+ if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1;
- if (all_day_event)
+ if (all_day_event && notime_events)
{
- wprintf("<li class=\"event\"> "
+ wprintf("<li class=\"event_framed%s\"> "
"<a href=\"display_edit_event?"
- "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+ "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
" class=\"event_title\" "
" btt_tooltext=\"",
- Cal->cal_msgnum, year, month, day, hour);
- wprintf("<i>%s</i><br />", _("All day event"));
- wprintf("<i>%s</i> ", _("Summary:"));
+ (Cal->unread)?"_unread":"_read",
+ Cal->cal_msgnum, year, month, day);
+ wprintf("<i>%s</i><br />", _("All day event"));
+ wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+ wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *) icalproperty_get_comment(p));
wprintf("<br />");
q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
wprintf(_("All day event"));
wprintf(")</span></li>\n");
}
- else if (ongoing_event && (hour == -1))
+ else if (ongoing_event && notime_events)
{
- wprintf("<li class=\"event\"> "
+ wprintf("<li class=\"event_framed%s\"> "
"<a href=\"display_edit_event?"
- "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+ "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
" class=\"event_title\" "
"btt_tooltext=\"",
- Cal->cal_msgnum, year, month, day, hour);
- wprintf("<i>%s</i><br />", _("Ongoing event"));
- wprintf("<i>%s</i> ", _("Summary:"));
+ (Cal->unread)?"_unread":"_read",
+ Cal->cal_msgnum, year, month, day);
+ wprintf("<i>%s</i><br />", _("Ongoing event"));
+ wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+ wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *) icalproperty_get_comment(p));
wprintf("<br />");
q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
escputs((char *)icalproperty_get_comment(q));
wprintf("<br />");
}
- fmt_date(buf, event_tt, 1);
+ webcit_fmt_date(buf, event_tt, 1);
wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
- fmt_date(buf, event_tte, 1);
+ 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(_("Ongoing event"));
wprintf(")</span></li>\n");
}
- else
+ else if (!all_day_event && !notime_events)
{
gap++;
- 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_mday != day) event_te.tm_hour = 0;
+ if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
- if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = ((event_tm.tm_hour == hour) ? (event_tm.tm_min / 2) : (event_tm.tm_min / 6)) ;
- top = (event_te.tm_hour * 10) + startmin -1;
- height= ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin ;
- }
- if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = event_tm.tm_min / 2;
- top = (event_te.tm_hour * 10) + startmin - 1;
- height = ((dstart - event_te.tm_hour) * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin - (diffmin * 3);
- }
- if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = ((event_te.tm_hour == hour) ? (event_te.tm_min / 2) : (event_te.tm_min / 6)) ;
- endmin = event_tm.tm_min / 6;
- top = (event_te.tm_hour * 10) + startmin - 1;
- height = ((dstart - event_te.tm_hour) * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin - diffmin;
- }
- if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
- startmin = diffmin = (event_te.tm_min / 2);
- endmin = event_tm.tm_min / 2;
- top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin - 1;
- height = ((event_tm.tm_hour - event_te.tm_hour) * 30) + endmin - diffmin;
- }
- if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = (event_te.tm_min / 2);
- endmin = event_tm.tm_min / 6;
- top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + diffmin - 1;
- height = (((dend - event_te.tm_hour + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10)) + endmin - diffmin;
- }
- if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = event_tm.tm_min / 6;
- top = (dstart * 10) + ((dend - dstart) * 30) + ((event_tm.tm_hour - event_te.tm_hour) * 10) + startmin - 1;
- height = ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin;
- }
- wprintf("<dd class=\"event\" "
+ /* 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_framed%s\" "
"style=\"position: absolute; "
"top:%dpx; left:%dpx; "
"height:%dpx; \" >",
- top, (gap * 40), height
+ (Cal->unread)?"_unread":"_read",
+ top, (gap * 40), (bottom-top)
);
wprintf("<a href=\"display_edit_event?"
- "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d&case=%d\" "
+ "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, hour);
- wprintf("<i>%s</i> ", _("Summary:"));
+ Cal->cal_msgnum, year, month, day, t.hour);
+ wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+ wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *) icalproperty_get_comment(p));
wprintf("<br />");
q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
escputs((char *)icalproperty_get_comment(q));
wprintf("<br />");
}
- fmt_date(buf, event_tt, 1);
+ webcit_fmt_date(buf, event_tt, 1);
wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
- fmt_date(buf, event_tte, 1);
+ 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) {
escputs((char *) icalproperty_get_comment(p));
wprintf("</a></dd>\n");
- }
-
}
}
}
"height: %dpx; "
"\" > "
"<a href=\"display_edit_event?msgnum=0"
- "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+ "&calview=day&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
(hour * extratimeline ), extratimeline,
year, month, day, hour
);
}
wprintf("</dt>");
-
- /* put the data here, stupid */
- calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
-
}
gap = daystart * extratimeline;
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
- "<a href=\"display_edit_event?msgnum=0"
+ "<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
}
wprintf("</dt>");
-
- /* put the data here, stupid */
- calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
-
}
gap = gap + ((dayend - daystart + 1) * timeline);
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
- "<a href=\"display_edit_event?msgnum=0"
+ "<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
}
wprintf("</dt>");
-
- /* put the data here, stupid */
- calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
-
}
+ /* 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("<ul>");
- /** Display all-day events) */
- calendar_day_view_display_events(today_t, year, month, day, -1, daystart, dayend);
+ /** Display all-day events */
+ calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
wprintf("</ul>");
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\"");
projects / citadel.git / blobdiff