From a6f02c5492dcff177c53c480b05cef8c5cbe53e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 9 Dec 2019 12:56:21 +0100 Subject: [PATCH] Version19.88.5 --- css/{swad19.85.css => swad19.88.5.css} | 6 ++ swad_changelog.h | 6 +- swad_date.c | 12 ++-- swad_match_result.c | 94 ++------------------------ swad_statistic.c | 12 ++-- swad_test.c | 28 +++----- swad_user.c | 4 +- 7 files changed, 41 insertions(+), 121 deletions(-) rename css/{swad19.85.css => swad19.88.5.css} (99%) diff --git a/css/swad19.85.css b/css/swad19.88.5.css similarity index 99% rename from css/swad19.85.css rename to css/swad19.88.5.css index 066542c8c..5d99cc83c 100644 --- a/css/swad19.85.css +++ b/css/swad19.88.5.css @@ -2204,6 +2204,12 @@ a:hover img.CENTRE_PHOTO_SHOW font-size:8pt; } +/****************************** Date range form ******************************/ +.DATE_RANGE + { + float:left; /* To display something after the table in the same line */ + } + /*********************************** Lists ***********************************/ .LIST_LEFT, .LIST_TREE { diff --git a/swad_changelog.h b/swad_changelog.h index cc0578348..d88c45fd7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,13 +490,15 @@ 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.3 (2019-12-09)" -#define CSS_FILE "swad19.85.css" +#define Log_PLATFORM_VERSION "SWAD 19.88.5 (2019-12-09)" +#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. + Version 19.88.5: Dec 09, 2019 Changes in layout of date range. (248118 lines) + Version 19.88.4: Dec 09, 2019 Code refactoring in selection of users in matches results. (248119 lines) Version 19.88.3: Dec 09, 2019 Code refactoring in selection of users in tests results. (248181 lines) Version 19.88.2: Dec 09, 2019 Changes in matches results. (248224 lines) Version 19.88.1: Dec 08, 2019 Changes in layout of matches results. (248219 lines) diff --git a/swad_date.c b/swad_date.c index a9a91ec99..e844f2bc8 100644 --- a/swad_date.c +++ b/swad_date.c @@ -431,9 +431,9 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 extern const char *Txt_Yesterday; extern const char *Txt_Today; + /***** Start date-time *****/ HTM_TR_Begin (NULL); - /***** Start date-time *****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_START_END_TIME[Dat_START_TIME]); @@ -451,10 +451,9 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 SetHMS000000To235959 ? Dat_HMS_TO_000000 : // Set hour, minute and second to 00:00:00 Dat_HMS_DO_NOT_SET, // Don't set hour, minute and second to 00:00:00 false); // Don't submit on change - HTM_TD_End (); - /***** "Yesterday" and "Today" buttons *****/ - HTM_TD_Begin ("rowspan=\"2\" class=\"LM\""); + /* "Yesterday" and "Today" buttons */ + HTM_NBSP (); HTM_INPUT_BUTTON ("Yesterday",Txt_Yesterday, "onclick=\"setDateToYesterday('Start','End');\""); HTM_INPUT_BUTTON ("Today",Txt_Today, @@ -462,9 +461,10 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 HTM_TD_End (); HTM_TR_End (); - HTM_TR_Begin (NULL); /***** End date-time *****/ + HTM_TR_Begin (NULL); + HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s:",Txt_START_END_TIME[Dat_END_TIME]); @@ -560,7 +560,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, char *ParamNameTimeUTC; /***** Begin table *****/ - HTM_TABLE_Begin (NULL); + HTM_TABLE_Begin ("DATE_RANGE"); HTM_TR_Begin (NULL); /***** Year *****/ diff --git a/swad_match_result.c b/swad_match_result.c index 95e6b8f64..f9baa785e 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -109,97 +109,15 @@ static bool McR_GetVisibilityMchResultFromDB (long MchCod); void McR_SelUsrsToViewMchResults (void) { extern const char *Hlp_ASSESSMENT_Games_results; - extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Results; - extern const char *Txt_Users; extern const char *Txt_View_matches_results; - unsigned NumTotalUsrs; - /***** Get and update type of list, - number of columns in class photo - and preference about viewing photos *****/ - Usr_GetAndUpdatePrefsAboutUsrList (); - - /***** Get groups to show ******/ - Grp_GetParCodsSeveralGrpsToShowUsrs (); - - /***** Get and order lists of users from this course *****/ - Usr_GetListUsrs (Hie_CRS,Rol_STD); - Usr_GetListUsrs (Hie_CRS,Rol_NET); - Usr_GetListUsrs (Hie_CRS,Rol_TCH); - NumTotalUsrs = Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs + - Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs + - Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; - - /***** Begin box *****/ - Box_BoxBegin (NULL,Txt_Results,NULL, - Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); - - /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (NULL, - Grp_MY_GROUPS); - - /***** Start section with user list *****/ - HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); - - if (NumTotalUsrs) - { - if (Usr_GetIfShowBigList (NumTotalUsrs,NULL,NULL)) - { - /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (NULL); - - /***** Begin form *****/ - Frm_StartForm (ActSeeAllMchResCrs); - Grp_PutParamsCodGrps (); - - /***** Put list of users to select some of them *****/ - HTM_TABLE_BeginCenterPadding (2); - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Users); - HTM_TD_End (); - - HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TABLE_BeginPadding (2); - Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected); - Usr_ListUsersToSelect (Rol_NET,&Gbl.Usrs.Selected); - Usr_ListUsersToSelect (Rol_STD,&Gbl.Usrs.Selected); - HTM_TABLE_End (); - HTM_TD_End (); - - HTM_TR_End (); - - HTM_TABLE_End (); - - /***** Send button *****/ - Btn_PutConfirmButton (Txt_View_matches_results); - - /***** End form *****/ - Frm_EndForm (); - } - } - else // NumTotalUsrs == 0 - /***** Show warning indicating no students found *****/ - Usr_ShowWarningNoUsersFound (Rol_UNK); - - /***** End section with user list *****/ - HTM_SECTION_End (); - - /***** End box *****/ - Box_BoxEnd (); - - /***** Free memory for users' list *****/ - Usr_FreeUsrsList (Rol_TCH); - Usr_FreeUsrsList (Rol_NET); - Usr_FreeUsrsList (Rol_STD); - - /***** Free memory used by list of selected users' codes *****/ - Usr_FreeListsSelectedEncryptedUsrsCods (&Gbl.Usrs.Selected); - - /***** Free memory for list of selected groups *****/ - Grp_FreeListCodSelectedGrps (); + Usr_PutFormToSelectUsrsToGoToAct (&Gbl.Usrs.Selected, + ActSeeAllMchResCrs,Grp_PutParamsCodGrps, + Txt_Results, + Hlp_ASSESSMENT_Games_results, + Txt_View_matches_results, + false); // Do not put form with date range } /*****************************************************************************/ diff --git a/swad_statistic.c b/swad_statistic.c index 1ea5eb3b2..ddf36645c 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -380,7 +380,7 @@ void Sta_AskShowCrsHits (void) HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TABLE_Begin (NULL); Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected); Usr_ListUsersToSelect (Rol_NET,&Gbl.Usrs.Selected); @@ -403,7 +403,7 @@ void Sta_AskShowCrsHits (void) HTM_TxtF ("%s:",Txt_Show); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); + HTM_TD_Begin ("class=\"LM\""); if ((Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_CRS_PER_USR || Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_CRS_PER_ACTION) && @@ -545,7 +545,7 @@ void Sta_AskShowGblHits (void) HTM_LABEL_End (); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); + HTM_TD_Begin ("class=\"LM\""); HTM_SELECT_Begin (false, "id=\"Role\" name=\"Role\" class=\"STAT_SEL\""); for (RoleStat = (Sta_Role_t) 0; @@ -574,7 +574,7 @@ void Sta_AskShowGblHits (void) HTM_LABEL_End (); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); + HTM_TD_Begin ("class=\"LM\""); Gbl.Scope.Allowed = 1 << Hie_SYS | 1 << Hie_CTY | 1 << Hie_INS | @@ -597,7 +597,7 @@ void Sta_AskShowGblHits (void) HTM_LABEL_End (); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); + HTM_TD_Begin ("class=\"LM\""); Sta_WriteSelectorCountType (); /***** Type of statistic *****/ @@ -722,7 +722,7 @@ static void Sta_WriteSelectorAction (void) HTM_LABEL_End (); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); + HTM_TD_Begin ("class=\"LM\""); HTM_SELECT_Begin (false, "id=\"StatAct\" name=\"StatAct\" class=\"STAT_SEL\""); HTM_OPTION (HTM_Type_STRING,"0",Gbl.Stat.NumAction == 0,false, diff --git a/swad_test.c b/swad_test.c index acc70be8e..71fb0a419 100644 --- a/swad_test.c +++ b/swad_test.c @@ -172,7 +172,7 @@ static bool Tst_CheckIfCurrentCrsHasTestTags (void); static unsigned long Tst_GetAllTagsFromCurrentCrs (MYSQL_RES **mysql_res); static unsigned long Tst_GetEnabledTagsFromThisCrs (MYSQL_RES **mysql_res); static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, - bool ShowOnlyEnabledTags,unsigned NumCols); + bool ShowOnlyEnabledTags); static void Tst_ShowFormEditTags (void); static void Tst_PutIconEnable (long TagCod,const char *TagTxt); static void Tst_PutIconDisable (long TagCod,const char *TagTxt); @@ -182,7 +182,7 @@ static void Tst_PutInputFieldNumQst (const char *Field,const char *Label, static Tst_Pluggable_t Tst_GetPluggableFromForm (void); static Tst_Feedback_t Tst_GetFeedbackTypeFromForm (void); static void Tst_CheckAndCorrectNumbersQst (void); -static void Tst_ShowFormAnswerTypes (unsigned NumCols); +static void Tst_ShowFormAnswerTypes (void); static unsigned long Tst_GetQuestions (MYSQL_RES **mysql_res); static unsigned long Tst_GetQuestionsForTest (MYSQL_RES **mysql_res); static void Tst_ListOneQstToEdit (void); @@ -329,10 +329,10 @@ void Tst_ShowFormAskTst (void) HTM_TABLE_BeginPadding (2); /***** Selection of tags *****/ - Tst_ShowFormSelTags (NumRows,mysql_res,true,1); + Tst_ShowFormSelTags (NumRows,mysql_res,true); /***** Selection of types of answers *****/ - Tst_ShowFormAnswerTypes (1); + Tst_ShowFormAnswerTypes (); /***** Number of questions to generate ****/ HTM_TR_Begin (NULL); @@ -1285,10 +1285,10 @@ void Tst_ShowFormAskEditTsts (void) HTM_TABLE_BeginPadding (2); /***** Selection of tags *****/ - Tst_ShowFormSelTags (NumRows,mysql_res,false,2); + Tst_ShowFormSelTags (NumRows,mysql_res,false); /***** Selection of types of answers *****/ - Tst_ShowFormAnswerTypes (2); + Tst_ShowFormAnswerTypes (); /***** Starting and ending dates in the search *****/ Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); @@ -1341,7 +1341,7 @@ void Tst_ShowFormAskSelectTstsForGame (void) HTM_TABLE_BeginPadding (2); /***** Selection of tags *****/ - Tst_ShowFormSelTags (NumRows,mysql_res,false,2); + Tst_ShowFormSelTags (NumRows,mysql_res,false); /***** Starting and ending dates in the search *****/ Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); @@ -1670,7 +1670,7 @@ static unsigned long Tst_GetEnabledTagsFromThisCrs (MYSQL_RES **mysql_res) /*****************************************************************************/ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, - bool ShowOnlyEnabledTags,unsigned NumCols) + bool ShowOnlyEnabledTags) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Tags; @@ -1696,10 +1696,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, HTM_TD_End (); /***** Select all tags *****/ - if (NumCols > 1) - HTM_TD_Begin ("colspan=\"%u\" class=\"LT\"",NumCols); - else - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"LT\""); HTM_TABLE_BeginPadding (2); HTM_TR_Begin (NULL); @@ -2310,7 +2307,7 @@ static void Tst_CheckAndCorrectNumbersQst (void) /***************** Show form for select the types of answers *****************/ /*****************************************************************************/ -static void Tst_ShowFormAnswerTypes (unsigned NumCols) +static void Tst_ShowFormAnswerTypes (void) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Types_of_answers; @@ -2329,10 +2326,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) HTM_TD_End (); /***** Select all types of answers *****/ - if (NumCols > 1) - HTM_TD_Begin ("colspan=\"%u\" class=\"LT\"",NumCols); - else - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"LT\""); HTM_TABLE_BeginPadding (2); HTM_TR_Begin (NULL); diff --git a/swad_user.c b/swad_user.c index 44efc0f31..5ee3ae328 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6392,8 +6392,8 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs, HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); - HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TABLE_BeginCenter (); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); + HTM_TABLE_BeginCenterPadding (2); Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs); Usr_ListUsersToSelect (Rol_NET,SelectedUsrs); Usr_ListUsersToSelect (Rol_STD,SelectedUsrs);