Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 23.47: Nov 08, 2023 Infinite scroll in timeline.

This commit is contained in:
acanas 2023-11-08 01:20:40 +01:00
parent ae614985de
commit 78a84a22c4
3 changed files with 78 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/swad22.49.js → js/swad23.47.js
View File

@ -55,7 +55,7 @@ function handleMatchKeys(event) {
/*****************************************************************************/
function submitForm(FormId) {
var Form = document.getElementById(FormId);
const Form = document.getElementById(FormId);
if (Form)
Form.submit();
@ -77,7 +77,7 @@ function submitForm(FormId) {
// WriteDateOnSameDay = false ==> don't write date if it's the same day than the last call
// WriteWeekDay = true ==> write day of the week ('monday', 'tuesday'...)
// WriteHMS = 3 least significant bits for hour, minute and second
var txtToday = [
const txtToday = [
"", // Unknown
"Avui", // CA
"Heute", // DE
@ -88,6 +88,7 @@ var txtToday = [
"Oggi", // IT
"Dzisiaj", // PL
"Hoje", // PT
"Bugün", // TR
];
function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
@ -1016,6 +1017,30 @@ function moveNewTimelineToTimeline () {
/************* Refresh old publications in timeline using AJAX ***************/
/*****************************************************************************/
// See https://webdesign.tutsplus.com/how-to-implement-infinite-scrolling-with-javascript--cms-37055t
var throttleWait;
const throttle = (callback, time) => {
if (throttleWait) return;
throttleWait = true;
setTimeout(() => {
callback();
throttleWait = false;
}, time);
};
const handleInfiniteScroll = () => {
throttle(() => {
const endOfPage = window.innerHeight + window.pageYOffset >= document.body.offsetHeight - 320;
if (endOfPage)
refreshOldTimeline ();
}, 250);
};
// This function is called when user clicks in 'See more'
var objXMLHttpReqOldTml = false;
@ -1066,9 +1091,12 @@ function readOldTimelineData () {
for (var i=0; i<countOldTimeline; i++)
timeline.appendChild(oldTimeline.firstChild);
}
else // No old publications retrieved, so we have reached the oldest pub.
// Hide container with link to get old publications
else { // No old publications retrieved, so we have reached the oldest pub.
// Remove event listener
window.removeEventListener("scroll", handleInfiniteScroll);
// Hide container with link to get old publications
document.getElementById("view_old_pubs_container").style.display = 'none';
}
}
}
}

8
swad_changelog.h
View File

@ -633,10 +633,12 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.46 (2023-11-07)"
#define CSS_FILE "swad23.46.css"
#define JS_FILE "swad22.49.js"
#define Log_PLATFORM_VERSION "SWAD 23.47 (2023-11-08)"
#define CSS_FILE "swad23.46.1.css"
#define JS_FILE "swad23.47.js"
/*
Version 23.47: Nov 08, 2023 Infinite scroll in timeline. (335565 lines)
Version 23.46.1: Nov 07, 2023 Improvements in responsive design. (? lines)
Version 23.46: Nov 07, 2023 Code refactoring and layout changes in lists of my courses, forums and chat. (335525 lines)
Version 23.45: Nov 07, 2023 Improvements in responsive design. (335468 lines)
Version 23.44.4: Nov 06, 2023 Code refactoring in hierarchy. (335412 lines)

64
swad_layout.c
View File

@ -519,7 +519,7 @@ static void Lay_WriteScripts (void)
/***** Write script to initialize variables used to draw dates *****/
HTM_SCRIPT_Begin (NULL,NULL);
HTM_Txt ("\tvar DAYS = [");
HTM_Txt ("\tconst DAYS = [");
for (DayOfWeek = 0;
DayOfWeek < 7;
DayOfWeek++)
@ -530,7 +530,7 @@ static void Lay_WriteScripts (void)
}
HTM_Txt ("];\n");
HTM_Txt ("\tvar DAYS2 = [");
HTM_Txt ("\tconst DAYS2 = [");
for (DayOfWeek = 0;
DayOfWeek < 7;
DayOfWeek++)
@ -564,7 +564,7 @@ static void Lay_WriteScripts (void)
/***** Write script to initialize variables used to draw months *****/
HTM_SCRIPT_Begin (NULL,NULL);
HTM_Txt ("\tvar STR_EXAM = '");
HTM_Txt ("\tconst STR_EXAM = '");
HTM_TxtF (Txt_Exam_of_X,Gbl.Hierarchy.Node[Hie_CRS].FullName);
HTM_Txt ("';\n");
@ -759,6 +759,7 @@ static void Lay_WriteScriptInit (void)
bool RefreshConnected;
bool RefreshLastClicks = false;
bool RefreshNewTimeline = false;
bool RefreshOldTimeline = false;
bool RefreshMatchStd = false;
bool RefreshMatchTch = false;
@ -772,7 +773,7 @@ static void Lay_WriteScriptInit (void)
RefreshLastClicks = true;
break;
/* Timeline */
/* Global timeline */
case ActSeeGblTL:
case ActRcvPstGblTL:
case ActRcvComGblTL:
@ -781,6 +782,18 @@ static void Lay_WriteScriptInit (void)
case ActReqRemComGblTL:
case ActRemComGblTL:
RefreshNewTimeline = true;
RefreshOldTimeline = true;
break;
/* User timeline */
case ActSeeOthPubPrf:
case ActRcvPstUsrTL:
case ActRcvComUsrTL:
case ActReqRemPubUsrTL:
case ActRemPubUsrTL:
case ActReqRemComUsrTL:
case ActRemComUsrTL:
RefreshOldTimeline = true;
break;
/* Match */
@ -812,9 +825,9 @@ static void Lay_WriteScriptInit (void)
if (RefreshNewTimeline) // Refresh new timeline via AJAX
HTM_TxtF ("\tvar delayNewTml = %lu;\n",Cfg_TIME_TO_REFRESH_TIMELINE);
else if (RefreshMatchStd) // Refresh match via AJAX
HTM_TxtF ("\tvar delayMatch = %lu;\n",Cfg_TIME_TO_REFRESH_MATCH_STD);
HTM_TxtF ("\tconst delayMatch = %lu;\n",Cfg_TIME_TO_REFRESH_MATCH_STD);
else if (RefreshMatchTch) // Refresh match via AJAX
HTM_TxtF ("\tvar delayMatch = %lu;\n",Cfg_TIME_TO_REFRESH_MATCH_TCH);
HTM_TxtF ("\tconst delayMatch = %lu;\n",Cfg_TIME_TO_REFRESH_MATCH_TCH);
/***** Function init () ******/
HTM_Txt ("function init() {\n");
@ -831,8 +844,13 @@ static void Lay_WriteScriptInit (void)
if (RefreshLastClicks) // Refresh last clicks via AJAX
HTM_TxtF ("\tsetTimeout('refreshLastClicks()',%lu);\n",
Cfg_TIME_TO_REFRESH_LAST_CLICKS);
else if (RefreshNewTimeline) // Refresh timeline via AJAX
HTM_Txt ("\tsetTimeout('refreshNewTimeline()',delayNewTml);\n");
else if (RefreshNewTimeline || RefreshOldTimeline) // Refresh timeline via AJAX
{
if (RefreshNewTimeline)
HTM_Txt ("\tsetTimeout('refreshNewTimeline()',delayNewTml);\n");
if (RefreshOldTimeline)
HTM_Txt ("\twindow.addEventListener('scroll', handleInfiniteScroll);\n");
}
else if (RefreshMatchStd) // Refresh match for a student via AJAX
HTM_Txt ("\tsetTimeout('refreshMatchStd()',delayMatch);\n");
else if (RefreshMatchTch) // Refresh match for a teacher via AJAX
@ -854,15 +872,15 @@ static void Lay_WriteScriptParsAJAX (void)
/***** Parameters with code of session and current course code *****/
// Refresh parameters
HTM_TxtF ("var refreshParamIdSes = \"ses=%s\";\n"
"var refreshParamCrsCod = \"crs=%ld\";\n",
HTM_TxtF ("const refreshParamIdSes = \"ses=%s\";\n"
"const refreshParamCrsCod = \"crs=%ld\";\n",
Gbl.Session.Id,
Gbl.Hierarchy.Node[Hie_CRS].HieCod);
/***** Parameter to refresh connected users *****/
if (Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB)
// Refresh parameter
HTM_TxtF ("var refreshParamNxtActCon = \"act=%ld\";\n",
HTM_TxtF ("const refreshParamNxtActCon = \"act=%ld\";\n",
Act_GetActCod (ActRefCon));
/***** Parameters related with expanding/contracting folders in file browsers *****/
@ -870,8 +888,8 @@ static void Lay_WriteScriptParsAJAX (void)
/* In all actions related to file browsers ==>
put parameters used by AJAX */
// Refresh parameters
HTM_TxtF ("var refreshParamExpand = \"act=%ld\";\n"
"var refreshParamContract = \"act=%ld\";\n",
HTM_TxtF ("const refreshParamExpand = \"act=%ld\";\n"
"const refreshParamContract = \"act=%ld\";\n",
Act_GetActCod (Brw_GetActionExpand ()),
Act_GetActCod (Brw_GetActionContract ()));
@ -889,9 +907,9 @@ static void Lay_WriteScriptParsAJAX (void)
/* In all actions related to view or editing global timeline ==>
put parameters used by AJAX */
// Refresh parameters
HTM_TxtF ("var refreshParamNxtActNewPub = \"act=%ld\";\n"
"var refreshParamNxtActOldPub = \"act=%ld\";\n"
"var refreshParamWho = \"Who=%u\";\n",
HTM_TxtF ("const refreshParamNxtActNewPub = \"act=%ld\";\n"
"const refreshParamNxtActOldPub = \"act=%ld\";\n"
"const refreshParamWho = \"Who=%u\";\n",
Act_GetActCod (ActRefNewPubGblTL),
Act_GetActCod (ActRefOldPubGblTL),
(unsigned) TmlWho_GetGlobalWho ()); // Global variable got in a priori function
@ -909,8 +927,8 @@ static void Lay_WriteScriptParsAJAX (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0)
Usr_GetParOtherUsrCodEncrypted (&Gbl.Usrs.Other.UsrDat);
// Refresh parameters
HTM_TxtF ("var refreshParamNxtActOldPub = \"act=%ld\";\n"
"var refreshParamUsr = \"OtherUsrCod=%s\";\n",
HTM_TxtF ("const refreshParamNxtActOldPub = \"act=%ld\";\n"
"const refreshParamUsr = \"OtherUsrCod=%s\";\n",
Act_GetActCod (ActRefOldPubUsrTL),
Gbl.Usrs.Other.UsrDat.EnUsrCod);
break;
@ -920,8 +938,8 @@ static void Lay_WriteScriptParsAJAX (void)
case ActRemMchAnsQstStd:
case ActAnsMchQstStd:
// Refresh parameters
HTM_TxtF ("var refreshParamNxtActMch = \"act=%ld\";\n"
"var refreshParamMchCod = \"MchCod=%ld\";\n",
HTM_TxtF ("const refreshParamNxtActMch = \"act=%ld\";\n"
"const refreshParamMchCod = \"MchCod=%ld\";\n",
Act_GetActCod (ActRefMchStd),
Mch_GetMchCodBeingPlayed ());
break;
@ -937,15 +955,15 @@ static void Lay_WriteScriptParsAJAX (void)
// Handle keys in keyboard/presenter
HTM_Txt ("document.addEventListener(\"keydown\",handleMatchKeys);\n");
// Refresh parameters
HTM_TxtF ("var refreshParamNxtActMch = \"act=%ld\";\n"
"var refreshParamMchCod = \"MchCod=%ld\";\n",
HTM_TxtF ("const refreshParamNxtActMch = \"act=%ld\";\n"
"const refreshParamMchCod = \"MchCod=%ld\";\n",
Act_GetActCod (ActRefMchTch),
Mch_GetMchCodBeingPlayed ());
break;
/* Parameter related with clicks refreshing */
case ActLstClk:
// Refresh parameter
HTM_TxtF ("var refreshParamNxtActLstClk = \"act=%ld\";\n",
HTM_TxtF ("const refreshParamNxtActLstClk = \"act=%ld\";\n",
Act_GetActCod (ActRefLstClk));
break;
default: