diff --git a/swad_changelog.h b/swad_changelog.h index fca2409f9..c661f8396 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -633,10 +633,11 @@ Me sale este error, no s "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod') */ -#define Log_PLATFORM_VERSION "SWAD 23.55 (2024-01-16)" +#define Log_PLATFORM_VERSION "SWAD 23.55.1 (2024-01-17)" #define CSS_FILE "swad23.55.css" #define JS_FILE "swad23.53.6.js" /* + Version 23.55.1: Jan 17, 2024 Responsive design in groups. (335787 lines) Version 23.55: Jan 16, 2024 Responsive design in exams. Changes in exam sessions and matches. (335819 lines) Version 23.54: Dec 20, 2023 Responsive design in games and matches. (335906 lines) Version 23.53.7: Dec 20, 2023 Layout changes in hierarchy edition. (335883 lines) diff --git a/swad_group.c b/swad_group.c index 5575ce7cd..a8f321ca5 100644 --- a/swad_group.c +++ b/swad_group.c @@ -356,47 +356,43 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncPars) (void *Args),void *Args ICanEdit = !Frm_CheckIfInside () && (Gbl.Usrs.Me.Role.Logged == Rol_TCH || Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM); - if (ICanEdit) - Box_BoxBegin (NULL,Txt_Groups, - Grp_PutIconToEditGroups,NULL, - Hlp_USERS_Groups,Box_CLOSABLE); - else - Box_BoxBegin (NULL,Txt_Groups, - NULL,NULL, - Hlp_USERS_Groups,Box_CLOSABLE); + Box_BoxBegin (NULL,Txt_Groups, + ICanEdit ? Grp_PutIconToEditGroups : + NULL,NULL, + Hlp_USERS_Groups,Box_CLOSABLE); - /***** Begin form to update the students listed - depending on the groups selected *****/ - Frm_BeginFormAnchor (Gbl.Action.Act, // Repeat current action - Usr_USER_LIST_SECTION_ID); - Set_PutParsPrefsAboutUsrList (); - if (FuncPars) - FuncPars (Args); + /***** Begin form to update the students listed + depending on the groups selected *****/ + Frm_BeginFormAnchor (Gbl.Action.Act, // Repeat current action + Usr_USER_LIST_SECTION_ID); + Set_PutParsPrefsAboutUsrList (); + if (FuncPars) + FuncPars (Args); - /***** Select all groups *****/ - Grp_PutCheckboxAllGrps (GroupsSelectableByStdsOrNETs); + /***** Select all groups *****/ + Grp_PutCheckboxAllGrps (GroupsSelectableByStdsOrNETs); - /***** Get list of groups types and groups in this course *****/ - Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); + /***** Get list of groups types and groups in this course *****/ + Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); - /***** List the groups for each group type *****/ - HTM_TABLE_BeginWidePadding (2); - for (NumGrpTyp = 0; - NumGrpTyp < Gbl.Crs.Grps.GrpTypes.NumGrpTypes; - NumGrpTyp++) - if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) - Grp_ListGrpsForMultipleSelection (&Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp], - GroupsSelectableByStdsOrNETs); - HTM_TABLE_End (); + /***** List the groups for each group type *****/ + HTM_TABLE_Begin ("TBL_SCROLL"); + for (NumGrpTyp = 0; + NumGrpTyp < Gbl.Crs.Grps.GrpTypes.NumGrpTypes; + NumGrpTyp++) + if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) + Grp_ListGrpsForMultipleSelection (&Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp], + GroupsSelectableByStdsOrNETs); + HTM_TABLE_End (); - /***** Free list of groups types and groups in this course *****/ - Grp_FreeListGrpTypesAndGrps (); + /***** Free list of groups types and groups in this course *****/ + Grp_FreeListGrpTypesAndGrps (); - /***** Submit button *****/ - Lay_WriteLinkToUpdate (Txt_Update_users); + /***** Submit button *****/ + Lay_WriteLinkToUpdate (Txt_Update_users); - /***** End form *****/ - Frm_EndForm (); + /***** End form *****/ + Frm_EndForm (); /***** End box *****/ Box_BoxEnd (); diff --git a/swad_text.c b/swad_text.c index 22c1ad9c1..11166d8e3 100644 --- a/swad_text.c +++ b/swad_text.c @@ -1523,7 +1523,7 @@ const char *Txt_All_groups = #elif L==5 // fr "Tous les groupes"; #elif L==6 // gn - "Todos los grupos"; // Okoteve traducción + "Mayma aty"; #elif L==7 // it "Tutti i gruppi"; #elif L==8 // pl @@ -1531,7 +1531,7 @@ const char *Txt_All_groups = #elif L==9 // pt "Todos os grupos"; #elif L==10 // tr - "All groups"; // Çeviri lazim! + "Tüm gruplar"; #endif const char *Txt_All_places = @@ -41306,29 +41306,6 @@ const char *Txt_Select_the_groups_in_from_which_you_want_to_register_remove_user " or removed from the course and from all groups."; // Çeviri lazim! #endif -const char *Txt_Select_users = -#if L==1 // ca - "Seleccioneu usuaris"; -#elif L==2 // de - "Wählen Sie Benutzer aus"; -#elif L==3 // en - "Select users"; -#elif L==4 // es - "Seleccione usuarios"; -#elif L==5 // fr - "Sélectionnez des utilisateurs"; -#elif L==6 // gn - "Seleccione usuarios"; // Okoteve traducción -#elif L==7 // it - "Seleziona utenti"; -#elif L==8 // pl - "Wybierz użytkowników"; -#elif L==9 // pt - "Selecione usuários"; -#elif L==10 // tr - "Select users"; // Çeviri lazim! -#endif - const char *Txt_Selected_users_X_Followed_Y_Not_followed_Z = // Warning: it is very important to include three %u in the following sentences #if L==1 // ca "Usuaris seleccionats: %u
" diff --git a/swad_user.c b/swad_user.c index f460f75ce..da10c3595 100644 --- a/swad_user.c +++ b/swad_user.c @@ -3690,7 +3690,6 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct Usr_SelectedUsrs *SelectedUsrs, const char *TxtButton, Frm_PutForm_t PutFormDateRange) { - extern const char *Txt_Select_users; extern const char *Txt_Users; unsigned NumTotalUsrs; static const Dat_SetHMS SetHMS[Dat_NUM_START_END_TIME] = @@ -3720,81 +3719,73 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct Usr_SelectedUsrs *SelectedUsrs, Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs + Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; - /***** Draw class photos to select users *****/ - Box_BoxBegin (NULL,Txt_Select_users, - NULL,NULL, - NULL,Box_NOT_CLOSABLE); + /***** Show form to select the groups *****/ + Grp_ShowFormToSelectSeveralGroups (FuncPars,Args, + Grp_MY_GROUPS); - /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (FuncPars,Args, - Grp_MY_GROUPS); + /***** Begin section with user list *****/ + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); - /***** Begin section with user list *****/ - HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); - - if (NumTotalUsrs) + if (NumTotalUsrs) + { + if (Usr_GetIfShowBigList (NumTotalUsrs, + FuncPars,Args, + NULL)) { - if (Usr_GetIfShowBigList (NumTotalUsrs, - FuncPars,Args, - NULL)) - { - /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (FuncPars,Args); + /***** Form to select type of list used for select several users *****/ + Usr_ShowFormsToSelectUsrListType (FuncPars,Args); - /***** Link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); + /***** Link to register students *****/ + Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** Form to select users and select date range ****/ - /* Begin form */ - Frm_BeginForm (NextAction); + /***** Form to select users and select date range ****/ + /* Begin form */ + Frm_BeginForm (NextAction); - /* Hidden parameters */ - Grp_PutParsCodGrps (); - if (NextAction == ActAdmAsgWrkCrs) - { - Gbl.FileBrowser.FullTree = true; // By default, show all files - Brw_PutParFullTreeIfSelected (&Gbl.FileBrowser.FullTree); - } - if (FuncPars) - FuncPars (Args); + /* Hidden parameters */ + Grp_PutParsCodGrps (); + if (NextAction == ActAdmAsgWrkCrs) + { + Gbl.FileBrowser.FullTree = true; // By default, show all files + Brw_PutParFullTreeIfSelected (&Gbl.FileBrowser.FullTree); + } + if (FuncPars) + FuncPars (Args); - HTM_TABLE_BeginCenterPadding (2); + HTM_TABLE_BeginCenterPadding (2); - /* Put list of users to select some of them */ - HTM_TR_Begin (NULL); - HTM_TD_TxtColon (Txt_Users); - HTM_TD_Begin ("class=\"LT FORM_IN_%s\"", - The_GetSuffix ()); - HTM_TABLE_BeginCenterPadding (2); - Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs); - Usr_ListUsersToSelect (Rol_NET,SelectedUsrs); - Usr_ListUsersToSelect (Rol_STD,SelectedUsrs); - HTM_TABLE_End (); - HTM_TD_End (); - HTM_TR_End (); + /* Put list of users to select some of them */ + HTM_TR_Begin (NULL); + HTM_TD_TxtColon (Txt_Users); + HTM_TD_Begin ("class=\"LT FORM_IN_%s\"", + The_GetSuffix ()); + HTM_TABLE_BeginCenterPadding (2); + Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs); + Usr_ListUsersToSelect (Rol_NET,SelectedUsrs); + Usr_ListUsersToSelect (Rol_STD,SelectedUsrs); + HTM_TABLE_End (); + HTM_TD_End (); + HTM_TR_End (); - /* Starting and ending dates in the search */ - if (PutFormDateRange == Frm_PUT_FORM) - Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (SetHMS); + /* Starting and ending dates in the search */ + if (PutFormDateRange == Frm_PUT_FORM) + Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (SetHMS); - HTM_TABLE_End (); + HTM_TABLE_End (); - /***** Send button *****/ - Btn_PutConfirmButton (TxtButton); + /***** Send button *****/ + Btn_PutConfirmButton (TxtButton); - /***** End form *****/ - Frm_EndForm (); - } + /***** End form *****/ + Frm_EndForm (); } - else // NumTotalUsrs == 0 - /***** Show warning indicating no users found *****/ - Usr_ShowWarningNoUsersFound (Rol_UNK); + } + else // NumTotalUsrs == 0 + /***** Show warning indicating no users found *****/ + Usr_ShowWarningNoUsersFound (Rol_UNK); - /***** End section with user list *****/ - HTM_SECTION_End (); - - /***** End box *****/ - Box_BoxEnd (); + /***** End section with user list *****/ + HTM_SECTION_End (); /***** Free memory for users' list *****/ Usr_FreeUsrsList (Rol_TCH);