diff --git a/swad_changelog.h b/swad_changelog.h index d1e794eff..49578a303 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -553,7 +553,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 20.18 (2021-02-09)" +#define Log_PLATFORM_VERSION "SWAD 20.18.1 (2021-02-09)" #define CSS_FILE "swad20.8.css" #define JS_FILE "swad20.6.2.js" /* @@ -600,6 +600,7 @@ TODO: DNI de un estudiante sale err TODO: BUG: Cuando un tipo de grupo sólo tiene un grupo, inscribirse es voluntario, el estudiante sólo puede pertenecer a un grupo, y se inscribe en él, debería poder desapuntarse. Ahora no puede. + Version 20.18.1: Feb 09, 2021 Code refactoring in timeline. (305100 lines) Version 20.18: Feb 09, 2021 Removed temporary table not used in timeline. (305096 lines) Version 20.17: Feb 09, 2021 Code refactoring in timeline. (305110 lines) Version 20.16.3: Feb 09, 2021 Time is not get from database in timeline publications. (305211 lines) diff --git a/swad_timeline.c b/swad_timeline.c index 74fb9d5ea..52848fc3f 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -57,8 +57,8 @@ /*****************************************************************************/ // Number of recent publishings got and shown the first time, before refreshing -#define TL_MAX_NEW_PUBS_TO_GET_AND_SHOW 10000 // Unlimited #define TL_MAX_REC_PUBS_TO_GET_AND_SHOW 10 // Recent publishings to show (first time) +#define TL_MAX_NEW_PUBS_TO_GET_AND_SHOW 10000 // Unlimited #define TL_MAX_OLD_PUBS_TO_GET_AND_SHOW 20 // Old publishings are retrieved in packs of this size #define TL_NUM_VISIBLE_COMMENTS 3 // Maximum number of comments visible before expanding them @@ -692,22 +692,25 @@ static void TL_BuildQueryToGetTimeline (struct TL_Timeline *Timeline, |_____| 1 0 */ - RangePubsToGet.Top = 0; // +Infinite - RangePubsToGet.Bottom = 0; // -Infinite switch (Timeline->WhatToGet) { case TL_GET_ONLY_NEW_PUBS: // Get the publications (without limit) newer than LastPubCod /* This query is made via AJAX automatically from time to time */ + RangePubsToGet.Top = 0; // +Infinite RangePubsToGet.Bottom = TL_GetPubCodFromSession ("LastPubCod"); break; - case TL_GET_RECENT_TIMELINE: // Get some limited recent publications - /* This is the first query to get initial timeline shown - ==> no notes yet in current timeline table */ - break; case TL_GET_ONLY_OLD_PUBS: // Get some limited publications older than FirstPubCod /* This query is made via AJAX when I click in link to get old publications */ RangePubsToGet.Top = TL_GetPubCodFromSession ("FirstPubCod"); + RangePubsToGet.Bottom = 0; // -Infinite + break; + case TL_GET_RECENT_TIMELINE: // Get some limited recent publications + default: + /* This is the first query to get initial timeline shown + ==> no notes yet in current timeline table */ + RangePubsToGet.Top = 0; // +Infinite + RangePubsToGet.Bottom = 0; // -Infinite break; } @@ -791,8 +794,8 @@ static unsigned TL_GetMaxPubsToGet (const struct TL_Timeline *Timeline) { static const unsigned MaxPubsToGet[TL_NUM_WHAT_TO_GET] = { - [TL_GET_ONLY_NEW_PUBS ] = TL_MAX_NEW_PUBS_TO_GET_AND_SHOW, [TL_GET_RECENT_TIMELINE] = TL_MAX_REC_PUBS_TO_GET_AND_SHOW, + [TL_GET_ONLY_NEW_PUBS ] = TL_MAX_NEW_PUBS_TO_GET_AND_SHOW, [TL_GET_ONLY_OLD_PUBS ] = TL_MAX_OLD_PUBS_TO_GET_AND_SHOW, }; diff --git a/swad_timeline.h b/swad_timeline.h index dc329a844..59cde3639 100644 --- a/swad_timeline.h +++ b/swad_timeline.h @@ -93,10 +93,10 @@ typedef enum #define TL_NUM_WHAT_TO_GET 3 typedef enum { - TL_GET_ONLY_NEW_PUBS, // New publications are retrieved via AJAX - // automatically from time to time TL_GET_RECENT_TIMELINE, // Recent timeline is shown when the user clicks on action menu,... // or after editing timeline + TL_GET_ONLY_NEW_PUBS, // New publications are retrieved via AJAX + // automatically from time to time TL_GET_ONLY_OLD_PUBS, // Old publications are retrieved via AJAX // when the user clicks on link at bottom of timeline } TL_WhatToGet_t;