Version19.116.1

This commit is contained in:
Antonio Cañas Vargas 2020-01-14 08:58:29 +01:00
parent 5174215ac6
commit 84c45f21f5
4 changed files with 26 additions and 9 deletions

View File

@ -344,7 +344,6 @@ static void Ctr_PutIconToEditCentres (void)
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
{ {
extern const char *Txt_Map;
extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT]; extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
struct Place Plc; struct Place Plc;
const char *TxtClassNormal; const char *TxtClassNormal;
@ -394,13 +393,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
/***** Map *****/ /***** Map *****/
HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor);
if (Ctr_GetIfMapIsAvailable (Ctr)) Ctr_FormToGoToMap (Ctr);
{
Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre
Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL,Ctr_PutParamGoToCtr,
"map-marker-alt.svg",
Txt_Map);
}
HTM_TD_End (); HTM_TD_End ();
/***** Number of degrees *****/ /***** Number of degrees *****/
@ -2129,6 +2122,23 @@ static void Ctr_EditingCentreDestructor (void)
} }
} }
/*****************************************************************************/
/************************ Form to go to centre map ***************************/
/*****************************************************************************/
void Ctr_FormToGoToMap (struct Centre *Ctr)
{
extern const char *Txt_Map;
if (Ctr_GetIfMapIsAvailable (&Ctr))
{
Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre
Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL,Ctr_PutParamGoToCtr,
"map-marker-alt.svg",
Txt_Map);
}
}
/*****************************************************************************/ /*****************************************************************************/
/************************ Check if a centre has map **************************/ /************************ Check if a centre has map **************************/
/*****************************************************************************/ /*****************************************************************************/

View File

@ -144,6 +144,7 @@ unsigned Ctr_GetNumCtrsWithUsrs (Rol_Role_t Role,const char *SubQuery);
void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs); void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs);
void Ctr_FormToGoToMap (struct Centre *Ctr);
bool Ctr_GetIfMapIsAvailable (const struct Centre *Ctr); bool Ctr_GetIfMapIsAvailable (const struct Centre *Ctr);
#endif #endif

View File

@ -472,6 +472,8 @@ contiene una de las que yo imparto. As
// TODO: ¿Añadir dos columnas a resultados de juegos entre "Preguntas contestadas" y "Puntuación total": Preguntas "Correctas" y Preguntas "Erróneas"? // TODO: ¿Añadir dos columnas a resultados de juegos entre "Preguntas contestadas" y "Puntuación total": Preguntas "Correctas" y Preguntas "Erróneas"?
// Problema: sólo es aplicable a tipo test // Problema: sólo es aplicable a tipo test
// TODO: Si hay accesos a un centro y el centro se elimina, al clicar en el acceso sale un mensaje de "Usted no tiene permiso para realizar esta acción." en lugar de "No existe el centro"
// TODO: Poner en swad.cfg varias líneas de swad_config.h para que sea más configurable // TODO: Poner en swad.cfg varias líneas de swad_config.h para que sea más configurable
/*****************************************************************************/ /*****************************************************************************/
@ -492,7 +494,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.116 (2020-01-11)" #define Log_PLATFORM_VERSION "SWAD 19.116.1 (2020-01-14)"
#define CSS_FILE "swad19.115.css" #define CSS_FILE "swad19.115.css"
#define JS_FILE "swad19.91.1.js" #define JS_FILE "swad19.91.1.js"
/* /*
@ -501,6 +503,7 @@ ps2pdf source.ps destination.pdf
// TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué? // TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué?
// TODO: Mapas más estrechos en móvil // TODO: Mapas más estrechos en móvil
Version 19.116.1: Jan 14, 2020 Form to go to centre map in statistics. (278518 lines)
Version 19.116: Jan 11, 2020 Changes in number of digits printed in doubles. Version 19.116: Jan 11, 2020 Changes in number of digits printed in doubles.
Code refactoring related to printing some strings. (278506 lines) Code refactoring related to printing some strings. (278506 lines)
Version 19.115.1: Jan 11, 2020 Fixed bug in edition of degrees. (278531 lines) Version 19.115.1: Jan 11, 2020 Fixed bug in edition of degrees. (278531 lines)

View File

@ -3468,6 +3468,9 @@ static void Sta_WriteCentre (long CtrCod)
/***** Form to go to centre *****/ /***** Form to go to centre *****/
Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf, Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf,
"BT_LINK LT LOG","CT"); "BT_LINK LT LOG","CT");
/***** Map *****/
Ctr_FormToGoToMap (&Ctr);
} }
else // Hit with no centre selected else // Hit with no centre selected
{ {