diff --git a/swad_action.c b/swad_action.c index 6eee717db..4af246a33 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2175,7 +2175,7 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = [ActSeeMyMchResMch ] = {1812,-1,TabUnk,ActSeeAllGam ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowMyMchResultsInMch ,NULL}, [ActSeeOneMchResMe ] = {1797,-1,TabUnk,ActSeeAllGam ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowOneMchResult ,NULL}, - [ActReqSeeAllMchRes ] = {1798,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,McR_SelUsrsToViewMchResults ,NULL}, + [ActReqSeeAllMchRes ] = {1798,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_SelUsrsToViewMchResults ,NULL}, [ActSeeAllMchResCrs ] = {1799,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowAllMchResultsInCrs ,NULL}, [ActSeeAllMchResGam ] = {1811,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowAllMchResultsInGam ,NULL}, [ActSeeAllMchResMch ] = {1813,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowAllMchResultsInMch ,NULL}, diff --git a/swad_attendance.c b/swad_attendance.c index 6e74a5205..2f4708935 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1914,8 +1914,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); diff --git a/swad_changelog.h b/swad_changelog.h index a782d4fc5..a2c78df5e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,13 +490,16 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.88.9 (2019-12-09)" +#define Log_PLATFORM_VERSION "SWAD 19.88.11 (2019-12-10)" #define CSS_FILE "swad19.88.5.css" #define JS_FILE "swad19.70.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. +// TODO: ¿Poner en color rojo las fechas de los juegos que tengan todas las partidas terminadas? + Version 19.88.11: Dec 10, 2019 Fixed bug in selection of groups. (248141 lines) + Version 19.88.10: Dec 10, 2019 Fixed bug in matches results. (248145 lines) Version 19.88.9: Dec 09, 2019 Matches results for a game or match are ordered by user's name. (248135 lines) Version 19.88.8: Dec 09, 2019 Fixed bug in matches results. (248126 lines) Version 19.88.7: Dec 09, 2019 Fixed bug in matches results. (248123 lines) diff --git a/swad_match_result.c b/swad_match_result.c index 5dbbbc13a..f48ce00d1 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -113,7 +113,7 @@ void McR_SelUsrsToViewMchResults (void) extern const char *Txt_View_matches_results; Usr_PutFormToSelectUsrsToGoToAct (&Gbl.Usrs.Selected, - ActSeeAllMchResCrs,Grp_PutParamsCodGrps, + ActSeeAllMchResCrs,NULL, Txt_Results, Hlp_ASSESSMENT_Games_results, Txt_View_matches_results, @@ -344,7 +344,7 @@ static void McR_ListAllMchResultsInGam (long GamCod) McR_ShowHeaderMchResults (Usr_OTHER); /***** Get all users who have answered any match question in this game *****/ - NumUsrs = DB_QuerySELECT (&mysql_res,"can not get matches results of a user", + NumUsrs = DB_QuerySELECT (&mysql_res,"can not get users in game", "SELECT users.UsrCod FROM" " (SELECT DISTINCT mch_results.UsrCod AS UsrCod" // row[0] " FROM mch_results,mch_matches,gam_games" @@ -430,7 +430,7 @@ static void McR_ListAllMchResultsInMch (long MchCod) McR_ShowHeaderMchResults (Usr_OTHER); /***** Get all users who have answered any match question in this game *****/ - NumUsrs = DB_QuerySELECT (&mysql_res,"can not get matches results of a user", + NumUsrs = DB_QuerySELECT (&mysql_res,"can not get users in match", "SELECT users.UsrCod FROM" " (SELECT mch_results.UsrCod AS UsrCod" // row[0] " FROM mch_results,mch_matches,gam_games" @@ -714,8 +714,17 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, } else if (GamesSelectedCommas) { - if (asprintf (&GamSubQuery," AND mch_matches.GamCod IN (%s)",GamesSelectedCommas) < 0) - Lay_NotEnoughMemoryExit (); + if (GamesSelectedCommas[0]) + { + if (asprintf (&GamSubQuery," AND mch_matches.GamCod IN (%s)", + GamesSelectedCommas) < 0) + Lay_NotEnoughMemoryExit (); + } + else + { + if (asprintf (&GamSubQuery,"%s","") < 0) + Lay_NotEnoughMemoryExit (); + } } else { @@ -725,7 +734,7 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, /***** Make database query *****/ NumResults = - (unsigned) DB_QuerySELECT (&mysql_res,"can not get matches results of a user", + (unsigned) DB_QuerySELECT (&mysql_res,"can not get matches results", "SELECT mch_results.MchCod," // row[0] "UNIX_TIMESTAMP(mch_results.StartTime)," // row[1] "UNIX_TIMESTAMP(mch_results.EndTime)," // row[2] diff --git a/swad_message.c b/swad_message.c index d34059285..992f29d01 100644 --- a/swad_message.c +++ b/swad_message.c @@ -241,8 +241,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) if (GetUsrsInCrs) { /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (Msg_PutParamsWriteMsg, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (Msg_PutParamsWriteMsg,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); diff --git a/swad_statistic.c b/swad_statistic.c index ddf36645c..ebf247f87 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -348,8 +348,7 @@ void Sta_AskShowCrsHits (void) Hlp_ANALYTICS_Visits_visits_to_course,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (NULL, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (NULL,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); diff --git a/swad_test.c b/swad_test.c index 71fb0a419..038042320 100644 --- a/swad_test.c +++ b/swad_test.c @@ -7423,7 +7423,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) extern const char *Txt_View_test_results; Usr_PutFormToSelectUsrsToGoToAct (&Gbl.Usrs.Selected, - ActSeeUsrTstRes,Grp_PutParamsCodGrps, + ActSeeUsrTstRes,NULL, Txt_Results, Hlp_ASSESSMENT_Tests_results, Txt_View_test_results, diff --git a/swad_user.c b/swad_user.c index 5ee3ae328..a4abd19d0 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6353,8 +6353,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs, Box_BoxBegin (NULL,Txt_Select_users,NULL,HelpLink,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (FuncParams, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (FuncParams,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); @@ -8162,8 +8161,7 @@ void Usr_SeeStudents (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); @@ -8331,8 +8329,7 @@ void Usr_SeeTeachers (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope, - Grp_MY_GROUPS); + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,Grp_MY_GROUPS); /***** Start section with user list *****/ HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID);