mirror of https://github.com/acanas/swad-core.git
Version 15.135
This commit is contained in:
Antonio Cañas Vargas
parent
7f624c7dab
commit
218c485128
|
|
@ -121,13 +121,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.134.2 (2016-01-29)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.135 (2016-01-30)"
|
||||
#define CSS_FILE "swad15.134.css"
|
||||
#define JS_FILE "swad15.131.3.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.135: Jan 30, 2016 New figure with number of following and followers. (195516 lines)
|
||||
Version 15.134.2: Jan 29, 2016 New order of figures. (195327 lines)
|
||||
Version 15.134.1: Jan 29, 2016 Changes in lists of following/followers. (195326 lines)
|
||||
Version 15.134: Jan 29, 2016 Change in menu of social tab. (195328 lines)
|
||||
|
|
|
|||
1109
swad_statistic.c
1109
swad_statistic.c
File diff suppressed because it is too large
Load Diff
|
|
@ -97,7 +97,7 @@ typedef enum
|
|||
Sta_CLICKS_GBL_PER_COURSE = 23,
|
||||
} Sta_ClicksGroupedBy_t;
|
||||
|
||||
#define Sta_NUM_FIGURES 21
|
||||
#define Sta_NUM_FIGURES 22
|
||||
typedef enum
|
||||
{
|
||||
Sta_USERS, // Number of users
|
||||
|
|
@ -109,6 +109,7 @@ typedef enum
|
|||
Sta_OER, // Number of OERs (Open Educational Resources)
|
||||
Sta_ASSIGNMENTS, // Number of assignments
|
||||
Sta_TESTS, // Number of test questions
|
||||
Sta_FOLLOW, // Number of following and followers
|
||||
Sta_FORUMS, // Number of forums, threads and posts
|
||||
Sta_NOTIFY_EVENTS, // Number of users per notify event
|
||||
Sta_NOTICES, // Number of notices
|
||||
|
|
|
|||
47
swad_text.c
47
swad_text.c
|
|
@ -12139,6 +12139,27 @@ const char *Txt_Follow =
|
|||
"Seguir";
|
||||
#endif
|
||||
|
||||
const char *Txt_Followed =
|
||||
#if L==1
|
||||
"Seguits";
|
||||
#elif L==2
|
||||
"Gefolgt";
|
||||
#elif L==3
|
||||
"Followed";
|
||||
#elif L==4
|
||||
"Seguidos";
|
||||
#elif L==5
|
||||
"Suivis";
|
||||
#elif L==6
|
||||
"Seguidos"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Seguiti";
|
||||
#elif L==8
|
||||
"Obserwowani";
|
||||
#elif L==9
|
||||
"Seguidos";
|
||||
#endif
|
||||
|
||||
const char *Txt_Followers =
|
||||
#if L==1
|
||||
"Seguidors";
|
||||
|
|
@ -12153,7 +12174,7 @@ const char *Txt_Followers =
|
|||
#elif L==6
|
||||
"Seguidores"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Followers";
|
||||
"Seguendo";
|
||||
#elif L==8
|
||||
"Obserwują";
|
||||
#elif L==9
|
||||
|
|
@ -12174,7 +12195,7 @@ const char *Txt_Following =
|
|||
#elif L==6
|
||||
"Siguiendo"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Following";
|
||||
"Seguendo";
|
||||
#elif L==8
|
||||
"Następujący";
|
||||
#elif L==9
|
||||
|
|
@ -12195,7 +12216,7 @@ const char *Txt_Following_unfollow =
|
|||
#elif L==6
|
||||
"Siguiendo, dejar de seguir"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Following, smetti";
|
||||
"Seguendo, smetti";
|
||||
#elif L==8
|
||||
"Następujący, nie obserwuj";
|
||||
#elif L==9
|
||||
|
|
@ -37607,6 +37628,26 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] =
|
|||
"Testes"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Sta_FOLLOW
|
||||
"Seguits / Seguidors"
|
||||
#elif L==2
|
||||
"Gefolgt / Anhänger"
|
||||
#elif L==3
|
||||
"Followed / Followers"
|
||||
#elif L==4
|
||||
"Seguidos / Seguidores"
|
||||
#elif L==5
|
||||
"Suivis / Suiveurs"
|
||||
#elif L==6
|
||||
"Seguidos / Seguidores" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Seguiti / Seguaci"
|
||||
#elif L==8
|
||||
"Obserwowani / Obserwują"
|
||||
#elif L==9
|
||||
"Seguidos / Seguidores"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Sta_FORUMS
|
||||
"Fòrums"
|
||||
#elif L==2
|
||||
|
|
|
|||
12
swad_user.c
12
swad_user.c
|
|
@ -3619,9 +3619,9 @@ unsigned Usr_GetNumUsrsWhoClaimToBelongToCty (long CtyCod)
|
|||
char Query[128];
|
||||
|
||||
/***** Get the number of users in a country from database *****/
|
||||
sprintf (Query,"SELECT COUNT(DISTINCT UsrCod)"
|
||||
sprintf (Query,"SELECT COUNT(UsrCod)"
|
||||
" FROM usr_data"
|
||||
" WHERE usr_data.CtyCod='%ld'",
|
||||
" WHERE CtyCod='%ld'",
|
||||
CtyCod);
|
||||
return (unsigned) DB_QueryCOUNT (Query,"can not get the number of users in a country");
|
||||
}
|
||||
|
|
@ -3635,9 +3635,9 @@ unsigned Usr_GetNumUsrsWhoClaimToBelongToIns (long InsCod)
|
|||
char Query[128];
|
||||
|
||||
/***** Get the number of users in an institution from database *****/
|
||||
sprintf (Query,"SELECT COUNT(DISTINCT UsrCod)"
|
||||
sprintf (Query,"SELECT COUNT(UsrCod)"
|
||||
" FROM usr_data"
|
||||
" WHERE usr_data.InsCod='%ld'",
|
||||
" WHERE InsCod='%ld'",
|
||||
InsCod);
|
||||
return (unsigned) DB_QueryCOUNT (Query,"can not get the number of users in an institution");
|
||||
}
|
||||
|
|
@ -3651,9 +3651,9 @@ unsigned Usr_GetNumUsrsWhoClaimToBelongToCtr (long CtrCod)
|
|||
char Query[128];
|
||||
|
||||
/***** Get the number of users in a centre from database *****/
|
||||
sprintf (Query,"SELECT COUNT(DISTINCT UsrCod)"
|
||||
sprintf (Query,"SELECT COUNT(UsrCod)"
|
||||
" FROM usr_data"
|
||||
" WHERE usr_data.CtrCod='%ld'",
|
||||
" WHERE CtrCod='%ld'",
|
||||
CtrCod);
|
||||
return (unsigned) DB_QueryCOUNT (Query,"can not get the number of users in a centre");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue