Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finished calendar in find form

Browse Source 
SVN revision: 727
This commit is contained in:
Stefan Ritt 2004-01-30 09:25:18 +00:00
parent 5c820d2d1c
commit 2b4e5b2649
4 changed files with 144 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ChangeLog
View File

@ -1,3 +1,11 @@
Version 2.5.1, released February xxth, 2004
===========================================
- Avoid last '\0' in flush_return_buffer()
- Added CSV output
- During synchronization, display link to received entries
- Implemented calendar
Version 2.5.0, released January 28th, 2004 Version 2.5.0, released January 28th, 2004
========================================== ==========================================

2
doc/config.html
View File

@ -1665,7 +1665,7 @@ but not executed. Default is <b><code>0</code></b>.
<div class=footer>&nbsp; <div class=footer>&nbsp;
Content by <a class=nav href="mailto:Stefan.Ritt@psi.ch">Stefan Ritt</a>, Content by <a class=nav href="mailto:Stefan.Ritt@psi.ch">Stefan Ritt</a>,
Web pages by <a class=nav href="mailto:fredp@mygale.org">Fred Pacquier</a> Web pages by <a class=nav href="mailto:fredp@mygale.org">Fred Pacquier</a>
- last modified on 12/01/2004 - last modified on 28/01/2004
&nbsp;</div> &nbsp;</div>
</BODY> </BODY>
</HTML> </HTML>

126
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.220 2004/01/30 09:25:17 midas
Finished calendar in find form
Revision 1.219 2004/01/29 21:20:02 midas Revision 1.219 2004/01/29 21:20:02 midas
Started working on calendar Started working on calendar
@ -2129,7 +2132,10 @@ int check_language()
getcfg("global", "Language", language); getcfg("global", "Language", language);
/* set locale for strftime */ /* set locale for strftime */
setlocale(LC_ALL, language); if (language[0])
setlocale(LC_ALL, language);
else
setlocale(LC_ALL, "english");
/* force re-read configuration file if changed */ /* force re-read configuration file if changed */
strlcpy(file_name, resource_dir, sizeof(file_name)); strlcpy(file_name, resource_dir, sizeof(file_name));
@ -6683,7 +6689,7 @@ void show_find_form(LOGBOOK * lbs)
/*---- header ----*/ /*---- header ----*/
show_standard_header(lbs, TRUE, loc("ELOG find"), NULL); show_standard_header(lbs, FALSE, loc("ELOG find"), NULL);
/*---- title ----*/ /*---- title ----*/
@ -6799,7 +6805,7 @@ void show_find_form(LOGBOOK * lbs)
rsprintf("<option value=\"\">\n"); rsprintf("<option value=\"\">\n");
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
rsprintf("<option value=\"%s\">%s\n", mname[i], month_name(i)); rsprintf("<option value=\"%d\">%s\n", i+1, month_name(i));
rsprintf("</select>\n"); rsprintf("</select>\n");
rsprintf("<select name=\"d1\">"); rsprintf("<select name=\"d1\">");
@ -6815,7 +6821,7 @@ void show_find_form(LOGBOOK * lbs)
rsprintf("if (navigator.javaEnabled()) {\n"); rsprintf("if (navigator.javaEnabled()) {\n");
rsprintf(" document.write(\"&nbsp;&nbsp;\");\n"); rsprintf(" document.write(\"&nbsp;&nbsp;\");\n");
rsprintf rsprintf
(" document.write(\"<input type=button value=\\\"%s\\\" onClick=window.open(\\\"cal.html\\\",\\\"\\\",\\\"width=300,height=220,dependent=yes,menubar=no,scrollbars=no,location=no\\\");>\");\n", (" document.write(\"<input type=button value=\\\"%s\\\" onClick=window.open(\\\"cal.html?i=1\\\",\\\"\\\",\\\"width=300,height=220,dependent=yes,menubar=no,scrollbars=no,location=no\\\");>\");\n",
loc("Calendar")); loc("Calendar"));
rsprintf("} \n"); rsprintf("} \n");
rsprintf("</script>\n"); rsprintf("</script>\n");
@ -6839,7 +6845,7 @@ void show_find_form(LOGBOOK * lbs)
rsprintf("<option value=\"\">\n"); rsprintf("<option value=\"\">\n");
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
rsprintf("<option value=\"%s\">%s\n", mname[i], month_name(i)); rsprintf("<option value=\"%d\">%s\n", i+1, month_name(i));
rsprintf("</select>\n"); rsprintf("</select>\n");
rsprintf("<select name=\"d2\">"); rsprintf("<select name=\"d2\">");
@ -6855,7 +6861,7 @@ void show_find_form(LOGBOOK * lbs)
rsprintf("if (navigator.javaEnabled()) {\n"); rsprintf("if (navigator.javaEnabled()) {\n");
rsprintf(" document.write(\"&nbsp;&nbsp;\");\n"); rsprintf(" document.write(\"&nbsp;&nbsp;\");\n");
rsprintf rsprintf
(" document.write(\"<input type=button value=\\\"%s\\\" onClick=window.open(\\\"cal.html\\\",\\\"\\\",\\\"width=300,height=220,dependent=yes,menubar=no,scrollbars=no,location=no\\\");>\");\n", (" document.write(\"<input type=button value=\\\"%s\\\" onClick=window.open(\\\"cal.html?i=2\\\",\\\"\\\",\\\"width=300,height=220,dependent=yes,menubar=no,scrollbars=no,location=no\\\");>\");\n",
loc("Calendar")); loc("Calendar"));
rsprintf("} \n"); rsprintf("} \n");
rsprintf("</script>\n"); rsprintf("</script>\n");
@ -10845,7 +10851,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
y1 = current_year; y1 = current_year;
else else
y1 = atoi(getparam("y1")); y1 = atoi(getparam("y1"));
if (y1 < 1990 || y1 > current_year) { if (y1 < 1970 || y1 > current_year) {
sprintf(str, "Error: Year %s out of range", getparam("y1")); sprintf(str, "Error: Year %s out of range", getparam("y1"));
show_error(str); show_error(str);
return; return;
@ -10853,13 +10859,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
/* if month not given, use current month */ /* if month not given, use current month */
if (*getparam("m1")) { if (*getparam("m1")) {
strcpy(str, getparam("m1")); m1 = atoi(getparam("m1"));
for (m1 = 0; m1 < 12; m1++)
if (equal_ustring(str, mname[m1]))
break;
if (m1 == 12)
m1 = 0;
m1++;
} else } else
m1 = current_month; m1 = current_month;
@ -10870,7 +10870,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
d1 = 1; d1 = 1;
memset(&tms, 0, sizeof(struct tm)); memset(&tms, 0, sizeof(struct tm));
tms.tm_year = y1 % 100; tms.tm_year = y1 - 1900;
tms.tm_mon = m1 - 1; tms.tm_mon = m1 - 1;
tms.tm_mday = d1; tms.tm_mday = d1;
tms.tm_hour = 0; tms.tm_hour = 0;
@ -10887,7 +10887,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
else else
y2 = current_year; y2 = current_year;
if (y2 < 1990 || y2 > current_year) { if (y2 < 1970 || y2 > current_year) {
sprintf(date, "%d", y2); sprintf(date, "%d", y2);
sprintf(str, "Error: Year %s out of range", date); sprintf(str, "Error: Year %s out of range", date);
show_error(str); show_error(str);
@ -10896,13 +10896,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
/* if month not given, use current month */ /* if month not given, use current month */
if (*getparam("m2")) { if (*getparam("m2")) {
strcpy(str, getparam("m2")); m2 = atoi(getparam("m2"));
for (m2 = 0; m2 < 12; m2++)
if (equal_ustring(str, mname[m2]))
break;
if (m2 == 12)
m2 = 0;
m2++;
} else } else
m2 = current_month; m2 = current_month;
@ -10911,7 +10905,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
d2 = atoi(getparam("d2")); d2 = atoi(getparam("d2"));
else { else {
memset(&tms, 0, sizeof(struct tm)); memset(&tms, 0, sizeof(struct tm));
tms.tm_year = y2 % 100; tms.tm_year = y2 - 1900;
tms.tm_mon = m2 - 1 + 1; tms.tm_mon = m2 - 1 + 1;
tms.tm_mday = 1; tms.tm_mday = 1;
tms.tm_hour = 12; tms.tm_hour = 12;
@ -10925,7 +10919,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
} }
memset(&tms, 0, sizeof(struct tm)); memset(&tms, 0, sizeof(struct tm));
tms.tm_year = y2 % 100; tms.tm_year = y2 - 1900;
tms.tm_mon = m2 - 1; tms.tm_mon = m2 - 1;
tms.tm_mday = d2; tms.tm_mday = d2;
tms.tm_hour = 0; tms.tm_hour = 0;
@ -11452,7 +11446,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
memset(&tms, 0, sizeof(struct tm)); memset(&tms, 0, sizeof(struct tm));
tms.tm_year = y1 % 100; tms.tm_year = y1 - 1900;
tms.tm_mon = m1 - 1; tms.tm_mon = m1 - 1;
tms.tm_mday = d1; tms.tm_mday = d1;
tms.tm_hour = 12; tms.tm_hour = 12;
@ -11469,7 +11463,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
if (*getparam("m2") || *getparam("y2") || *getparam("d2")) { if (*getparam("m2") || *getparam("y2") || *getparam("d2")) {
/* calculate previous day */ /* calculate previous day */
memset(&tms, 0, sizeof(struct tm)); memset(&tms, 0, sizeof(struct tm));
tms.tm_year = y2 % 100; tms.tm_year = y2 - 1900;
tms.tm_mon = m2 - 1; tms.tm_mon = m2 - 1;
tms.tm_mday = d2; tms.tm_mday = d2;
tms.tm_hour = 12; tms.tm_hour = 12;
@ -14065,9 +14059,23 @@ int do_self_register(LOGBOOK * lbs, char *command)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
void show_day(char *css_class, char *day)
{
if (day[0]) {
rsprintf("<td class=\"%s\" ", css_class);
rsprintf("onClick='submit_day(\"%s\")' ", day);
rsprintf("onMouseOver=\"this.className='calsel';\" ");
rsprintf("onMouseOut=\"this.className='%s';\" ", css_class);
rsprintf(">%s</td>\n", day);
} else {
/* empty cell */
rsprintf("<td class=\"%s\">&nbsp;</td>\n", css_class);
}
}
void show_calendar(LOGBOOK * lbs) void show_calendar(LOGBOOK * lbs)
{ {
int i, j, cur_mon, cur_day, cur_year, today_day, today_mon, today_year; int i, j, index, cur_mon, cur_day, cur_year, today_day, today_mon, today_year;
time_t now, stime; time_t now, stime;
struct tm *ts; struct tm *ts;
char str[256]; char str[256];
@ -14091,37 +14099,45 @@ void show_calendar(LOGBOOK * lbs)
cur_day = ts->tm_mday; cur_day = ts->tm_mday;
cur_year = ts->tm_year + 1900; cur_year = ts->tm_year + 1900;
} }
if (isparam("i"))
show_html_header(lbs, TRUE, loc("Calendar")); index = atoi(getparam("i"));
rsprintf("<body>\n");
rsprintf
("<table border=1 width=294 height=214><tr><td colspan=7 class=\"caltitle\">\n");
/* link to previous month */
if (cur_mon > 1)
rsprintf("<a href=\"?m=%d&y=%d\">&lt;</a>", cur_mon - 1, cur_year);
else else
rsprintf("<a href=\"?m=%d&y=%d\">&lt;</a>", 12, cur_year - 1); index = 1;
/* current month */ show_html_header(lbs, FALSE, loc("Calendar"));
strftime(str, sizeof(str), "%B", ts); rsprintf("<body><form name=form1 method=\"GET\" action=\"\">\n");
rsprintf("&nbsp;%s&nbsp;", str); rsprintf("<input type=hidden name=\"y\" value=\"%d\">\n", cur_year);
/* link to next month */ rsprintf("<script language=\"JavaScript\">\n\n");
if (cur_mon == 12) rsprintf("function submit_day(day)\n");
rsprintf("<a href=\"?m=%d&y=%d\">&gt;</a>", 1, cur_year + 1); rsprintf("{\n");
else rsprintf(" opener.document.form1.d%d.value = day;\n", index, cur_year);
rsprintf("<a href=\"?m=%d&y=%d\">&gt;</a>", cur_mon + 1, cur_year); rsprintf(" opener.document.form1.m%d.value = \"%d\";\n", index, cur_mon);
rsprintf(" opener.document.form1.y%d.value = \"%d\";\n", index, cur_year);
rsprintf(" window.close();\n");
rsprintf("}\n");
rsprintf("</script>\n\n");
rsprintf("<table border=1 width=294 height=214><tr>");
rsprintf("<td colspan=7 class=\"caltitle\">\n");
rsprintf("<select name=\"m\" onChange=\"document.form1.submit()\">\n");
for (i = 0; i < 12; i++)
if (i+1 == cur_mon)
rsprintf("<option selected value=\"%d\">%s\n", i+1, month_name(i));
else
rsprintf("<option value=\"%d\">%s\n", i+1, month_name(i));
rsprintf("</select>\n");
/* link to previous year */ /* link to previous year */
rsprintf("&nbsp;&nbsp;"); rsprintf("&nbsp;&nbsp;");
rsprintf("<a href=\"?m=%d&y=%d\">&lt;</a>", cur_mon, cur_year - 1); rsprintf("<a href=\"?i=%d&m=%d&y=%d\">&lt;</a>", index, cur_mon, cur_year - 1);
/* current year */ /* current year */
rsprintf("&nbsp;%d&nbsp;", cur_year); rsprintf("&nbsp;%d&nbsp;", cur_year);
/* link to next year */ /* link to next year */
rsprintf("<a href=\"?m=%d&y=%d\">&gt;</a>", cur_mon, cur_year + 1); rsprintf("<a href=\"?i=%d&m=%d&y=%d\">&gt;</a>", index, cur_mon, cur_year + 1);
/* go to first day of month */ /* go to first day of month */
ts->tm_mday = 1; ts->tm_mday = 1;
@ -14141,8 +14157,6 @@ void show_calendar(LOGBOOK * lbs)
stime -= 3600 * 24 * 7; stime -= 3600 * 24 * 7;
ts = localtime(&stime); ts = localtime(&stime);
/* onClick='window.close(); opener.document.form1.y1 = 2004;'; */
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
rsprintf("<tr>\n"); rsprintf("<tr>\n");
@ -14150,16 +14164,18 @@ void show_calendar(LOGBOOK * lbs)
if (ts->tm_mon + 1 == cur_mon) if (ts->tm_mon + 1 == cur_mon)
sprintf(str, "%d", ts->tm_mday); sprintf(str, "%d", ts->tm_mday);
else else
strcpy(str, "&nbsp;"); strcpy(str, "");
if (ts->tm_mday == today_day && ts->tm_mon + 1 == today_mon if (ts->tm_mday == today_day && ts->tm_mon + 1 == today_mon
&& ts->tm_year + 1900 == today_year) && ts->tm_year + 1900 == today_year)
rsprintf("<td class=\"calcurday\">%s</td>\n", str); show_day("calcurday", str);
else { else {
if (j == 0) if (j == 0)
rsprintf("<td class=\"calhday\">%s</td>\n", str); show_day("calsun", str);
else if (j == 6)
show_day("calsat", str);
else else
rsprintf("<td class=\"calday\">%s</td>\n", str); show_day("calday", str);
} }
stime += 3600 * 24; stime += 3600 * 24;
ts = localtime(&stime); ts = localtime(&stime);
@ -14170,7 +14186,7 @@ void show_calendar(LOGBOOK * lbs)
break; break;
} }
rsprintf("</body></html>\n"); rsprintf("</form></body></html>\n");
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/

64
themes/default/default.css
View File

@ -440,6 +440,70 @@ td {
padding:5px; padding:5px;
} }
.caltitle {
background-color:#DDDDFF;
padding:3px;
font-size:medium;
text-align:center;
font-weight:bold;
}
.calhead {
background-color:#AAAAFF;
padding:0px;
font-size:12px;
text-align:center;
font-weight:bold;
}
.calday {
background-color:#CCFFCC;
padding:0px;
font-size:16px;
font-weight:bold;
text-align:center;
cursor:pointer;
}
.calcurday {
background-color:#4040A0;
padding:0px;
font-size:16px;
text-align:center;
font-weight:bold;
color:white;
cursor:pointer;
}
.calsel {
background-color:#40A040;
padding:0px;
font-size:16px;
text-align:center;
font-weight:bold;
color:white;
cursor:pointer;
}
.calsat {
background-color:#90C090;
padding:0px;
font-size:16px;
font-weight:bold;
text-align:center;
cursor:pointer;
}
.calsun {
background-color:#90C090;
padding:0px;
font-size:16px;
font-weight:bold;
text-align:center;
color:red;
cursor:pointer;
}
/* ELOG home page link at bottom of page */ /* ELOG home page link at bottom of page */
.bottomlink { .bottomlink {
font-family:sans-serif; font-family:sans-serif;