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

Version19.119

This commit is contained in:
Antonio Cañas Vargas 2020-01-25 21:34:20 +01:00
parent bf1b74c7da
commit 5aa20a0749
6 changed files with 77 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swad_centre.c
View File

@ -1905,6 +1905,19 @@ unsigned Ctr_GetNumCtrsTotal (void)
return (unsigned) DB_GetNumRowsTable ("centres");
}
/*****************************************************************************/
/********************** Get number of centres with map ***********************/
/*****************************************************************************/
unsigned Ctr_GetNumCtrsWithMap (void)
{
/***** Get number of centres with map from database
(coordinates 0, 0 means not set ==> don't show map) *****/
return (unsigned) DB_QueryCOUNT ("can not get if map is available",
"SELECT COUNT(*) FROM centres"
" WHERE Latitude<>0 OR Longitude<>0");
}
/*****************************************************************************/
/******************* Get number of centres in a country **********************/
/*****************************************************************************/

1
swad_centre.h
View File

@ -133,6 +133,7 @@ void Ctr_RecFormReqCtr (void);
void Ctr_RecFormNewCtr (void);
unsigned Ctr_GetNumCtrsTotal (void);
unsigned Ctr_GetNumCtrsWithMap (void);
void Ctr_FlushCacheNumCtrsInCty (void);
unsigned Ctr_GetNumCtrsInCty (long CtyCod);
void Ctr_FlushCacheNumCtrsInIns (void);

3
swad_changelog.h
View File

@ -494,7 +494,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.118.2 (2020-01-23)"
#define Log_PLATFORM_VERSION "SWAD 19.119 (2020-01-25)"
#define CSS_FILE "swad19.118.css"
#define JS_FILE "swad19.91.1.js"
/*
@ -502,6 +502,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué?
Version 19.119: Jan 25, 2020 Number of centres with map shown in platform configuration. (278591 lines)
Version 19.118.2: Jan 23, 2020 Fixed bug in enrolment notifications. (278559 lines)
Version 19.118.1: Jan 23, 2020 Fixed bug in marks, reported by Diana Alexandra Dumitru. (278554 lines)
Version 19.118: Jan 14, 2020 Responsive maps. (278546 lines)

4
swad_figure.c
View File

@ -3434,7 +3434,7 @@ static void Fig_GetAndShowTimelineActivityStats (void)
HTM_TD_Begin ("class=\"DAT RM\"");
HTM_Double2Decimals (NumUsrs ? (double) NumNotes / (double) NumUsrs :
0.0);
0.0);
HTM_TD_End ();
HTM_TR_End ();
@ -3554,7 +3554,7 @@ static void Fig_GetAndShowTimelineActivityStats (void)
HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\"");
HTM_Double2Decimals (NumUsrs ? (double) NumNotes / (double) NumUsrs :
0.0);
0.0);
HTM_TD_End ();
HTM_TR_End ();

76
swad_system_config.c
View File

@ -66,7 +66,6 @@
static void SysCfg_Configuration (bool PrintView);
static void SysCfg_PutIconToPrint (void);
static bool SysCfg_GetIfMapIsAvailable (void);
static void SysCfg_GetCoordAndZoom (struct Coordinates *Coord,unsigned *Zoom);
static void SysCfg_Map (void);
static void SysCfg_Platform (void);
@ -74,7 +73,8 @@ static void SysCfg_Shortcut (bool PrintView);
static void SysCfg_QR (void);
static void SysCfg_NumCtys (void);
static void SysCfg_NumInss (void);
static void SysCfg_NumCtrs (void);
static void SysCfg_NumCtrs (unsigned NumCtrs);
static void SysCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap);
static void SysCfg_NumDegs (void);
static void SysCfg_NumCrss (void);
static void SysCfg_NumUsrsInCrss (Rol_Role_t Role);
@ -107,7 +107,8 @@ void SysCfg_PrintConfiguration (void)
static void SysCfg_Configuration (bool PrintView)
{
extern const char *Hlp_SYSTEM_Information;
bool MapIsAvailable;
unsigned NumCtrs;
unsigned NumCtrsWithMap;
/***** Begin box *****/
if (PrintView)
@ -129,11 +130,14 @@ static void SysCfg_Configuration (bool PrintView)
/***** Shortcut to the country *****/
SysCfg_Shortcut (PrintView);
NumCtrsWithMap = Ctr_GetNumCtrsWithMap ();
if (PrintView)
/***** QR code with link to the country *****/
SysCfg_QR ();
else
{
NumCtrs = Ctr_GetNumCtrsTotal ();
/***** Number of countries,
number of institutions,
number of centres,
@ -141,7 +145,8 @@ static void SysCfg_Configuration (bool PrintView)
number of courses *****/
SysCfg_NumCtys ();
SysCfg_NumInss ();
SysCfg_NumCtrs ();
SysCfg_NumCtrs (NumCtrs);
SysCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap);
SysCfg_NumDegs ();
SysCfg_NumCrss ();
@ -159,10 +164,7 @@ static void SysCfg_Configuration (bool PrintView)
HTM_DIV_End ();
/**************************** Right part **********************************/
/***** Check map *****/
MapIsAvailable = SysCfg_GetIfMapIsAvailable ();
if (MapIsAvailable)
if (NumCtrsWithMap)
{
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\"");
@ -185,34 +187,6 @@ static void SysCfg_PutIconToPrint (void)
Ico_PutContextualIconToPrint (ActPrnSysInf,NULL);
}
/*****************************************************************************/
/******************* Check if any of the centres has map *********************/
/*****************************************************************************/
static bool SysCfg_GetIfMapIsAvailable (void)
{
MYSQL_RES *mysql_res;
MYSQL_ROW row;
bool MapIsAvailable = false;
/***** Get if any centre has a coordinate set
(coordinates 0, 0 means not set ==> don't show map) *****/
if (DB_QuerySELECT (&mysql_res,"can not get if map is available",
"SELECT EXISTS"
"(SELECT * FROM centres"
" WHERE centres.Latitude<>0 OR centres.Longitude<>0)"))
{
/* Get if map is available */
row = mysql_fetch_row (mysql_res);
MapIsAvailable = (row[0][0] == '1');
}
/* Free structure that stores the query result */
DB_FreeMySQLResult (&mysql_res);
return MapIsAvailable;
}
/*****************************************************************************/
/********* Get average coordinates of centres in current institution *********/
/*****************************************************************************/
@ -405,7 +379,7 @@ static void SysCfg_NumInss (void)
/************** Show number of centres in system configuration ***************/
/*****************************************************************************/
static void SysCfg_NumCtrs (void)
static void SysCfg_NumCtrs (unsigned NumCtrs)
{
extern const char *Txt_Centres;
@ -417,7 +391,33 @@ static void SysCfg_NumCtrs (void)
/* Data */
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Ctr_GetNumCtrsTotal ());
HTM_Unsigned (NumCtrs);
HTM_TD_End ();
HTM_TR_End ();
}
/*****************************************************************************/
/********** Show number of centres with map in system configuration **********/
/*****************************************************************************/
static void SysCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap)
{
extern const char *Txt_Centres_with_map;
/***** Number of centres *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Centres_with_map);
/* Data */
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_TxtF ("%u (%.1lf%%)",
NumCtrsWithMap,
NumCtrs ? (double) NumCtrsWithMap * 100.0 /
(double) NumCtrs :
0.0);
HTM_TD_End ();
HTM_TR_End ();

21
swad_text.c
View File

@ -3527,6 +3527,27 @@ const char *Txt_CENTRES_ORDER[Ctr_NUM_ORDERS] =
#endif
};
const char *Txt_Centres_with_map =
#if L==1 // ca
"Centres amb mapa";
#elif L==2 // de
"Lehrinstitute mit Karte";
#elif L==3 // en
"Centres with map";
#elif L==4 // es
"Centros con mapa";
#elif L==5 // fr
"Centres avec carte";
#elif L==6 // gn
"Centros con mapa"; // Okoteve traducción
#elif L==7 // it
"Centri con mappa";
#elif L==8 // pl
"Centra z map&aogon;";
#elif L==9 // pt
"Centros com mapa";
#endif
const char *Txt_Centres_with_pending_degrees =
#if L==1 // ca
"Centres amb titulacions pendents d'activar";