X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=1b6e8681ebe2f9f3f2deeeb3ef7b5cf666f403c7;hb=47585659f82eec5dc6cedc9d6695e03ef34f019e;hp=95da4cb89d793b473779de88d2919b3a6320f4c8;hpb=48f15ff83b740c7b51be5c8a5cbbac6e36d09703;p=citadel.git diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 95da4cb89..1b6e8681e 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -1,23 +1,15 @@ /* - * $Id$ - * * Handles the HTML display of calendar items. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -25,8 +17,8 @@ #include "calendar.h" /* These define how high the hour rows are in the day view */ -#define TIMELINE 30 -#define EXTRATIMELINE (TIMELINE / 2) +#define TIMELINE 22 +#define EXTRATIMELINE 22 void embeddable_mini_calendar(int year, int month) { @@ -145,7 +137,7 @@ void embeddable_mini_calendar(int year, int month) StrBufAppendPrintf(WC->trailing_javascript, " function minical_change_month(year, month) { \n" " p = 'year=' + year + '&month=' + month \n" - " + '&r=' + CtdlRandomString(); \n" + " + '&r=' + ctdlRandomString(); \n" " new Ajax.Updater('%s', 'mini_calendar', \n" " { method: 'get', parameters: p, evalScripts: true } ); \n" " } \n" @@ -190,7 +182,7 @@ void calendar_month_view_display_events(int year, int month, int day) time_t tt; if (GetCount(WCC->disp_cal_items) == 0) { - wc_printf("


\n"); + wc_printf("
\n"); return; } @@ -206,7 +198,6 @@ void calendar_month_view_display_events(int year, int month, int 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; @@ -215,7 +206,6 @@ void calendar_month_view_display_events(int year, int month, int 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; /* * Create another one without caring about the timezone for all day events. @@ -261,6 +251,14 @@ void calendar_month_view_display_events(int year, int month, int day) * If we determined that this event occurs today, then display it. */ if (show_event) { + + /* time_t logtt = icaltime_as_timet(t); + syslog(LOG_DEBUG, "Match on %04d-%02d-%02d for event %x%s on %s", + year, month, day, + (int)Cal, ((all_day_event) ? " (all day)" : ""), + ctime(&logtt) + ); */ + p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY); if (p == NULL) { p = icalproperty_new_summary(_("Untitled Event")); @@ -288,10 +286,10 @@ void calendar_month_view_display_events(int year, int month, int day) wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *)icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property( Cal->cal, @@ -299,7 +297,7 @@ void calendar_month_view_display_events(int year, int month, int day) if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } /* @@ -379,11 +377,11 @@ void calendar_month_view_display_events(int year, int month, int day) if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); - wc_printf("
\n"); + wc_printf("
\n"); if (all_day_event) { wc_printf(""); @@ -418,7 +416,6 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { icalproperty *e; struct icaltimetype t; disp_cal *Cal; - int month, day, year; int all_day_event = 0; char *timeformat; int time_format; @@ -429,9 +426,6 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { else timeformat="%I:%M %p"; localtime_r(&thetime, &today_tm); - month = today_tm.tm_mon + 1; - day = today_tm.tm_mday; - year = today_tm.tm_year + 1900; Pos = GetNewHashPos(WCC->disp_cal_items, 0); while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) { @@ -571,8 +565,7 @@ void calendar_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wc_printf("
" - " \n
"); + wc_printf(" \n
"); wc_printf("\n"); @@ -581,7 +574,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"\"\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); wc_printf("  " @@ -593,7 +586,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"\"\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); @@ -664,8 +657,8 @@ void calendar_month_view(int year, int month, int day) { } wc_printf("
" /* end of inner table */ - "
" /* end of outer table */ - "
\n"); + "\n" /* end of outer table */ + ); } /* @@ -707,9 +700,8 @@ void calendar_brief_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wc_printf("
" - "
\n"); + wc_printf("
\n"); wc_printf("\n"); @@ -718,7 +710,7 @@ void calendar_brief_month_view(int year, int month, int day) { localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"\"\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(month_label, sizeof month_label, "%B", &tm); wc_printf("  " @@ -730,7 +722,7 @@ void calendar_brief_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"\"\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); @@ -753,7 +745,7 @@ void calendar_brief_month_view(int year, int month, int day) { wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm); wc_printf("" " \n", - _("Week"), + _("Week"), weeknumber, _("Hours"), _("Subject"), @@ -787,15 +779,15 @@ void calendar_brief_month_view(int year, int month, int day) { } wc_printf("
%s %s
%s%s%s%s
" /* end of inner table */ - "
" /* end of outer table */ - "\n"); + "
\n" /* end of outer table */ + ); } /* * Calendar week view -- not implemented yet, this is a stub function */ void calendar_week_view(int year, int month, int day) { - wc_printf("
week view FIXME

\n"); + wc_printf("
week view FIXME

\n"); } @@ -860,7 +852,6 @@ void calendar_day_view_display_events(time_t thetime, 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; @@ -869,7 +860,6 @@ void calendar_day_view_display_events(time_t thetime, 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; /* * Create another one without caring about the timezone for all day events. @@ -954,16 +944,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("All day event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("All day event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); @@ -979,7 +969,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -998,16 +988,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("Ongoing event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("Ongoing event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); wc_printf("%s %s
", _("Starting date/time:"), buf); @@ -1017,7 +1007,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -1080,15 +1070,15 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); @@ -1104,7 +1094,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf("\n"); @@ -1165,8 +1155,6 @@ void calendar_day_view(int year, int month, int day) { ++tomorrow.day; tomorrow = icaltime_normalize(tomorrow); - wc_printf("
"); - /* Inner table (the real one) */ wc_printf(" \n"); @@ -1181,18 +1169,14 @@ void calendar_day_view(int year, int month, int day) { if (hourlabel > (timeline - 2)) hourlabel = timeline - 2; for (hour = 0; hour < daystart; ++hour) { /* could do HEIGHT=xx */ - wc_printf("
" + wc_printf("
" "", +/* TODO: what have these been used for? (hour * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); @@ -1212,18 +1196,14 @@ void calendar_day_view(int year, int month, int day) { gap = daystart * extratimeline; for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */ - wc_printf("
" + wc_printf("
" "", +/*TODO: what have these been used for? gap + ((hour - daystart) * timeline ), timeline, hourlabel, +*/ year, month, day, hour ); @@ -1243,18 +1223,14 @@ void calendar_day_view(int year, int month, int day) { gap = gap + ((dayend - daystart + 1) * timeline); for (hour = (dayend + 1); hour < 24; ++hour) { /* could do HEIGHT=xx */ - wc_printf("
" + wc_printf("
" "", +/*TODO: what have these been used for? gap + ((hour - dayend - 1) * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); @@ -1300,15 +1276,15 @@ void calendar_day_view(int year, int month, int day) { wc_printf("
"); wc_strftime(d_str, sizeof d_str, "", &d_tm ); @@ -1318,21 +1294,19 @@ void calendar_day_view(int year, int month, int day) { wc_printf(""); wc_printf("
"); wc_printf("", yesterday.year, yesterday.month, yesterday.day); - wc_printf("\"\""); + wc_printf("\"previous\""); wc_printf("" - "%A
" - "%B
" - "%d
" - "%Y
" + "%A
" + "%B
" + "%d
" + "%Y
" "		"); wc_printf("", tomorrow.year, tomorrow.month, tomorrow.day); - wc_printf("\"\"\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); /* End todays-date-with-left-and-right-arrows */ /* Embed a mini month calendar in this space */ - wc_printf("
\n"); + wc_printf("
\n"); embeddable_mini_calendar(year, month); wc_printf(""); /* end stuff-on-the-right */ - - wc_printf("" /* end of inner table */ - "
"); + wc_printf("\n"); /* end of inner table */ } @@ -1401,7 +1375,7 @@ int calendar_summary_view(void) { wc_printf("
\n"); + wc_printf("
\n"); ++num_displayed; } } @@ -1445,7 +1419,9 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, void **ViewSpecific, long oper, char *cmd, - long len) + long len, + char *filter, + long flen) { wcsession *WCC = WC; calview *c; @@ -1553,3 +1529,10 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, DeleteHash(&WC->disp_cal_items); return 0; } + +void +InitModule_CALENDAR_VIEW +(void) +{ + WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX); +}