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.136.6

This commit is contained in:
Antonio Cañas Vargas 2016-02-06 12:50:05 +01:00
parent f5c0d0bc31
commit 7680a66055
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -121,13 +121,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.136.5 (2016-02-04)" #define Log_PLATFORM_VERSION "SWAD 15.136.6 (2016-02-06)"
#define CSS_FILE "swad15.136.5.css" #define CSS_FILE "swad15.136.5.css"
#define JS_FILE "swad15.131.3.js" #define JS_FILE "swad15.131.3.js"
// 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 15.136.6: Feb 06, 2016 Change in graphic with number of users per country. (195703 lines)
Version 15.136.5: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195702 lines) Version 15.136.5: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195702 lines)
Version 15.136.4: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195687 lines) Version 15.136.4: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195687 lines)
Version 15.136.3: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195686 lines) Version 15.136.3: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195686 lines)

10
swad_country.c
View File

@ -773,7 +773,7 @@ void Cty_WriteScriptGoogleGeochart (void)
extern const char *Txt_Users_NO_HTML; extern const char *Txt_Users_NO_HTML;
extern const char *Txt_Institutions_NO_HTML; extern const char *Txt_Institutions_NO_HTML;
unsigned NumCty; unsigned NumCty;
unsigned NumUsrsWithCountry = 0; unsigned MaxUsrsInCountry = 0;
unsigned NumCtysWithUsrs = 0; unsigned NumCtysWithUsrs = 0;
/***** Write start of the script *****/ /***** Write start of the script *****/
@ -802,7 +802,8 @@ void Cty_WriteScriptGoogleGeochart (void)
Gbl.Ctys.Lst[NumCty].Alpha2, Gbl.Ctys.Lst[NumCty].Alpha2,
Gbl.Ctys.Lst[NumCty].NumUsrsWhoClaimToBelongToCty, Gbl.Ctys.Lst[NumCty].NumUsrsWhoClaimToBelongToCty,
Gbl.Ctys.Lst[NumCty].NumInss); Gbl.Ctys.Lst[NumCty].NumInss);
NumUsrsWithCountry += Gbl.Ctys.Lst[NumCty].NumUsrsWhoClaimToBelongToCty; if (Gbl.Ctys.Lst[NumCty].NumUsrsWhoClaimToBelongToCty > MaxUsrsInCountry)
MaxUsrsInCountry = Gbl.Ctys.Lst[NumCty].NumUsrsWhoClaimToBelongToCty;
NumCtysWithUsrs++; NumCtysWithUsrs++;
} }
@ -818,9 +819,8 @@ void Cty_WriteScriptGoogleGeochart (void)
" chart.draw(data, options);\n" " chart.draw(data, options);\n"
" };\n" " };\n"
"</script>\n", "</script>\n",
NumCtysWithUsrs ? (unsigned) pow (10.0,ceil (log10 (2.0 * (double) NumUsrsWithCountry / NumCtysWithUsrs ? MaxUsrsInCountry :
(double) NumCtysWithUsrs))) : 0);
0); // colorAxis.maxValue = 2*Average_number_of_users
} }
/*****************************************************************************/ /*****************************************************************************/