diff --git a/swad_changelog.h b/swad_changelog.h index 3d876f9cf..0d01f8bb5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -148,13 +148,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.17.11 (2016-10-09)" +#define Log_PLATFORM_VERSION "SWAD 16.17.12 (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.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) Version 16.17.10: Oct 09, 2016 Code refactoring in user's usage report. (206285 lines) Version 16.17.9: Oct 08, 2016 Code refactoring in user's usage report. (206286 lines) diff --git a/swad_report.c b/swad_report.c index e371e49e3..1ee29f9cf 100644 --- a/swad_report.c +++ b/swad_report.c @@ -115,8 +115,7 @@ static void Rep_WriteSectionPlatform (void); static void Rep_WriteSectionUsrInfo (void); static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report); static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures); -static void Rep_WriteSectionGlobalHits (const struct UsrFigures *UsrFigures, - const struct tm *tm_FirstClickTime); +static void Rep_WriteSectionGlobalHits (const struct Rep_Report *Report); static void Rep_WriteSectionCurrentCourses (const struct UsrFigures *UsrFigures, const struct tm *tm_FirstClickTime, const struct Rep_CurrentTimeUTC *CurrentTimeUTC, @@ -240,7 +239,7 @@ static void Rep_CreateMyUsageReport (struct Rep_Report *Report) Rep_WriteSectionUsrFigures (Report); /***** Global count of hits *****/ - Rep_WriteSectionGlobalHits (&Report->UsrFigures,&Report->tm_FirstClickTime); + Rep_WriteSectionGlobalHits (Report); /***** Global hits distributed by action *****/ Rep_WriteSectionHitsPerAction (&Report->UsrFigures); @@ -742,8 +741,7 @@ static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report) /******** Write section for user's global hits in user's usage report ********/ /*****************************************************************************/ -static void Rep_WriteSectionGlobalHits (const struct UsrFigures *UsrFigures, - const struct tm *tm_FirstClickTime) +static void Rep_WriteSectionGlobalHits (const struct Rep_Report *Report) { extern const char *Txt_Hits_per_year; @@ -755,8 +753,8 @@ static void Rep_WriteSectionGlobalHits (const struct UsrFigures *UsrFigures, /***** Global (in any course) hits per year *****/ Rep_ShowMyHitsPerYear (true,-1L, // Any course Rol_UNKNOWN, // Any role - UsrFigures->FirstClickTimeUTC, - tm_FirstClickTime, + Report->UsrFigures.FirstClickTimeUTC, + &Report->tm_FirstClickTime, 0); // MaxHitsPerYear not passed as an argument but computed inside the function /***** End of section *****/