Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 22:35:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.160.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-21 16:45:26 +01:00
parent 98fdaf8706
commit c5373b7181
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
swad_agenda.c
View File

@ -995,6 +995,7 @@ static void Agd_GetParamEventOrder (void)
static void Agd_GetListEvents (Agd_AgendaType_t AgendaType) static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
{ {
char Past__FutureEventsSubQuery[256];
char OrderBySubQuery[256]; char OrderBySubQuery[256];
char Query[1024]; char Query[1024];
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -1021,53 +1022,55 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
"Location"); "Location");
break; break;
} }
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
sprintf (Query,"SELECT AgdCod FROM agendas" case Agd_ANOTHER_AGENDA_TODAY: // Today events
" WHERE UsrCod='%ld'" sprintf (Past__FutureEventsSubQuery,
" AND DATE(StartTime)<=CURDATE()" " AND DATE(StartTime)<=CURDATE()"
" AND DATE(EndTime)>=CURDATE()" // Only today events " AND DATE(EndTime)>=CURDATE()");
" ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
break; break;
case Agd_MY_AGENDA: case Agd_MY_AGENDA:
sprintf (Query,"SELECT AgdCod FROM agendas" case Agd_ANOTHER_AGENDA:
" WHERE UsrCod='%ld'" switch (Gbl.Agenda.Past__FutureEvents)
" ORDER BY %s", {
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery); case (1 << Agd_PAST___EVENTS): // Past and today events
sprintf (Past__FutureEventsSubQuery,
" AND DATE(StartTime)<=CURDATE()");
break;
case (1 << Agd_FUTURE_EVENTS): // Today and future events
sprintf (Past__FutureEventsSubQuery,
" AND DATE(EndTime)>=CURDATE()");
break;
default: // All events
Past__FutureEventsSubQuery[0] = '\0';
break;
}
break; break;
/* }
case Agd_MY_PUBLIC_AGENDA_TODAY:
switch (AgendaType)
{
case Agd_MY_AGENDA_TODAY:
case Agd_MY_AGENDA:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'" " WHERE UsrCod='%ld'%s"
" AND DATE(StartTime)<=CURDATE()"
" AND DATE(EndTime)>=CURDATE()" // Only today events
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Me.UsrDat.UsrCod,
break; Past__FutureEventsSubQuery,
case Agd_MY_PUBLIC_AGENDA: OrderBySubQuery);
sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'"
" AND DATE(EndTime)>=CURDATE()" // Only today and future events
" ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
break; break;
*/
case Agd_ANOTHER_AGENDA_TODAY: case Agd_ANOTHER_AGENDA_TODAY:
sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'"
" AND DATE(StartTime)<=CURDATE()"
" AND DATE(EndTime)>=CURDATE()" // Only today events
" ORDER BY %s",
Gbl.Usrs.Other.UsrDat.UsrCod,OrderBySubQuery);
break;
case Agd_ANOTHER_AGENDA: case Agd_ANOTHER_AGENDA:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'" " WHERE UsrCod='%ld'%s"
" AND Public='Y' AND Hidden='N'"
" AND DATE(EndTime)>=CURDATE()" // Only today and future events " AND DATE(EndTime)>=CURDATE()" // Only today and future events
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Other.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Other.UsrDat.UsrCod,
Past__FutureEventsSubQuery,
OrderBySubQuery);
break; break;
} }
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get agenda events"); NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get agenda events");

1
swad_changelog.h
View File

@ -217,6 +217,7 @@
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.160.2: Mar 21, 2017 Changes in agenda. Not finished. (217348 lines)
Version 16.160.1: Mar 21, 2017 Changes in agenda. Not finished. (217347 lines) Version 16.160.1: Mar 21, 2017 Changes in agenda. Not finished. (217347 lines)
Version 16.160: Mar 21, 2017 Changes in agenda. Not finished. (217413 lines) Version 16.160: Mar 21, 2017 Changes in agenda. Not finished. (217413 lines)
1 change necessary in database: 1 change necessary in database: