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.16

This commit is contained in:
Antonio Cañas Vargas 2016-10-09 01:03:30 +02:00
parent 9070d50c97
commit 23ad51625b
2 changed files with 45 additions and 46 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.15 (2016-10-09)" #define Log_PLATFORM_VERSION "SWAD 16.17.16 (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.16: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines)
Version 16.17.15: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines) Version 16.17.15: Oct 09, 2016 Code refactoring in user's usage report. (206236 lines)
Version 16.17.14: Oct 09, 2016 Code refactoring in user's usage report. (206268 lines) 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)

88
swad_report.c
View File

@ -114,23 +114,23 @@ static void Rep_WriteHeader (const struct Rep_Report *Report);
static void Rep_WriteSectionPlatform (void); static void Rep_WriteSectionPlatform (void);
static void Rep_WriteSectionUsrInfo (void); 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 (struct Rep_Report *Report);
static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report); static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report);
static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report); static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report);
static void Rep_WriteSectionHistoricCourses (const struct Rep_Report *Report); static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report);
static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC); static void Rep_GetMaxHitsPerYear (struct Rep_Report *Report);
static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role, static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role,
const struct Rep_Report *Report); struct Rep_Report *Report);
static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (const struct Rep_Report *Report); static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (struct Rep_Report *Report);
static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role, static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role,
const struct Rep_Report *Report); struct Rep_Report *Report);
static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role, static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role,
const struct Rep_Report *Report, struct Rep_Report *Report,
bool WriteNumUsrs); bool WriteNumUsrs);
static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role, static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
const struct Rep_Report *Report); struct Rep_Report *Report);
static void Rep_ComputeMaxAndTotalHits (struct Rep_Hits *Hits, static void Rep_ComputeMaxAndTotalHits (struct Rep_Hits *Hits,
unsigned long NumRows, unsigned long NumRows,
MYSQL_RES *mysql_res,unsigned Field); MYSQL_RES *mysql_res,unsigned Field);
@ -216,21 +216,23 @@ static void Rep_CreateMyUsageReport (struct Rep_Report *Report)
/***** Figures *****/ /***** Figures *****/
Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&Report->UsrFigures); Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&Report->UsrFigures);
GetUsrFiguresAgain = Prf_GetAndStoreAllUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&Report->UsrFigures); GetUsrFiguresAgain = Prf_GetAndStoreAllUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,
&Report->UsrFigures);
if (GetUsrFiguresAgain) if (GetUsrFiguresAgain)
Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&Report->UsrFigures); Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&Report->UsrFigures);
if (Report->UsrFigures.FirstClickTimeUTC) if (Report->UsrFigures.FirstClickTimeUTC)
gmtime_r (&Report->UsrFigures.FirstClickTimeUTC,&Report->tm_FirstClickTime); gmtime_r (&Report->UsrFigures.FirstClickTimeUTC,
&Report->tm_FirstClickTime);
Rep_WriteSectionUsrFigures (Report); Rep_WriteSectionUsrFigures (Report);
/***** Global count of hits *****/ /***** Global count of hits *****/
Rep_WriteSectionGlobalHits (Report); Rep_WriteSectionGlobalHits (Report);
/***** Global hits distributed by action *****/ /***** Global hits distributed by action *****/
Rep_WriteSectionHitsPerAction (&Report->UsrFigures); Rep_WriteSectionHitsPerAction (Report);
/***** Current courses *****/ /***** Current courses *****/
Report->MaxHitsPerYear = Rep_GetMaxHitsPerYear (Report->UsrFigures.FirstClickTimeUTC); Rep_GetMaxHitsPerYear (Report);
Rep_WriteSectionCurrentCourses (Report); Rep_WriteSectionCurrentCourses (Report);
/***** Historic courses *****/ /***** Historic courses *****/
@ -747,7 +749,7 @@ static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report)
/******** Write section for user's global hits in user's usage report ********/ /******** Write section for user's global hits in user's usage report ********/
/*****************************************************************************/ /*****************************************************************************/
static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures) static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
{ {
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS]; extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD]; extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
@ -759,7 +761,6 @@ static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures)
MYSQL_ROW row; MYSQL_ROW row;
unsigned long NumRows; unsigned long NumRows;
unsigned long NumRow; unsigned long NumRow;
struct Rep_Hits Hits;
long ActCod; long ActCod;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1]; char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
unsigned long NumClicks; unsigned long NumClicks;
@ -773,12 +774,12 @@ static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures)
sprintf (Query,"SELECT SQL_NO_CACHE ActCod,COUNT(*) AS N FROM log_full" sprintf (Query,"SELECT SQL_NO_CACHE ActCod,COUNT(*) AS N FROM log_full"
" WHERE ClickTime>=FROM_UNIXTIME('%ld') AND UsrCod='%ld'" " WHERE ClickTime>=FROM_UNIXTIME('%ld') AND UsrCod='%ld'"
" GROUP BY ActCod ORDER BY N DESC LIMIT %u", " GROUP BY ActCod ORDER BY N DESC LIMIT %u",
(long) UsrFigures->FirstClickTimeUTC,Gbl.Usrs.Me.UsrDat.UsrCod, (long) Report->UsrFigures.FirstClickTimeUTC,Gbl.Usrs.Me.UsrDat.UsrCod,
Rep_MAX_ACTIONS); Rep_MAX_ACTIONS);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get clicks"); NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get clicks");
/***** Compute maximum number of hits per action *****/ /***** Compute maximum number of hits per action *****/
Rep_ComputeMaxAndTotalHits (&Hits,NumRows,mysql_res,1); Rep_ComputeMaxAndTotalHits (&Report->Hits,NumRows,mysql_res,1);
mysql_data_seek (mysql_res,0); mysql_data_seek (mysql_res,0);
/***** Write rows *****/ /***** Write rows *****/
@ -792,12 +793,12 @@ static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures)
ActCod = Str_ConvertStrCodToLongCod (row[0]); ActCod = Str_ConvertStrCodToLongCod (row[0]);
/* Get number of hits (row[1]) */ /* Get number of hits (row[1]) */
if (sscanf (row[1],"%lu",&Hits.Num) != 1) if (sscanf (row[1],"%lu",&Report->Hits.Num) != 1)
Hits.Num = 0; Report->Hits.Num = 0;
NumClicks += Hits.Num; NumClicks += Report->Hits.Num;
/* Draw bar proportional to number of hits */ /* Draw bar proportional to number of hits */
Rep_DrawBarNumHits (Hits.Num,Hits.Max,Rep_MAX_BAR_WIDTH); Rep_DrawBarNumHits (Report->Hits.Num,Report->Hits.Max,Rep_MAX_BAR_WIDTH);
/* Write action text */ /* Write action text */
fprintf (Gbl.F.Rep," "); fprintf (Gbl.F.Rep," ");
@ -814,9 +815,9 @@ static void Rep_WriteSectionHitsPerAction (const struct UsrFigures *UsrFigures)
} }
/***** Draw bar for the rest of the clicks *****/ /***** Draw bar for the rest of the clicks *****/
if ((unsigned long) UsrFigures->NumClicks > NumClicks) if ((unsigned long) Report->UsrFigures.NumClicks > NumClicks)
fprintf (Gbl.F.Rep,"%ld&nbsp;%s<br />", fprintf (Gbl.F.Rep,"%ld&nbsp;%s<br />",
UsrFigures->NumClicks - NumClicks, Report->UsrFigures.NumClicks - NumClicks,
Txt_Other_actions); Txt_Other_actions);
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -830,7 +831,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 Rep_Report *Report) static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report)
{ {
extern const char *Txt_Courses; extern const char *Txt_Courses;
Rol_Role_t Role; Rol_Role_t Role;
@ -860,7 +861,7 @@ static void Rep_WriteSectionCurrentCourses (const struct Rep_Report *Report)
/***** Write section for user's historic courses in user's usage report ******/ /***** Write section for user's historic courses in user's usage report ******/
/*****************************************************************************/ /*****************************************************************************/
static void Rep_WriteSectionHistoricCourses (const struct Rep_Report *Report) static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report)
{ {
extern const char *Txt_Courses; extern const char *Txt_Courses;
extern const char *Txt_historical_log; extern const char *Txt_historical_log;
@ -895,12 +896,11 @@ static void Rep_WriteSectionHistoricCourses (const struct Rep_Report *Report)
/*****************************************************************************/ /*****************************************************************************/
// Return the maximum number of hits per year // Return the maximum number of hits per year
static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC) static void Rep_GetMaxHitsPerYear (struct Rep_Report *Report)
{ {
char Query[1024]; char Query[1024];
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
MYSQL_ROW row; MYSQL_ROW row;
unsigned long MaxHitsPerYear = 0;
sprintf (Query,"SELECT MAX(N) FROM (" sprintf (Query,"SELECT MAX(N) FROM ("
// Clicks without course selected --------------------------- // Clicks without course selected ---------------------------
@ -932,24 +932,23 @@ static unsigned long Rep_GetMaxHitsPerYear (time_t FirstClickTimeUTC)
// ---------------------------------------------------------- // ----------------------------------------------------------
") AS hits_per_crs_year", ") AS hits_per_crs_year",
(unsigned) Rol_UNKNOWN, (unsigned) Rol_UNKNOWN,
(long) FirstClickTimeUTC, (long) Report->UsrFigures.FirstClickTimeUTC,
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(long) FirstClickTimeUTC, (long) Report->UsrFigures.FirstClickTimeUTC,
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_STUDENT, (unsigned) Rol_STUDENT,
(unsigned) Rol_TEACHER); (unsigned) Rol_TEACHER);
DB_QuerySELECT (Query,&mysql_res,"can not get last question index"); DB_QuerySELECT (Query,&mysql_res,"can not get last question index");
/***** Get number of users *****/ /***** Get number of users *****/
Report->MaxHitsPerYear = 0;
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
if (row[0]) // There are questions if (row[0]) // There are questions
if (sscanf (row[0],"%lu",&MaxHitsPerYear) != 1) if (sscanf (row[0],"%lu",&Report->MaxHitsPerYear) != 1)
Lay_ShowErrorAndExit ("Error when getting maximum hits."); Lay_ShowErrorAndExit ("Error when getting maximum hits.");
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
return MaxHitsPerYear;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -957,7 +956,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,
const struct Rep_Report *Report) struct Rep_Report *Report)
{ {
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];
@ -1036,7 +1035,7 @@ static void Rep_GetAndWriteMyCurrentCrss (Rol_Role_t Role,
/************* Write my historic clicks without course selected **************/ /************* Write my historic clicks without course selected **************/
/*****************************************************************************/ /*****************************************************************************/
static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (const struct Rep_Report *Report) static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (struct Rep_Report *Report)
{ {
extern const char *Txt_Hits_without_course_selected; extern const char *Txt_Hits_without_course_selected;
@ -1061,7 +1060,7 @@ static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (const struct Rep_Report *R
/*****************************************************************************/ /*****************************************************************************/
static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role, static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role,
const struct Rep_Report *Report) struct Rep_Report *Report)
{ {
extern const char *Txt_Hits_as_a_USER; extern const char *Txt_Hits_as_a_USER;
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];
@ -1122,7 +1121,7 @@ static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role,
/*****************************************************************************/ /*****************************************************************************/
static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role, static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role,
const struct Rep_Report *Report, struct Rep_Report *Report,
bool WriteNumUsrs) bool WriteNumUsrs)
{ {
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
@ -1182,7 +1181,7 @@ static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role,
/*****************************************************************************/ /*****************************************************************************/
static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role, static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
const struct Rep_Report *Report) struct Rep_Report *Report)
{ {
char Query[512]; char Query[512];
char SubQueryCrs[128]; char SubQueryCrs[128];
@ -1194,7 +1193,6 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
unsigned ReadYear; unsigned ReadYear;
unsigned LastYear; unsigned LastYear;
unsigned Year; unsigned Year;
struct Rep_Hits Hits;
/***** Make the query *****/ /***** Make the query *****/
if (AnyCourse) if (AnyCourse)
@ -1228,11 +1226,11 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
/***** Set maximum number of hits per year *****/ /***** Set maximum number of hits per year *****/
if (Report->MaxHitsPerYear) if (Report->MaxHitsPerYear)
/* Set maximum number of hits per year from parameter */ /* Set maximum number of hits per year from parameter */
Hits.Max = Report->MaxHitsPerYear; Report->Hits.Max = Report->MaxHitsPerYear;
else else
{ {
/* Compute maximum number of hits per year */ /* Compute maximum number of hits per year */
Rep_ComputeMaxAndTotalHits (&Hits,NumRows,mysql_res,1); Rep_ComputeMaxAndTotalHits (&Report->Hits,NumRows,mysql_res,1);
mysql_data_seek (mysql_res,0); mysql_data_seek (mysql_res,0);
} }
@ -1248,8 +1246,8 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
Lay_ShowErrorAndExit ("Wrong date."); Lay_ShowErrorAndExit ("Wrong date.");
/* Get number hits (in row[1]) */ /* Get number hits (in row[1]) */
if (sscanf (row[1],"%lu",&Hits.Num) != 1) if (sscanf (row[1],"%lu",&Report->Hits.Num) != 1)
Hits.Num = 0; Report->Hits.Num = 0;
for (Year = LastYear; for (Year = LastYear;
Year >= ReadYear; Year >= ReadYear;
@ -1259,9 +1257,9 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
fprintf (Gbl.F.Rep,"%04u&nbsp;",Year); fprintf (Gbl.F.Rep,"%04u&nbsp;",Year);
/* Draw bar proportional to number of hits */ /* Draw bar proportional to number of hits */
Rep_DrawBarNumHits (Year == LastYear ? Hits.Num : Rep_DrawBarNumHits (Year == LastYear ? Report->Hits.Num :
0, 0,
Hits.Max,Rep_MAX_BAR_WIDTH); Report->Hits.Max,Rep_MAX_BAR_WIDTH);
fprintf (Gbl.F.Rep,"<br />"); fprintf (Gbl.F.Rep,"<br />");
} }
LastYear = Year; LastYear = Year;
@ -1279,7 +1277,7 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role,
fprintf (Gbl.F.Rep,"%04u&nbsp;",Year); fprintf (Gbl.F.Rep,"%04u&nbsp;",Year);
/* Draw bar proportional to number of hits */ /* Draw bar proportional to number of hits */
Rep_DrawBarNumHits (0,Hits.Max,Rep_MAX_BAR_WIDTH); Rep_DrawBarNumHits (0,Report->Hits.Max,Rep_MAX_BAR_WIDTH);
fprintf (Gbl.F.Rep,"<br />"); fprintf (Gbl.F.Rep,"<br />");
} }
} }