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 20.69.2: May 04, 2021 Fixed bug in removal of timeline favs.

This commit is contained in:
acanas 2021-05-04 19:58:33 +02:00
parent 2c419baa32
commit 4818af539d
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/swad20.69.1.js
View File

@ -4,7 +4,7 @@
SWAD (Shared Workspace At a Distance),
is a web platform developed at the University of Granada (Spain),
and used to support university teaching.
Copyright (C) 1999-2020 Antonio Cañas-Vargas
Copyright (C) 1999-2021 Antonio Cañas-Vargas
University of Granada (SPAIN) (acanas@ugr.es)
This program is free software: you can redistribute it and/or modify
@ -978,7 +978,7 @@ function moveNewTimelineToTimeline () {
for (var j=0; j<lastChildIndex; j++)
if (newTimeline.childNodes[j].dataset.noteCode ==
newTimeline.lastChild.dataset.noteCode) {
newTimeline.lastChild.dataset.noteCode) {
mostRecentOcurrenceOfNote = false;
break;
}

3
swad_changelog.h
View File

@ -600,13 +600,14 @@ TODO: Salvador Romero Cort
TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria.
*/
#define Log_PLATFORM_VERSION "SWAD 20.69.1 (2021-04-30)"
#define Log_PLATFORM_VERSION "SWAD 20.69.2 (2021-05-04)"
#define CSS_FILE "swad20.45.css"
#define JS_FILE "swad20.69.1.js"
/*
TODO: Rename CENTRE to CENTER in help wiki.
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
Version 20.69.2: May 04, 2021 Fixed bug in removal of timeline favs. (309778 lines)
Version 20.69.1: Apr 30, 2021 Code refactoring in JavaScript (firstChild instead of childNodes[0]). (309775 lines)
Version 20.69: Apr 30, 2021 Changes in timeline to not repeat notes in new activity. (309773 lines)
Version 20.68.8: Apr 30, 2021 Code refactoring in timeline. (309751 lines)

42
swad_timeline.c
View File

@ -39,11 +39,11 @@ mysql> SHOW TABLES LIKE 'tml_%';
The timeline is a set of publications.
A publication can be:
· an original note (22783, 83% of 27396)
· a shared note ( 750, 3% of 27396)
· a comment to a note ( 3863, 14% of 27396)
· an original note (23573, 80% of 29435)
· a shared note ( 1007, 3% of 29435)
· a comment to a note ( 4855, 17% of 29435)
*Numbers are got from swad.ugr.es on february 2020
*Numbers are got from swad.ugr.es on may 2021
____tml_pubs___ _tml_comments
| | | |
@ -58,28 +58,28 @@ mysql> SHOW TABLES LIKE 'tml_%';
|Publication i+4|---------->| Comment 1 |---+ |
| (comment) | | (to note n) | | |
|_______________| |_____________| | |
| | (3863) | |
| | (4855) | |
|Publication i+3|-- | |
|(original note)| \ | |
|_______________| \ ___tml_notes___ | | _calls_for_exams
| | \ | | | | | |
|Publication i+2|-- ---->| Note n |<-+ | | Call for exam | (5571)
|(original note)| \ |(exam announc.)|-(2639)->|_______________|
|_______________| \ |_______________| 12% ____files____
|Publication i+2|-- ---->| Note n |<-+ | | Call for exam | (5581)
|(original note)| \ |(exam announc.)|-(2622)->|_______________|
|_______________| \ |_______________| 11% ____files____
| | \ | | | | |
|Publication i+1|-- ---->| Note n-1 |-(64)--->| Public file | (1473406)
|Publication i+1|-- ---->| Note n-1 |-(64)--->| Public file | (1497132)
|(original note)| \ | (public file) | <1% |_____________|
|_______________| \ |_______________| | _notices_
| | \ | | | | |
| Publication i |-- ---->| Note n-2 |-(16693)>| Notice | (14793)
|(original note)| \ | (notice) | 73% |_________|
| Publication i |-- ---->| Note n-2 |-(17078)>| Notice | (14984)
|(original note)| \ | (notice) | 72% |_________|
|_______________| \ |_______________| | __tml_posts__
| | \ | | | | |
· ... · ---->| Note n-3 |-(3119)->| Post s |
· ... · | (tl. post) | 14% | |
· ... · ---->| Note n-3 |-(3533)->| Post s |
· ... · | (tl. post) | 15% | |
|_______________| |_______________| | |_____________|
| | | | | | |
| Publication 3 | · ... · | · ... · (3119)
| Publication 3 | · ... · | · ... · (3533)
| (shared note) |--- · ... · | · ... ·
|_______________| \ |_______________| | |_____________|
| | \ | | | | |
@ -88,16 +88,16 @@ mysql> SHOW TABLES LIKE 'tml_%';
|_______________| |_______________| |_____________|
| | | | _forum_post_
| Publication 1 |--------->| Note 1 | | |
|(original note)| | (forum post) |-(268)-->| Forum post | (66226)
|(original note)| | (forum post) |-(276)-->| Forum post | (66226)
|_______________| |_______________| 1% |____________|
(27396) (22783)
(29435) (23573)
A note can be:
· a timeline post ( 3119, 14% of 22783)
· a public file ( 64, <1% of 22783)
· an exam announcement ( 2639, 12% of 22783)
· a notice (16693, 73% of 22783)
· a forum post ( 268, 1% of 22783)
· a timeline post ( 3533, 15% of 23573)
· a public file ( 64, <1% of 23573)
· an exam announcement ( 2622, 11% of 23573)
· a notice (17078, 72% of 23573)
· a forum post ( 276, 1% of 23573)
written by an author in a date-time.
A note can have comments attached to it.

6
swad_timeline_database.c
View File

@ -1117,12 +1117,14 @@ void Tml_DB_RemoveAllFavsToPubsBy (Tml_Usr_FavSha_t FavSha,long UsrCod)
"%s"
" WHERE tml_pubs.PublisherCod=%ld" // Author of the comment
" AND tml_pubs.PubType=%u"
" AND tml_pubs.PubCod=%s.PubCod",
" AND tml_pubs.%s=%s.%s",
Tml_DB_TableFav[FavSha],
Tml_DB_TableFav[FavSha],
UsrCod,
(unsigned) Tml_DB_PubTypeFav[FavSha],
Tml_DB_TableFav[FavSha]);
Tml_DB_FieldFav[FavSha],
Tml_DB_TableFav[FavSha],
Tml_DB_FieldFav[FavSha]);
}
/*****************************************************************************/