diff --git a/swad_changelog.h b/swad_changelog.h
index 75cd40f35..9a50fc392 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -40,7 +40,7 @@
// 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 | tail -1
/*
- Version 14.52.3 :Jan 02, 2014 Titles in statistics. (? lines)
+ Version 14.52.3 :Jan 02, 2014 Titles in statistics. (173258 lines)
Version 14.52.2 :Jan 02, 2014 Fixed bugs in layout.
Statistics about number of users who hace chosen a menu. (173163 lines)
Version 14.52.1 :Jan 02, 2014 Link to calendar in name of month. (173021 lines)
diff --git a/swad_network.c b/swad_network.c
index f3c0b270e..6fa4224fc 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -313,6 +313,7 @@ static void Net_GetMyWebsAndSocialNetsFromForm (void)
void Net_ShowWebAndSocialNetworksStats (void)
{
+ extern const char *Txt_Webs_social_networks;
extern const char *Txt_Web_social_network;
extern const char *Txt_No_of_users;
extern const char *Txt_PERCENT_of_users;
@@ -387,7 +388,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
"can not get number of users with webs / social networks");
/***** Number of users *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Webs_social_networks);
fprintf (Gbl.F.Out,"
"
""
diff --git a/swad_statistic.c b/swad_statistic.c
index 17ee9a471..52cbd9c34 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -120,6 +120,7 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa
static void Sta_WriteSelectedRangeOfDates (unsigned NumDays);
static void Sta_WriteFloatNum (float Number);
+static void Sta_GetAndShowDegCrsStats (void);
static void Sta_WriteHeadDegsCrssInSWAD (void);
static void Sta_GetAndShowNumCtysInSWAD (void);
static void Sta_GetAndShowNumInssInSWAD (void);
@@ -127,22 +128,22 @@ static void Sta_GetAndShowNumCtrsInSWAD (void);
static void Sta_GetAndShowNumDegsInSWAD (void);
static void Sta_GetAndShowNumCrssInSWAD (void);
-static void Sta_ShowUsersStats (void);
+static void Sta_GetAndShowUsersStats (void);
-static void Sta_ShowStatsFileBrowsers (void);
+static void Sta_GetAndShowFileBrowsersStats (void);
static void Sta_WriteStatsExpTreesTableHead (void);
static void Sta_WriteRowStatsExpTrees (Brw_FileBrowser_t FileZone,const char *NameOfFileZones);
static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t FileBrowser,struct Sta_SizeOfFileZones *SizeOfFileZones);
-static void Sta_ShowOERs (void);
-static void Sta_GetNumberOfOERFromDB (Sco_Scope_t Scope,Brw_License_t License,unsigned long NumFiles[2]);
+static void Sta_GetAndShowOERsStats (void);
+static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,unsigned long NumFiles[2]);
-static void Sta_ShowAssignmentsStats (void);
-static void Sta_ShowTestsStats (void);
+static void Sta_GetAndShowAssignmentsStats (void);
+static void Sta_GetAndShowTestsStats (void);
+static void Sta_GetAndShowNoticesStats (void);
+static void Sta_GetAndShowMsgsStats (void);
-static void Sta_ShowNoticesStats (void);
-static void Sta_ShowMsgsStats (void);
-static void Sta_ShowForumStats (void);
+static void Sta_GetAndShowForumStats (void);
static void Sta_ShowStatOfAForumType (For_ForumType_t ForumType,
long InsCod,long CtrCod,long DegCod,long CrsCod,
struct Sta_StatsForum *StatsForum);
@@ -152,8 +153,7 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
const char *ForumName1,const char *ForumName2);
static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum);
-static void Sta_ShowSurveysStats (void);
-
+static void Sta_GetAndShowSurveysStats (void);
static void Sta_GetAndShowNumUsrsPerLanguage (void);
static void Sta_GetAndShowNumUsrsPerLayout (void);
static void Sta_GetAndShowNumUsrsPerTheme (void);
@@ -3617,12 +3617,14 @@ void Sta_ReqUseOfPlatform (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Scope;
+ extern const char *Txt_Statistics;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
extern const char *Txt_Show_statistic;
Sta_UseStatType_t UseStatType;
/***** Start form *****/
- fprintf (Gbl.F.Out,"");
+ fprintf (Gbl.F.Out,"
");
Act_FormStart (ActSeeUseGbl);
/***** Compute stats for anywhere, degree or course? *****/
@@ -3638,31 +3640,26 @@ void Sta_ReqUseOfPlatform (void)
Gbl.Scope.Default = Sco_SCOPE_PLATFORM;
Sco_GetScope ();
Sco_PutSelectorScope (false);
- fprintf (Gbl.F.Out,"
");
/***** Type of statistic *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,"
"
- ""
- ""
- " "
- " ");
- Lay_EndRoundFrameTable10 ();
+ fprintf (Gbl.F.Out,""
+ "
");
/***** Submit button *****/
fprintf (Gbl.F.Out," ",
@@ -3698,18 +3695,11 @@ void Sta_ShowUseOfPlatform (void)
{
case Sta_DEGREES_AND_COURSES:
/***** Number of degrees and courses *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
- Sta_WriteHeadDegsCrssInSWAD ();
- Sta_GetAndShowNumCtysInSWAD ();
- Sta_GetAndShowNumInssInSWAD ();
- Sta_GetAndShowNumCtrsInSWAD ();
- Sta_GetAndShowNumDegsInSWAD ();
- Sta_GetAndShowNumCrssInSWAD ();
- Lay_EndRoundFrameTable10 ();
+ Sta_GetAndShowDegCrsStats ();
break;
case Sta_USERS:
/***** Number of users *****/
- Sta_ShowUsersStats ();
+ Sta_GetAndShowUsersStats ();
break;
case Sta_SOCIAL_NETWORKS:
/***** Number of users in social networks *****/
@@ -3718,19 +3708,19 @@ void Sta_ShowUseOfPlatform (void)
case Sta_FOLDERS_AND_FILES:
/***** File browsers (folders and files) *****/
// TODO: add links to statistic
- Sta_ShowStatsFileBrowsers ();
+ Sta_GetAndShowFileBrowsersStats ();
break;
case Sta_OER:
/***** Number of Open Educational Resources (OERs) *****/
- Sta_ShowOERs ();
+ Sta_GetAndShowOERsStats ();
break;
case Sta_ASSIGNMENTS:
/***** Number of assignments *****/
- Sta_ShowAssignmentsStats ();
+ Sta_GetAndShowAssignmentsStats ();
break;
case Sta_TESTS:
/***** Number of tests *****/
- Sta_ShowTestsStats ();
+ Sta_GetAndShowTestsStats ();
break;
case Sta_NOTIFY_EVENTS:
/***** Number of users who want to be notified by e-mail on each event *****/
@@ -3738,19 +3728,19 @@ void Sta_ShowUseOfPlatform (void)
break;
case Sta_NOTICES:
/***** Number of notices *****/
- Sta_ShowNoticesStats ();
+ Sta_GetAndShowNoticesStats ();
break;
case Sta_MSGS_BETWEEN_USERS:
/***** Number of sent and received messages *****/
- Sta_ShowMsgsStats ();
+ Sta_GetAndShowMsgsStats ();
break;
case Sta_FORUMS:
/***** Number of forums, threads and posts *****/
- Sta_ShowForumStats ();
+ Sta_GetAndShowForumStats ();
break;
case Sta_SURVEYS:
/***** Number of surveys *****/
- Sta_ShowSurveysStats ();
+ Sta_GetAndShowSurveysStats ();
break;
case Sta_LANGUAGES:
/***** Number of users who have chosen a language *****/
@@ -3779,6 +3769,24 @@ void Sta_ShowUseOfPlatform (void)
}
}
+/*****************************************************************************/
+/*************** Get and show stats about degrees and courses ****************/
+/*****************************************************************************/
+
+static void Sta_GetAndShowDegCrsStats (void)
+ {
+ extern const char *Txt_Degrees_and_courses;
+
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees_and_courses);
+ Sta_WriteHeadDegsCrssInSWAD ();
+ Sta_GetAndShowNumCtysInSWAD ();
+ Sta_GetAndShowNumInssInSWAD ();
+ Sta_GetAndShowNumCtrsInSWAD ();
+ Sta_GetAndShowNumDegsInSWAD ();
+ Sta_GetAndShowNumCrssInSWAD ();
+ Lay_EndRoundFrameTable10 ();
+ }
+
/*****************************************************************************/
/******************* Write head table degrees and courses ********************/
/*****************************************************************************/
@@ -4403,7 +4411,7 @@ unsigned Sta_GetTotalNumberOfUsers (Sco_Scope_t Scope,Rol_Role_t Role)
/********************** Show stats about number of users *********************/
/*****************************************************************************/
-static void Sta_ShowUsersStats (void)
+static void Sta_GetAndShowUsersStats (void)
{
extern const char *Txt_Users;
extern const char *Txt_No_of_users;
@@ -4411,7 +4419,7 @@ static void Sta_ShowUsersStats (void)
extern const char *Txt_Average_number_of_users_belonging_to_a_course;
/***** Number of users *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Users);
fprintf (Gbl.F.Out," "
""
@@ -4442,8 +4450,9 @@ static void Sta_ShowUsersStats (void)
/********************* Show stats about exploration trees ********************/
/*****************************************************************************/
-static void Sta_ShowStatsFileBrowsers (void)
+static void Sta_GetAndShowFileBrowsersStats (void)
{
+ extern const char *Txt_Folders_and_files;
extern const char *Txt_STAT_COURSE_FILE_ZONES[];
extern const char *Txt_Virtual_pendrives;
static const Brw_FileBrowser_t StatCrsFileZones[Sta_NUM_STAT_CRS_FILE_ZONES] =
@@ -4461,7 +4470,7 @@ static void Sta_ShowStatsFileBrowsers (void)
unsigned NumStat;
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Folders_and_files);
/***** Write table heading *****/
Sta_WriteStatsExpTreesTableHead ();
@@ -4897,8 +4906,9 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
/************ Show stats about Open Educational Resources (OERs) *************/
/*****************************************************************************/
-static void Sta_ShowOERs (void)
+static void Sta_GetAndShowOERsStats (void)
{
+ extern const char *Txt_OER;
extern const char *Txt_License;
extern const char *Txt_No_of_private_files;
extern const char *Txt_No_of_public_files;
@@ -4907,7 +4917,7 @@ static void Sta_ShowOERs (void)
unsigned long NumFiles[2];
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_OER);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -4929,7 +4939,7 @@ static void Sta_ShowOERs (void)
License < Brw_NUM_LICENSES;
License++)
{
- Sta_GetNumberOfOERFromDB (Gbl.Scope.Current,License,NumFiles);
+ Sta_GetNumberOfOERsFromDB (Gbl.Scope.Current,License,NumFiles);
fprintf (Gbl.F.Out," "
""
@@ -4955,7 +4965,7 @@ static void Sta_ShowOERs (void)
/**************** Get the size of a file zone from database ******************/
/*****************************************************************************/
-static void Sta_GetNumberOfOERFromDB (Sco_Scope_t Scope,Brw_License_t License,unsigned long NumFiles[2])
+static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,unsigned long NumFiles[2])
{
char Query[512];
MYSQL_RES *mysql_res;
@@ -5048,8 +5058,9 @@ static void Sta_GetNumberOfOERFromDB (Sco_Scope_t Scope,Brw_License_t License,un
/************************ Show stats about assignments ***********************/
/*****************************************************************************/
-static void Sta_ShowAssignmentsStats (void)
+static void Sta_GetAndShowAssignmentsStats (void)
{
+ extern const char *Txt_Assignments;
extern const char *Txt_Number_of_BR_assignments;
extern const char *Txt_Number_of_BR_courses_with_BR_assignments;
extern const char *Txt_Average_number_BR_of_assignments_BR_per_course;
@@ -5066,7 +5077,7 @@ static void Sta_ShowAssignmentsStats (void)
NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Assignments);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -5116,8 +5127,9 @@ static void Sta_ShowAssignmentsStats (void)
/********************** Show stats about test questions **********************/
/*****************************************************************************/
-static void Sta_ShowTestsStats (void)
+static void Sta_GetAndShowTestsStats (void)
{
+ extern const char *Txt_Tests;
extern const char *Txt_Type_of_BR_answers;
extern const char *Txt_Number_of_BR_courses_BR_with_test_BR_questions;
extern const char *Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions;
@@ -5135,7 +5147,7 @@ static void Sta_ShowTestsStats (void)
" border-width:1px;";
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Tests);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -5284,8 +5296,9 @@ static void Sta_ShowTestsStats (void)
/***************************** Show stats of notices *************************/
/*****************************************************************************/
-static void Sta_ShowNoticesStats (void)
+static void Sta_GetAndShowNoticesStats (void)
{
+ extern const char *Txt_Notices;
extern const char *Txt_NOTICE_Active_BR_notices;
extern const char *Txt_NOTICE_Obsolete_BR_notices;
extern const char *Txt_NOTICE_Deleted_BR_notices;
@@ -5313,7 +5326,7 @@ static void Sta_ShowNoticesStats (void)
NumTotalNotifications += NumNotif;
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Notices);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -5371,7 +5384,7 @@ static void Sta_ShowNoticesStats (void)
/*************************** Show stats of messages **************************/
/*****************************************************************************/
-static void Sta_ShowMsgsStats (void)
+static void Sta_GetAndShowMsgsStats (void)
{
extern const char *Txt_Messages;
extern const char *Txt_MSGS_Not_deleted;
@@ -5393,7 +5406,7 @@ static void Sta_ShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Messages);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -5472,7 +5485,7 @@ static void Sta_ShowMsgsStats (void)
/***************************** Show stats of forums **************************/
/*****************************************************************************/
-static void Sta_ShowForumStats (void)
+static void Sta_GetAndShowForumStats (void)
{
extern const char *Txt_Forums;
extern const char *Txt_No_of_forums;
@@ -5491,7 +5504,7 @@ static void Sta_ShowForumStats (void)
StatsForum.NumUsrsToBeNotifiedByEMail = 0;
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Forums);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -5825,8 +5838,9 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum)
/***************************** Show stats of surveys *************************/
/*****************************************************************************/
-static void Sta_ShowSurveysStats (void)
+static void Sta_GetAndShowSurveysStats (void)
{
+ extern const char *Txt_Surveys;
extern const char *Txt_Number_of_BR_surveys;
extern const char *Txt_Number_of_BR_courses_with_BR_surveys;
extern const char *Txt_Average_number_BR_of_surveys_BR_per_course;
@@ -5848,7 +5862,7 @@ static void Sta_ShowSurveysStats (void)
}
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,NULL);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Surveys);
/***** Write table heading *****/
fprintf (Gbl.F.Out," "
@@ -6630,6 +6644,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
{
+ extern const char *Txt_Notifications;
extern const char *Txt_Event;
extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS];
extern const char *Txt_No_of_users;
@@ -6651,7 +6666,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
char *StyleTableCell = " border-style:solid none none none;"
" border-width:1px;";
- Lay_StartRoundFrameTable10 (NULL,2,Txt_Event);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Notifications);
/***** Heading row *****/
fprintf (Gbl.F.Out," "
diff --git a/swad_text.c b/swad_text.c
index aacf2ccef..cadc9ee20 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -7281,6 +7281,27 @@ const char *Txt_degrees =
"titulaçoes";
#endif
+const char *Txt_Degrees_and_courses =
+#if L==0
+ "Titulaciones y asignaturas"; // Necessita traducció
+#elif L==1
+ "Studiengänge und Kursen";
+#elif L==2
+ "Degrees and courses";
+#elif L==3
+ "Titulaciones y asignaturas";
+#elif L==4
+ "Études et matières";
+#elif L==5
+ "Titulaciones y asignaturas"; // Okoteve traducción
+#elif L==6
+ "Lauree e corsi";
+#elif L==7
+ "Degrees and courses"; // Potrzebujesz tlumaczenie
+#elif L==8
+ "Titulaçoes e disciplinas";
+#endif
+
const char *Txt_Degrees_of_CENTRE_X = // Warning: it is very important to include %s in the following sentences
#if L==0
"Titulacions de %s";
@@ -11299,6 +11320,27 @@ const char *Txt_folders =
"diretórios";
#endif
+const char *Txt_Folders_and_files =
+#if L==0
+ "Carpetes i fitxers";
+#elif L==1
+ "Verzeichnisse und Dateien";
+#elif L==2
+ "Folders and files";
+#elif L==3
+ "Carpetas y archivos";
+#elif L==4
+ "Répertoires et fichiers";
+#elif L==5
+ "Carpetas y archivos"; // Okoteve traducción
+#elif L==6
+ "Cartelle e file";
+#elif L==7
+ "Foldery i pliki";
+#elif L==8
+ "Diretórios e arquivos";
+#endif
+
const char *Txt_Folders_copied =
#if L==0
"Carpetes copiades";
@@ -12268,27 +12310,6 @@ const char *Txt_Guided_academic_assignments =
"Atividades académicas guided";
#endif
-const char *Txt_Help_on_the_file_browser =
-#if L==0
- "Ajuda sobre el explorador de fitxers";
-#elif L==1
- "Hilfe auf dem Datei-Browser";
-#elif L==2
- "Help on the file browser";
-#elif L==3
- "Ayuda sobre el explorador de archivos";
-#elif L==4
- "Aide sur le navigateur de fichiers";
-#elif L==5
- "Ayuda sobre el explorador de archivos"; // Okoteve traducción
-#elif L==6
- "Guida sul file browser";
-#elif L==7
- "Pomoc w przegladarke plików";
-#elif L==8
- "Ajuda sobre o arquivo navegador";
-#endif
-
const char *Txt_Hidden_MALE_PLURAL =
#if L==0
"Ocultos"; // Necessita traduccio
@@ -24584,6 +24605,27 @@ const char *Txt_Numeric_BR_code_BR_ISO_3166_1 =
"Cód. numérico ISO 3166-1";
#endif
+const char *Txt_OER =
+#if L==0
+ "Recursos Educatius Oberts (OER)";
+#elif L==1
+ "Open Educational Resources (OER)";
+#elif L==2
+ "Open Educational Resources (OER)";
+#elif L==3
+ "Recursos Educativos Abiertos (OER)";
+#elif L==4
+ "Ressources Éducatives Libres (REL)";
+#elif L==5
+ "Recursos Educativos Abiertos (OER)"; // Okoteve traducción
+#elif L==6
+ "Risorse Didattiche Aperte (OER)";
+#elif L==7
+ "Otwarte Zasoby Edukacyjne (OER)";
+#elif L==8
+ "Recursos Educacionais Abertos (OER)";
+#endif
+
const char *Txt_of_PART_OF_A_TOTAL = // Example: transferred 2 of 3 files
#if L==0
"de"; // Necessita traduccio
@@ -35165,6 +35207,27 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS] =
#endif
};
+const char *Txt_Statistics =
+#if L==0
+ "Estadístiques";
+#elif L==1
+ "Statistik";
+#elif L==2
+ "Statistics";
+#elif L==3
+ "Estadísticas";
+#elif L==4
+ "Statistiques";
+#elif L==5
+ "Papy'aporeko";
+#elif L==6
+ "Statistiche";
+#elif L==7
+ "Statystyki";
+#elif L==8
+ "Estatísticas";
+#endif
+
const char *Txt_Statistics_of_all_visits =
#if L==0
"Estadística de todos los accesos"; // Necessita traduccio
@@ -36962,6 +37025,27 @@ const char *Txt_Test_result =
"Resultado do teste";
#endif
+const char *Txt_Tests =
+#if L==0
+ "Tests";
+#elif L==1
+ "Tests";
+#elif L==2
+ "Tests";
+#elif L==3
+ "Tests";
+#elif L==4
+ "Tests";
+#elif L==5
+ "Tests"; // Okoteve traducción
+#elif L==6
+ "Test";
+#elif L==7
+ "Testów";
+#elif L==8
+ "Testes";
+#endif
+
const char *Txt_Thanks_for_answering_the_survey =
#if L==0
"Gracias por responder la encuesta."; // Necessita traduccio