From e0404d18d041ba5a794aa0a3984802690fbc197e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 11 Apr 2019 14:45:31 +0200 Subject: [PATCH] Version18.110.1 --- swad_QR.c | 2 +- swad_QR.h | 2 +- swad_alert.c | 6 ++--- swad_alert.h | 6 ++--- swad_attendance.c | 6 ++--- swad_calendar.c | 2 +- swad_calendar.h | 2 +- swad_changelog.h | 5 ++-- swad_enrolment.c | 2 +- swad_enrolment.h | 2 +- swad_figure.c | 2 +- swad_file_browser.c | 3 +-- swad_follow.c | 8 +++---- swad_group.c | 7 +++--- swad_group.h | 4 ++-- swad_icon.c | 16 ++++++------- swad_icon.h | 16 ++++++------- swad_layout.c | 14 ++++++------ swad_layout.h | 8 +++---- swad_mail.c | 2 +- swad_message.c | 7 +++--- swad_photo.c | 4 ++-- swad_project.c | 16 +------------ swad_statistic.c | 4 ++-- swad_test.c | 4 ++-- swad_user.c | 56 +++++++++++++++++++++++---------------------- swad_user.h | 9 ++++---- 27 files changed, 101 insertions(+), 114 deletions(-) diff --git a/swad_QR.c b/swad_QR.c index 767bca553..db537b4ef 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -64,7 +64,7 @@ extern struct Globals Gbl; /***************** Put a link to a print view of a QR code *******************/ /*****************************************************************************/ -void QR_PutLinkToPrintQRCode (Act_Action_t Action,void (*FuncParams) ()) +void QR_PutLinkToPrintQRCode (Act_Action_t Action,void (*FuncParams) (void)) { extern const char *Txt_QR_code; diff --git a/swad_QR.h b/swad_QR.h index 11c3689b9..d39bebddc 100644 --- a/swad_QR.h +++ b/swad_QR.h @@ -39,7 +39,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void QR_PutLinkToPrintQRCode (Act_Action_t Action,void (*FuncParams) ()); +void QR_PutLinkToPrintQRCode (Act_Action_t Action,void (*FuncParams) (void)); void QR_PutParamQRString (void); void QR_PrintQRCode (void); diff --git a/swad_alert.c b/swad_alert.c index 69aadd083..10d8ae08e 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -299,7 +299,7 @@ static void Ale_ShowFixAlert (Ale_AlertType_t AlertType,const char *Txt) /*****************************************************************************/ void Ale_ShowLastAlertAndButton (Act_Action_t NextAction,const char *Anchor, - const char *OnSubmit,void (*FuncParams) (), + const char *OnSubmit,void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton) { /***** Show last alert and then reset it *****/ @@ -328,7 +328,7 @@ void Ale_ShowLastAlertAndButton1 (void) /*****************************************************************************/ void Ale_ShowAlertAndButton (Act_Action_t NextAction,const char *Anchor, - const char *OnSubmit,void (*FuncParams) (), + const char *OnSubmit,void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton, Ale_AlertType_t AlertType,const char *fmt,...) { @@ -443,7 +443,7 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx /*****************************************************************************/ void Ale_ShowAlertAndButton2 (Act_Action_t NextAction,const char *Anchor,const char *OnSubmit, - void (*FuncParams) (), + void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton) { /***** Optional button *****/ diff --git a/swad_alert.h b/swad_alert.h index 6156f1446..6b6c0671a 100644 --- a/swad_alert.h +++ b/swad_alert.h @@ -70,16 +70,16 @@ void Ale_ShowAlertsAndExit (); void Ale_ShowAlerts (const char *Section); void Ale_ShowAlert (Ale_AlertType_t AlertType,const char *fmt,...); void Ale_ShowLastAlertAndButton (Act_Action_t NextAction,const char *Anchor, - const char *OnSubmit,void (*FuncParams) (), + const char *OnSubmit,void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton); void Ale_ShowLastAlertAndButton1 (void); void Ale_ShowAlertAndButton (Act_Action_t NextAction,const char *Anchor, - const char *OnSubmit,void (*FuncParams) (), + const char *OnSubmit,void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton, Ale_AlertType_t AlertType,const char *fmt,...); void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *fmt,...); void Ale_ShowAlertAndButton2 (Act_Action_t NextAction,const char *Anchor,const char *OnSubmit, - void (*FuncParams) (), + void (*FuncParams) (void), Btn_Button_t Button,const char *TxtButton); void Ale_CreateAlertUserNotFoundOrYouDoNotHavePermission (void); diff --git a/swad_attendance.c b/swad_attendance.c index bbf1146d7..c723a86a7 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1953,7 +1953,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt,Att_PutParamSelectedAttCod, + Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -2709,7 +2709,7 @@ void Usr_ReqListStdsAttendanceCrs (void) NULL,Box_NOT_CLOSABLE); /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt,Att_PutParamSelectedAttCod, + Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -2724,7 +2724,7 @@ void Usr_ReqListStdsAttendanceCrs (void) /***** Draw a class photo with students of the course *****/ /* Form to select type of list used for select several users */ - Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt,NULL); + Usr_ShowFormsToSelectUsrListType (NULL); /* Start form */ Frm_StartForm (ActSeeLstStdAtt); diff --git a/swad_calendar.c b/swad_calendar.c index 67b212a4d..503eeef5d 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -103,7 +103,7 @@ static void Cal_PutIconsFirstDayOfWeek (void) /************** Show form to select the first day of the week ****************/ /*****************************************************************************/ -void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) ()) +void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (void)) { extern const char *Txt_First_day_of_the_week; extern const char *Txt_DAYS_SMALL[7]; diff --git a/swad_calendar.h b/swad_calendar.h index 2ee285455..2331edfbd 100644 --- a/swad_calendar.h +++ b/swad_calendar.h @@ -44,7 +44,7 @@ /*****************************************************************************/ void Cal_PutIconsToSelectFirstDayOfWeek (void); -void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) ()); +void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (void)); void Cal_ChangeFirstDayOfWeek (void); unsigned Cal_GetFirstDayOfWeekFromStr (const char *Str); diff --git a/swad_changelog.h b/swad_changelog.h index a5f5dc8bd..e735fe1c6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -456,13 +456,14 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.110 (2019-04-10)" +#define Log_PLATFORM_VERSION "SWAD 18.110.1 (2019-04-11)" #define CSS_FILE "swad18.92.css" #define JS_FILE "swad18.92.js" /* Comprobar si Gbl.AttEvents.AttCodToEdit puede ser sustituido por Gbl.AttEvents.AttCod - Version 18.110: Apr 10, 2019 Code refactoring in selection of groups and users. + Version 18.110.1: Apr 11, 2019 Code refactoring in selection of groups and users. (242553 lines) + Version 18.110: Apr 11, 2019 Code refactoring in selection of groups and users. Adding multiple users ad once to a project, suggested by Pedro Villar Castro. (242563 lines) Version 18.109.2: Apr 10, 2019 Code refactoring in selection of users to view homework. (242421 lines) Version 18.109.1: Apr 10, 2019 A non-editing teacher can choose students with no groups of a type. (242406 lines) diff --git a/swad_enrolment.c b/swad_enrolment.c index 3faffd0a4..51adf82b0 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -363,7 +363,7 @@ static void Enr_NotifyAfterEnrolment (struct UsrData *UsrDat,Rol_Role_t NewRole) /****** Write a form to request another user's ID, @nickname or email ********/ /*****************************************************************************/ -void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) ()) +void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_nick_email_or_ID; diff --git a/swad_enrolment.h b/swad_enrolment.h index 93a19a7ed..1a38346b4 100644 --- a/swad_enrolment.h +++ b/swad_enrolment.h @@ -79,7 +79,7 @@ void Enr_ModifyRoleInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole); void Enr_RegisterUsrInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole, Enr_KeepOrSetAccepted_t KeepOrSetAccepted); -void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) ()); +void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) (void)); void Enr_ReqAcceptRegisterInCrs (void); void Enr_GetNotifEnrolment (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], diff --git a/swad_figure.c b/swad_figure.c index 468cbbcf0..f99468ba1 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -1042,7 +1042,7 @@ static void Fig_GetAndShowInstitutionsStats (void) /***** Form to select type of list used to display degree photos *****/ Usr_GetAndUpdatePrefsAboutUsrList (); - Usr_ShowFormsToSelectUsrListType (ActSeeUseGbl,Fig_PutHiddenParamFigures); + Usr_ShowFormsToSelectUsrListType (Fig_PutHiddenParamFigures); /***** Institutions ordered by number of centres *****/ Fig_GetAndShowInssOrderedByNumCtrs (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 5b730ecb7..a08d56158 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3057,8 +3057,7 @@ void Brw_AskEditWorksCrs (void) Brw_GetParAndInitFileBrowser (); /***** List users to select some of them *****/ - Usr_PutFormToSelectUsrsToGoToAct (ActReqAsgWrkCrs,NULL, // Current action - ActAdmAsgWrkCrs,NULL, // Next action + Usr_PutFormToSelectUsrsToGoToAct (ActAdmAsgWrkCrs,NULL, Hlp_FILES_Homework_for_teachers, Txt_View_homework); } diff --git a/swad_follow.c b/swad_follow.c index baa88277f..ab9a7361e 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -95,8 +95,8 @@ static void Fol_PutInactiveIconToFollowUnfollow (void); static void Fol_PutIconToFollow (struct UsrData *UsrDat); static void Fol_PutIconToUnfollow (struct UsrData *UsrDat); -static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) ()); -static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) ()); +static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)); +static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)); static void Fol_GetFollowedFromSelectedUsrs (unsigned *NumFollowed, unsigned *NumNotFollowed); static void Fol_PutParamsFollowSelectedStds (void); @@ -1099,7 +1099,7 @@ void Fol_RequestFollowTchs (void) Fol_RequestFollowUsrs (ActFolSevTch,Fol_PutParamsFollowSelectedTchs); } -static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) ()) +static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Follow; extern const char *Txt_Do_you_want_to_follow_the_selected_user_whom_you_do_not_follow_yet; @@ -1143,7 +1143,7 @@ void Fol_RequestUnfollowTchs (void) Fol_RequestUnfollowUsrs (ActUnfSevTch,Fol_PutParamsUnfollowSelectedTchs); } -static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) ()) +static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Do_you_want_to_stop_following_the_selected_user_whom_you_follow; extern const char *Txt_Do_you_want_to_stop_following_the_X_selected_users_whom_you_follow; diff --git a/swad_group.c b/swad_group.c index 847403278..81af6ee23 100644 --- a/swad_group.c +++ b/swad_group.c @@ -359,7 +359,7 @@ static void Grp_PutIconToCreateNewGroup (void) /*************** Show form to select one or several groups *******************/ /*****************************************************************************/ -void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,void (*FuncParams) (), +void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void), Grp_WhichGroups_t GroupsSelectableByStdsOrNETs) { extern const char *Hlp_USERS_Groups; @@ -383,7 +383,8 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,void (*FuncParam /***** Start form to update the students listed depending on the groups selected *****/ - Frm_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); + Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action + Usr_USER_LIST_SECTION_ID); Usr_PutParamsPrefsAboutUsrList (); if (FuncParams) FuncParams (); @@ -5001,7 +5002,7 @@ void Grp_PutParamWhichGrpsAllGrps (void) /***** Show form to choice whether to show only my groups or all groups ******/ /*****************************************************************************/ -void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()) +void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) (void)) { extern const char *Txt_GROUP_WHICH_GROUPS[2]; Grp_WhichGroups_t WhichGrps; diff --git a/swad_group.h b/swad_group.h index cd9fec7d6..971d6ad52 100644 --- a/swad_group.h +++ b/swad_group.h @@ -147,7 +147,7 @@ typedef enum void Grp_WriteNamesOfSelectedGrps (void); void Grp_ReqEditGroups (void); -void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,void (*FuncParams) (), +void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void), Grp_WhichGroups_t GroupsSelectableByStdsOrNETs); void Grp_PutParamsCodGrps (void); void Grp_GetParCodsSeveralGrpsToShowUsrs (void); @@ -219,7 +219,7 @@ void Grp_PutParamAllGroups (void); void Grp_PutParamWhichGrps (void); void Grp_PutParamWhichGrpsOnlyMyGrps (void); void Grp_PutParamWhichGrpsAllGrps (void); -void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()); +void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) (void)); void Grp_GetParamWhichGrps (void); #endif diff --git a/swad_icon.c b/swad_icon.c index be3231eaa..37cbfda51 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -217,7 +217,7 @@ Ico_IconSet_t Ico_GetIconSetFromStr (const char *Str) /*****************************************************************************/ void Ico_PutContextualIconToAdd (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Txt) { Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,FuncParams, @@ -225,7 +225,7 @@ void Ico_PutContextualIconToAdd (Act_Action_t NextAction,const char *Anchor, Txt); } -void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) ()) +void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Remove; @@ -234,7 +234,7 @@ void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) ( Txt_Remove); } -void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) ()) +void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Edit; @@ -243,7 +243,7 @@ void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) ()) Txt_Edit); } -void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,void (*FuncParams) ()) +void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Files; @@ -252,7 +252,7 @@ void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,void (*FuncParams Txt_Files); } -void Ico_PutContextualIconToView (Act_Action_t NextAction,void (*FuncParams) ()) +void Ico_PutContextualIconToView (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_View; @@ -261,7 +261,7 @@ void Ico_PutContextualIconToView (Act_Action_t NextAction,void (*FuncParams) ()) Txt_View); } -void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) ()) +void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) (void)) { extern const char *Txt_Hide; @@ -270,7 +270,7 @@ void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,voi Txt_Hide); } -void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) ()) +void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) (void)) { extern const char *Txt_Show; @@ -279,7 +279,7 @@ void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,v Txt_Show); } -void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) ()) +void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Print; diff --git a/swad_icon.h b/swad_icon.h index 6690dab89..5838c71e2 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -56,15 +56,15 @@ Ico_IconSet_t Ico_GetParamIconSet (void); Ico_IconSet_t Ico_GetIconSetFromStr (const char *Str); void Ico_PutContextualIconToAdd (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Txt); -void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) ()); -void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) ()); -void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,void (*FuncParams) ()); -void Ico_PutContextualIconToView (Act_Action_t NextAction,void (*FuncParams) ()); -void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) ()); -void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) ()); -void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) ()); +void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToView (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) (void)); +void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,void (*FuncParams) (void)); +void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title); void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title); diff --git a/swad_layout.c b/swad_layout.c index 61fe789df..a450b221c 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1086,7 +1086,7 @@ static void Lay_ShowRightColumn (void) /*****************************************************************************/ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Icon, const char *Title) { @@ -1107,7 +1107,7 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor, /*****************************************************************************/ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Icon, const char *Text) { @@ -1140,10 +1140,10 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, /*****************************************************************************/ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), - const char *Icon, - const char *Text, - const char *OnSubmit) + void (*FuncParams) (void), + const char *Icon, + const char *Text, + const char *OnSubmit) { extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES]; @@ -1174,7 +1174,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char * /*****************************************************************************/ void Lay_PutContextualCheckbox (Act_Action_t NextAction, - void (*FuncParams) (), + void (*FuncParams) (void), const char *CheckboxName, bool Checked,bool Disabled, const char *Title,const char *Text) diff --git a/swad_layout.h b/swad_layout.h index 176b75e29..9c4de1c37 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -53,20 +53,20 @@ void Lay_WriteStartOfPage (void); void Lay_WriteHTTPStatus204NoContent (void); void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Icon, const char *Title); void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Icon, const char *Text); void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), + void (*FuncParams) (void), const char *Icon, const char *Text, const char *OnSubmit); void Lay_PutContextualCheckbox (Act_Action_t NextAction, - void (*FuncParams) (), + void (*FuncParams) (void), const char *CheckboxName, bool Checked,bool Disabled, const char *Title,const char *Text); diff --git a/swad_mail.c b/swad_mail.c index 24a6c9e44..39302b741 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -906,7 +906,7 @@ void Mai_ListEmails (void) Hlp_MESSAGES_Email,Box_NOT_CLOSABLE); /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActMaiStd,NULL, + Grp_ShowFormToSelectSeveralGroups (NULL, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ diff --git a/swad_message.c b/swad_message.c index 7ca93a0c7..e5f2c168c 100644 --- a/swad_message.c +++ b/swad_message.c @@ -240,7 +240,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) if (GetUsrsInCrs) { /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActReqMsgUsr,Msg_PutParamsWriteMsg, + Grp_ShowFormToSelectSeveralGroups (Msg_PutParamsWriteMsg, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -249,14 +249,13 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) if (NumUsrsInCrs) { /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (ActReqMsgUsr,Msg_PutParamsWriteMsg); + Usr_ShowFormsToSelectUsrListType (Msg_PutParamsWriteMsg); /***** Put link to register students *****/ Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); /***** Check if it's a big list *****/ - ShowUsrsInCrs = Usr_GetIfShowBigList (NumUsrsInCrs, - Msg_PutParamsWriteMsg, + ShowUsrsInCrs = Usr_GetIfShowBigList (NumUsrsInCrs,Msg_PutParamsWriteMsg, "CopyMessageToHiddenFields();"); if (ShowUsrsInCrs) diff --git a/swad_photo.c b/swad_photo.c index ca9033a3c..2032a11e0 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -2117,7 +2117,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin { /***** Form to select type of list used to display degree photos *****/ if (SeeOrPrint == Pho_DEGREES_SEE) - Usr_ShowFormsToSelectUsrListType (ActSeePhoDeg,Pho_PutParamsDegPhoto); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto); Tbl_StartTableCenter (0); /***** Get and print degrees *****/ @@ -2198,7 +2198,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Class photo start *****/ if (SeeOrPrint == Pho_DEGREES_SEE) /***** Form to select type of list used to display degree photos *****/ - Usr_ShowFormsToSelectUsrListType (ActSeePhoDeg,Pho_PutParamsDegPhoto); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto); /***** Write heading *****/ Tbl_StartTableCenter (2); diff --git a/swad_project.c b/swad_project.c index 612a4c5ad..b75d3eb25 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1897,24 +1897,10 @@ static void Prj_ReqAddUsrs (Prj_RoleInProject_t RoleInProject) snprintf (TxtButton,sizeof (TxtButton), Txt_Add_USER, Txt_PROJECT_ROLES_PLURAL_abc[RoleInProject]); - Usr_PutFormToSelectUsrsToGoToAct (Gbl.Action.Act,Prj_PutCurrentParams, // Current action - ActionAddUsr[RoleInProject],Prj_PutCurrentParams, // Next action + Usr_PutFormToSelectUsrsToGoToAct (ActionAddUsr[RoleInProject],Prj_PutCurrentParams, Hlp_ASSESSMENT_Projects_add_user, TxtButton); - /***** Start box *****/ - // snprintf (Gbl.Title,sizeof (Gbl.Title), - // Txt_Add_USER, - // Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]); - // Box_StartBox (NULL,Gbl.Title,NULL, - // Hlp_ASSESSMENT_Projects_add_user,Box_NOT_CLOSABLE); - - /***** Write form to request another user's ID *****/ - // Enr_WriteFormToReqAnotherUsrID (ActionAddUsr[RoleInProject],Prj_PutCurrentParams); - - /***** End box *****/ - // Box_EndBox (); - /***** Put a form to create/edit project *****/ Prj_RequestCreatOrEditPrj (Gbl.Prjs.PrjCod); } diff --git a/swad_statistic.c b/swad_statistic.c index 3cb65e6ce..f701f2687 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -350,7 +350,7 @@ void Sta_AskShowCrsHits (void) Hlp_ANALYTICS_Visits_visits_to_course,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs,NULL, + Grp_ShowFormToSelectSeveralGroups (NULL, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -361,7 +361,7 @@ void Sta_AskShowCrsHits (void) if (Usr_GetIfShowBigList (NumTotalUsrs,NULL,NULL)) { /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (ActReqAccCrs,NULL); + Usr_ShowFormsToSelectUsrListType (NULL); /***** Put link to register students *****/ Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); diff --git a/swad_test.c b/swad_test.c index 60af1ef54..290842df3 100644 --- a/swad_test.c +++ b/swad_test.c @@ -7329,7 +7329,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes,NULL, + Grp_ShowFormToSelectSeveralGroups (NULL, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -7340,7 +7340,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) if (Usr_GetIfShowBigList (NumTotalUsrs,NULL,NULL)) { /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstRes,NULL); + Usr_ShowFormsToSelectUsrListType (NULL); /***** Start form *****/ Frm_StartForm (ActSeeUsrTstRes); diff --git a/swad_user.c b/swad_user.c index 2d2f11933..00c38d02c 100644 --- a/swad_user.c +++ b/swad_user.c @@ -201,14 +201,14 @@ static void Usr_GetListUsrsFromQuery (char *Query,Rol_Role_t Role,Hie_Level_t Sc static void Usr_AllocateUsrsList (Rol_Role_t Role); static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs, - void (*FuncParams) (), + void (*FuncParams) (void), const char *OnSubmit); static void Usr_PutParamsConfirmIWantToSeeBigList (void); static void Usr_AllocateListSelectedUsrCod (Rol_Role_t Role); static void Usr_AllocateListOtherRecipients (void); -static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams) (), +static void Usr_FormToSelectUsrListType (void (*FuncParams) (void), Usr_ShowUsrsType_t ListType); static Usr_Sex_t Usr_GetSexOfUsrsLst (Rol_Role_t Role); @@ -2533,7 +2533,7 @@ void Usr_PutLinkToLogin (void) /************************ Write form for user log in *************************/ /*****************************************************************************/ -void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ()) +void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Hlp_PROFILE_LogIn; extern const char *Txt_Log_in; @@ -2997,7 +2997,7 @@ void Usr_ChkUsrAndGetUsrData (void) { bool PutForm; Act_Action_t Action; - void (*FuncParams) (); + void (*FuncParams) (void); } FormLogin = { false, @@ -5595,7 +5595,7 @@ void Usr_FreeUsrsList (Rol_Role_t Role) /*****************************************************************************/ bool Usr_GetIfShowBigList (unsigned NumUsrs, - void (*FuncParams) (), + void (*FuncParams) (void), const char *OnSubmit) { bool ShowBigList; @@ -5619,7 +5619,7 @@ bool Usr_GetIfShowBigList (unsigned NumUsrs, /*****************************************************************************/ static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs, - void (*FuncParams) (), + void (*FuncParams) (void), const char *OnSubmit) { extern const char *Txt_The_list_of_X_users_is_too_large_to_be_displayed; @@ -6014,7 +6014,7 @@ void Usr_FreeListOtherRecipients (void) /*************************** Selection of list type **************************/ /*****************************************************************************/ -void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams) ()) +void Usr_ShowFormsToSelectUsrListType (void (*FuncParams) (void)) { Set_StartSettingsHead (); Set_StartOneSettingSelector (); @@ -6023,10 +6023,11 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams fprintf (Gbl.F.Out,"
", Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO ? "PREF_ON" : "PREF_OFF"); - Usr_FormToSelectUsrListType (NextAction,FuncParams,Usr_LIST_AS_CLASS_PHOTO); + Usr_FormToSelectUsrListType (FuncParams,Usr_LIST_AS_CLASS_PHOTO); /* Number of columns in the class photo */ - Frm_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); + Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action + Usr_USER_LIST_SECTION_ID); Grp_PutParamsCodGrps (); Usr_PutParamUsrListType (Usr_LIST_AS_CLASS_PHOTO); Usr_PutParamListWithPhotos (); @@ -6040,10 +6041,11 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams fprintf (Gbl.F.Out,"
", Gbl.Usrs.Me.ListType == Usr_LIST_AS_LISTING ? "PREF_ON" : "PREF_OFF"); - Usr_FormToSelectUsrListType (NextAction,FuncParams,Usr_LIST_AS_LISTING); + Usr_FormToSelectUsrListType (FuncParams,Usr_LIST_AS_LISTING); /* See the photos in list? */ - Frm_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); + Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action + Usr_USER_LIST_SECTION_ID); Grp_PutParamsCodGrps (); Usr_PutParamUsrListType (Usr_LIST_AS_LISTING); if (FuncParams) @@ -6060,14 +6062,15 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams /************* Put a radio element to select a users' list type **************/ /*****************************************************************************/ -static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams) (), +static void Usr_FormToSelectUsrListType (void (*FuncParams) (void), Usr_ShowUsrsType_t ListType) { extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES]; extern const char *Txt_USR_LIST_TYPES[Usr_NUM_USR_LIST_TYPES]; /***** Start form *****/ - Frm_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); + Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action + Usr_USER_LIST_SECTION_ID); Grp_PutParamsCodGrps (); Usr_PutParamUsrListType (ListType); Usr_PutParamListWithPhotos (); @@ -6077,8 +6080,8 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,void (*FuncPara /***** Link and image *****/ Frm_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType], The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme], - NextAction == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : - NULL); + Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : + NULL); fprintf (Gbl.F.Out,"\"%s\"" @@ -6097,8 +6100,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,void (*FuncPara /******************** List users to select some of them **********************/ /*****************************************************************************/ -void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t CurrAction,void (*FuncParamsCurrAction) (), - Act_Action_t NextAction,void (*FuncParamsNextAction) (), +void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams) (), const char *HelpLink, const char *TxtButton) { @@ -6125,7 +6127,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t CurrAction,void (*FuncParams Box_StartBox (NULL,Txt_Users,NULL,HelpLink,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ - Grp_ShowFormToSelectSeveralGroups (CurrAction,FuncParamsCurrAction, + Grp_ShowFormToSelectSeveralGroups (FuncParams, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -6133,18 +6135,18 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t CurrAction,void (*FuncParams if (NumTotalUsrs) { - if (Usr_GetIfShowBigList (NumTotalUsrs,FuncParamsCurrAction,NULL)) + if (Usr_GetIfShowBigList (NumTotalUsrs,FuncParams,NULL)) { /* Form to select type of list used for select several users */ - Usr_ShowFormsToSelectUsrListType (CurrAction,FuncParamsCurrAction); + Usr_ShowFormsToSelectUsrListType (FuncParams); /***** Put link to register students *****/ Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); /* Start form */ Frm_StartForm (NextAction); - if (FuncParamsNextAction) - FuncParamsNextAction (); + if (FuncParams) + FuncParams (); Grp_PutParamsCodGrps (); Gbl.FileBrowser.FullTree = true; // By default, show all files Brw_PutHiddenParamFullTreeIfSelected (); @@ -7789,7 +7791,7 @@ void Usr_SeeGuests (void) Usr_GetListsSelectedUsrsCods (); /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (ActLstGst,Sco_PutParamCurrentScope); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope); /***** Draw a class photo with guests *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) @@ -7936,7 +7938,7 @@ void Usr_SeeStudents (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (ActLstStd,Sco_PutParamCurrentScope, + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -7951,7 +7953,7 @@ void Usr_SeeStudents (void) Usr_GetListsSelectedUsrsCods (); /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (ActLstStd,Sco_PutParamCurrentScope); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope); /***** Draw a class photo with students of the course *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) @@ -8113,7 +8115,7 @@ void Usr_SeeTeachers (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (ActLstTch,Sco_PutParamCurrentScope, + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope, Grp_ONLY_MY_GROUPS); /***** Start section with user list *****/ @@ -8125,7 +8127,7 @@ void Usr_SeeTeachers (void) Sco_PutParamCurrentScope,NULL)) { /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (ActLstTch,Sco_PutParamCurrentScope); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope); /***** Draw a class photo with teachers of the course *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) diff --git a/swad_user.h b/swad_user.h index 31f5688de..b1c03c079 100644 --- a/swad_user.h +++ b/swad_user.h @@ -351,7 +351,7 @@ void Usr_WriteLandingPage (void); void Usr_WriteFormLogout (void); void Usr_Logout (void); void Usr_PutLinkToLogin (void); -void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ()); +void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)); void Usr_WelcomeUsr (void); void Usr_CreateBirthdayStrDB (const struct UsrData *UsrDat, @@ -408,7 +408,7 @@ void Usr_CopyBasicUsrDataFromList (struct UsrData *UsrDat,const struct UsrInList void Usr_FreeUsrsList (Rol_Role_t Role); bool Usr_GetIfShowBigList (unsigned NumUsrs, - void (*FuncParams) (), + void (*FuncParams) (void), const char *OnSubmit); void Usr_PutHiddenParUsrCodAll (Act_Action_t NextAction,const char *ListUsrCods); @@ -419,14 +419,13 @@ unsigned Usr_CountNumUsrsInListOfSelectedUsrs (void); void Usr_FreeListsSelectedUsrsCods (void); void Usr_FreeListOtherRecipients (void); -void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction,void (*FuncParams) ()); +void Usr_ShowFormsToSelectUsrListType (void (*FuncParams) (void)); void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role); unsigned Usr_GetColumnsForSelectUsrs (void); void Usr_SetUsrDatMainFieldNames (void); void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr); -void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t CurrAction,void (*FuncParamsCurrAction) (), - Act_Action_t NextAction,void (*FuncParamsNextAction) (), +void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams) (), const char *HelpLink, const char *TxtButton); void Usr_GetSelectedUsrsAndGoToAct (void (*FuncWhenUsrsSelected) (),