From 2521c83c58b2b86d3c3adae6aee5953e8ba93815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 8 Sep 2016 22:53:04 +0200 Subject: [PATCH] Version 15.249.4 --- swad_changelog.h | 5 +++-- swad_report.c | 4 ++++ swad_user.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 0d9803d16..e3e705477 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -135,15 +135,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.249.3 (2016-09-08)" +#define Log_PLATFORM_VERSION "SWAD 15.249.4 (2016-09-08)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.238.1.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.249.4: Sep 08, 2016 List of courses in user's usage report. (203993 lines) Version 15.249.3: Sep 08, 2016 Fixed bug related with search of users. (203983 lines) - Version 15.249.2: Sep 08, 2016 Shared record card and details of user's profile are shown in uswer's usage report. (203978 lines) + Version 15.249.2: Sep 08, 2016 Shared record card and details of user's profile are shown in user's usage report. (203978 lines) Version 15.249.1: Sep 08, 2016 Removed lines with NULL values in swad_text.c. (203977 lines) Version 15.249: Sep 08, 2016 New option Statistics > Report. Not implemented. (204341 lines) Version 15.248.3: Sep 07, 2016 Fixed bug related to attendance events in web service, reported by Rubén Martín Hidalgo. (? lines) diff --git a/swad_report.c b/swad_report.c index 0b09bc0f2..96693ec5f 100644 --- a/swad_report.c +++ b/swad_report.c @@ -69,4 +69,8 @@ void Rep_ShowMyUsageReport (void) /***** Show details of user's profile *****/ Prf_ShowDetailsUserProfile (&Gbl.Usrs.Me.UsrDat); + + /***** List my courses *****/ + Crs_GetAndWriteCrssOfAUsr (&Gbl.Usrs.Me.UsrDat,Rol_TEACHER); + Crs_GetAndWriteCrssOfAUsr (&Gbl.Usrs.Me.UsrDat,Rol_STUDENT); } diff --git a/swad_user.c b/swad_user.c index a55d80f25..3488e1df5 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6109,7 +6109,13 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *SearchQuery) Gbl.RowEvenOdd, Usr_NUM_MAIN_FIELDS_DATA_USR-2, Gbl.RowEvenOdd); - Crs_GetAndWriteCrssOfAUsr (&UsrDat,Role); + if (Role == Rol_UNKNOWN) + { + Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TEACHER); + Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_STUDENT); + } + else + Crs_GetAndWriteCrssOfAUsr (&UsrDat,Role); fprintf (Gbl.F.Out,"" ""); }