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

Version 15.129.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-25 21:48:08 +01:00
parent 12d47161e3
commit 0ca6406309
4 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_changelog.h
View File

@ -117,20 +117,19 @@
// TODO: Go to forum post (or at least to forum thread) from social timeline and notifications?
// TODO: Width of column for data in notifications is too short
// TODO: Remove timeline notifications when clicking on "Show new activity" or "Show more"
// TODO: Do not show top message for original publishings
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.129 (2016-01-25)"
#define Log_PLATFORM_VERSION "SWAD 15.129.2 (2016-01-25)"
#define CSS_FILE "swad15.121.7.css"
#define JS_FILE "swad15.121.7.js"
// 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
/*
Version 15.129.2: Jan 25, 2016 Mark timeline notifications as seen when new social activity is shown. (194967 lines)
Version 15.129.1: Jan 25, 2016 Do not show top message in social timeline for original publishings. (194979 lines)
Version 15.129: Jan 25, 2016 Do not notify new social sharings or comments. (194979 lines)
Version 15.128.5: Jan 25, 2016 Fixed bug and code optimization when sharing a social note. (194958 lines)
Version 15.128.4: Jan 25, 2016 Fixed bug when removing a social note. (194961 lines)

28
swad_social.c
View File

@ -128,6 +128,8 @@ static void Soc_ShowTimelineUsrHighlightingNot (long NotCod);
static void Soc_GetAndShowNewTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl);
static void Soc_GetAndShowOldTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl);
static void Soc_MarkAllMyNotifAboutTimelineAsSeen (void);
static void Soc_BuildQueryToGetTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl,
Soc_WhatToGetFromTimeline_t WhatToGetFromTimeline,
char *Query);
@ -278,7 +280,7 @@ void Soc_ShowTimelineGbl (void)
Soc_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLLMENT_REQUEST
/* Social tab */
Soc_TOP_MESSAGE_PUBLISHED, // Ntf_EVENT_TIMELINE_PUBLISH
Soc_TOP_MESSAGE_NONE, // Ntf_EVENT_TIMELINE_PUBLISH
Soc_TOP_MESSAGE_COMMENTED, // Ntf_EVENT_TIMELINE_COMMENT
Soc_TOP_MESSAGE_FAVED, // Ntf_EVENT_TIMELINE_FAV
Soc_TOP_MESSAGE_SHARED, // Ntf_EVENT_TIMELINE_SHARE
@ -349,11 +351,7 @@ static void Soc_ShowTimelineGblHighlightingNot (long NotCod)
Soc_DropTemporaryTablesUsedToQueryTimeline ();
/***** Mark all my notifications related to timeline as seen *****/
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_PUBLISH,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_COMMENT,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_FAV ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_SHARE ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_MENTION,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Soc_MarkAllMyNotifAboutTimelineAsSeen ();
}
/*****************************************************************************/
@ -415,6 +413,9 @@ static void Soc_GetAndShowNewTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl)
/***** Drop temporary tables *****/
Soc_DropTemporaryTablesUsedToQueryTimeline ();
/***** Mark all my notifications related to timeline as seen *****/
Soc_MarkAllMyNotifAboutTimelineAsSeen ();
/***** All the output is made, so don't write anymore *****/
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
@ -459,6 +460,19 @@ static void Soc_GetAndShowOldTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
/*****************************************************************************/
/************ Mark all my notifications about timeline as seen ***************/
/*****************************************************************************/
static void Soc_MarkAllMyNotifAboutTimelineAsSeen (void)
{
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_PUBLISH,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_COMMENT,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_FAV ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_SHARE ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_MENTION,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
}
/*****************************************************************************/
/************************ Build query to get timeline ************************/
/*****************************************************************************/
@ -4197,7 +4211,7 @@ static void Soc_GetDataOfSocialPublishingFromRow (MYSQL_ROW row,struct SocialPub
const Soc_TopMessage_t TopMessages[Soc_NUM_PUB_TYPES] =
{
Soc_TOP_MESSAGE_NONE, // Soc_PUB_UNKNOWN
Soc_TOP_MESSAGE_PUBLISHED, // Soc_PUB_ORIGINAL_NOTE
Soc_TOP_MESSAGE_NONE, // Soc_PUB_ORIGINAL_NOTE
Soc_TOP_MESSAGE_SHARED, // Soc_PUB_SHARED_NOTE
Soc_TOP_MESSAGE_COMMENTED, // Soc_PUB_COMMENT_TO_NOTE
};

15
swad_social.h
View File

@ -87,17 +87,16 @@ typedef enum
} Soc_NoteType_t;
#define Soc_NUM_TOP_MESSAGES (1+7)
#define Soc_NUM_TOP_MESSAGES (1+6)
typedef enum
{
Soc_TOP_MESSAGE_NONE = 0,
Soc_TOP_MESSAGE_PUBLISHED = 1,
Soc_TOP_MESSAGE_COMMENTED = 2,
Soc_TOP_MESSAGE_FAVED = 3,
Soc_TOP_MESSAGE_UNFAVED = 4,
Soc_TOP_MESSAGE_SHARED = 5,
Soc_TOP_MESSAGE_UNSHARED = 6,
Soc_TOP_MESSAGE_MENTIONED = 7,
Soc_TOP_MESSAGE_COMMENTED = 1,
Soc_TOP_MESSAGE_FAVED = 2,
Soc_TOP_MESSAGE_UNFAVED = 3,
Soc_TOP_MESSAGE_SHARED = 4,
Soc_TOP_MESSAGE_UNSHARED = 5,
Soc_TOP_MESSAGE_MENTIONED = 6,
} Soc_TopMessage_t;
struct SocialPublishing

21
swad_text.c
View File

@ -36156,27 +36156,6 @@ const char *Txt_SOCIAL_NOTE_TOP_MESSAGES[Soc_NUM_TOP_MESSAGES] =
{
// Soc_TOP_MESSAGE_NONE
""
,
// Soc_TOP_MESSAGE_PUBLISHED:
#if L==1
"ha publicat"
#elif L==2
"hat veröffentlicht"
#elif L==3
"has published"
#elif L==4
"ha publicado"
#elif L==5
"a publié"
#elif L==6
"ha publicado" // Okoteve traducción
#elif L==7
"ha pubblicato"
#elif L==8
"opublikował"
#elif L==9
"publicou"
#endif
,
// Soc_TOP_MESSAGE_COMMENTED:
#if L==1