From dde24c86529c09cf1410744a1a98f62edbe1f965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 30 May 2016 19:52:46 +0200 Subject: [PATCH] Version 15.212.9 --- swad_centre.c | 5 +++-- swad_changelog.h | 3 ++- swad_country.c | 28 +++++++++++++++++++--------- swad_degree.c | 3 ++- swad_institution.c | 5 +++-- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index 0245f570d..a2224c548 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -481,8 +481,9 @@ static void Ctr_Configuration (bool PrintView) /* Form to go to see degrees of this centre */ Act_FormGoToStart (ActSeeDeg); - Deg_PutParamDegCod (Gbl.CurrentCtr.Ctr.CtrCod); - sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShortName); + Ctr_PutParamCtrCod (Gbl.CurrentCtr.Ctr.CtrCod); + sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, + Gbl.CurrentCtr.Ctr.ShortName); Act_LinkFormSubmit (Gbl.Title,"DAT"); fprintf (Gbl.F.Out,"%u", Deg_GetNumDegsInCtr (Gbl.CurrentCtr.Ctr.CtrCod)); diff --git a/swad_changelog.h b/swad_changelog.h index e0760d1d1..6b7eea133 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -140,13 +140,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.212.8 (2016-05-30)" +#define Log_PLATFORM_VERSION "SWAD 15.212.9 (2016-05-30)" #define CSS_FILE "swad15.210.css" #define JS_FILE "swad15.197.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.212.9: May 30, 2016 Link to list institutions of country in country configuration. (201567 lines) Version 15.212.8: May 30, 2016 Link to list centres of institution in institution configuration. (201555 lines) Version 15.212.7: May 30, 2016 Link to list degrees of centre in centre configuration. (201547 lines) Version 15.212.6: May 30, 2016 Link to list courses of degree in degree configuration. (201539 lines) diff --git a/swad_country.c b/swad_country.c index d5bd9694a..ab85682e6 100644 --- a/swad_country.c +++ b/swad_country.c @@ -204,11 +204,12 @@ void Cty_PrintConfiguration (void) static void Cty_Configuration (bool PrintView) { extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_Institutions; extern const char *Txt_Country; extern const char *Txt_Shortcut; extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES]; extern const char *Txt_QR_code; + extern const char *Txt_Institutions; + extern const char *Txt_Institutions_of_COUNTRY_X; extern const char *Txt_Centres; extern const char *Txt_Degrees; extern const char *Txt_Courses; @@ -347,15 +348,24 @@ static void Cty_Configuration (bool PrintView) /***** Number of institutions *****/ fprintf (Gbl.F.Out,"" "" - "%s:" - "" - "" - "%u" - "" - "", + "%s:" + "" + "", The_ClassForm[Gbl.Prefs.Theme], - Txt_Institutions, + Txt_Institutions); + + /* Form to go to see institutions of this country */ + Act_FormGoToStart (ActSeeIns); + Cty_PutParamCtyCod (Gbl.CurrentCty.Cty.CtyCod); + sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, + Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); + Act_LinkFormSubmit (Gbl.Title,"DAT"); + fprintf (Gbl.F.Out,"%u", Ins_GetNumInssInCty (Gbl.CurrentCty.Cty.CtyCod)); + Act_FormEnd (); + + fprintf (Gbl.F.Out,"" + ""); /***** Number of centres *****/ fprintf (Gbl.F.Out,"" @@ -1550,7 +1560,7 @@ void Cty_RemoveCountry (void) /***** Write message to show the change made *****/ sprintf (Gbl.Message,Txt_Country_X_removed, - Cty.Name); + Cty.Name[Gbl.Prefs.Language]); Lay_ShowAlert (Lay_SUCCESS,Gbl.Message); } diff --git a/swad_degree.c b/swad_degree.c index c10914dc4..98b542828 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -424,7 +424,8 @@ static void Deg_Configuration (bool PrintView) /* Form to go to see courses of this degree */ Act_FormGoToStart (ActSeeCrs); Deg_PutParamDegCod (Gbl.CurrentDeg.Deg.DegCod); - sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShortName); + sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X, + Gbl.CurrentDeg.Deg.ShortName); Act_LinkFormSubmit (Gbl.Title,"DAT"); fprintf (Gbl.F.Out,"%u", Crs_GetNumCrssInDeg (Gbl.CurrentDeg.Deg.DegCod)); diff --git a/swad_institution.c b/swad_institution.c index 644fa83ac..aafb3e917 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -392,8 +392,9 @@ static void Ins_Configuration (bool PrintView) /* Form to go to see centres of this institution */ Act_FormGoToStart (ActSeeCtr); - Deg_PutParamDegCod (Gbl.CurrentIns.Ins.InsCod); - sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.ShortName); + Ins_PutParamInsCod (Gbl.CurrentIns.Ins.InsCod); + sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, + Gbl.CurrentIns.Ins.ShortName); Act_LinkFormSubmit (Gbl.Title,"DAT"); fprintf (Gbl.F.Out,"%u", Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod));