mirror of https://github.com/acanas/swad-core.git
Version 16.17.13
This commit is contained in:
parent
67d155afbc
commit
39a95f5294
|
@ -148,13 +148,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.17.12 (2016-10-09)"
|
#define Log_PLATFORM_VERSION "SWAD 16.17.13 (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.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)
|
||||||
Version 16.17.10: Oct 09, 2016 Code refactoring in user's usage report. (206285 lines)
|
Version 16.17.10: Oct 09, 2016 Code refactoring in user's usage report. (206285 lines)
|
||||||
|
|
|
@ -116,10 +116,7 @@ static void Rep_WriteSectionUsrInfo (void);
|
||||||
static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report);
|
static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report);
|
||||||
static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures);
|
static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures);
|
||||||
static void Rep_WriteSectionGlobalHits (const struct Rep_Report *Report);
|
static void Rep_WriteSectionGlobalHits (const struct Rep_Report *Report);
|
||||||
static void Rep_WriteSectionCurrentCourses (const struct UsrFigures *UsrFigures,
|
static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report);
|
||||||
const struct tm *tm_FirstClickTime,
|
|
||||||
const struct Rep_CurrentTimeUTC *CurrentTimeUTC,
|
|
||||||
unsigned long MaxHitsPerYear);
|
|
||||||
static void Rep_WriteSectionHistoricCourses (const struct UsrFigures *UsrFigures,
|
static void Rep_WriteSectionHistoricCourses (const struct UsrFigures *UsrFigures,
|
||||||
const struct tm *tm_FirstClickTime,
|
const struct tm *tm_FirstClickTime,
|
||||||
unsigned long MaxHitsPerYear);
|
unsigned long MaxHitsPerYear);
|
||||||
|
@ -246,8 +243,7 @@ static void Rep_CreateMyUsageReport (struct Rep_Report *Report)
|
||||||
|
|
||||||
/***** Current courses *****/
|
/***** Current courses *****/
|
||||||
Report->MaxHitsPerYear = Rep_GetMaxHitsPerYear (Report->UsrFigures.FirstClickTimeUTC);
|
Report->MaxHitsPerYear = Rep_GetMaxHitsPerYear (Report->UsrFigures.FirstClickTimeUTC);
|
||||||
Rep_WriteSectionCurrentCourses (&Report->UsrFigures,&Report->tm_FirstClickTime,
|
Rep_WriteSectionCurrentCourses (Report);
|
||||||
&Report->CurrentTimeUTC,Report->MaxHitsPerYear);
|
|
||||||
|
|
||||||
/***** Historic courses *****/
|
/***** Historic courses *****/
|
||||||
Rep_WriteSectionHistoricCourses (&Report->UsrFigures,&Report->tm_FirstClickTime,
|
Rep_WriteSectionHistoricCourses (&Report->UsrFigures,&Report->tm_FirstClickTime,
|
||||||
|
@ -848,10 +844,7 @@ static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures)
|
||||||
/****** Write section for user's current courses in user's usage report ******/
|
/****** Write section for user's current courses in user's usage report ******/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Rep_WriteSectionCurrentCourses (const struct UsrFigures *UsrFigures,
|
static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report)
|
||||||
const struct tm *tm_FirstClickTime,
|
|
||||||
const struct Rep_CurrentTimeUTC *CurrentTimeUTC,
|
|
||||||
unsigned long MaxHitsPerYear)
|
|
||||||
{
|
{
|
||||||
extern const char *Txt_Courses;
|
extern const char *Txt_Courses;
|
||||||
Rol_Role_t Role;
|
Rol_Role_t Role;
|
||||||
|
@ -860,8 +853,8 @@ static void Rep_WriteSectionCurrentCourses (const struct UsrFigures *UsrFigures,
|
||||||
fprintf (Gbl.F.Rep,"<section>"
|
fprintf (Gbl.F.Rep,"<section>"
|
||||||
"<h3>%s",
|
"<h3>%s",
|
||||||
Txt_Courses);
|
Txt_Courses);
|
||||||
if (CurrentTimeUTC->StrDate[0])
|
if (Report->CurrentTimeUTC.StrDate[0])
|
||||||
fprintf (Gbl.F.Rep," (%s)",CurrentTimeUTC->StrDate);
|
fprintf (Gbl.F.Rep," (%s)",Report->CurrentTimeUTC.StrDate);
|
||||||
fprintf (Gbl.F.Rep,"</h3>"
|
fprintf (Gbl.F.Rep,"</h3>"
|
||||||
"<ul>");
|
"<ul>");
|
||||||
|
|
||||||
|
@ -871,8 +864,9 @@ static void Rep_WriteSectionCurrentCourses (const struct UsrFigures *UsrFigures,
|
||||||
Role++)
|
Role++)
|
||||||
/* List my courses with this role */
|
/* List my courses with this role */
|
||||||
Rep_GetAndWriteMyCurrentCrss (Role,
|
Rep_GetAndWriteMyCurrentCrss (Role,
|
||||||
UsrFigures->FirstClickTimeUTC,tm_FirstClickTime,
|
Report->UsrFigures.FirstClickTimeUTC,
|
||||||
MaxHitsPerYear);
|
&Report->tm_FirstClickTime,
|
||||||
|
Report->MaxHitsPerYear);
|
||||||
|
|
||||||
/***** End of section *****/
|
/***** End of section *****/
|
||||||
fprintf (Gbl.F.Rep,"</ul>"
|
fprintf (Gbl.F.Rep,"</ul>"
|
||||||
|
|
Loading…
Reference in New Issue