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 15.66.2

This commit is contained in:
Antonio Cañas Vargas 2015-12-14 16:44:14 +01:00
parent fe76ba8a67
commit 87e29ea9fd
6 changed files with 66 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
swad_centre.c
View File

@ -1377,6 +1377,24 @@ static void Ctr_ListCentresForEdition (void)
}
fprintf (Gbl.F.Out,"</td>");
/* Number of users who claim to belong to this centre */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ctr->NumUsrsWhoClaimToBelongToCtr);
/* Number of degrees */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ctr->NumDegs);
/* Number of users in courses of this centre */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ctr->NumUsrs);
/* Centre status */
StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status);
fprintf (Gbl.F.Out,"<td class=\"DAT STATUS\">");
@ -2108,7 +2126,7 @@ static void Ctr_PutFormToCreateCentre (void)
"</td>",
Cns_MAX_LENGTH_WWW,Ctr->WWW);
/***** Number of teachers *****/
/***** Number of users who claim to belong to this centre *****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
@ -2118,6 +2136,11 @@ static void Ctr_PutFormToCreateCentre (void)
"0"
"</td>");
/***** Number of users in courses of this centre *****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
/***** Centre status *****/
fprintf (Gbl.F.Out,"<td class=\"DAT STATUS\">"
"%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)
"<th class=\"RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE\">"
"%s+<br />%s"
"</th>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
@ -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);
}

3
swad_changelog.h
View File

@ -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)

5
swad_country.c
View File

@ -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;

14
swad_course.c
View File

@ -1333,18 +1333,18 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
/* Current number of students in this course */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">"
"%u"
"</td>",
TxtClassNormal,BgColor,Crs->NumStds);
/* Current number of teachers in this course */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">"
"%u"
"</td>",
TxtClassNormal,BgColor,Crs->NumTchs);
/* Current number of students in this course */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">"
"%u"
"</td>",
TxtClassNormal,BgColor,Crs->NumStds);
/* Course status */
StatusTxt = Crs_GetStatusTxtFromStatusBits (Crs->Status);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">"
@ -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);
}

4
swad_course.h
View File

@ -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
};
/*****************************************************************************/

34
swad_institution.c
View File

@ -711,12 +711,6 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
"<th class=\"RIGHT_MIDDLE\">"
"%s"
"</th>"
// "<th class=\"RIGHT_MIDDLE\">"
// "%s"
// "</th>"
// "<th class=\"RIGHT_MIDDLE\">"
// "%s"
// "</th>"
"<th class=\"RIGHT_MIDDLE\">"
"%s+<br />%s"
"</th>"
@ -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,"</td>");
/* Number of users */
/* Number of users who claim to belong to this institution */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ins->NumUsrs);
Ins->NumUsrsWhoClaimToBelongToIns);
/* Number of centres */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
@ -1286,6 +1277,12 @@ static void Ins_ListInstitutionsForEdition (void)
"</td>",
Ins->NumCtrs);
/* Number of users in courses of this institution */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ins->NumUsrs);
/* Institution status */
StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status);
fprintf (Gbl.F.Out,"<td class=\"DAT STATUS\">");
@ -1858,7 +1855,7 @@ static void Ins_PutFormToCreateInstitution (void)
"</td>",
Cns_MAX_LENGTH_WWW,Ins->WWW);
/***** Number of users ****/
/***** Number of users who claim to belong to this institution ****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
@ -1868,6 +1865,11 @@ static void Ins_PutFormToCreateInstitution (void)
"0"
"</td>");
/***** Number of users in courses of this institution ****/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
/***** Institution status *****/
fprintf (Gbl.F.Out,"<td class=\"DAT STATUS\">"
"%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)
"<th class=\"RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE\">"
"%s+<br />%s"
"</th>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
@ -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);
}