mirror of https://github.com/acanas/swad-core.git
Version 16.46.9
This commit is contained in:
parent
e768b2de28
commit
f4438fe9d5
|
@ -156,13 +156,15 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.46.7 (2016-11-05)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.46.9 (2016-11-06)"
|
||||
#define CSS_FILE "swad16.32.1.css"
|
||||
#define JS_FILE "swad16.46.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.46.9: Nov 06, 2016 Fixed bug in figures (statistics). (206064 lines)
|
||||
Version 16.46.8: Nov 05, 2016 Changes in texts related to notifications. (206047 lines)
|
||||
Version 16.46.7: Nov 05, 2016 Changes in text related to forum statistics. (206046 lines)
|
||||
Version 16.46.6: Nov 05, 2016 Changes in texts related to public social activity statistics. (206045 lines)
|
||||
Version 16.46.5: Nov 05, 2016 Changes in texts related to folders and files statistics. (206043 lines)
|
||||
|
|
|
@ -438,7 +438,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
" ORDER BY N DESC,Web");
|
||||
break;
|
||||
case Sco_SCOPE_CTY:
|
||||
sprintf (Query,"SELECT usr_webs.Web,COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
sprintf (Query,"SELECT usr_webs.Web,"
|
||||
"COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
" FROM institutions,centres,degrees,courses,crs_usr,usr_webs"
|
||||
" WHERE institutions.CtyCod='%ld'"
|
||||
" AND institutions.InsCod=centres.InsCod"
|
||||
|
@ -451,7 +452,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
Gbl.CurrentCty.Cty.CtyCod);
|
||||
break;
|
||||
case Sco_SCOPE_INS:
|
||||
sprintf (Query,"SELECT usr_webs.Web,COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
sprintf (Query,"SELECT usr_webs.Web,"
|
||||
"COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
" FROM centres,degrees,courses,crs_usr,usr_webs"
|
||||
" WHERE centres.InsCod='%ld'"
|
||||
" AND centres.CtrCod=degrees.CtrCod"
|
||||
|
@ -463,7 +465,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
Gbl.CurrentIns.Ins.InsCod);
|
||||
break;
|
||||
case Sco_SCOPE_CTR:
|
||||
sprintf (Query,"SELECT usr_webs.Web,COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
sprintf (Query,"SELECT usr_webs.Web,"
|
||||
"COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
" FROM degrees,courses,crs_usr,usr_webs"
|
||||
" WHERE degrees.CtrCod='%ld'"
|
||||
" AND degrees.DegCod=courses.DegCod"
|
||||
|
@ -474,7 +477,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
Gbl.CurrentCtr.Ctr.CtrCod);
|
||||
break;
|
||||
case Sco_SCOPE_DEG:
|
||||
sprintf (Query,"SELECT usr_webs.Web,COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
sprintf (Query,"SELECT usr_webs.Web,"
|
||||
"COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
" FROM courses,crs_usr,usr_webs"
|
||||
" WHERE courses.DegCod='%ld'"
|
||||
" AND courses.CrsCod=crs_usr.CrsCod"
|
||||
|
@ -484,7 +488,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
Gbl.CurrentDeg.Deg.DegCod);
|
||||
break;
|
||||
case Sco_SCOPE_CRS:
|
||||
sprintf (Query,"SELECT usr_webs.Web,COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
sprintf (Query,"SELECT usr_webs.Web,"
|
||||
"COUNT(DISTINCT usr_webs.UsrCod) AS N"
|
||||
" FROM crs_usr,usr_webs"
|
||||
" WHERE crs_usr.CrsCod='%ld'"
|
||||
" AND crs_usr.UsrCod=usr_webs.UsrCod"
|
||||
|
@ -558,7 +563,9 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
Net_WebsAndSocialNetworksTitle[Web],
|
||||
Net_WebsAndSocialNetworksTitle[Web],
|
||||
NumUsrs,
|
||||
NumUsrsTotalInPlatform ? 100.0 * (float) NumUsrs / (float) NumUsrsTotalInPlatform :
|
||||
NumUsrsTotalInPlatform ? 100.0 *
|
||||
(float) NumUsrs /
|
||||
(float) NumUsrsTotalInPlatform :
|
||||
0.0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2056,7 +2056,7 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
|
|||
else // Gbl.Action.Act == ActSeeAccGbl
|
||||
{
|
||||
Par_PutHiddenParamUnsigned ("Role",(unsigned) Gbl.Stat.Role);
|
||||
Sco_PutParamScope ("ScopeSta",Gbl.Scope.Current);
|
||||
Sta_PutHiddenParamScopeSta ();
|
||||
}
|
||||
|
||||
fprintf (Gbl.F.Out,"%s: ",Txt_Color_of_the_graphic);
|
||||
|
@ -3837,18 +3837,27 @@ void Sta_ReqUseOfPlatform (void)
|
|||
/********* Put hidden parameter for the type of figure (statistic) ***********/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Pho_PutHiddenParamFigureType (void)
|
||||
void Sta_PutHiddenParamFigureType (void)
|
||||
{
|
||||
Par_PutHiddenParamUnsigned ("FigureType",(unsigned) Gbl.Stat.FigureType);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********* Put hidden parameter for the type of figure (statistic) ***********/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Sta_PutHiddenParamScopeSta (void)
|
||||
{
|
||||
Sco_PutParamScope ("ScopeSta",Gbl.Scope.Current);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************** Show use of the platform *************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Sta_ShowUseOfPlatform (void)
|
||||
{
|
||||
void (*Sta_Function[Sta_NUM_FIGURES])(void) = // Array of pointers to functions
|
||||
static void (*Sta_Function[Sta_NUM_FIGURES])(void) = // Array of pointers to functions
|
||||
{
|
||||
Sta_GetAndShowUsersStats, // Sta_USERS
|
||||
Sta_GetAndShowUsersRanking, // Sta_USERS_RANKING
|
||||
|
@ -3877,7 +3886,7 @@ void Sta_ShowUseOfPlatform (void)
|
|||
char UnsignedStr[10+1];
|
||||
unsigned UnsignedNum;
|
||||
|
||||
/***** Get the type of stat of use ******/
|
||||
/***** Get the type of figure ******/
|
||||
Par_GetParToText ("FigureType",UnsignedStr,10);
|
||||
if (sscanf (UnsignedStr,"%u",&UnsignedNum) != 1)
|
||||
Lay_ShowErrorAndExit ("Type of stat is missing.");
|
||||
|
|
|
@ -161,7 +161,8 @@ void Sta_ComputeMaxAndTotalHits (struct Sta_Hits *Hits,
|
|||
unsigned Divisor);
|
||||
|
||||
void Sta_ReqUseOfPlatform (void);
|
||||
void Pho_PutHiddenParamFigureType (void);
|
||||
void Sta_PutHiddenParamFigureType (void);
|
||||
void Sta_PutHiddenParamScopeSta (void);
|
||||
void Sta_ShowUseOfPlatform (void);
|
||||
unsigned Sta_GetTotalNumberOfUsersInCourses (Sco_Scope_t Scope,Rol_Role_t Role);
|
||||
|
||||
|
|
|
@ -758,7 +758,7 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_
|
|||
"",
|
||||
"Nova resposta en un fòrum",
|
||||
"Neue Antwort in einem Forum",
|
||||
"New response in a forum",
|
||||
"New reply in a forum",
|
||||
"Nueva respuesta en un foro",
|
||||
"Nouvelle réponse dans un forum",
|
||||
"Nueva respuesta en un foro", // Okoteve traducción
|
||||
|
@ -26189,7 +26189,7 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
#elif L==2
|
||||
"Neue Antworten auf meine Beiträge in den Foren"
|
||||
#elif L==3
|
||||
"New responses to my posts in forums"
|
||||
"New replies to my posts in forums"
|
||||
#elif L==4
|
||||
"Nuevas respuestas a mis mensajes en foros"
|
||||
#elif L==5
|
||||
|
|
|
@ -5232,7 +5232,8 @@ void Usr_PutExtraParamsUsrList (Act_Action_t NextAction)
|
|||
}
|
||||
break;
|
||||
case ActSeeUseGbl:
|
||||
Pho_PutHiddenParamFigureType ();
|
||||
Sta_PutHiddenParamScopeSta ();
|
||||
Sta_PutHiddenParamFigureType ();
|
||||
break;
|
||||
case ActSeePhoDeg:
|
||||
Pho_PutHiddenParamTypeOfAvg ();
|
||||
|
|
Loading…
Reference in New Issue