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

Version 16.17.14

This commit is contained in:
Antonio Cañas Vargas 2016-10-09 00:41:09 +02:00
parent 39a95f5294
commit c41857076f
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -148,13 +148,14 @@
/****************************** Public constants *****************************/ /****************************** 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 CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.js" #define JS_FILE "swad15.238.1.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // 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.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.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.11: Oct 09, 2016 Code refactoring in user's usage report. (206279 lines)

18
swad_report.c
View File

@ -123,9 +123,7 @@ static void Rep_WriteSectionHistoricCourses (const struct UsrFigures *UsrFigures
static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC); static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC);
static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role,
time_t FirstClickTimeUTC, const struct Rep_Report *Report);
const struct tm *tm_FirstClickTime,
unsigned long MaxHitsPerYear);
static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (time_t FirstClickTimeUTC, static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (time_t FirstClickTimeUTC,
const struct tm *tm_FirstClickTime, const struct tm *tm_FirstClickTime,
unsigned long MaxHitsPerYear); unsigned long MaxHitsPerYear);
@ -863,10 +861,7 @@ static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report)
Role <= Rol_TEACHER; Role <= Rol_TEACHER;
Role++) Role++)
/* List my courses with this role */ /* List my courses with this role */
Rep_GetAndWriteMyCurrentCrss (Role, Rep_GetAndWriteMyCurrentCrss (Role,Report);
Report->UsrFigures.FirstClickTimeUTC,
&Report->tm_FirstClickTime,
Report->MaxHitsPerYear);
/***** End of section *****/ /***** End of section *****/
fprintf (Gbl.F.Rep,"</ul>" fprintf (Gbl.F.Rep,"</ul>"
@ -979,9 +974,7 @@ static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC)
/*****************************************************************************/ /*****************************************************************************/
static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role,
time_t FirstClickTimeUTC, const struct Rep_Report *Report)
const struct tm *tm_FirstClickTime,
unsigned long MaxHitsPerYear)
{ {
extern const char *Txt_USER_in_COURSE; extern const char *Txt_USER_in_COURSE;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; 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 */ /* Write data of this course */
Rep_WriteRowCrsData (CrsCod,Role, Rep_WriteRowCrsData (CrsCod,Role,
FirstClickTimeUTC,tm_FirstClickTime, Report->UsrFigures.FirstClickTimeUTC,
MaxHitsPerYear, &Report->tm_FirstClickTime,
Report->MaxHitsPerYear,
true); // Write number of users in course true); // Write number of users in course
} }