From 87e29ea9fd92d3e68254eb65a2076d3264e4fc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 14 Dec 2015 16:44:14 +0100 Subject: [PATCH] Version 15.66.2 --- swad_centre.c | 38 +++++++++++++++++++++++++++++++++----- swad_changelog.h | 3 ++- swad_country.c | 5 +---- swad_course.c | 14 +++++++------- swad_course.h | 4 ++-- swad_institution.c | 34 +++++++++++++++++++++------------- 6 files changed, 66 insertions(+), 32 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index ea509e38..e620f39e 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1377,6 +1377,24 @@ static void Ctr_ListCentresForEdition (void) } fprintf (Gbl.F.Out,""); + /* Number of users who claim to belong to this centre */ + fprintf (Gbl.F.Out,"" + "%u" + "", + Ctr->NumUsrsWhoClaimToBelongToCtr); + + /* Number of degrees */ + fprintf (Gbl.F.Out,"" + "%u" + "", + Ctr->NumDegs); + + /* Number of users in courses of this centre */ + fprintf (Gbl.F.Out,"" + "%u" + "", + Ctr->NumUsrs); + /* Centre status */ StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status); fprintf (Gbl.F.Out,""); @@ -2108,7 +2126,7 @@ static void Ctr_PutFormToCreateCentre (void) "", Cns_MAX_LENGTH_WWW,Ctr->WWW); - /***** Number of teachers *****/ + /***** Number of users who claim to belong to this centre *****/ fprintf (Gbl.F.Out,"" "0" ""); @@ -2118,6 +2136,11 @@ static void Ctr_PutFormToCreateCentre (void) "0" ""); + /***** Number of users in courses of this centre *****/ + fprintf (Gbl.F.Out,"" + "0" + ""); + /***** Centre status *****/ fprintf (Gbl.F.Out,"" "%s" @@ -2203,8 +2226,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) Txt_Place, Txt_Degrees_ABBREVIATION, Txt_Courses_ABBREVIATION, - Txt_Teachers_ABBREVIATION, - Txt_Students_ABBREVIATION, + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, Txt_Status); } @@ -2220,8 +2242,10 @@ static void Ctr_PutHeadCentresForEdition (void) extern const char *Txt_Short_name; extern const char *Txt_Full_name; extern const char *Txt_WWW; - extern const char *Txt_Teachers_ABBREVIATION; + extern const char *Txt_Users; extern const char *Txt_Degrees_ABBREVIATION; + extern const char *Txt_Teachers_ABBREVIATION; + extern const char *Txt_Students_ABBREVIATION; extern const char *Txt_Status; extern const char *Txt_Requester; @@ -2252,6 +2276,9 @@ static void Ctr_PutHeadCentresForEdition (void) "" "%s" "" + "" + "%s+
%s" + "" "" "%s" "" @@ -2265,8 +2292,9 @@ static void Ctr_PutHeadCentresForEdition (void) Txt_Short_name, Txt_Full_name, Txt_WWW, - Txt_Teachers_ABBREVIATION, + Txt_Users, Txt_Degrees_ABBREVIATION, + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, Txt_Status, Txt_Requester); } diff --git a/swad_changelog.h b/swad_changelog.h index b8d6e403..df199986 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -120,12 +120,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.66.1 (2015/12/14)" +#define Log_PLATFORM_VERSION "SWAD 15.66.2 (2015/12/14)" #define CSS_FILE "swad15.65.1.css" // 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.66.2: Dec 14, 2015 Changes in edition of institutions, centres and degrees. (186994 lines) Version 15.66.1: Dec 14, 2015 Removed unused code related to list of countries, institutions and centres by reasons of speed. (186966 lines) Version 15.66: Dec 14, 2015 Number of teachers and number of students removed from list of countries, institutions and centres by reasons of speed. (187057 lines) Version 15.65.1: Dec 14, 2015 Changes in layout of profile. (187031 lines) diff --git a/swad_country.c b/swad_country.c index 9fa64fc0..0702ba0d 100644 --- a/swad_country.c +++ b/swad_country.c @@ -550,10 +550,7 @@ void Cty_ListCountries2 (void) Txt_Centres_ABBREVIATION, Txt_Degrees_ABBREVIATION, Txt_Courses_ABBREVIATION, - // Txt_Teachers_ABBREVIATION, - // Txt_Students_ABBREVIATION, - Txt_Teachers_ABBREVIATION, - Txt_Students_ABBREVIATION); + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION); /***** Write all the countries and their number of users and institutions *****/ for (NumCty = 0; diff --git a/swad_course.c b/swad_course.c index d6e65af9..40f64759 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1333,18 +1333,18 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) Act_FormEnd (); fprintf (Gbl.F.Out,""); - /* Current number of students in this course */ - fprintf (Gbl.F.Out,"" - "%u" - "", - TxtClassNormal,BgColor,Crs->NumStds); - /* Current number of teachers in this course */ fprintf (Gbl.F.Out,"" "%u" "", TxtClassNormal,BgColor,Crs->NumTchs); + /* Current number of students in this course */ + fprintf (Gbl.F.Out,"" + "%u" + "", + TxtClassNormal,BgColor,Crs->NumStds); + /* Course status */ StatusTxt = Crs_GetStatusTxtFromStatusBits (Crs->Status); fprintf (Gbl.F.Out,"" @@ -1794,8 +1794,8 @@ static void Crs_PutHeadCoursesForSeeing (void) Txt_Institutional_BR_code, Txt_Year_OF_A_DEGREE, Txt_Course, - Txt_Students_ABBREVIATION, Txt_Teachers_ABBREVIATION, + Txt_Students_ABBREVIATION, Txt_Status); } diff --git a/swad_course.h b/swad_course.h index c0318a43..64def342 100644 --- a/swad_course.h +++ b/swad_course.h @@ -83,9 +83,9 @@ struct Course long RequesterUsrCod; // User code of the person who requested the creation of this course char ShortName[Crs_MAX_LENGTH_COURSE_SHORT_NAME+1]; // Short name of course char FullName[Crs_MAX_LENGTH_COURSE_FULL_NAME+1]; // Full name of course - unsigned NumStds; // Number of students - unsigned NumTchs; // Number of teachers unsigned NumUsrs; // Number of users (students + teachers) + unsigned NumTchs; // Number of teachers + unsigned NumStds; // Number of students }; /*****************************************************************************/ diff --git a/swad_institution.c b/swad_institution.c index d11bb4c8..02ce50e2 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -711,12 +711,6 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) "" "%s" "" - // "" - // "%s" - // "" - // "" - // "%s" - // "" "" "%s+
%s" "" @@ -728,10 +722,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) Txt_Degrees_ABBREVIATION, Txt_Courses_ABBREVIATION, Txt_Departments_ABBREVIATION, - // Txt_Teachers_ABBREVIATION, - // Txt_Students_ABBREVIATION, - Txt_Teachers_ABBREVIATION, - Txt_Students_ABBREVIATION, + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, Txt_Status); } @@ -1274,11 +1265,11 @@ static void Ins_ListInstitutionsForEdition (void) } fprintf (Gbl.F.Out,""); - /* Number of users */ + /* Number of users who claim to belong to this institution */ fprintf (Gbl.F.Out,"" "%u" "", - Ins->NumUsrs); + Ins->NumUsrsWhoClaimToBelongToIns); /* Number of centres */ fprintf (Gbl.F.Out,"" @@ -1286,6 +1277,12 @@ static void Ins_ListInstitutionsForEdition (void) "", Ins->NumCtrs); + /* Number of users in courses of this institution */ + fprintf (Gbl.F.Out,"" + "%u" + "", + Ins->NumUsrs); + /* Institution status */ StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); fprintf (Gbl.F.Out,""); @@ -1858,7 +1855,7 @@ static void Ins_PutFormToCreateInstitution (void) "", Cns_MAX_LENGTH_WWW,Ins->WWW); - /***** Number of users ****/ + /***** Number of users who claim to belong to this institution ****/ fprintf (Gbl.F.Out,"" "0" ""); @@ -1868,6 +1865,11 @@ static void Ins_PutFormToCreateInstitution (void) "0" ""); + /***** Number of users in courses of this institution ****/ + fprintf (Gbl.F.Out,"" + "0" + ""); + /***** Institution status *****/ fprintf (Gbl.F.Out,"" "%s" @@ -1904,6 +1906,8 @@ static void Ins_PutHeadInstitutionsForEdition (void) extern const char *Txt_WWW; extern const char *Txt_Users; extern const char *Txt_Centres_ABBREVIATION; + extern const char *Txt_Teachers_ABBREVIATION; + extern const char *Txt_Students_ABBREVIATION; extern const char *Txt_Status; extern const char *Txt_Requester; @@ -1931,6 +1935,9 @@ static void Ins_PutHeadInstitutionsForEdition (void) "" "%s" "" + "" + "%s+
%s" + "" "" "%s" "" @@ -1945,6 +1952,7 @@ static void Ins_PutHeadInstitutionsForEdition (void) Txt_WWW, Txt_Users, Txt_Centres_ABBREVIATION, + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, Txt_Status, Txt_Requester); }