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.40.2: Mar 03, 2021 Code refactoring in fav/share timeline.

This commit is contained in:
acanas 2021-03-03 10:02:42 +01:00
parent c4adac88ed
commit dca0e83339
9 changed files with 67 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -598,10 +598,11 @@ 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.
TODO: Salvador Romero Cortés: @acanas opción para editar posts
*/
#define Log_PLATFORM_VERSION "SWAD 20.40.1 (2021-03-03)"
#define Log_PLATFORM_VERSION "SWAD 20.40.2 (2021-03-03)"
#define CSS_FILE "swad20.33.9.css"
#define JS_FILE "swad20.6.2.js"
/*
Version 20.40.2: Mar 03, 2021 Code refactoring in fav/share timeline. (305519 lines)
Version 20.40.1: Mar 03, 2021 Code refactoring in fav/share timeline. (305532 lines)
Version 20.40: Mar 03, 2021 Code refactoring in fav/share timeline. (305532 lines)
Version 20.39.11: Mar 02, 2021 Code refactoring in fav/share timeline. (305525 lines)

7
swad_timeline_comment.c
View File

@ -644,9 +644,10 @@ static void TL_Com_WriteButtons (const struct TL_Timeline *Timeline,
/***** Foot column 1: fav zone *****/
HTM_DIV_Begin ("id=\"fav_com_%s_%u\" class=\"TL_FAV_COM TL_FAV_WIDTH\"",
Gbl.UniqueNameEncrypted,NumDiv);
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_COMM,
Com->PubCod,Com->UsrCod,Com->NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_COMM,
Com->PubCod,Com->UsrCod,Com->NumFavs,
TL_Usr_SHOW_FEW_USRS);
HTM_DIV_End ();
/***** Foot column 2: icon to remove this comment *****/

61
swad_timeline_favourite.c
View File

@ -84,9 +84,9 @@ void TL_Fav_ShowAllFaversNoteGbl (void)
TL_Not_GetDataOfNoteByCod (&Not);
/***** Write HTML inside DIV with form to fav/unfav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_ALL_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_ALL_USRS);
}
void TL_Fav_FavNoteUsr (void)
@ -106,9 +106,9 @@ void TL_Fav_FavNoteGbl (void)
TL_Fav_FavNote (&Not);
/***** Write HTML inside DIV with form to unfav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_FEW_USRS);
}
void TL_Fav_UnfNoteUsr (void)
@ -128,9 +128,9 @@ void TL_Fav_UnfNoteGbl (void)
TL_Fav_UnfNote (&Not);
/***** Write HTML inside DIV with form to fav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_NOTE,
Not.NotCod,Not.UsrCod,Not.NumFavs,
TL_Usr_SHOW_FEW_USRS);
}
static void TL_Fav_FavNote (struct TL_Not_Note *Not)
@ -219,9 +219,9 @@ void TL_Fav_ShowAllFaversComGbl (void)
Med_MediaDestructor (&Com.Content.Media);
/***** Write HTML inside DIV with form to fav/unfav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_ALL_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_ALL_USRS);
}
void TL_Fav_FavCommUsr (void)
@ -241,9 +241,9 @@ void TL_Fav_FavCommGbl (void)
TL_Fav_FavComm (&Com);
/***** Write HTML inside DIV with form to unfav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_FEW_USRS);
}
void TL_Fav_UnfCommUsr (void)
@ -263,9 +263,9 @@ void TL_Fav_UnfCommGbl (void)
TL_Fav_UnfComm (&Com);
/***** Write HTML inside DIV with form to fav *****/
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_COMM,
Com.PubCod,Com.UsrCod,Com.NumFavs,
TL_Usr_SHOW_FEW_USRS);
}
static void TL_Fav_FavComm (struct TL_Com_Comment *Com)
@ -345,28 +345,3 @@ static void TL_Fav_UnfComm (struct TL_Com_Comment *Com)
/***** Free image *****/
Med_MediaDestructor (&Com->Content.Media);
}
/*****************************************************************************/
/**************** Put icon to fav/unfav and list of favers *******************/
/*****************************************************************************/
void TL_Fav_PutIconToFavUnf (TL_Usr_FavSha_t FavSha,
long Cod,long UsrCod,unsigned NumUsrs,
TL_Usr_HowManyUsrs_t HowManyUsrs)
{
/***** Put form to fav/unfav this comment *****/
/* Begin container */
HTM_DIV_Begin ("class=\"TL_ICO\"");
/* Icon to fav/unfav */
if (Usr_ItsMe (UsrCod)) // I am the author ==> I can not fav/unfav
TL_Usr_PutDisabledIconFavSha (FavSha,NumUsrs);
else // I am not the author
TL_Frm_PutFormToFavUnfShaUns (FavSha,Cod);
/* End container */
HTM_DIV_End ();
/***** Show who have faved this note/comment *****/
TL_Usr_GetAndShowSharersOrFavers (FavSha,Cod,UsrCod,NumUsrs,HowManyUsrs);
}

4
swad_timeline_favourite.h
View File

@ -55,8 +55,4 @@ void TL_Fav_FavCommGbl (void);
void TL_Fav_UnfCommUsr (void);
void TL_Fav_UnfCommGbl (void);
void TL_Fav_PutIconToFavUnf (TL_Usr_FavSha_t FavSha,
long Cod,long UsrCod,unsigned NumUsrs,
TL_Usr_HowManyUsrs_t HowManyUsrs);
#endif

10
swad_timeline_note.c
View File

@ -841,16 +841,18 @@ static void TL_Not_WriteFavShaRem (const struct TL_Timeline *Timeline,
HTM_DIV_Begin ("id=\"fav_not_%s_%u\""
" class=\"TL_FAV_NOT TL_FAV_NOT_WIDTH\"",
Gbl.UniqueNameEncrypted,NumDiv);
TL_Fav_PutIconToFavUnf (TL_Usr_FAV_UNF_NOTE,
Not->NotCod,Not->UsrCod,Not->NumFavs,
TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_FAV_UNF_NOTE,
Not->NotCod,Not->UsrCod,Not->NumFavs,
TL_Usr_SHOW_FEW_USRS);
HTM_DIV_End ();
/***** Foot column 2: share zone *****/
HTM_DIV_Begin ("id=\"sha_not_%s_%u\""
" class=\"TL_SHA_NOT TL_SHA_NOT_WIDTH\"",
Gbl.UniqueNameEncrypted,NumDiv);
TL_Sha_PutIconToShaUnsNote (Not,TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_SHA_UNS_NOTE,
Not->NotCod,Not->UsrCod,Not->NumShared,
TL_Usr_SHOW_FEW_USRS);
HTM_DIV_End ();
/***** Foot column 3: icon to remove this note *****/

37
swad_timeline_share.c
View File

@ -81,7 +81,9 @@ void TL_Sha_ShowAllSharersNoteGbl (void)
TL_Not_GetDataOfNoteByCod (&Not);
/***** Write HTML inside DIV with form to share/unshare *****/
TL_Sha_PutIconToShaUnsNote (&Not,TL_Usr_SHOW_ALL_USRS);
TL_Usr_PutIconFavSha (TL_Usr_SHA_UNS_NOTE,
Not.NotCod,Not.UsrCod,Not.NumShared,
TL_Usr_SHOW_ALL_USRS);
}
void TL_Sha_ShaNoteUsr (void)
@ -101,7 +103,9 @@ void TL_Sha_ShaNoteGbl (void)
TL_Sha_ShaNote (&Not);
/***** Write HTML inside DIV with form to unshare *****/
TL_Sha_PutIconToShaUnsNote (&Not,TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_SHA_UNS_NOTE,
Not.NotCod,Not.UsrCod,Not.NumShared,
TL_Usr_SHOW_FEW_USRS);
}
static void TL_Sha_ShaNote (struct TL_Not_Note *Not)
@ -160,7 +164,9 @@ void TL_Sha_UnsNoteGbl (void)
TL_Sha_UnsNote (&Not);
/***** Write HTML inside DIV with form to share *****/
TL_Sha_PutIconToShaUnsNote (&Not,TL_Usr_SHOW_FEW_USRS);
TL_Usr_PutIconFavSha (TL_Usr_SHA_UNS_NOTE,
Not.NotCod,Not.UsrCod,Not.NumShared,
TL_Usr_SHOW_FEW_USRS);
}
static void TL_Sha_UnsNote (struct TL_Not_Note *Not)
@ -186,28 +192,3 @@ static void TL_Sha_UnsNote (struct TL_Not_Note *Not)
if (OriginalPubCod > 0)
Ntf_MarkNotifAsRemoved (Ntf_EVENT_TIMELINE_SHARE,OriginalPubCod);
}
void TL_Sha_PutIconToShaUnsNote (const struct TL_Not_Note *Not,
TL_Usr_HowManyUsrs_t HowManyUsrs)
{
/***** Put form to share/unshare this note *****/
/* Begin container */
HTM_DIV_Begin ("class=\"TL_ICO\"");
/* Icon to share */
if (Not->Unavailable || // Unavailable notes can not be shared
Usr_ItsMe (Not->UsrCod)) // I am the author
/* Put disabled icon */
TL_Usr_PutDisabledIconFavSha (TL_Usr_SHA_UNS_NOTE,Not->NumShared);
else // Available and I am not the author
/* Put icon to share/unshare */
TL_Frm_PutFormToFavUnfShaUns (TL_Usr_SHA_UNS_NOTE,Not->NotCod);
/* End container */
HTM_DIV_End ();
/***** Show who have shared this note *****/
TL_Usr_GetAndShowSharersOrFavers (TL_Usr_SHA_UNS_NOTE,
Not->NotCod,Not->UsrCod,Not->NumShared,HowManyUsrs);
}

2
swad_timeline_share.h
View File

@ -50,7 +50,5 @@ void TL_Sha_ShaNoteUsr (void);
void TL_Sha_ShaNoteGbl (void);
void TL_Sha_UnsNoteUsr (void);
void TL_Sha_UnsNoteGbl (void);
void TL_Sha_PutIconToShaUnsNote (const struct TL_Not_Note *Not,
TL_Usr_HowManyUsrs_t HowManyUsrs);
#endif

25
swad_timeline_user.c
View File

@ -287,6 +287,31 @@ unsigned TL_Usr_GetListFaversOrSharers (TL_Usr_FavSha_t FavSha,
return 0; // Not reached
}
/*****************************************************************************/
/**************** Put icon to fav/unfav and list of favers *******************/
/*****************************************************************************/
void TL_Usr_PutIconFavSha (TL_Usr_FavSha_t FavSha,
long Cod,long UsrCod,unsigned NumUsrs,
TL_Usr_HowManyUsrs_t HowManyUsrs)
{
/***** Put form to fav/unfav or share/unshare this note/comment *****/
/* Begin container */
HTM_DIV_Begin ("class=\"TL_ICO\"");
/* Icon to fav/unfav or share/unshare this note/comment */
if (Usr_ItsMe (UsrCod)) // I am the author ==> I can not fav/unfav or share/unshare
TL_Usr_PutDisabledIconFavSha (FavSha,NumUsrs);
else // I am not the author
TL_Frm_PutFormToFavUnfShaUns (FavSha,Cod);
/* End container */
HTM_DIV_End ();
/***** Show who have faved/shared this note/comment *****/
TL_Usr_GetAndShowSharersOrFavers (FavSha,Cod,UsrCod,NumUsrs,HowManyUsrs);
}
/*****************************************************************************/
/****************** Put disabled icon to mark as favourite *******************/
/*****************************************************************************/

3
swad_timeline_user.h
View File

@ -81,6 +81,9 @@ unsigned TL_Usr_GetListFaversOrSharers (TL_Usr_FavSha_t FavSha,
long Cod,long UsrCod,unsigned MaxUsrs,
MYSQL_RES **mysql_res);
void TL_Usr_PutIconFavSha (TL_Usr_FavSha_t FavSha,
long Cod,long UsrCod,unsigned NumUsrs,
TL_Usr_HowManyUsrs_t HowManyUsrs);
void TL_Usr_PutDisabledIconFavSha (TL_Usr_FavSha_t FavSha,unsigned NumUsrs);
#endif