diff --git a/swad_changelog.h b/swad_changelog.h index 9a00ea0c8..803c4377b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -148,13 +148,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.17.13 (2016-10-09)" +#define Log_PLATFORM_VERSION "SWAD 16.17.14 (2016-10-09)" #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 16.17.14: Oct 09, 2016 Code refactoring in user's usage report. (206268 lines) Version 16.17.13: Oct 09, 2016 Code refactoring in user's usage report. (206273 lines) Version 16.17.12: Oct 09, 2016 Code refactoring in user's usage report. (206278 lines) Version 16.17.11: Oct 09, 2016 Code refactoring in user's usage report. (206279 lines) diff --git a/swad_report.c b/swad_report.c index e85ee5c08..471c2c731 100644 --- a/swad_report.c +++ b/swad_report.c @@ -123,9 +123,7 @@ static void Rep_WriteSectionHistoricCourses (const struct UsrFigures *UsrFigures static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC); static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, - time_t FirstClickTimeUTC, - const struct tm *tm_FirstClickTime, - unsigned long MaxHitsPerYear); + const struct Rep_Report *Report); static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (time_t FirstClickTimeUTC, const struct tm *tm_FirstClickTime, unsigned long MaxHitsPerYear); @@ -863,10 +861,7 @@ static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report) Role <= Rol_TEACHER; Role++) /* List my courses with this role */ - Rep_GetAndWriteMyCurrentCrss (Role, - Report->UsrFigures.FirstClickTimeUTC, - &Report->tm_FirstClickTime, - Report->MaxHitsPerYear); + Rep_GetAndWriteMyCurrentCrss (Role,Report); /***** End of section *****/ fprintf (Gbl.F.Rep,"" @@ -979,9 +974,7 @@ static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC) /*****************************************************************************/ static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, - time_t FirstClickTimeUTC, - const struct tm *tm_FirstClickTime, - unsigned long MaxHitsPerYear) + const struct Rep_Report *Report) { extern const char *Txt_USER_in_COURSE; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; @@ -1042,8 +1035,9 @@ static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, /* Write data of this course */ Rep_WriteRowCrsData (CrsCod,Role, - FirstClickTimeUTC,tm_FirstClickTime, - MaxHitsPerYear, + Report->UsrFigures.FirstClickTimeUTC, + &Report->tm_FirstClickTime, + Report->MaxHitsPerYear, true); // Write number of users in course }