mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-05 16:25:29 +02:00
Version19.88.11
This commit is contained in:
parent
c931861c11
commit
5137e9f5a9
|
@ -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},
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user