diff --git a/swad_API.c b/swad_API.c index 7ee3b369c..8b16057d9 100644 --- a/swad_API.c +++ b/swad_API.c @@ -173,25 +173,25 @@ typedef enum /* Translation from service-web-role to swad-core-role */ Rol_Role_t API_SvcRole_to_RolRole[API_NUM_ROLES] = { - Rol_UNK, // API_ROLE_UNKNOWN - Rol_GST, // API_ROLE__GUEST_ - Rol_STD, // API_ROLE_STUDENT - Rol_TCH, // API_ROLE_TEACHER // TODO: Create new web service role for non-editing teachers + [API_ROLE_UNKNOWN] = Rol_UNK, + [API_ROLE__GUEST_] = Rol_GST, + [API_ROLE_STUDENT] = Rol_STD, + [API_ROLE_TEACHER] = Rol_TCH, // TODO: Create new web service role for non-editing teachers }; /* Translation from swad-core-role to service-web-role */ API_Role_t API_RolRole_to_SvcRole[Rol_NUM_ROLES] = { - API_ROLE_UNKNOWN, // Rol_UNK - API_ROLE__GUEST_, // Rol_GST - API_ROLE_UNKNOWN, // Rol_USR - API_ROLE_STUDENT, // Rol_STD - API_ROLE_TEACHER, // Rol_NET // TODO: Create new web service role for non-editing teachers - API_ROLE_TEACHER, // Rol_TCH - API_ROLE_UNKNOWN, // Rol_DEG_ADM - API_ROLE_UNKNOWN, // Rol_CTR_ADM - API_ROLE_UNKNOWN, // Rol_INS_ADM - API_ROLE_UNKNOWN, // Rol_SYS_ADM + [Rol_UNK ] = API_ROLE_UNKNOWN, + [Rol_GST ] = API_ROLE__GUEST_, + [Rol_USR ] = API_ROLE_UNKNOWN, + [Rol_STD ] = API_ROLE_STUDENT, + [Rol_NET ] = API_ROLE_TEACHER, // TODO: Create new web service role for non-editing teachers + [Rol_TCH ] = API_ROLE_TEACHER, + [Rol_DEG_ADM] = API_ROLE_UNKNOWN, + [Rol_CTR_ADM] = API_ROLE_UNKNOWN, + [Rol_INS_ADM] = API_ROLE_UNKNOWN, + [Rol_SYS_ADM] = API_ROLE_UNKNOWN, }; #define API_BYTES_WS_KEY Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 diff --git a/swad_action.c b/swad_action.c index d83a60f56..18c3cb18d 100644 --- a/swad_action.c +++ b/swad_action.c @@ -5253,13 +5253,13 @@ void Act_AdjustActionWhenNoUsrLogged (void) { static const Act_Action_t Actions[Hie_NUM_LEVELS] = { - ActUnk, // Hie_UNK, Unknown - ActFrmLogIn, // Hie_SYS, System - ActSeeCtyInf, // Hie_CTY, Country - ActSeeInsInf, // Hie_INS, Institution - ActSeeCtrInf, // Hie_CTR, Centre - ActSeeDegInf, // Hie_DEG, Degree - ActSeeCrsInf, // Hie_CRS, Course + [Hie_UNK] = ActUnk, // Unknown + [Hie_SYS] = ActFrmLogIn, // System + [Hie_CTY] = ActSeeCtyInf, // Country + [Hie_INS] = ActSeeInsInf, // Institution + [Hie_CTR] = ActSeeCtrInf, // Centre + [Hie_DEG] = ActSeeDegInf, // Degree + [Hie_CRS] = ActSeeCrsInf, // Course }; if (Gbl.Hierarchy.Level >= Hie_NUM_LEVELS) diff --git a/swad_agenda.c b/swad_agenda.c index da1e4d6a3..aaf31d5e4 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -184,8 +184,8 @@ static void Agd_ShowFormToSelPast__FutureEvents (void) Agd_Past__FutureEvents_t PstFut; static const char *Icon[2] = { - "calendar-minus.svg", // Agd_PAST___EVENTS - "calendar-plus.svg", // Agd_FUTURE_EVENTS + [Agd_PAST___EVENTS] = "calendar-minus.svg", + [Agd_FUTURE_EVENTS] = "calendar-plus.svg", }; Set_StartOneSettingSelector (); @@ -221,8 +221,8 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void) Agd_PrivatPublicEvents_t PrvPub; static const char *Icon[2] = { - "lock.svg", // Agd_PRIVAT_EVENTS - "unlock.svg", // Agd_PUBLIC_EVENTS + [Agd_PRIVAT_EVENTS] = "lock.svg", + [Agd_PUBLIC_EVENTS] = "unlock.svg", }; Set_StartOneSettingSelector (); @@ -258,8 +258,8 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void) Agd_HiddenVisiblEvents_t HidVis; static const char *Icon[2] = { - "eye-slash.svg", // Agd_HIDDEN_EVENTS - "eye.svg", // Agd_VISIBL_EVENTS + [Agd_HIDDEN_EVENTS] = "eye-slash.svg", + [Agd_VISIBL_EVENTS] = "eye.svg", }; Set_StartOneSettingSelector (); @@ -442,10 +442,10 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) unsigned NumEvent; Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] = { - Pag_MY_AGENDA, // Agd_MY_AGENDA_TODAY, not used - Pag_MY_AGENDA, // Agd_MY_AGENDA - Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA_TODAY, not used - Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA + [Agd_MY_AGENDA_TODAY ] = Pag_MY_AGENDA, // not used + [Agd_MY_AGENDA ] = Pag_MY_AGENDA, + [Agd_ANOTHER_AGENDA_TODAY] = Pag_ANOTHER_AGENDA, // not used + [Agd_ANOTHER_AGENDA ] = Pag_ANOTHER_AGENDA, }; /***** Get parameters *****/ @@ -919,10 +919,10 @@ static void Agd_GetParams (Agd_AgendaType_t AgendaType) { Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] = { - Pag_MY_AGENDA, // Agd_MY_AGENDA_TODAY, not used - Pag_MY_AGENDA, // Agd_MY_AGENDA - Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA_TODAY, not used - Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA + [Agd_MY_AGENDA_TODAY ] = Pag_MY_AGENDA, // not used + [Agd_MY_AGENDA ] = Pag_MY_AGENDA, + [Agd_ANOTHER_AGENDA_TODAY] = Pag_ANOTHER_AGENDA, // not used + [Agd_ANOTHER_AGENDA ] = Pag_ANOTHER_AGENDA, }; if (AgendaType == Agd_MY_AGENDA) @@ -978,8 +978,8 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType) char HiddenVisiblEventsSubQuery[Agd_MAX_BYTES_SUBQUERY]; static const char *OrderBySubQuery[Agd_NUM_ORDERS] = { - "StartTime,EndTime,Event,Location", // Agd_ORDER_BY_START_DATE - "EndTime,StartTime,Event,Location", // Agd_ORDER_BY_END_DATE + [Agd_ORDER_BY_START_DATE] = "StartTime,EndTime,Event,Location", + [Agd_ORDER_BY_END_DATE ] = "EndTime,StartTime,Event,Location", }; MYSQL_RES *mysql_res; MYSQL_ROW row; diff --git a/swad_alert.c b/swad_alert.c index c157055d3..798fd8d41 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -53,13 +53,13 @@ extern struct Globals Gbl; static const char *Ale_AlertIcons[Ale_NUM_ALERT_TYPES] = { - NULL, // Ale_NONE - "clipboard.svg", // Ale_CLIPBOARD - "info-circle.svg", // Ale_INFO - "check-circle.svg", // Ale_SUCCESS - "question64x64.gif", // Ale_QUESTION animated gif - "warning64x64.gif", // Ale_WARNING animated gif - "error64x64.gif", // Ale_ERROR animated gif + [Ale_NONE ] = NULL, + [Ale_CLIPBOARD] = "clipboard.svg", + [Ale_INFO ] = "info-circle.svg", + [Ale_SUCCESS ] = "check-circle.svg", + [Ale_QUESTION ] = "question64x64.gif", // animated gif + [Ale_WARNING ] = "warning64x64.gif", // animated gif + [Ale_ERROR ] = "error64x64.gif", // animated gif }; /*****************************************************************************/ @@ -382,13 +382,13 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx char IdAlert[Frm_MAX_BYTES_ID + 1]; static const bool AlertClosable[Ale_NUM_ALERT_TYPES] = { - false, // Ale_NONE - true, // Ale_CLIPBOARD - true, // Ale_INFO - true, // Ale_SUCCESS - true, // Ale_QUESTION - true, // Ale_WARNING - true, // Ale_ERROR + [Ale_NONE ] = false, + [Ale_CLIPBOARD] = true, + [Ale_INFO ] = true, + [Ale_SUCCESS ] = true, + [Ale_QUESTION ] = true, + [Ale_WARNING ] = true, + [Ale_ERROR ] = true, }; /****** If start of page is not written yet, do it now ******/ diff --git a/swad_announcement.c b/swad_announcement.c index c2a61b7b2..e913419bd 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -279,23 +279,23 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, extern const char *Txt_Do_not_show_again; static const char *ContainerClass[Ann_NUM_STATUS] = { - "NOTICE_CONTAINER_ACTIVE NOTICE_CONTAINER_WIDE", // Ann_ACTIVE_ANNOUNCEMENT - "NOTICE_CONTAINER_OBSOLETE NOTICE_CONTAINER_WIDE", // Ann_OBSOLETE_ANNOUNCEMENT + [Ann_ACTIVE_ANNOUNCEMENT ] = "NOTICE_CONTAINER_ACTIVE NOTICE_CONTAINER_WIDE", + [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_CONTAINER_OBSOLETE NOTICE_CONTAINER_WIDE", }; static const char *SubjectClass[Ann_NUM_STATUS] = { - "NOTICE_SUBJECT_ACTIVE", // Ann_ACTIVE_ANNOUNCEMENT - "NOTICE_SUBJECT_OBSOLETE", // Ann_OBSOLETE_ANNOUNCEMENT + [Ann_ACTIVE_ANNOUNCEMENT ] = "NOTICE_SUBJECT_ACTIVE", + [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_SUBJECT_OBSOLETE", }; static const char *ContentClass[Ann_NUM_STATUS] = { - "NOTICE_TEXT_ACTIVE", // Ann_ACTIVE_ANNOUNCEMENT - "NOTICE_TEXT_OBSOLETE", // Ann_OBSOLETE_ANNOUNCEMENT + [Ann_ACTIVE_ANNOUNCEMENT ] = "NOTICE_TEXT_ACTIVE", + [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_TEXT_OBSOLETE", }; static const char *UsersClass[Ann_NUM_STATUS] = { - "NOTICE_USERS_ACTIVE", // Ann_ACTIVE_ANNOUNCEMENT - "NOTICE_USERS_OBSOLETE", // Ann_OBSOLETE_ANNOUNCEMENT + [Ann_ACTIVE_ANNOUNCEMENT ] = "NOTICE_USERS_ACTIVE", + [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_USERS_OBSOLETE", }; Rol_Role_t Role; bool SomeRolesAreSelected; diff --git a/swad_changelog.h b/swad_changelog.h index 60cf363fb..5960b4517 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -488,13 +488,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.74.3 (2019-11-20)" +#define Log_PLATFORM_VERSION "SWAD 19.74.4 (2019-11-20)" #define CSS_FILE "swad19.74.3.css" #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: Impedir la creación y edición de proyectos si no son editables. + Version 19.74.4: Nov 20, 2019 Code refactoring related to vectos. (247021 lines) Version 19.74.3: Nov 20, 2019 Minor bug fixes and changes in layout and users' ranking. (247020 lines) Version 19.74.2: Nov 20, 2019 Changes in layout of timeline. (247006 lines) Version 19.74.1: Nov 20, 2019 Fixed bug in CSS related to buttons. (247020 lines) diff --git a/swad_statistic.c b/swad_statistic.c index f8af9537c..e4693d5c6 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -55,34 +55,34 @@ extern struct Globals Gbl; const unsigned Sta_CellPadding[Sta_NUM_CLICKS_GROUPED_BY] = { - 2, // Sta_CLICKS_CRS_DETAILED_LIST + [Sta_CLICKS_CRS_DETAILED_LIST ] = 2, - 1, // Sta_CLICKS_CRS_PER_USR - 1, // Sta_CLICKS_CRS_PER_DAY - 0, // Sta_CLICKS_CRS_PER_DAY_AND_HOUR - 1, // Sta_CLICKS_CRS_PER_WEEK - 1, // Sta_CLICKS_CRS_PER_MONTH - 1, // Sta_CLICKS_CRS_PER_YEAR - 1, // Sta_CLICKS_CRS_PER_HOUR - 0, // Sta_CLICKS_CRS_PER_MINUTE - 1, // Sta_CLICKS_CRS_PER_ACTION + [Sta_CLICKS_CRS_PER_USR ] = 1, + [Sta_CLICKS_CRS_PER_DAY ] = 1, + [Sta_CLICKS_CRS_PER_DAY_AND_HOUR] = 0, + [Sta_CLICKS_CRS_PER_WEEK ] = 1, + [Sta_CLICKS_CRS_PER_MONTH ] = 1, + [Sta_CLICKS_CRS_PER_YEAR ] = 1, + [Sta_CLICKS_CRS_PER_HOUR ] = 1, + [Sta_CLICKS_CRS_PER_MINUTE ] = 0, + [Sta_CLICKS_CRS_PER_ACTION ] = 1, - 1, // Sta_CLICKS_GBL_PER_DAY - 0, // Sta_CLICKS_GBL_PER_DAY_AND_HOUR - 1, // Sta_CLICKS_GBL_PER_WEEK - 1, // Sta_CLICKS_GBL_PER_MONTH - 1, // Sta_CLICKS_GBL_PER_YEAR - 1, // Sta_CLICKS_GBL_PER_HOUR - 0, // Sta_CLICKS_GBL_PER_MINUTE - 1, // Sta_CLICKS_GBL_PER_ACTION - 1, // Sta_CLICKS_GBL_PER_PLUGIN - 1, // Sta_CLICKS_GBL_PER_API_FUNCTION - 1, // Sta_CLICKS_GBL_PER_BANNER - 1, // Sta_CLICKS_GBL_PER_COUNTRY - 1, // Sta_CLICKS_GBL_PER_INSTITUTION - 1, // Sta_CLICKS_GBL_PER_CENTRE - 1, // Sta_CLICKS_GBL_PER_DEGREE - 1, // Sta_CLICKS_GBL_PER_COURSE + [Sta_CLICKS_GBL_PER_DAY ] = 1, + [Sta_CLICKS_GBL_PER_DAY_AND_HOUR] = 0, + [Sta_CLICKS_GBL_PER_WEEK ] = 1, + [Sta_CLICKS_GBL_PER_MONTH ] = 1, + [Sta_CLICKS_GBL_PER_YEAR ] = 1, + [Sta_CLICKS_GBL_PER_HOUR ] = 1, + [Sta_CLICKS_GBL_PER_MINUTE ] = 0, + [Sta_CLICKS_GBL_PER_ACTION ] = 1, + [Sta_CLICKS_GBL_PER_PLUGIN ] = 1, + [Sta_CLICKS_GBL_PER_API_FUNCTION] = 1, + [Sta_CLICKS_GBL_PER_BANNER ] = 1, + [Sta_CLICKS_GBL_PER_COUNTRY ] = 1, + [Sta_CLICKS_GBL_PER_INSTITUTION ] = 1, + [Sta_CLICKS_GBL_PER_CENTRE ] = 1, + [Sta_CLICKS_GBL_PER_DEGREE ] = 1, + [Sta_CLICKS_GBL_PER_COURSE ] = 1, }; #define Sta_STAT_RESULTS_SECTION_ID "stat_results"