Version19.40.4

This commit is contained in:
Antonio Cañas Vargas 2019-10-22 20:43:03 +02:00
parent 00d44a1b24
commit f3836e3f0d
4 changed files with 44 additions and 8 deletions

View File

@ -3019,6 +3019,7 @@ a:hover img.CENTRE_PHOTO_SHOW
.PREF_CONTAINERS .PREF_CONTAINERS
{ {
margin:0 auto; margin:0 auto;
text-align:center;
} }
.PREF_CONTAINER .PREF_CONTAINER
{ {

View File

@ -487,13 +487,17 @@ 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.40.3 (2019-10-21)" #define Log_PLATFORM_VERSION "SWAD 19.40.4 (2019-10-22)"
#define CSS_FILE "swad19.40.3.css" #define CSS_FILE "swad19.40.3.css"
#define JS_FILE "swad19.39.js" #define JS_FILE "swad19.39.js"
/* /*
// TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas) // TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas)
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
Version 19.40.4: Oct 22, 2019 New icon to view results in matches. (245838 lines)
Copy the following 10 icons to icon public directory:
sudo cp -a icon/poll-h.svg /var/www/html/swad/icon/
Version 19.40.3: Oct 21, 2019 Changes in score table. (245810 lines) Version 19.40.3: Oct 21, 2019 Changes in score table. (245810 lines)
Version 19.40.2: Oct 21, 2019 Fixed bug in score table. (245777 lines) Version 19.40.2: Oct 21, 2019 Fixed bug in score table. (245777 lines)
Version 19.40.1: Oct 21, 2019 Coloured bars in score table. (245774 lines) Version 19.40.1: Oct 21, 2019 Coloured bars in score table. (245774 lines)

View File

@ -158,6 +158,7 @@ static void Mch_ShowNumQstInMatch (struct Match *Match);
static void Mch_PutMatchControlButtons (struct Match *Match); static void Mch_PutMatchControlButtons (struct Match *Match);
static void Mch_PutCheckboxResult (struct Match *Match); static void Mch_PutCheckboxResult (struct Match *Match);
static void Mch_ShowMatchTitle (struct Match *Match); static void Mch_ShowMatchTitle (struct Match *Match);
static void Mch_ShowFormViewResult (struct Match *Match);
static void Mch_ShowQuestionAndAnswersTch (struct Match *Match); static void Mch_ShowQuestionAndAnswersTch (struct Match *Match);
static void Mch_ShowQuestionAndAnswersStd (struct Match *Match); static void Mch_ShowQuestionAndAnswersStd (struct Match *Match);
@ -2061,8 +2062,14 @@ static void Mch_ShowLeftColumnTch (struct Match *Match)
/***** Buttons *****/ /***** Buttons *****/
Mch_PutMatchControlButtons (Match); Mch_PutMatchControlButtons (Match);
/***** Put forms to choice which projects to show *****/
/* 1st. row */
Set_StartSettingsHead ();
Mch_ShowFormViewResult (Match);
Set_EndSettingsHead ();
/***** Write button to request viewing results *****/ /***** Write button to request viewing results *****/
Mch_PutCheckboxResult (Match); // Mch_PutCheckboxResult (Match);
/***** End left container *****/ /***** End left container *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -2319,6 +2326,30 @@ static void Mch_PutCheckboxResult (struct Match *Match)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
static void Mch_ShowFormViewResult (struct Match *Match)
{
extern const char *Txt_View_results;
/***** Begin selector *****/
Set_StartOneSettingSelector ();
fprintf (Gbl.F.Out,"<div class=\"%s\">",
(Match->Status.ShowQstResults) ? "PREF_ON" :
"PREF_OFF");
/***** Begin form *****/
Frm_StartForm (ActChgVisResMchQst);
Mch_PutParamMchCod (Match->MchCod); // Current match being played
Ico_PutSettingIconLink ("poll-h.svg",Txt_View_results);
/***** End form *****/
Frm_EndForm ();
/***** End selector *****/
fprintf (Gbl.F.Out,"</div>");
Set_EndOneSettingSelector ();
}
/*****************************************************************************/ /*****************************************************************************/
/***************************** Show match title ******************************/ /***************************** Show match title ******************************/
/*****************************************************************************/ /*****************************************************************************/

View File

@ -2318,9 +2318,9 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float HitsMax)
{ {
unsigned Interval; unsigned Interval;
unsigned NumColor; unsigned NumColor;
unsigned R; unsigned R = 0; // Initialized to avoid warning
unsigned G; unsigned G = 0; // Initialized to avoid warning
unsigned B; unsigned B = 0; // Initialized to avoid warning
/***** Write numbers from 0 to Hits.Max *****/ /***** Write numbers from 0 to Hits.Max *****/
Tbl_TABLE_BeginWide (); Tbl_TABLE_BeginWide ();
@ -2376,9 +2376,9 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float HitsMax)
static void Sta_DrawAccessesPerHourForADay (Sta_ColorType_t ColorType,float HitsNum[24],float HitsMax) static void Sta_DrawAccessesPerHourForADay (Sta_ColorType_t ColorType,float HitsNum[24],float HitsMax)
{ {
unsigned Hour; unsigned Hour;
unsigned R; unsigned R = 0; // Initialized to avoid warning
unsigned G; unsigned G = 0; // Initialized to avoid warning
unsigned B; unsigned B = 0; // Initialized to avoid warning
char *Str; char *Str;
for (Hour = 0; for (Hour = 0;