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

Version19.73.1

This commit is contained in:
Antonio Cañas Vargas 2019-11-20 01:47:22 +01:00
parent e269fbd9b9
commit 86b0be3aaa
5 changed files with 982 additions and 940 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1554
swad_action.c
View File

File diff suppressed because it is too large Load Diff

3
swad_changelog.h
View File

@ -488,13 +488,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.73 (2019-11-18)" #define Log_PLATFORM_VERSION "SWAD 19.73.1 (2019-11-19)"
#define CSS_FILE "swad19.73.css" #define CSS_FILE "swad19.73.css"
#define JS_FILE "swad19.70.js" #define JS_FILE "swad19.70.js"
/* /*
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
// TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Impedir la creación y edición de proyectos si no son editables.
Version 19.73.1: Nov 19, 2019 Code refactoring in notifications. (? lines)
Version 19.73: Nov 18, 2019 Changes in file browser. (247005 lines) Version 19.73: Nov 18, 2019 Changes in file browser. (247005 lines)
Version 19.72.2: Nov 18, 2019 Fixed bugs related to buttons. (247024 lines) Version 19.72.2: Nov 18, 2019 Fixed bugs related to buttons. (247024 lines)
Version 19.72.1: Nov 18, 2019 Fixed bugs related to buttons. (247023 lines) Version 19.72.1: Nov 18, 2019 Fixed bugs related to buttons. (247023 lines)

282
swad_notification.c
View File

@ -62,82 +62,94 @@ extern struct Globals Gbl;
const char *Ntf_WSNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = const char *Ntf_WSNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
{ {
"unknown", // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = "unknown",
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = "timelineComment",
[Ntf_EVENT_TIMELINE_FAV ] = "timelineFav",
[Ntf_EVENT_TIMELINE_SHARE ] = "timelineShare",
[Ntf_EVENT_TIMELINE_MENTION ] = "timelineMention",
[Ntf_EVENT_FOLLOWER ] = "follower",
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
"documentFile", // Ntf_EVENT_DOCUMENT_FILE
"teachersFile", // Ntf_EVENT_TEACHERS_FILE
"sharedFile", // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
"assignment", // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = "assignment",
"examAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = "survey",
"marksFile", // Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = "examAnnouncement",
/* Files tab */
[Ntf_EVENT_DOCUMENT_FILE ] = "documentFile",
[Ntf_EVENT_TEACHERS_FILE ] = "teachersFile",
[Ntf_EVENT_SHARED_FILE ] = "sharedFile",
[Ntf_EVENT_MARKS_FILE ] = "marksFile",
/* Users tab */ /* Users tab */
"enrollmentStudent", // Ntf_EVENT_ENROLMENT_STD // TODO: Change to "enrolmentStudent" carefully in future versions [Ntf_EVENT_ENROLMENT_STD ] = "enrollmentStudent",
"enrollmentTeacher", // Ntf_EVENT_ENROLMENT_TCH // TODO: Change to "enrolmentTeacher" carefully in future versions [Ntf_EVENT_ENROLMENT_NET ] = "enrolmentNonEditingTeacher",
"enrollmentRequest", // Ntf_EVENT_ENROLMENT_REQUEST // TODO: Change to "enrolmentRequest" carefully in future versions [Ntf_EVENT_ENROLMENT_TCH ] = "enrollmentTeacher",
[Ntf_EVENT_ENROLMENT_REQUEST] = "enrollmentRequest",
/* Social tab */
"timelineComment", // Ntf_EVENT_TIMELINE_COMMENT
"timelineFav", // Ntf_EVENT_TIMELINE_FAV
"timelineShare", // Ntf_EVENT_TIMELINE_SHARE
"timelineMention", // Ntf_EVENT_TIMELINE_MENTION
"follower", // Ntf_EVENT_FOLLOWER
"forumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
"forumReply", // Ntf_EVENT_FORUM_REPLY
/* Messages tab */ /* Messages tab */
"notice", // Ntf_EVENT_NOTICE [Ntf_EVENT_NOTICE ] = "notice",
"message", // Ntf_EVENT_MESSAGE [Ntf_EVENT_FORUM_POST_COURSE] = "forumPostCourse",
[Ntf_EVENT_FORUM_REPLY ] = "forumReply",
[Ntf_EVENT_MESSAGE ] = "message",
/* Statistics tab */ /* Analytics tab */
/* Profile tab */ /* Profile tab */
"survey", // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
"enrolmentNonEditingTeacher", // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] = static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] =
{ {
ActUnk, // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = ActUnk,
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = ActSeeSocTmlGbl,
[Ntf_EVENT_TIMELINE_FAV ] = ActSeeSocTmlGbl,
[Ntf_EVENT_TIMELINE_SHARE ] = ActSeeSocTmlGbl,
[Ntf_EVENT_TIMELINE_MENTION ] = ActSeeSocTmlGbl,
[Ntf_EVENT_FOLLOWER ] = ActSeeFlr,
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
ActSeeAdmDocCrsGrp, // Ntf_EVENT_DOCUMENT_FILE
ActAdmTchCrsGrp, // Ntf_EVENT_TEACHERS_FILE
ActAdmShaCrsGrp, // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
ActSeeAsg, // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = ActSeeAsg,
ActSeeAllExaAnn, // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = ActSeeAllSvy,
ActSeeAdmMrk, // Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = ActSeeAllExaAnn,
/* Files tab */
[Ntf_EVENT_DOCUMENT_FILE ] = ActSeeAdmDocCrsGrp,
[Ntf_EVENT_TEACHERS_FILE ] = ActAdmTchCrsGrp,
[Ntf_EVENT_SHARED_FILE ] = ActAdmShaCrsGrp,
[Ntf_EVENT_MARKS_FILE ] = ActSeeAdmMrk,
/* Users tab */ /* Users tab */
ActReqAccEnrStd, // Ntf_EVENT_ENROLMENT_STD [Ntf_EVENT_ENROLMENT_STD ] = ActReqAccEnrStd,
ActReqAccEnrTch, // Ntf_EVENT_ENROLMENT_TCH [Ntf_EVENT_ENROLMENT_NET ] = ActReqAccEnrNET,
ActSeeSignUpReq, // Ntf_EVENT_ENROLMENT_REQUEST [Ntf_EVENT_ENROLMENT_TCH ] = ActReqAccEnrTch,
[Ntf_EVENT_ENROLMENT_REQUEST] = ActSeeSignUpReq,
/* Social tab */
ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_COMMENT // TODO: Change position
ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_FAV // TODO: Change position
ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_SHARE // TODO: Change position
ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_MENTION // TODO: Change position
ActSeeFlr, // Ntf_EVENT_FOLLOWER // TODO: Change position
ActSeeFor, // Ntf_EVENT_FORUM_POST_COURSE // TODO: Change position
ActSeeFor, // Ntf_EVENT_FORUM_REPLY // TODO: Change position
/* Messages tab */ /* Messages tab */
ActSeeOneNot, // Ntf_EVENT_NOTICE [Ntf_EVENT_NOTICE ] = ActSeeOneNot,
ActExpRcvMsg, // Ntf_EVENT_MESSAGE [Ntf_EVENT_FORUM_POST_COURSE] = ActSeeFor,
[Ntf_EVENT_FORUM_REPLY ] = ActSeeFor,
[Ntf_EVENT_MESSAGE ] = ActExpRcvMsg,
/* Statistics tab */ /* Analytics tab */
/* Profile tab */ /* Profile tab */
ActSeeAllSvy, // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
ActReqAccEnrNET, // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
/*****************************************************************************/ /*****************************************************************************/
@ -147,124 +159,142 @@ static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] =
// Notify me notification events // Notify me notification events
static const char *Ntf_ParamNotifMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = static const char *Ntf_ParamNotifMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
{ {
"NotifyNtfEventUnknown", // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = "NotifyNtfEventUnknown",
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = "NotifyNtfEventTimelineComment",
[Ntf_EVENT_TIMELINE_FAV ] = "NotifyNtfEventTimelineFav",
[Ntf_EVENT_TIMELINE_SHARE ] = "NotifyNtfEventTimelineShare",
[Ntf_EVENT_TIMELINE_MENTION ] = "NotifyNtfEventTimelineMention",
[Ntf_EVENT_FOLLOWER ] = "NotifyNtfEventFollower",
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
"NotifyNtfEventDocumentFile", // Ntf_EVENT_DOCUMENT_FILE
"NotifyNtfEventTeachersFile", // Ntf_EVENT_TEACHERS_FILE
"NotifyNtfEventSharedFile", // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
"NotifyNtfEventAssignment", // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = "NotifyNtfEventAssignment",
"NotifyNtfEventExamAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = "NotifyNtfEventSurvey",
"NotifyNtfEventMarksFile", // Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = "NotifyNtfEventExamAnnouncement",
/* Users tab */ /* Files tab */
"NotifyNtfEventEnrolmentStudent", // Ntf_EVENT_ENROLMENT_STD [Ntf_EVENT_DOCUMENT_FILE ] = "NotifyNtfEventDocumentFile",
"NotifyNtfEventEnrolmentTeacher", // Ntf_EVENT_ENROLMENT_TCH [Ntf_EVENT_TEACHERS_FILE ] = "NotifyNtfEventTeachersFile",
"NotifyNtfEventEnrolmentRequest", // Ntf_EVENT_ENROLMENT_REQUEST [Ntf_EVENT_SHARED_FILE ] = "NotifyNtfEventSharedFile",
[Ntf_EVENT_MARKS_FILE ] = "NotifyNtfEventMarksFile",
/* Social tab */
"NotifyNtfEventTimelineComment", // Ntf_EVENT_TIMELINE_COMMENT
"NotifyNtfEventTimelineFav", // Ntf_EVENT_TIMELINE_FAV
"NotifyNtfEventTimelineShare", // Ntf_EVENT_TIMELINE_SHARE
"NotifyNtfEventTimelineMention", // Ntf_EVENT_TIMELINE_MENTION
"NotifyNtfEventFollower", // Ntf_EVENT_FOLLOWER
"NotifyNtfEventForumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
"NotifyNtfEventForumReply", // Ntf_EVENT_FORUM_REPLY
/* Messages tab */ /* Messages tab */
"NotifyNtfEventNotice", // Ntf_EVENT_NOTICE [Ntf_EVENT_NOTICE ] = "NotifyNtfEventNotice",
"NotifyNtfEventMessage", // Ntf_EVENT_MESSAGE [Ntf_EVENT_FORUM_POST_COURSE] = "NotifyNtfEventForumPostCourse",
[Ntf_EVENT_FORUM_REPLY ] = "NotifyNtfEventForumReply",
[Ntf_EVENT_MESSAGE ] = "NotifyNtfEventMessage",
/* Statistics tab */ /* Users tab */
[Ntf_EVENT_ENROLMENT_STD ] = "NotifyNtfEventEnrolmentStudent",
[Ntf_EVENT_ENROLMENT_NET ] = "NotifyNtfEventEnrolmentNonEditingTeacher",
[Ntf_EVENT_ENROLMENT_TCH ] = "NotifyNtfEventEnrolmentTeacher",
[Ntf_EVENT_ENROLMENT_REQUEST] = "NotifyNtfEventEnrolmentRequest",
/* Analytics tab */
/* Profile tab */ /* Profile tab */
"NotifyNtfEventSurvey", // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
"NotifyNtfEventEnrolmentNonEditingTeacher", // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
// Email me about notification events // Email me about notification events
static const char *Ntf_ParamEmailMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = static const char *Ntf_ParamEmailMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
{ {
"EmailNtfEventUnknown", // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = "EmailNtfEventUnknown",
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = "EmailNtfEventTimelineComment",
[Ntf_EVENT_TIMELINE_FAV ] = "EmailNtfEventTimelineFav",
[Ntf_EVENT_TIMELINE_SHARE ] = "EmailNtfEventTimelineShare",
[Ntf_EVENT_TIMELINE_MENTION ] = "EmailNtfEventTimelineMention",
[Ntf_EVENT_FOLLOWER ] = "EmailNtfEventSocialFollower",
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
"EmailNtfEventDocumentFile", // Ntf_EVENT_DOCUMENT_FILE
"EmailNtfEventTeachersFile", // Ntf_EVENT_TEACHERS_FILE
"EmailNtfEventSharedFile", // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
"EmailNtfEventAssignment", // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = "EmailNtfEventAssignment",
"EmailNtfEventExamAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = "EmailNtfEventSurvey",
"EmailNtfEventMarksFile", // Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = "EmailNtfEventExamAnnouncement",
/* Users tab */ /* Files tab */
"EmailNtfEventEnrolmentStudent", // Ntf_EVENT_ENROLMENT_STD [Ntf_EVENT_DOCUMENT_FILE ] = "EmailNtfEventDocumentFile",
"EmailNtfEventEnrolmentTeacher", // Ntf_EVENT_ENROLMENT_TCH [Ntf_EVENT_TEACHERS_FILE ] = "EmailNtfEventTeachersFile",
"EmailNtfEventEnrolmentRequest", // Ntf_EVENT_ENROLMENT_REQUEST [Ntf_EVENT_SHARED_FILE ] = "EmailNtfEventSharedFile",
[Ntf_EVENT_MARKS_FILE ] = "EmailNtfEventMarksFile",
/* Social tab */
"EmailNtfEventTimelineComment", // Ntf_EVENT_TIMELINE_COMMENT
"EmailNtfEventTimelineFav", // Ntf_EVENT_TIMELINE_FAV
"EmailNtfEventTimelineShare", // Ntf_EVENT_TIMELINE_SHARE
"EmailNtfEventTimelineMention", // Ntf_EVENT_TIMELINE_MENTION
"EmailNtfEventSocialFollower", // Ntf_EVENT_FOLLOWER
"EmailNtfEventForumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
"EmailNtfEventForumReply", // Ntf_EVENT_FORUM_REPLY
/* Messages tab */ /* Messages tab */
"EmailNtfEventNotice", // Ntf_EVENT_NOTICE [Ntf_EVENT_NOTICE ] = "EmailNtfEventNotice",
"EmailNtfEventMessage", // Ntf_EVENT_MESSAGE [Ntf_EVENT_FORUM_POST_COURSE] = "EmailNtfEventForumPostCourse",
[Ntf_EVENT_FORUM_REPLY ] = "EmailNtfEventForumReply",
[Ntf_EVENT_MESSAGE ] = "EmailNtfEventMessage",
/* Users tab */
[Ntf_EVENT_ENROLMENT_STD ] = "EmailNtfEventEnrolmentStudent",
[Ntf_EVENT_ENROLMENT_NET ] = "EmailNtfEventEnrolmentNonEditingTeacher",
[Ntf_EVENT_ENROLMENT_TCH ] = "EmailNtfEventEnrolmentTeacher",
[Ntf_EVENT_ENROLMENT_REQUEST] = "EmailNtfEventEnrolmentRequest",
/* Statistics tab */ /* Statistics tab */
/* Profile tab */ /* Profile tab */
"EmailNtfEventSurvey", // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
"EmailNtfEventEnrolmentNonEditingTeacher", // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
// Icons for notification events // Icons for notification events
static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] = static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] =
{ {
"question.svg", // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = "question.svg",
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = "comment-dots.svg",
[Ntf_EVENT_TIMELINE_FAV ] = "star.svg",
[Ntf_EVENT_TIMELINE_SHARE ] = "share-alt.svg",
[Ntf_EVENT_TIMELINE_MENTION ] = "at.svg",
[Ntf_EVENT_FOLLOWER ] = "user-plus.svg",
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
"file.svg", // Ntf_EVENT_DOCUMENT_FILE
"file.svg", // Ntf_EVENT_TEACHERS_FILE
"file.svg", // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
"edit.svg", // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = "edit.svg",
"bullhorn.svg", // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = "poll.svg",
"clipboard-list.svg",// Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = "bullhorn.svg",
/* Users tab */ /* Files tab */
"user.svg", // Ntf_EVENT_ENROLMENT_STD [Ntf_EVENT_DOCUMENT_FILE ] = "file.svg",
"user-tie.svg", // Ntf_EVENT_ENROLMENT_TCH [Ntf_EVENT_TEACHERS_FILE ] = "file.svg",
"hand-point-up.svg", // Ntf_EVENT_ENROLMENT_REQUEST [Ntf_EVENT_SHARED_FILE ] = "file.svg",
[Ntf_EVENT_MARKS_FILE ] = "clipboard-list.svg",
/* Social tab */
"comment-dots.svg", // Ntf_EVENT_TIMELINE_COMMENT
"star.svg", // Ntf_EVENT_TIMELINE_FAV
"share-alt.svg", // Ntf_EVENT_TIMELINE_SHARE
"at.svg", // Ntf_EVENT_TIMELINE_MENTION
"user-plus.svg", // Ntf_EVENT_FOLLOWER
"comments.svg", // Ntf_EVENT_FORUM_POST_COURSE
"comments.svg", // Ntf_EVENT_FORUM_REPLY
/* Messages tab */ /* Messages tab */
"sticky-note.svg", // Ntf_EVENT_NOTICE [Ntf_EVENT_NOTICE ] = "sticky-note.svg",
"envelope.svg", // Ntf_EVENT_MESSAGE [Ntf_EVENT_FORUM_POST_COURSE] = "comments.svg",
[Ntf_EVENT_FORUM_REPLY ] = "comments.svg",
[Ntf_EVENT_MESSAGE ] = "envelope.svg",
/* Users tab */
[Ntf_EVENT_ENROLMENT_STD ] = "user.svg",
[Ntf_EVENT_ENROLMENT_NET ] = "user-tie.svg",
[Ntf_EVENT_ENROLMENT_TCH ] = "user-tie.svg",
[Ntf_EVENT_ENROLMENT_REQUEST] = "hand-point-up.svg",
/* Statistics tab */ /* Statistics tab */
/* Profile tab */ /* Profile tab */
"poll.svg", // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
"user-tie.svg", // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
/*****************************************************************************/ /*****************************************************************************/

25
swad_notification.h
View File

@ -55,6 +55,18 @@ typedef enum // TODO: Change numbers (also in database)!!!!!!!!!!!!!!
{ {
Ntf_EVENT_UNKNOWN = 0, Ntf_EVENT_UNKNOWN = 0,
/* Start tab */
Ntf_EVENT_TIMELINE_COMMENT = 10, // New comment to one of my social publishings (notes or comments)
Ntf_EVENT_TIMELINE_FAV = 11, // New fav of one of my social publishings (notes or comments)
Ntf_EVENT_TIMELINE_SHARE = 12, // New sharing of one of my social notes
Ntf_EVENT_TIMELINE_MENTION = 13, // New mention
Ntf_EVENT_FOLLOWER = 14,
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
/* Assessment tab */ /* Assessment tab */
@ -74,20 +86,13 @@ typedef enum // TODO: Change numbers (also in database)!!!!!!!!!!!!!!
Ntf_EVENT_ENROLMENT_TCH = 8, Ntf_EVENT_ENROLMENT_TCH = 8,
Ntf_EVENT_ENROLMENT_REQUEST = 9, Ntf_EVENT_ENROLMENT_REQUEST = 9,
/* Social tab */
Ntf_EVENT_TIMELINE_COMMENT = 10, // New comment to one of my social publishings (notes or comments)
Ntf_EVENT_TIMELINE_FAV = 11, // New fav of one of my social publishings (notes or comments)
Ntf_EVENT_TIMELINE_SHARE = 12, // New sharing of one of my social notes
Ntf_EVENT_TIMELINE_MENTION = 13, // New mention
Ntf_EVENT_FOLLOWER = 14,
Ntf_EVENT_FORUM_POST_COURSE = 15, // New post in forums of my courses
Ntf_EVENT_FORUM_REPLY = 16, // New reply to one of my posts in any forum
/* Messages tab */ /* Messages tab */
Ntf_EVENT_NOTICE = 17, Ntf_EVENT_NOTICE = 17,
Ntf_EVENT_FORUM_POST_COURSE = 15, // New post in forums of my courses
Ntf_EVENT_FORUM_REPLY = 16, // New reply to one of my posts in any forum
Ntf_EVENT_MESSAGE = 18, Ntf_EVENT_MESSAGE = 18,
/* Statistics tab */ /* Analytics tab */
/* Profile tab */ /* Profile tab */

58
swad_timeline.c
View File

@ -343,42 +343,48 @@ void TL_ShowTimelineGbl2 (void)
Ntf_NotifyEvent_t NotifyEvent; Ntf_NotifyEvent_t NotifyEvent;
const TL_TopMessage_t TopMessages[Ntf_NUM_NOTIFY_EVENTS] = const TL_TopMessage_t TopMessages[Ntf_NUM_NOTIFY_EVENTS] =
{ {
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_UNKNOWN [Ntf_EVENT_UNKNOWN ] = TL_TOP_MESSAGE_NONE,
/* Start tab */
[Ntf_EVENT_TIMELINE_COMMENT ] = TL_TOP_MESSAGE_COMMENTED,
[Ntf_EVENT_TIMELINE_FAV ] = TL_TOP_MESSAGE_FAVED,
[Ntf_EVENT_TIMELINE_SHARE ] = TL_TOP_MESSAGE_SHARED,
[Ntf_EVENT_TIMELINE_MENTION ] = TL_TOP_MESSAGE_MENTIONED,
[Ntf_EVENT_FOLLOWER ] = TL_TOP_MESSAGE_NONE,
/* System tab */
/* Country tab */
/* Institution tab */
/* Centre tab */
/* Degree tab */
/* Course tab */ /* Course tab */
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_DOCUMENT_FILE
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_TEACHERS_FILE
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_SHARED_FILE
/* Assessment tab */ /* Assessment tab */
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_ASSIGNMENT [Ntf_EVENT_ASSIGNMENT ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_EXAM_ANNOUNCEMENT [Ntf_EVENT_SURVEY ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_MARKS_FILE [Ntf_EVENT_EXAM_ANNOUNCEMENT] = TL_TOP_MESSAGE_NONE,
/* Files tab */
[Ntf_EVENT_DOCUMENT_FILE ] = TL_TOP_MESSAGE_NONE,
[Ntf_EVENT_TEACHERS_FILE ] = TL_TOP_MESSAGE_NONE,
[Ntf_EVENT_SHARED_FILE ] = TL_TOP_MESSAGE_NONE,
[Ntf_EVENT_MARKS_FILE ] = TL_TOP_MESSAGE_NONE,
/* Users tab */ /* Users tab */
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLMENT_STD [Ntf_EVENT_ENROLMENT_STD ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLMENT_TCH [Ntf_EVENT_ENROLMENT_NET ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLMENT_REQUEST [Ntf_EVENT_ENROLMENT_TCH ] = TL_TOP_MESSAGE_NONE,
[Ntf_EVENT_ENROLMENT_REQUEST] = TL_TOP_MESSAGE_NONE,
/* Start tab */ // TODO: Move to top
TL_TOP_MESSAGE_COMMENTED, // Ntf_EVENT_TIMELINE_COMMENT
TL_TOP_MESSAGE_FAVED, // Ntf_EVENT_TIMELINE_FAV
TL_TOP_MESSAGE_SHARED, // Ntf_EVENT_TIMELINE_SHARE
TL_TOP_MESSAGE_MENTIONED, // Ntf_EVENT_TIMELINE_MENTION
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_FOLLOWER
/* Messages tab */ /* Messages tab */
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_FORUM_POST_COURSE [Ntf_EVENT_NOTICE ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_FORUM_REPLY [Ntf_EVENT_FORUM_POST_COURSE] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_NOTICE [Ntf_EVENT_FORUM_REPLY ] = TL_TOP_MESSAGE_NONE,
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_MESSAGE [Ntf_EVENT_MESSAGE ] = TL_TOP_MESSAGE_NONE,
/* Statistics tab */ /* Analytics tab */
/* Profile tab */ /* Profile tab */
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_SURVEY // TODO: Move to assessment tab (also necessary in database) !!!!!!!!!
TL_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLMENT_NET // TODO: Move to users tab (also necessary in database) !!!!!!!!!
}; };
/***** Initialize note code to -1 ==> no highlighted note *****/ /***** Initialize note code to -1 ==> no highlighted note *****/
@ -1910,9 +1916,9 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot)
/* Start tab */ /* Start tab */
ActUnk, // TL_NOTE_SOCIAL_POST (action not used) // TODO: Move to start tab ActUnk, // TL_NOTE_SOCIAL_POST (action not used) // TODO: Move to start tab
ActSeeFor, // TL_NOTE_FORUM_POST // TODO: Move to messages tab
/* Messages tab */ /* Messages tab */
ActSeeFor, // TL_NOTE_FORUM_POST // TODO: Move down
ActSeeOneNot, // TL_NOTE_NOTICE ActSeeOneNot, // TL_NOTE_NOTICE
/* Statistics tab */ /* Statistics tab */