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 14.107.8

This commit is contained in:
Antonio Cañas Vargas 2015-04-03 11:49:11 +02:00
parent 365d9e8cce
commit 415ca04a74
7 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon/cty16x16.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.107.7 (2015/04/03)" #define Log_PLATFORM_VERSION "SWAD 14.107.8 (2015/04/03)"
// 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 14.107.8: Apr 03, 2015 Changes in statistics (figures about hierarchy). (183774 lines)
Version 14.107.7: Apr 03, 2015 Changes in layout of sent / received messages. (183753 lines) Version 14.107.7: Apr 03, 2015 Changes in layout of sent / received messages. (183753 lines)
Version 14.107.6: Apr 03, 2015 Changes in layout of form to change password. (183748 lines) Version 14.107.6: Apr 03, 2015 Changes in layout of form to change password. (183748 lines)
Version 14.107.5: Apr 03, 2015 Changes in layout of form to change photo. (183718 lines) Version 14.107.5: Apr 03, 2015 Changes in layout of form to change photo. (183718 lines)

2
swad_global.c
View File

@ -405,7 +405,7 @@ void Gbl_InitializeGlobals (void)
Gbl.Stat.Role = Sta_IDENTIFIED_USRS; Gbl.Stat.Role = Sta_IDENTIFIED_USRS;
Gbl.Stat.NumAction = ActAll; Gbl.Stat.NumAction = ActAll;
Gbl.Stat.RowsPerPage = 50; Gbl.Stat.RowsPerPage = 50;
Gbl.Stat.UseStatType = Sta_USRS_RANKING; Gbl.Stat.UseStatType = Sta_USERS;
Gbl.Scope.Current = Sco_SCOPE_CRS; Gbl.Scope.Current = Sco_SCOPE_CRS;

2
swad_profile.c
View File

@ -751,7 +751,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
/***** Rank in form to go to ranking *****/ /***** Rank in form to go to ranking *****/
Act_FormStart (ActSeeUseGbl); Act_FormStart (ActSeeUseGbl);
Sco_PutParamScope (Sco_SCOPE_SYS); Sco_PutParamScope (Sco_SCOPE_SYS);
Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USRS_RANKING); Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USERS_RANKING);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"#%lu</a>",Rank); fprintf (Gbl.F.Out,"#%lu</a>",Rank);
Act_FormEnd (); Act_FormEnd ();

46
swad_statistic.c
View File

@ -3660,7 +3660,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Show the stat of use selected by user *****/ /***** Show the stat of use selected by user *****/
switch (Gbl.Stat.UseStatType) switch (Gbl.Stat.UseStatType)
{ {
case Sta_USRS_RANKING: case Sta_USERS_RANKING:
/***** Users ranking *****/ /***** Users ranking *****/
Sta_GetAndShowUsersRanking (); Sta_GetAndShowUsersRanking ();
break; break;
@ -3668,7 +3668,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Number of users *****/ /***** Number of users *****/
Sta_GetAndShowUsersStats (); Sta_GetAndShowUsersStats ();
break; break;
case Sta_DEGREES_AND_COURSES: case Sta_HIERARCHY:
/***** Number of degrees and courses *****/ /***** Number of degrees and courses *****/
Sta_GetAndShowDegCrsStats (); Sta_GetAndShowDegCrsStats ();
break; break;
@ -3701,7 +3701,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Number of notices *****/ /***** Number of notices *****/
Sta_GetAndShowNoticesStats (); Sta_GetAndShowNoticesStats ();
break; break;
case Sta_MSGS_BETWEEN_USERS: case Sta_MESSAGES:
/***** Number of sent and received messages *****/ /***** Number of sent and received messages *****/
Sta_GetAndShowMsgsStats (); Sta_GetAndShowMsgsStats ();
break; break;
@ -3798,7 +3798,7 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Messages; extern const char *Txt_Messages;
extern const char *Txt_Followers; extern const char *Txt_Followers;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USRS_RANKING]); Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING]);
/***** Header *****/ /***** Header *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -3867,7 +3867,7 @@ static void Sta_GetAndShowDegCrsStats (void)
{ {
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS]; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_DEGREES_AND_COURSES]); Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY]);
Sta_WriteHeadDegsCrssInSWAD (); Sta_WriteHeadDegsCrssInSWAD ();
Sta_GetAndShowNumCtysInSWAD (); Sta_GetAndShowNumCtysInSWAD ();
Sta_GetAndShowNumInssInSWAD (); Sta_GetAndShowNumInssInSWAD ();
@ -4016,7 +4016,9 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
/***** Write number of countries *****/ /***** Write number of countries *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">" "<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:" "<img src=\"%s/cty16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT\" style=\"text-align:right;\">"
"%u" "%u"
@ -4040,6 +4042,8 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Prefs.IconsURL,
Txt_Countries,
Txt_Countries, Txt_Countries,
NumCtysTotal, NumCtysTotal,
NumCtysWithInss, NumCtysWithInss,
@ -4135,7 +4139,9 @@ static void Sta_GetAndShowNumInssInSWAD (void)
/***** Write number of institutions *****/ /***** Write number of institutions *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">" "<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:" "<img src=\"%s/ins16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT\" style=\"text-align:right;\">"
"%u" "%u"
@ -4157,6 +4163,8 @@ static void Sta_GetAndShowNumInssInSWAD (void)
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Prefs.IconsURL,
Txt_Institutions,
Txt_Institutions, Txt_Institutions,
NumInssTotal, NumInssTotal,
NumInssWithCtrs, NumInssWithCtrs,
@ -4244,7 +4252,9 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
/***** Write number of centres *****/ /***** Write number of centres *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">" "<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:" "<img src=\"%s/ctr16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT\" style=\"text-align:right;\">"
"%u" "%u"
@ -4264,6 +4274,8 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Prefs.IconsURL,
Txt_Centres,
Txt_Centres, Txt_Centres,
NumCtrsTotal, NumCtrsTotal,
NumCtrsWithDegs, NumCtrsWithDegs,
@ -4343,7 +4355,9 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
/***** Write number of degrees *****/ /***** Write number of degrees *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">" "<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:" "<img src=\"%s/deg16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT\" style=\"text-align:right;\">"
"%u" "%u"
@ -4361,6 +4375,8 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Prefs.IconsURL,
Txt_Degrees,
Txt_Degrees, Txt_Degrees,
NumDegsTotal, NumDegsTotal,
NumDegsWithCrss, NumDegsWithCrss,
@ -4380,7 +4396,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
unsigned NumCrssWithTchs = 0; unsigned NumCrssWithTchs = 0;
unsigned NumCrssWithStds = 0; unsigned NumCrssWithStds = 0;
/***** Get number of degrees *****/ /***** Get number of courses *****/
switch (Gbl.Scope.Current) switch (Gbl.Scope.Current)
{ {
case Sco_SCOPE_SYS: case Sco_SCOPE_SYS:
@ -4429,10 +4445,12 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
break; break;
} }
/***** Write number of degrees *****/ /***** Write number of courses *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">" "<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:" "<img src=\"%s/crs16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>" "</td>"
"<td class=\"DAT\" style=\"text-align:right;\">" "<td class=\"DAT\" style=\"text-align:right;\">"
"%u" "%u"
@ -4448,6 +4466,8 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Prefs.IconsURL,
Txt_Courses,
Txt_Courses, Txt_Courses,
NumCrssTotal, NumCrssTotal,
NumCrssWithTchs, NumCrssWithTchs,
@ -6271,7 +6291,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED); NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MSGS_BETWEEN_USERS]); Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES]);
/***** Write table heading *****/ /***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"

6
swad_statistic.h
View File

@ -90,8 +90,8 @@ typedef enum
typedef enum typedef enum
{ {
Sta_USERS, // Number of users Sta_USERS, // Number of users
Sta_USRS_RANKING, // Users' ranking Sta_USERS_RANKING, // Users' ranking
Sta_DEGREES_AND_COURSES, // Number of degrees and courses Sta_HIERARCHY, // Number of countries, institutions, centres, degrees and courses
Sta_SOCIAL_NETWORKS, // Number of users in social networks Sta_SOCIAL_NETWORKS, // Number of users in social networks
Sta_FOLDERS_AND_FILES, // Number of folders and files Sta_FOLDERS_AND_FILES, // Number of folders and files
Sta_OER, // Number of OERs (Open Educational Resources) Sta_OER, // Number of OERs (Open Educational Resources)
@ -99,7 +99,7 @@ typedef enum
Sta_TESTS, // Number of test questions Sta_TESTS, // Number of test questions
Sta_NOTIFY_EVENTS, // Number of users per notify event Sta_NOTIFY_EVENTS, // Number of users per notify event
Sta_NOTICES, // Number of notices Sta_NOTICES, // Number of notices
Sta_MSGS_BETWEEN_USERS, // Number of users' (sent and received) messages Sta_MESSAGES, // Number of users' (sent and received) messages
Sta_FORUMS, // Number of forums, threads and posts Sta_FORUMS, // Number of forums, threads and posts
Sta_SURVEYS, // Number of surveys Sta_SURVEYS, // Number of surveys
Sta_PRIVACY, // Number of users per privacity Sta_PRIVACY, // Number of users per privacity

18
swad_text.c
View File

@ -36086,23 +36086,23 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS] =
#endif #endif
, ,
#if L==0 #if L==0
"Titulaciones y asignaturas" // Necessita traducció "Jerarquia"
#elif L==1 #elif L==1
"Studieng&auml;nge und Kursen" "Hierarchie"
#elif L==2 #elif L==2
"Degrees and courses" "Hierarchy"
#elif L==3 #elif L==3
"Titulaciones y asignaturas" "Jerarqu&iacute;a"
#elif L==4 #elif L==4
"&Eacute;tudes et mati&egrave;res" "Hi&eacute;rarchie"
#elif L==5 #elif L==5
"Titulaciones y asignaturas" // Okoteve traducción "Jerarqu&iacute;a" // Okoteve traducción
#elif L==6 #elif L==6
"Lauree e corsi" "Gerarchia"
#elif L==7 #elif L==7
"Degrees and courses" // Potrzebujesz tlumaczenie "Hierarchia"
#elif L==8 #elif L==8
"Titula&ccedil;oes e disciplinas" "Hierarquia"
#endif #endif
, ,
#if L==0 #if L==0