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 15.252.1

This commit is contained in:
Antonio Cañas Vargas 2016-09-12 01:06:36 +02:00
parent f28dfae624
commit 8291baa9c0
4 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -135,13 +135,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.252 (2016-09-12)"
#define Log_PLATFORM_VERSION "SWAD 15.252.1 (2016-09-12)"
#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 15.252.1: Sep 12, 2016 Hits in user's usage report. Not finished. (204619 lines)
Version 15.252: Sep 12, 2016 Hits in user's usage report. Not finished. (204589 lines)
Version 15.251.2: Sep 11, 2016 Changes in layout of user's usage report. (204465 lines)
Version 15.251.1: Sep 11, 2016 Changes in user's usage report. (204406 lines)

46
swad_report.c
View File

@ -73,6 +73,7 @@ static void Rep_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t R
static void Rep_WriteRowCrsData (MYSQL_ROW row);
static void Rep_ShowMyHits (time_t FirstClickTimeUTC,struct tm *tm_FirstClickTime);
static void Rep_DrawBarNumHits (char Color,float HitsNum,float HitsMax,unsigned MaxBarWidth);
/*****************************************************************************/
/********* Show my usage report (report on my use of the platform) ***********/
@ -557,15 +558,15 @@ static void Rep_ShowMyHits (time_t FirstClickTimeUTC,struct tm *tm_FirstClickTim
/* Write the month */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LOG LEFT_TOP\">"
"%04u-%02u&nbsp;"
"%04u-%02u: "
"</td>",
Date.Year,Date.Month);
/* Draw bar proportional to number of pages generated */
Sta_DrawBarNumHits ('c',
Rep_DrawBarNumHits ('c',
M == NumMonthsBetweenLastDateAndCurrentDate ? Hits.Num :
0.0,
Hits.Max,Hits.Total,500);
Hits.Max,500);
/* Decrease month */
Dat_GetMonthBefore (&Date,&Date);
@ -582,12 +583,12 @@ static void Rep_ShowMyHits (time_t FirstClickTimeUTC,struct tm *tm_FirstClickTim
/* Write the month */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LOG LEFT_TOP\">"
"%04u-%02u&nbsp;"
"%04u-%02u"
"</td>",
Date.Year,Date.Month);
/* Draw bar proportional to number of pages generated */
Sta_DrawBarNumHits ('c',0.0,Hits.Max,Hits.Total,500);
Rep_DrawBarNumHits ('c',0.0,Hits.Max,500);
/* Decrease month */
Dat_GetMonthBefore (&Date,&Date);
@ -595,3 +596,38 @@ static void Rep_ShowMyHits (time_t FirstClickTimeUTC,struct tm *tm_FirstClickTim
fprintf (Gbl.F.Out,"</table>");
}
/*****************************************************************************/
/********************* Draw a bar with the number of hits ********************/
/*****************************************************************************/
static void Rep_DrawBarNumHits (char Color,float HitsNum,float HitsMax,unsigned MaxBarWidth)
{
unsigned BarWidth;
fprintf (Gbl.F.Out,"<td class=\"LOG LEFT_MIDDLE\">");
if (HitsNum != 0.0)
{
/***** Draw bar with a with proportional to the number of hits *****/
BarWidth = (unsigned) (((HitsNum * (float) MaxBarWidth) / HitsMax) + 0.5);
if (BarWidth == 0)
BarWidth = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\""
" alt=\"\" title=\"\""
" class=\"LEFT_TOP\""
" style=\"width:%upx; height:18px;\" />"
"&nbsp;",
Gbl.Prefs.IconsURL,Color,BarWidth);
/***** Write the number of hits *****/
Str_WriteFloatNum (HitsNum);
}
else
/***** Write the number of clicks *****/
fprintf (Gbl.F.Out,"0");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}

4
swad_statistic.c
View File

@ -176,6 +176,8 @@ static void Sta_WriteDegree (long DegCod);
static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
MYSQL_RES *mysql_res);
static void Sta_DrawBarNumHits (char Color,float HitsNum,float HitsMax,float HitsTotal,unsigned MaxBarWidth);
static void Sta_GetAndShowHierarchyStats (void);
static void Sta_WriteHeadDegsCrssInSWAD (void);
static void Sta_GetAndShowNumCtysInSWAD (void);
@ -3718,7 +3720,7 @@ void Sta_ComputeMaxAndTotalHits (struct Sta_Hits *Hits,
/********************* Draw a bar with the number of hits ********************/
/*****************************************************************************/
void Sta_DrawBarNumHits (char Color,float HitsNum,float HitsMax,float HitsTotal,unsigned MaxBarWidth)
static void Sta_DrawBarNumHits (char Color,float HitsNum,float HitsMax,float HitsTotal,unsigned MaxBarWidth)
{
unsigned BarWidth;

2
swad_statistic.h
View File

@ -165,8 +165,6 @@ void Pho_PutHiddenParamFigureType (void);
void Sta_ShowUseOfPlatform (void);
unsigned Sta_GetTotalNumberOfUsersInCourses (Sco_Scope_t Scope,Rol_Role_t Role);
void Sta_DrawBarNumHits (char Color,float HitsNum,float HitsMax,float HitsTotal,unsigned MaxBarWidth);
void Sta_WriteParamsDatesSeeAccesses (void);
void Sta_ComputeTimeToGeneratePage (void);