diff --git a/css/swad19.39.css b/css/swad19.39.css index 10ebd1382..a799a409b 100644 --- a/css/swad19.39.css +++ b/css/swad19.39.css @@ -2649,7 +2649,7 @@ a:hover img.CENTRE_PHOTO_SHOW { box-sizing:border-box; float:left; - width:20%; + width:25%; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; @@ -2659,7 +2659,7 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; display:table; float:left; - width:80%; + width:75%; } .MATCH_TOP { @@ -2690,7 +2690,7 @@ a:hover img.CENTRE_PHOTO_SHOW .MATCH_NUM_QST { color:#808080; - font-size:32pt; + font-size:24pt; font-weight:bold; text-align:center; vertical-align:top; @@ -2861,7 +2861,7 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; width:84px; text-align:center; - vertical-align:middle; + vertical-align:top; } .MATCH_TCH_BUTTON { diff --git a/swad_action.c b/swad_action.c index 52d123141..32ac9c904 100644 --- a/swad_action.c +++ b/swad_action.c @@ -614,7 +614,7 @@ Assessment: 464. ActNewMch Create a new match showing first question in a new browser tab 465. ActResMch Resume an unfinished match showing current question in a new browser tab 466. ActBckMch Go back when playing a match - 467. ActPlyPauMch Play/pause current match + 467. ActPlyPauMch Play/pause current match 469. ActFwdMch Go forward when playing a match 471. ActChgVisResMchQst Change visibility of question results when playing a match 470. ActRefMchTch Refresh current question when playing a match (as teacher) @@ -2162,7 +2162,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActNewMch */{1671,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Mch_CreateNewMatchTch ,Mch_ResumeMatch ,NULL}, /* ActResMch */{1785,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Mch_GetMatchBeingPlayed ,Mch_ResumeMatch ,NULL}, /* ActBckMch */{1790,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_BackMatch ,NULL}, - /* ActPlyPauMch */{1789,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_PlayMatch ,NULL}, + /* ActPlyPauMch */{1789,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_PlayPauseMatch ,NULL}, /* ActFwdMch */{1672,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_ForwardMatch ,NULL}, /* ActChgVisResMchQst*/{1794,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_ToggleVisibilResultsMchQst ,NULL}, /* ActRefMchTch */{1788,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_RFRESH,Mch_GetMatchBeingPlayed ,Mch_RefreshMatchTch ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 267c04189..93ec6ba2d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,13 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.39 (2019-10-17)" +#define Log_PLATFORM_VERSION "SWAD 19.39.1 (2019-10-18)" #define CSS_FILE "swad19.39.css" #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: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.39.1: Oct 18, 2019 Changes in layout and behaviour of matches. (245656 lines) Version 19.39: Oct 17, 2019 Keyboard/presenter is allowed for playing matches. (245657 lines) 2 changes necessary in database: UPDATE actions SET Obsolete='Y' WHERE ActCod=1791; diff --git a/swad_match.c b/swad_match.c index b0a93ecb2..e545e2601 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1718,10 +1718,10 @@ static void Mch_GetElapsedTime (unsigned NumRows,MYSQL_RES *mysql_res, } /*****************************************************************************/ -/** Show current match status (current question, answers...) (by a teacher) **/ +/********************** Play/pause match (by a teacher) **********************/ /*****************************************************************************/ -void Mch_PlayMatch (void) +void Mch_PlayPauseMatch (void) { struct Match Match; @@ -1742,8 +1742,8 @@ void Mch_PlayMatch (void) /* If unfinished, update status */ if (Match.Status.QstInd < Mch_AFTER_LAST_QUESTION) // Unfinished { - if (Match.Status.QstInd == 0) // Match has been created, but it has not started - Mch_SetMatchStatusToNext (&Match); + // if (Match.Status.QstInd == 0) // Match has been created, but it has not started + // Mch_SetMatchStatusToNext (&Match); Match.Status.Playing = true; // Start/resume match } } @@ -2102,21 +2102,18 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match) Txt_MATCH_respond); if (Match->Status.QstInd > 0 && Match->Status.QstInd < Mch_AFTER_LAST_QUESTION) - { 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); - } - } else fprintf (Gbl.F.Out,"-"); + 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,"" ""); } diff --git a/swad_match.h b/swad_match.h index de9a7df6d..a91c1c3c0 100644 --- a/swad_match.h +++ b/swad_match.h @@ -101,7 +101,7 @@ void Mch_GetIndexes (long MchCod,unsigned QstInd, void Mch_RemoveGroup (long GrpCod); void Mch_RemoveGroupsOfType (long GrpTypCod); -void Mch_PlayMatch (void); +void Mch_PlayPauseMatch (void); void Mch_ToggleVisibilResultsMchQst (void); void Mch_BackMatch (void); void Mch_ForwardMatch (void); diff --git a/swad_test.c b/swad_test.c index 4a6a73c3e..8f463729c 100644 --- a/swad_test.c +++ b/swad_test.c @@ -4188,7 +4188,7 @@ static void Tst_WriteChoiceAnsViewMatch (long MchCod,unsigned QstInd,long QstCod Mch_GetIndexes (MchCod,QstInd,Indexes); /***** Start table *****/ - Tbl_TABLE_BeginWidePadding (2); + Tbl_TABLE_BeginWidePadding (5); /***** Show one row for each option *****/ for (NumOpt = 0;