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

This commit is contained in:
Antonio Cañas Vargas 2019-10-01 01:01:35 +02:00
parent f7469538ab
commit 9dba8a2766
3 changed files with 160 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
css/swad19.28.css → css/swad19.29.css
View File

@ -2602,7 +2602,7 @@ a:hover img.CENTRE_PHOTO_SHOW
{
box-sizing:border-box;
width:100%;
padding-left:24px;
padding:0 12px;
}
.MATCH_REFRESHABLE_TEACHER
@ -2730,10 +2730,56 @@ a:hover img.CENTRE_PHOTO_SHOW
width:25%;
}
.MATCH_STD_QST
.MATCH_PODIUM
{
color:#202020;
display:table;
box-sizing:border-box;
width:100%;
text-align:center;
}
.MATCH_PODIUM_POSITION
{
color:white;
font-size:32pt;
font-weight:bold;
}
.MATCH_PODIUM_SCORE
{
color:white;
font-size:24pt;
font-weight:bold;
}
.MATCH_PODIUM_1
{
display:table-cell;
box-sizing:border-box;
float:left;
width:33%;
margin-top:200px;
height:200px;
margin-top:200px;
background:grey;
}
.MATCH_PODIUM_0
{
display:table-cell;
box-sizing:border-box;
float:left;
width:34%;
margin-top:100px;
height:300px;
margin-top:100px;
background:grey;
}
.MATCH_PODIUM_2
{
display:table-cell;
box-sizing:border-box;
float:left;
width:33%;
height:100px;
margin-top:300px;
background:grey;
}
.MATCH_TCH_BUTTON_TD

5
swad_changelog.h
View File

@ -483,10 +483,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.28.2 (2019-09-30)"
#define CSS_FILE "swad19.28.css"
#define Log_PLATFORM_VERSION "SWAD 19.29 (2019-10-01)"
#define CSS_FILE "swad19.29.css"
#define JS_FILE "swad19.15.js"
/*
Version 19.29: Oct 01, 2019 Show podium at the end of the match. (246894 lines)
Version 19.28.2: Sep 30, 2019 Changed position of column in list of match results with the name of the match. (246762 lines)
Version 19.28.1: Sep 30, 2019 New column in list of match results with the name of the match. (246760 lines)
Version 19.28: Sep 30, 2019 Changes in layout of match playing. (246752 lines)

119
swad_match.c
View File

@ -160,6 +160,7 @@ static void Mch_PutCheckboxResult (struct Match *Match);
static void Mch_ShowMatchTitle (struct Match *Match);
static void Mch_ShowQuestionAndAnswersTch (struct Match *Match);
static void Mch_ShowQuestionAndAnswersStd (struct Match *Match);
static void Mch_ShowMatchPodium (struct Match *Match);
static void Mch_PutParamNumOpt (unsigned NumOpt);
static unsigned Mch_GetParamNumOpt (void);
@ -2135,19 +2136,24 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match)
Match->Status.QstInd);
fprintf (Gbl.F.Out,"<div class=\"MATCH_NUM_ANSWERERS\">"
"%s<br />"
"<strong>%u",
Txt_MATCH_respond,
NumAnswerersQst);
if (Match->Status.Playing)
"<strong>",
Txt_MATCH_respond);
if (Match->Status.QstInd > 0 &&
Match->Status.QstInd < Mch_AFTER_LAST_QUESTION)
{
/* Get current number of players */
Mch_GetNumPlayers (Match);
fprintf (Gbl.F.Out,"%u",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);
/* Show current number of players */
fprintf (Gbl.F.Out,"/%u",
Match->Status.NumPlayers);
}
}
else
fprintf (Gbl.F.Out,"-");
fprintf (Gbl.F.Out,"</strong>"
"</div>");
@ -2166,7 +2172,10 @@ static void Mch_ShowRightColumnTch (struct Match *Match)
Mch_ShowMatchTitle (Match);
/***** Bottom row: current question and possible answers *****/
Mch_ShowQuestionAndAnswersTch (Match);
if (Match->Status.QstInd < Mch_AFTER_LAST_QUESTION) // Not finished
Mch_ShowQuestionAndAnswersTch (Match);
else // Finished
Mch_ShowMatchPodium (Match);
/***** End right container *****/
fprintf (Gbl.F.Out,"</div>");
@ -2515,6 +2524,94 @@ static void Mch_ShowQuestionAndAnswersStd (struct Match *Match)
}
}
/*****************************************************************************/
/***************************** Show match podium *****************************/
/*****************************************************************************/
static void Mch_ShowMatchPodium (struct Match *Match)
{
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRows;
unsigned NumRow;
struct
{
double Score;
unsigned NumUsrs;
} Podium[3];
unsigned i;
static const unsigned Position[3] =
{
1, // 2nd position
0, // 1st position
2 // 3rd position
};
/***** Get podium from database *****/
NumRows = (unsigned)
DB_QuerySELECT (&mysql_res,"can not get data of a question",
"SELECT Score," // row[0]
"COUNT(*) AS NumUsrs" // row[1]
" FROM mch_results"
" WHERE MchCod=%ld"
" GROUP BY Score"
" ORDER BY Score DESC LIMIT 3",
Match->MchCod);
/* Get podium */
for (NumRow = 0;
NumRow < NumRows;
NumRow++)
{
row = mysql_fetch_row (mysql_res);
/* Get score (row[0]) */
Str_SetDecimalPointToUS (); // To get the decimal point as a dot
if (sscanf (row[0],"%lf",&(Podium[NumRow].Score)) != 1)
Podium[NumRow].Score = 0.0;
Str_SetDecimalPointToLocal (); // Return to local system
/* Get number of users (row[1]) *****/
if (sscanf (row[1],"%u",&(Podium[NumRow].NumUsrs)) != 1)
Podium[NumRow].NumUsrs = 0;
}
/* Reset remaining positions */
for (;
NumRow < 3;
NumRow++)
{
/* Score */
Podium[NumRow].Score = 0.0;
/* Number of users */
Podium[NumRow].NumUsrs = 0;
}
/***** Show podium *****/
fprintf (Gbl.F.Out,"<div class=\"MATCH_BOTTOM\">"); // Bottom
fprintf (Gbl.F.Out,"<div class=\"MATCH_PODIUM\">"); // Podium
for (i = 0;
i < 3;
i++)
{
fprintf (Gbl.F.Out,"<div class=\"MATCH_PODIUM_%u\">",Position[i]);
if (Podium[Position[i]].NumUsrs)
fprintf (Gbl.F.Out,"<div class=\"MATCH_PODIUM_POSITION\">%u</div>"
"<div class=\"MATCH_PODIUM_SCORE\">%.2lf (%u)</div>",
Position[i] + 1,
Podium[Position[i]].Score,
Podium[Position[i]].NumUsrs);
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>"); // Podium
fprintf (Gbl.F.Out,"</div>"); // Bottom
}
/*****************************************************************************/
/****** Write parameter with number of option (button) pressed by user *******/
/*****************************************************************************/