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

This commit is contained in:
Antonio Cañas Vargas 2019-09-30 14:55:55 +02:00
parent 10c318f907
commit e78e558cb2
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
css/swad19.15.css → css/swad19.27.css
View File

14
swad_changelog.h
View File

@ -456,6 +456,15 @@ Lo de mutear anuncios, en principio prefiero hacer una opci
// TODO: URGENTE: Reportado por Javier Fernández Baldomero. Al pasar lista con SWADroid, los estudiantes sin foto no salen en la lista de alumnos de SWADroid.
// TODO: Sugerencia de Pedro A. García Sánchez: poner un enlace a horario externo, igual que con otras partes de la información
/*
Ya voy a empezar a darte la lata... Aunque esto es algo que tengo apuntado desde hace tiempo. En los másteres es complicado hacer una plantilla de horarios como la que tienes en swad, pero nos obligan a meter el horario, con aula y profesor, por cada sesión. Por ejemplo,
https://oficinavirtual.ugr.es/awc/horario/ve_horario/visor.jsp?programa=M37156&siglas=15
contiene una de las que yo imparto. Así que me imagino que te esperarás la sugerencia (petición con café o cerveza como recompensa): ¿sería posible que en la pestaña de horario se pudiese embeber esa página? (Creo que los grados usan algo parecido también.)
*/
// TODO: No repintar los botones de matches del profesor durante el refresco AJAX
/*****************************************************************************/
@ -476,10 +485,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.26.1 (2019-09-30)"
#define CSS_FILE "swad19.15.css"
#define Log_PLATFORM_VERSION "SWAD 19.27 (2019-09-30)"
#define CSS_FILE "swad19.27.css"
#define JS_FILE "swad19.15.js"
/*
Version 19.27: Sep 30, 2019 Changes in layout of match playing. (246756 lines)
Version 19.26.1: Sep 30, 2019 Changes in edition of games. (246760 lines)
Version 19.26: Sep 30, 2019 Changes in edition of games. (246743 lines)
Version 19.25.3: Sep 30, 2019 Fixed bug: students should not see icon to add a match. (246745 lines)

57
swad_match.c
View File

@ -157,7 +157,6 @@ static void Mch_ShowRightColumnStd (struct Match *Match);
static void Mch_ShowNumQstInMatch (struct Match *Match);
static void Mch_PutMatchControlButtons (struct Match *Match);
static void Mch_PutCheckboxResult (struct Match *Match);
static void Mch_ShowNumPlayers (struct Match *Match);
static void Mch_ShowMatchTitle (struct Match *Match);
static void Mch_ShowQuestionAndAnswersTch (struct Match *Match);
static void Mch_ShowQuestionAndAnswersStd (struct Match *Match);
@ -2122,30 +2121,33 @@ static void Mch_ShowInsideLeftColumnTch (struct Match *Match)
fprintf (Gbl.F.Out,"-");
fprintf (Gbl.F.Out,"</div>");
/***** Number of users who have answered this question *****/
NumAnswerersQst = Mch_GetNumUsrsWhoHaveAnswerQst (Match->MchCod,
Match->Status.QstInd);
fprintf (Gbl.F.Out,"<div class=\"MATCH_NUM_ANSWERERS\">"
"%s<br />"
"<strong>%u",
Txt_MATCH_respond,
NumAnswerersQst);
if (Match->Status.Playing)
{
/* Get current number of players */
Mch_GetNumPlayers (Match);
/* Show current number of players */
fprintf (Gbl.F.Out,"/%u",
Match->Status.NumPlayers);
}
fprintf (Gbl.F.Out,"</strong>"
"</div>");
/***** Buttons *****/
Mch_PutMatchControlButtons (Match);
/***** Write button to request viewing results *****/
Mch_PutCheckboxResult (Match);
/***** Get current number of players *****/
Mch_GetNumPlayers (Match);
/***** Number of players *****/
Mch_ShowNumPlayers (Match);
/***** Number of users who have answered this question *****/
if (Match->Status.Playing)
{
NumAnswerersQst = Mch_GetNumUsrsWhoHaveAnswerQst (Match->MchCod,
Match->Status.QstInd);
fprintf (Gbl.F.Out,"<div class=\"MATCH_NUM_ANSWERERS\">"
"%s<br />"
"<strong>%u/%u</strong>"
"</div>",
Txt_MATCH_respond,
NumAnswerersQst,Match->Status.NumPlayers);
}
}
/*****************************************************************************/
@ -2346,21 +2348,6 @@ static void Mch_PutCheckboxResult (struct Match *Match)
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/************************** Show number of players ***************************/
/*****************************************************************************/
static void Mch_ShowNumPlayers (struct Match *Match)
{
extern const char *Txt_Players;
fprintf (Gbl.F.Out,"<div class=\"MATCH_NUM_PLAYERS\">"
"%s<br />"
"<strong>%u</strong>"
"</div>",
Txt_Players,Match->Status.NumPlayers);
}
/*****************************************************************************/
/***************************** Show match title ******************************/
/*****************************************************************************/