Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.169.2

This commit is contained in:
acanas 2020-04-08 13:40:21 +02:00
parent 35e42b7029
commit 808aea27cc
25 changed files with 217 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_ID.c
View File

@ -519,7 +519,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID)
"%upx", "%upx",
Rec_RECORD_WIDTH); Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_ID, Box_BoxBegin (StrRecordWidth,Txt_ID,
Acc_PutLinkToRemoveMyAccount,&Gbl, Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE); Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change ID *****/ /***** Show form to change ID *****/

13
swad_account.c
View File

@ -550,16 +550,15 @@ void Acc_ShowFormChgOtherUsrAccount (void)
/************* Put an icon (form) to request removing my account *************/ /************* Put an icon (form) to request removing my account *************/
/*****************************************************************************/ /*****************************************************************************/
void Acc_PutLinkToRemoveMyAccount (void *Args) void Acc_PutLinkToRemoveMyAccount (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_Remove_account; extern const char *Txt_Remove_account;
if (Args) if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Me.UsrDat.UsrCod))
if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Me.UsrDat.UsrCod)) Lay_PutContextualLinkOnlyIcon (ActReqRemMyAcc,NULL,
Lay_PutContextualLinkOnlyIcon (ActReqRemMyAcc,NULL, Acc_PutParamsToRemoveMyAccount,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod,
Acc_PutParamsToRemoveMyAccount,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, "trash.svg",
"trash.svg", Txt_Remove_account);
Txt_Remove_account);
} }
static void Acc_PutParamsToRemoveMyAccount (void *EncryptedUsrCod) static void Acc_PutParamsToRemoveMyAccount (void *EncryptedUsrCod)

2
swad_account.h
View File

@ -58,7 +58,7 @@ void Acc_ShowFormCreateMyAccount (void);
void Acc_ShowFormGoToRequestNewAccount (void); void Acc_ShowFormGoToRequestNewAccount (void);
void Acc_ShowFormChgMyAccount (void); void Acc_ShowFormChgMyAccount (void);
void Acc_ShowFormChgOtherUsrAccount (void); void Acc_ShowFormChgOtherUsrAccount (void);
void Acc_PutLinkToRemoveMyAccount (void *Args); void Acc_PutLinkToRemoveMyAccount (__attribute__((unused)) void *Args);
bool Acc_CreateMyNewAccountAndLogIn (void); bool Acc_CreateMyNewAccountAndLogIn (void);
void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount); void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount);
void Acc_AfterCreationNewAccount (void); void Acc_AfterCreationNewAccount (void);

6
swad_announcement.c
View File

@ -60,7 +60,7 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
static void Ann_PutIconToAddNewAnnouncement (void *Args); static void Ann_PutIconToAddNewAnnouncement (__attribute__((unused)) void *Args);
static void Ann_PutButtonToAddNewAnnouncement (void); static void Ann_PutButtonToAddNewAnnouncement (void);
static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
const char *Subject,const char *Content, const char *Subject,const char *Content,
@ -184,12 +184,12 @@ void Ann_ShowAllAnnouncements (void)
/******************** Put icon to add a new announcement *********************/ /******************** Put icon to add a new announcement *********************/
/*****************************************************************************/ /*****************************************************************************/
static void Ann_PutIconToAddNewAnnouncement (void *Args) static void Ann_PutIconToAddNewAnnouncement (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_New_announcement; extern const char *Txt_New_announcement;
Ico_PutContextualIconToAdd (ActWriAnn,NULL, Ico_PutContextualIconToAdd (ActWriAnn,NULL,
NULL,Args, NULL,NULL,
Txt_New_announcement); Txt_New_announcement);
} }

12
swad_attendance.c
View File

@ -98,7 +98,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events);
static void Att_ParamsWhichGroupsToShow (void *Events); static void Att_ParamsWhichGroupsToShow (void *Events);
static void Att_PutIconsInListOfAttEvents (void *Events); static void Att_PutIconsInListOfAttEvents (void *Events);
static void Att_PutIconToCreateNewAttEvent (struct Att_Events *Events); static void Att_PutIconToCreateNewAttEvent (struct Att_Events *Events);
static void Att_PutButtonToCreateNewAttEvent (void); static void Att_PutButtonToCreateNewAttEvent (struct Att_Events *Events);
static void Att_PutParamsToCreateNewAttEvent (void *Events); static void Att_PutParamsToCreateNewAttEvent (void *Events);
static void Att_PutParamsToListUsrsAttendance (void *Events); static void Att_PutParamsToListUsrsAttendance (void *Events);
@ -254,7 +254,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin ("100%",Txt_Events, Box_BoxBegin ("100%",Txt_Events,
Att_PutIconsInListOfAttEvents,&Gbl, Att_PutIconsInListOfAttEvents,Events,
Hlp_USERS_Attendance,Box_NOT_CLOSABLE); Hlp_USERS_Attendance,Box_NOT_CLOSABLE);
/***** Select whether show only my groups or all groups *****/ /***** Select whether show only my groups or all groups *****/
@ -328,7 +328,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
/***** Button to create a new attendance event *****/ /***** Button to create a new attendance event *****/
if (ICanEdit) if (ICanEdit)
Att_PutButtonToCreateNewAttEvent (); Att_PutButtonToCreateNewAttEvent (Events);
/***** End box *****/ /***** End box *****/
Box_BoxEnd (); Box_BoxEnd ();
@ -408,12 +408,12 @@ static void Att_PutIconToCreateNewAttEvent (struct Att_Events *Events)
/**************** Put button to create a new attendance event ****************/ /**************** Put button to create a new attendance event ****************/
/*****************************************************************************/ /*****************************************************************************/
static void Att_PutButtonToCreateNewAttEvent (void) static void Att_PutButtonToCreateNewAttEvent (struct Att_Events *Events)
{ {
extern const char *Txt_New_event; extern const char *Txt_New_event;
Frm_StartForm (ActFrmNewAtt); Frm_StartForm (ActFrmNewAtt);
Att_PutParamsToCreateNewAttEvent (&Gbl); Att_PutParamsToCreateNewAttEvent (Events);
Btn_PutConfirmButton (Txt_New_event); Btn_PutConfirmButton (Txt_New_event);
Frm_EndForm (); Frm_EndForm ();
} }
@ -2822,7 +2822,7 @@ static void Att_ListOrPrintMyAttendanceCrs (Att_TypeOfView_t TypeOfView)
{ {
case Att_VIEW_ONLY_ME: case Att_VIEW_ONLY_ME:
Box_BoxBegin (NULL,Txt_Attendance, Box_BoxBegin (NULL,Txt_Attendance,
Att_PutIconsMyAttList,&Gbl, Att_PutIconsMyAttList,&Events,
Hlp_USERS_Attendance_attendance_list,Box_NOT_CLOSABLE); Hlp_USERS_Attendance_attendance_list,Box_NOT_CLOSABLE);
break; break;
case Att_PRNT_ONLY_ME: case Att_PRNT_ONLY_ME:

36
swad_calendar.c
View File

@ -70,7 +70,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
Act_Action_t ActionChangeCalendar1stDay, Act_Action_t ActionChangeCalendar1stDay,
void (*FunctionToDrawContextualIcons) (void *Args),void *Args, void (*FunctionToDrawContextualIcons) (void *Args),void *Args,
bool PrintView); bool PrintView);
static void Cal_PutIconsCalendar (void *Args); static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args);
/*****************************************************************************/ /*****************************************************************************/
/************** Put icons to select the first day of the week ****************/ /************** Put icons to select the first day of the week ****************/
@ -238,7 +238,7 @@ void Cal_DrawCurrentMonth (void)
void Cal_ShowCalendar (void) void Cal_ShowCalendar (void)
{ {
Cal_DrawCalendar (ActSeeCal,ActChgCal1stDay, Cal_DrawCalendar (ActSeeCal,ActChgCal1stDay,
Cal_PutIconsCalendar,&Gbl, Cal_PutIconsCalendar,NULL,
false); false);
} }
@ -314,33 +314,29 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
/******************** Put contextual icons in calendar ***********************/ /******************** Put contextual icons in calendar ***********************/
/*****************************************************************************/ /*****************************************************************************/
static void Cal_PutIconsCalendar (void *Args) static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Print calendar *****/
{ Ico_PutContextualIconToPrint (ActPrnCal,
/***** Print calendar *****/ NULL,NULL);
Ico_PutContextualIconToPrint (ActPrnCal,
NULL,NULL);
/***** View holidays *****/ /***** View holidays *****/
if (Gbl.Hierarchy.Level == Hie_INS && // Institution selected if (Gbl.Hierarchy.Level == Hie_INS && // Institution selected
(Gbl.Hlds.Num || // There are holidays (Gbl.Hlds.Num || // There are holidays
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)) // Institution admin or system admin Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)) // Institution admin or system admin
Hld_PutIconToSeeHlds (); Hld_PutIconToSeeHlds ();
}
} }
/*****************************************************************************/ /*****************************************************************************/
/************************** Put icon to see calendar *************************/ /************************** Put icon to see calendar *************************/
/*****************************************************************************/ /*****************************************************************************/
void Cal_PutIconToSeeCalendar (void *Args) void Cal_PutIconToSeeCalendar (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_Calendar; extern const char *Txt_Calendar;
if (Args) Lay_PutContextualLinkOnlyIcon (ActSeeCal,NULL,
Lay_PutContextualLinkOnlyIcon (ActSeeCal,NULL, NULL,NULL,
NULL,NULL, "calendar.svg",
"calendar.svg", Txt_Calendar);
Txt_Calendar);
} }

2
swad_calendar.h
View File

@ -54,6 +54,6 @@ void Cal_DrawCurrentMonth (void);
void Cal_ShowCalendar (void); void Cal_ShowCalendar (void);
void Cal_PrintCalendar (void); void Cal_PrintCalendar (void);
void Cal_PutIconToSeeCalendar (void *Args); void Cal_PutIconToSeeCalendar (__attribute__((unused)) void *Args);
#endif #endif

56
swad_centre.c
View File

@ -64,13 +64,13 @@ static struct Centre *Ctr_EditingCtr = NULL; // Static variable to keep the cent
static void Ctr_ListCentres (void); static void Ctr_ListCentres (void);
static bool Ctr_CheckIfICanCreateCentres (void); static bool Ctr_CheckIfICanCreateCentres (void);
static void Ctr_PutIconsListingCentres (void *Args); static void Ctr_PutIconsListingCentres (__attribute__((unused)) void *Args);
static void Ctr_PutIconToEditCentres (void); static void Ctr_PutIconToEditCentres (void);
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr); static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr);
static void Ctr_GetParamCtrOrder (void); static void Ctr_GetParamCtrOrder (void);
static void Ctr_EditCentresInternal (void); static void Ctr_EditCentresInternal (void);
static void Ctr_PutIconsEditingCentres (void *Args); static void Ctr_PutIconsEditingCentres (__attribute__((unused)) void *Args);
static void Ctr_GetDataOfCentreFromRow (struct Centre *Ctr,MYSQL_ROW row); static void Ctr_GetDataOfCentreFromRow (struct Centre *Ctr,MYSQL_ROW row);
@ -84,7 +84,7 @@ static void Ctr_PutParamOtherCtrCod (long CtrCod);
static void Ctr_UpdateInsNameDB (long CtrCod,const char *FieldName,const char *NewCtrName); static void Ctr_UpdateInsNameDB (long CtrCod,const char *FieldName,const char *NewCtrName);
static void Ctr_ShowAlertAndButtonToGoToCtr (void); static void Ctr_ShowAlertAndButtonToGoToCtr (void);
static void Ctr_PutParamGoToCtr (void *Args); static void Ctr_PutParamGoToCtr (void *CtrCod);
static void Ctr_PutFormToCreateCentre (void); static void Ctr_PutFormToCreateCentre (void);
static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable); static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable);
@ -273,7 +273,7 @@ static void Ctr_ListCentres (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X, Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X,
Gbl.Hierarchy.Ins.FullName), Gbl.Hierarchy.Ins.FullName),
Ctr_PutIconsListingCentres,&Gbl, Ctr_PutIconsListingCentres,NULL,
Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE);
Str_FreeString (); Str_FreeString ();
@ -321,20 +321,17 @@ static bool Ctr_CheckIfICanCreateCentres (void)
/***************** Put contextual icons in list of centres *******************/ /***************** Put contextual icons in list of centres *******************/
/*****************************************************************************/ /*****************************************************************************/
static void Ctr_PutIconsListingCentres (void *Args) static void Ctr_PutIconsListingCentres (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to edit centres *****/
{ if (Ctr_CheckIfICanCreateCentres ())
/***** Put icon to edit centres *****/ Ctr_PutIconToEditCentres ();
if (Ctr_CheckIfICanCreateCentres ())
Ctr_PutIconToEditCentres ();
/***** Put icon to view places *****/ /***** Put icon to view places *****/
Plc_PutIconToViewPlaces (); Plc_PutIconToViewPlaces ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -478,7 +475,7 @@ static void Ctr_EditCentresInternal (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X, Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X,
Gbl.Hierarchy.Ins.FullName), Gbl.Hierarchy.Ins.FullName),
Ctr_PutIconsEditingCentres,&Gbl, Ctr_PutIconsEditingCentres,NULL,
Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE);
Str_FreeString (); Str_FreeString ();
@ -503,19 +500,16 @@ static void Ctr_EditCentresInternal (void)
/**************** Put contextual icons in edition of centres *****************/ /**************** Put contextual icons in edition of centres *****************/
/*****************************************************************************/ /*****************************************************************************/
static void Ctr_PutIconsEditingCentres (void *Args) static void Ctr_PutIconsEditingCentres (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to view centres *****/
{ Ctr_PutIconToViewCentres ();
/***** Put icon to view centres *****/
Ctr_PutIconToViewCentres ();
/***** Put icon to view places *****/ /***** Put icon to view places *****/
Plc_PutIconToViewPlaces (); Plc_PutIconToViewPlaces ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
void Ctr_PutIconToViewCentres (void) void Ctr_PutIconToViewCentres (void)
@ -1574,7 +1568,7 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void)
{ {
/***** Alert with button to go to centre *****/ /***** Alert with button to go to centre *****/
Ale_ShowLastAlertAndButton (ActSeeDeg,NULL,NULL, Ale_ShowLastAlertAndButton (ActSeeDeg,NULL,NULL,
Ctr_PutParamGoToCtr,&Gbl, Ctr_PutParamGoToCtr,&Ctr_EditingCtr->CtrCod,
Btn_CONFIRM_BUTTON, Btn_CONFIRM_BUTTON,
Hie_BuildGoToMsg (Ctr_EditingCtr->ShrtName)); Hie_BuildGoToMsg (Ctr_EditingCtr->ShrtName));
Hie_FreeGoToMsg (); Hie_FreeGoToMsg ();
@ -1584,10 +1578,10 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void)
Ale_ShowAlerts (NULL); Ale_ShowAlerts (NULL);
} }
static void Ctr_PutParamGoToCtr (void *Args) static void Ctr_PutParamGoToCtr (void *CtrCod)
{ {
if (Args) if (CtrCod)
Ctr_PutParamCtrCod (Ctr_EditingCtr->CtrCod); Ctr_PutParamCtrCod (*(long *) CtrCod);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2187,7 +2181,7 @@ static void Ctr_FormToGoToMap (struct Centre *Ctr)
{ {
Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre
Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL,
Ctr_PutParamGoToCtr,&Gbl, Ctr_PutParamGoToCtr,&Ctr_EditingCtr->CtrCod,
"map-marker-alt.svg", "map-marker-alt.svg",
Txt_Map); Txt_Map);
} }

37
swad_centre_config.c
View File

@ -74,7 +74,7 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
static void CtrCfg_Configuration (bool PrintView); static void CtrCfg_Configuration (bool PrintView);
static void CtrCfg_PutIconsCtrConfig (void *Args); static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args);
static void CtrCfg_PutIconToChangePhoto (void); static void CtrCfg_PutIconToChangePhoto (void);
static void CtrCfg_Title (bool PutLink); static void CtrCfg_Title (bool PutLink);
static void CtrCfg_Map (void); static void CtrCfg_Map (void);
@ -160,7 +160,7 @@ static void CtrCfg_Configuration (bool PrintView)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
else else
Box_BoxBegin (NULL,NULL, Box_BoxBegin (NULL,NULL,
CtrCfg_PutIconsCtrConfig,&Gbl, CtrCfg_PutIconsCtrConfig,NULL,
Hlp_CENTRE_Information,Box_NOT_CLOSABLE); Hlp_CENTRE_Information,Box_NOT_CLOSABLE);
/***** Title *****/ /***** Title *****/
@ -257,27 +257,24 @@ static void CtrCfg_Configuration (bool PrintView)
/************ Put contextual icons in configuration of a centre **************/ /************ Put contextual icons in configuration of a centre **************/
/*****************************************************************************/ /*****************************************************************************/
static void CtrCfg_PutIconsCtrConfig (void *Args) static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to print info about centre *****/
Ico_PutContextualIconToPrint (ActPrnCtrInf,
NULL,NULL);
/***** Put icon to view places *****/
Plc_PutIconToViewPlaces ();
if (Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
// Only centre admins, institution admins and system admins
// have permission to upload logo and photo of the centre
{ {
/***** Put icon to print info about centre *****/ /***** Put icon to upload logo of centre *****/
Ico_PutContextualIconToPrint (ActPrnCtrInf, Lgo_PutIconToChangeLogo (Hie_CTR);
NULL,NULL);
/***** Put icon to view places *****/ /***** Put icon to upload photo of centre *****/
Plc_PutIconToViewPlaces (); CtrCfg_PutIconToChangePhoto ();
if (Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
// Only centre admins, institution admins and system admins
// have permission to upload logo and photo of the centre
{
/***** Put icon to upload logo of centre *****/
Lgo_PutIconToChangeLogo (Hie_CTR);
/***** Put icon to upload photo of centre *****/
CtrCfg_PutIconToChangePhoto ();
}
} }
} }

3
swad_changelog.h
View File

@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.169.1 (2020-04-08)" #define Log_PLATFORM_VERSION "SWAD 19.169.2 (2020-04-08)"
#define CSS_FILE "swad19.146.css" #define CSS_FILE "swad19.146.css"
#define JS_FILE "swad19.153.js" #define JS_FILE "swad19.153.js"
/* /*
@ -548,6 +548,7 @@ Funci
// TODO: Oresti Baños: cambiar ojos por candados en descriptores para prohibir/permitir y dejar los ojos para poder elegir descriptores // TODO: Oresti Baños: cambiar ojos por candados en descriptores para prohibir/permitir y dejar los ojos para poder elegir descriptores
// TODO: Integrar pull requests con traducciones del alemán del usuario eruedin en GitHub // TODO: Integrar pull requests con traducciones del alemán del usuario eruedin en GitHub
Version 19.169.2: Apr 08, 2020 Mark some parameters as unused (functions from A to C). (284969 lines)
Version 19.169.1: Apr 08, 2020 Mark some parameters as unused. (284999 lines) Version 19.169.1: Apr 08, 2020 Mark some parameters as unused. (284999 lines)
Version 19.169: Apr 08, 2020 Code refactoring in games and matches. (285024 lines) Version 19.169: Apr 08, 2020 Code refactoring in games and matches. (285024 lines)
Version 19.168: Apr 07, 2020 Code refactoring in forums. (284866 lines) Version 19.168: Apr 07, 2020 Code refactoring in forums. (284866 lines)

24
swad_classroom.c
View File

@ -62,9 +62,9 @@ static struct Classroom *Cla_EditingCla = NULL; // Static variable to keep the c
static void Cla_GetParamClaOrder (void); static void Cla_GetParamClaOrder (void);
static bool Cla_CheckIfICanCreateClassrooms (void); static bool Cla_CheckIfICanCreateClassrooms (void);
static void Cla_PutIconsListingClassrooms (void *Args); static void Cla_PutIconsListingClassrooms (__attribute__((unused)) void *Args);
static void Cla_PutIconToEditClassrooms (void); static void Cla_PutIconToEditClassrooms (void);
static void Cla_PutIconsEditingClassrooms (void *Args); static void Cla_PutIconsEditingClassrooms (__attribute__((unused)) void *Args);
static void Cla_EditClassroomsInternal (void); static void Cla_EditClassroomsInternal (void);
@ -114,7 +114,7 @@ void Cla_SeeClassrooms (void)
/***** Table head *****/ /***** Table head *****/
Box_BoxBegin (NULL,Txt_Classrooms, Box_BoxBegin (NULL,Txt_Classrooms,
Cla_PutIconsListingClassrooms,&Gbl, Cla_PutIconsListingClassrooms,NULL,
Hlp_CENTRE_Classrooms,Box_NOT_CLOSABLE); Hlp_CENTRE_Classrooms,Box_NOT_CLOSABLE);
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_BeginWideMarginPadding (2);
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
@ -212,12 +212,11 @@ static bool Cla_CheckIfICanCreateClassrooms (void)
/**************** Put contextual icons in list of classrooms *****************/ /**************** Put contextual icons in list of classrooms *****************/
/*****************************************************************************/ /*****************************************************************************/
static void Cla_PutIconsListingClassrooms (void *Args) static void Cla_PutIconsListingClassrooms (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to edit classrooms *****/
/***** Put icon to edit classrooms *****/ if (Cla_CheckIfICanCreateClassrooms ())
if (Cla_CheckIfICanCreateClassrooms ()) Cla_PutIconToEditClassrooms ();
Cla_PutIconToEditClassrooms ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -256,7 +255,7 @@ static void Cla_EditClassroomsInternal (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Txt_Classrooms, Box_BoxBegin (NULL,Txt_Classrooms,
Cla_PutIconsEditingClassrooms,&Gbl, Cla_PutIconsEditingClassrooms,NULL,
Hlp_CENTRE_Classrooms_edit,Box_NOT_CLOSABLE); Hlp_CENTRE_Classrooms_edit,Box_NOT_CLOSABLE);
/***** Put a form to create a new classroom *****/ /***** Put a form to create a new classroom *****/
@ -277,11 +276,10 @@ static void Cla_EditClassroomsInternal (void)
/*************** Put contextual icons in edition of classrooms ***************/ /*************** Put contextual icons in edition of classrooms ***************/
/*****************************************************************************/ /*****************************************************************************/
static void Cla_PutIconsEditingClassrooms (void *Args) static void Cla_PutIconsEditingClassrooms (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to view classrooms *****/
/***** Put icon to view classrooms *****/ Cla_PutIconToViewClassrooms ();
Cla_PutIconToViewClassrooms ();
} }
/*****************************************************************************/ /*****************************************************************************/

21
swad_connected.c
View File

@ -60,7 +60,7 @@ extern struct Globals Gbl;
/**************************** Private prototypes *****************************/ /**************************** Private prototypes *****************************/
/*****************************************************************************/ /*****************************************************************************/
static void Con_PutIconToUpdateConnected (void *Args); static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args);
static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal); static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal);
@ -106,7 +106,7 @@ void Con_ShowConnectedUsrs (void)
Txt_Connected_users) < 0) Txt_Connected_users) < 0)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
Box_BoxBegin (NULL,Title, Box_BoxBegin (NULL,Title,
Con_PutIconToUpdateConnected,&Gbl, Con_PutIconToUpdateConnected,NULL,
Hlp_USERS_Connected,Box_NOT_CLOSABLE); Hlp_USERS_Connected,Box_NOT_CLOSABLE);
free (Title); free (Title);
Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC, Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC,
@ -128,19 +128,16 @@ void Con_ShowConnectedUsrs (void)
/******************** Put icon to update connected users *********************/ /******************** Put icon to update connected users *********************/
/*****************************************************************************/ /*****************************************************************************/
static void Con_PutIconToUpdateConnected (void *Args) static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_Update; extern const char *Txt_Update;
if (Args) Frm_StartForm (ActLstCon);
{ Sco_PutParamScope ("ScopeCon",Gbl.Scope.Current);
Frm_StartForm (ActLstCon); HTM_BUTTON_Animated_Begin (Txt_Update,"BT_LINK",NULL);
Sco_PutParamScope ("ScopeCon",Gbl.Scope.Current); Ico_PutCalculateIcon (Txt_Update);
HTM_BUTTON_Animated_Begin (Txt_Update,"BT_LINK",NULL); HTM_BUTTON_End ();
Ico_PutCalculateIcon (Txt_Update); Frm_EndForm ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
} }
/*****************************************************************************/ /*****************************************************************************/

48
swad_country.c
View File

@ -66,13 +66,13 @@ long Cty_CurrentCtyCod = -1L; // Used as parameter in contextual links
static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable); static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable);
static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty); static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty);
static void Cty_PutIconsListingCountries (void *Args); static void Cty_PutIconsListingCountries (__attribute__((unused)) void *Args);
static void Cty_PutIconToEditCountries (void); static void Cty_PutIconToEditCountries (void);
static void Cty_GetParamCtyOrder (void); static void Cty_GetParamCtyOrder (void);
static void Cty_EditCountriesInternal (void); static void Cty_EditCountriesInternal (void);
static void Cty_PutIconsEditingCountries (void *Args); static void Cty_PutIconsEditingCountries (__attribute__((unused)) void *Args);
static void Cty_PutIconToViewCountries (void); static void Cty_PutIconToViewCountries (void);
static void Cty_ListCountriesForEdition (void); static void Cty_ListCountriesForEdition (void);
@ -85,7 +85,7 @@ static bool Cty_CheckIfCountryNameExists (Lan_Language_t Language,const char *Na
static void Cty_UpdateCtyNameDB (long CtyCod,const char *FieldName,const char *NewCtyName); static void Cty_UpdateCtyNameDB (long CtyCod,const char *FieldName,const char *NewCtyName);
static void Cty_ShowAlertAndButtonToGoToCty (void); static void Cty_ShowAlertAndButtonToGoToCty (void);
static void Cty_PutParamGoToCty (void *Args); static void Cty_PutParamGoToCty (void *CtyCod);
static void Cty_PutFormToCreateCountry (void); static void Cty_PutFormToCreateCountry (void);
static void Cty_PutHeadCountriesForEdition (void); static void Cty_PutHeadCountriesForEdition (void);
@ -231,7 +231,7 @@ void Cty_ListCountries2 (void)
/***** Begin box and table *****/ /***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Countries, Box_BoxTableBegin (NULL,Txt_Countries,
Cty_PutIconsListingCountries,&Gbl, Cty_PutIconsListingCountries,NULL,
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2); Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2);
/***** Write heading *****/ /***** Write heading *****/
@ -458,17 +458,14 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
/***************** Put contextual icons in list of countries *****************/ /***************** Put contextual icons in list of countries *****************/
/*****************************************************************************/ /*****************************************************************************/
static void Cty_PutIconsListingCountries (void *Args) static void Cty_PutIconsListingCountries (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to edit countries *****/
{ if (Cty_CheckIfICanEditCountries ())
/***** Put icon to edit countries *****/ Cty_PutIconToEditCountries ();
if (Cty_CheckIfICanEditCountries ())
Cty_PutIconToEditCountries ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -681,7 +678,7 @@ static void Cty_EditCountriesInternal (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Txt_Countries, Box_BoxBegin (NULL,Txt_Countries,
Cty_PutIconsEditingCountries,&Gbl, Cty_PutIconsEditingCountries,NULL,
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE); Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE);
/***** Put a form to create a new country *****/ /***** Put a form to create a new country *****/
@ -702,16 +699,13 @@ static void Cty_EditCountriesInternal (void)
/*************** Put contextual icons in edition of countries ****************/ /*************** Put contextual icons in edition of countries ****************/
/*****************************************************************************/ /*****************************************************************************/
static void Cty_PutIconsEditingCountries (void *Args) static void Cty_PutIconsEditingCountries (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to view countries *****/
{ Cty_PutIconToViewCountries ();
/***** Put icon to view countries *****/
Cty_PutIconToViewCountries ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1580,7 +1574,7 @@ static void Cty_ShowAlertAndButtonToGoToCty (void)
{ {
/***** Alert with button to go to couuntry *****/ /***** Alert with button to go to couuntry *****/
Ale_ShowLastAlertAndButton (ActSeeIns,NULL,NULL, Ale_ShowLastAlertAndButton (ActSeeIns,NULL,NULL,
Cty_PutParamGoToCty,&Gbl, Cty_PutParamGoToCty,&Cty_EditingCty->CtyCod,
Btn_CONFIRM_BUTTON, Btn_CONFIRM_BUTTON,
Hie_BuildGoToMsg (Cty_EditingCty->Name[Gbl.Prefs.Language])); Hie_BuildGoToMsg (Cty_EditingCty->Name[Gbl.Prefs.Language]));
Hie_FreeGoToMsg (); Hie_FreeGoToMsg ();
@ -1590,11 +1584,11 @@ static void Cty_ShowAlertAndButtonToGoToCty (void)
Ale_ShowAlerts (NULL); Ale_ShowAlerts (NULL);
} }
static void Cty_PutParamGoToCty (void *Args) static void Cty_PutParamGoToCty (void *CtyCod)
{ {
if (Args) if (CtyCod)
/***** Put parameter *****/ /***** Put parameter *****/
Cty_PutParamCtyCod (Cty_EditingCty->CtyCod); Cty_PutParamCtyCod (*(long *) CtyCod);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2101,7 +2095,7 @@ static void Cty_FormToGoToMap (struct Country *Cty)
{ {
Cty_EditingCty = Cty; // Used to pass parameter with the code of the country Cty_EditingCty = Cty; // Used to pass parameter with the code of the country
Lay_PutContextualLinkOnlyIcon (ActSeeCtyInf,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeCtyInf,NULL,
Cty_PutParamGoToCty,&Gbl, Cty_PutParamGoToCty,&Cty_EditingCty->CtyCod,
"map-marker-alt.svg", "map-marker-alt.svg",
Txt_Map); Txt_Map);
} }

11
swad_country_config.c
View File

@ -62,7 +62,7 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
static void CtyCfg_Configuration (bool PrintView); static void CtyCfg_Configuration (bool PrintView);
static void CtyCfg_PutIconToPrint (void *Args); static void CtyCfg_PutIconToPrint (__attribute__((unused)) void *Args);
static void CtyCfg_Title (bool PutLink); static void CtyCfg_Title (bool PutLink);
static void CtyCfg_GetCoordAndZoom (struct Coordinates *Coord,unsigned *Zoom); static void CtyCfg_GetCoordAndZoom (struct Coordinates *Coord,unsigned *Zoom);
static void CtyCfg_Map (void); static void CtyCfg_Map (void);
@ -127,7 +127,7 @@ static void CtyCfg_Configuration (bool PrintView)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
else else
Box_BoxBegin (NULL,NULL, Box_BoxBegin (NULL,NULL,
CtyCfg_PutIconToPrint,&Gbl, CtyCfg_PutIconToPrint,NULL,
Hlp_COUNTRY_Information,Box_NOT_CLOSABLE); Hlp_COUNTRY_Information,Box_NOT_CLOSABLE);
/***** Title *****/ /***** Title *****/
@ -209,11 +209,10 @@ static void CtyCfg_Configuration (bool PrintView)
/************* Put icon to print the configuration of a country **************/ /************* Put icon to print the configuration of a country **************/
/*****************************************************************************/ /*****************************************************************************/
static void CtyCfg_PutIconToPrint (void *Args) static void CtyCfg_PutIconToPrint (__attribute__((unused)) void *Args)
{ {
if (Args) Ico_PutContextualIconToPrint (ActPrnCtyInf,
Ico_PutContextualIconToPrint (ActPrnCtyInf, NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

79
swad_course.c
View File

@ -40,6 +40,7 @@
#include "swad_HTML.h" #include "swad_HTML.h"
#include "swad_info.h" #include "swad_info.h"
#include "swad_logo.h" #include "swad_logo.h"
#include "swad_search.h"
#include "swad_test_exam.h" #include "swad_test_exam.h"
/*****************************************************************************/ /*****************************************************************************/
@ -71,12 +72,12 @@ static void Crs_WriteListMyCoursesToSelectOne (void);
static void Crs_GetListCrssInCurrentDeg (Crs_WhatCourses_t WhatCourses); static void Crs_GetListCrssInCurrentDeg (Crs_WhatCourses_t WhatCourses);
static void Crs_ListCourses (void); static void Crs_ListCourses (void);
static bool Crs_CheckIfICanCreateCourses (void); static bool Crs_CheckIfICanCreateCourses (void);
static void Crs_PutIconsListCourses (void *Args); static void Crs_PutIconsListCourses (__attribute__((unused)) void *Args);
static void Crs_PutIconToEditCourses (void); static void Crs_PutIconToEditCourses (void);
static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year); static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year);
static void Crs_EditCoursesInternal (void); static void Crs_EditCoursesInternal (void);
static void Crs_PutIconsEditingCourses (void *Args); static void Crs_PutIconsEditingCourses (__attribute__((unused)) void *Args);
static void Crs_PutIconToViewCourses (void); static void Crs_PutIconToViewCourses (void);
static void Crs_ListCoursesForEdition (void); static void Crs_ListCoursesForEdition (void);
static void Crs_ListCoursesOfAYearForEdition (unsigned Year); static void Crs_ListCoursesOfAYearForEdition (unsigned Year);
@ -103,8 +104,7 @@ static void Crs_UpdateCrsNameDB (long CrsCod,const char *FieldName,const char *N
static void Crs_PutButtonToGoToCrs (void); static void Crs_PutButtonToGoToCrs (void);
static void Crs_PutButtonToRegisterInCrs (void); static void Crs_PutButtonToRegisterInCrs (void);
static void Crs_PutIconToSearchCourses (void *Args); static void Crs_PutIconToSearchCourses (__attribute__((unused)) void *Args);
static void Sch_PutLinkToSearchCoursesParams (void *Args);
static void Crs_PutParamOtherCrsCod (long CrsCod); static void Crs_PutParamOtherCrsCod (long CrsCod);
static long Crs_GetAndCheckParamOtherCrsCod (long MinCodAllowed); static long Crs_GetAndCheckParamOtherCrsCod (long MinCodAllowed);
@ -178,7 +178,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Txt_My_courses, Box_BoxBegin (NULL,Txt_My_courses,
Crs_PutIconToSearchCourses,&Gbl, Crs_PutIconToSearchCourses,NULL,
Hlp_PROFILE_Courses,Box_NOT_CLOSABLE); Hlp_PROFILE_Courses,Box_NOT_CLOSABLE);
HTM_UL_Begin ("class=\"LIST_TREE\""); HTM_UL_Begin ("class=\"LIST_TREE\"");
@ -803,7 +803,7 @@ static void Crs_ListCourses (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X, Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X,
Gbl.Hierarchy.Deg.ShrtName), Gbl.Hierarchy.Deg.ShrtName),
Crs_PutIconsListCourses,&Gbl, Crs_PutIconsListCourses,NULL,
Hlp_DEGREE_Courses,Box_NOT_CLOSABLE); Hlp_DEGREE_Courses,Box_NOT_CLOSABLE);
Str_FreeString (); Str_FreeString ();
@ -853,17 +853,14 @@ static bool Crs_CheckIfICanCreateCourses (void)
/***************** Put contextual icons in list of courses *******************/ /***************** Put contextual icons in list of courses *******************/
/*****************************************************************************/ /*****************************************************************************/
static void Crs_PutIconsListCourses (void *Args) static void Crs_PutIconsListCourses (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to edit courses *****/
{ if (Crs_CheckIfICanCreateCourses ())
/***** Put icon to edit courses *****/ Crs_PutIconToEditCourses ();
if (Crs_CheckIfICanCreateCourses ())
Crs_PutIconToEditCourses ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1019,7 +1016,7 @@ static void Crs_EditCoursesInternal (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X, Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X,
Gbl.Hierarchy.Deg.ShrtName), Gbl.Hierarchy.Deg.ShrtName),
Crs_PutIconsEditingCourses,&Gbl, Crs_PutIconsEditingCourses,NULL,
Hlp_DEGREE_Courses,Box_NOT_CLOSABLE); Hlp_DEGREE_Courses,Box_NOT_CLOSABLE);
Str_FreeString (); Str_FreeString ();
@ -1044,16 +1041,13 @@ static void Crs_EditCoursesInternal (void)
/**************** Put contextual icons in edition of courses *****************/ /**************** Put contextual icons in edition of courses *****************/
/*****************************************************************************/ /*****************************************************************************/
static void Crs_PutIconsEditingCourses (void *Args) static void Crs_PutIconsEditingCourses (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to view degrees *****/
{ Crs_PutIconToViewCourses ();
/***** Put icon to view degrees *****/
Crs_PutIconToViewCourses ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_HIERARCHY); Fig_PutIconToShowFigure (Fig_HIERARCHY);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2369,25 +2363,15 @@ void Crs_ReqSelectOneOfMyCourses (void)
/******************* Put an icon (form) to search courses ********************/ /******************* Put an icon (form) to search courses ********************/
/*****************************************************************************/ /*****************************************************************************/
static void Crs_PutIconToSearchCourses (void *Args) static void Crs_PutIconToSearchCourses (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_Search_courses; extern const char *Txt_Search_courses;
if (Args) /***** Put form to search / select courses *****/
/***** Put form to search / select courses *****/ Lay_PutContextualLinkOnlyIcon (ActReqSch,NULL,
Lay_PutContextualLinkOnlyIcon (ActReqSch,NULL, Sch_PutLinkToSearchCoursesParams,NULL,
Sch_PutLinkToSearchCoursesParams,&Gbl, "search.svg",
"search.svg", Txt_Search_courses);
Txt_Search_courses);
}
static void Sch_PutLinkToSearchCoursesParams (void *Args) // TODO: Move to search module
{
if (Args)
{
Sco_PutParamScope ("ScopeSch",Hie_SYS);
Par_PutHiddenParamUnsigned (NULL,"WhatToSearch",(unsigned) Sch_SEARCH_COURSES);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2422,17 +2406,16 @@ void Crs_PutIconToSelectMyCoursesInBreadcrumb (void)
/****************** Put an icon (form) to select my courses ******************/ /****************** Put an icon (form) to select my courses ******************/
/*****************************************************************************/ /*****************************************************************************/
void Crs_PutIconToSelectMyCourses (void *Args) void Crs_PutIconToSelectMyCourses (__attribute__((unused)) void *Args)
{ {
extern const char *Txt_My_courses; extern const char *Txt_My_courses;
if (Args) if (Gbl.Usrs.Me.Logged) // I am logged
if (Gbl.Usrs.Me.Logged) // I am logged /***** Put icon with link *****/
/***** Put icon with link *****/ Lay_PutContextualLinkOnlyIcon (ActMyCrs,NULL,
Lay_PutContextualLinkOnlyIcon (ActMyCrs,NULL, NULL,NULL,
NULL,NULL, "sitemap.svg",
"sitemap.svg", Txt_My_courses);
Txt_My_courses);
} }
/*****************************************************************************/ /*****************************************************************************/

2
swad_course.h
View File

@ -136,7 +136,7 @@ void Crs_ChangeCrsStatus (void);
void Crs_ContEditAfterChgCrs (void); void Crs_ContEditAfterChgCrs (void);
void Crs_PutIconToSelectMyCoursesInBreadcrumb (void); void Crs_PutIconToSelectMyCoursesInBreadcrumb (void);
void Crs_PutIconToSelectMyCourses (void *Args); void Crs_PutIconToSelectMyCourses (__attribute__((unused)) void *Args);
void Crs_PutParamCrsCod (long CrsCod); void Crs_PutParamCrsCod (long CrsCod);
void Crs_ReqSelectOneOfMyCourses (void); void Crs_ReqSelectOneOfMyCourses (void);

11
swad_course_config.c
View File

@ -62,7 +62,7 @@ extern struct Globals Gbl;
/**************************** Private prototypes *****************************/ /**************************** Private prototypes *****************************/
/*****************************************************************************/ /*****************************************************************************/
static void CrsCfg_PutIconToPrint (void *Args); static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args);
static void CrsCfg_Title (bool PutLink); static void CrsCfg_Title (bool PutLink);
static void CrsCfg_Degree (bool PrintView,bool PutForm); static void CrsCfg_Degree (bool PrintView,bool PutForm);
static void CrsCfg_FullName (bool PutForm); static void CrsCfg_FullName (bool PutForm);
@ -118,7 +118,7 @@ void CrsCfg_Configuration (bool PrintView)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
else else
Box_BoxBegin (NULL,NULL, Box_BoxBegin (NULL,NULL,
CrsCfg_PutIconToPrint,&Gbl, CrsCfg_PutIconToPrint,NULL,
Hlp_COURSE_Information,Box_NOT_CLOSABLE); Hlp_COURSE_Information,Box_NOT_CLOSABLE);
/***** Title *****/ /***** Title *****/
@ -180,11 +180,10 @@ void CrsCfg_Configuration (bool PrintView)
/************* Put icon to print the configuration of a course ***************/ /************* Put icon to print the configuration of a course ***************/
/*****************************************************************************/ /*****************************************************************************/
static void CrsCfg_PutIconToPrint (void *Args) static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args)
{ {
if (Args) Ico_PutContextualIconToPrint (ActPrnCrsInf,
Ico_PutContextualIconToPrint (ActPrnCrsInf, NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

36
swad_degree_type.c
View File

@ -78,8 +78,8 @@ static void DT_EditDegreeTypesInternal (void);
static void DT_PutIconsEditingDegreeTypes (void *Args); static void DT_PutIconsEditingDegreeTypes (void *Args);
static void DT_ListDegreeTypesForSeeing (void); static void DT_ListDegreeTypesForSeeing (void);
static void DT_PutIconsListingDegTypes (void *Args); static void DT_PutIconsListingDegTypes (__attribute__((unused)) void *Args);
static void DT_PutIconToEditDegTypes (void *Args); static void DT_PutIconToEditDegTypes (__attribute__((unused)) void *Args);
static void DT_ListDegreeTypesForEdition (void); static void DT_ListDegreeTypesForEdition (void);
static void DT_PutFormToCreateDegreeType (void); static void DT_PutFormToCreateDegreeType (void);
@ -199,12 +199,12 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,
{ {
case ActSeeDegTyp: case ActSeeDegTyp:
Box_BoxBegin (NULL,Txt_Types_of_degree, Box_BoxBegin (NULL,Txt_Types_of_degree,
DT_PutIconsListingDegTypes,&Gbl, DT_PutIconsListingDegTypes,NULL,
Hlp_CENTRE_DegreeTypes,Box_NOT_CLOSABLE); Hlp_CENTRE_DegreeTypes,Box_NOT_CLOSABLE);
break; break;
case ActSeeUseGbl: case ActSeeUseGbl:
Box_BoxBegin (NULL,Txt_Types_of_degree, Box_BoxBegin (NULL,Txt_Types_of_degree,
DT_PutIconToEditDegTypes,&Gbl, DT_PutIconToEditDegTypes,NULL,
Hlp_ANALYTICS_Figures_types_of_degree,Box_NOT_CLOSABLE); Hlp_ANALYTICS_Figures_types_of_degree,Box_NOT_CLOSABLE);
break; break;
default: // Bad call default: // Bad call
@ -360,32 +360,28 @@ static void DT_ListDegreeTypesForSeeing (void)
/************** Put contextual icons in list of degree types *****************/ /************** Put contextual icons in list of degree types *****************/
/*****************************************************************************/ /*****************************************************************************/
static void DT_PutIconsListingDegTypes (void *Args) static void DT_PutIconsListingDegTypes (__attribute__((unused)) void *Args)
{ {
if (Args) /***** Put icon to edit degree types *****/
{ DT_PutIconToEditDegTypes (NULL);
/***** Put icon to edit degree types *****/
DT_PutIconToEditDegTypes (&Gbl);
/***** Put icon to view degrees *****/ /***** Put icon to view degrees *****/
Deg_PutIconToViewDegrees (); Deg_PutIconToViewDegrees ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Fig_PutIconToShowFigure (Fig_DEGREE_TYPES); Fig_PutIconToShowFigure (Fig_DEGREE_TYPES);
}
} }
/*****************************************************************************/ /*****************************************************************************/
/******************* Put link (form) to edit degree types ********************/ /******************* Put link (form) to edit degree types ********************/
/*****************************************************************************/ /*****************************************************************************/
static void DT_PutIconToEditDegTypes (void *Args) static void DT_PutIconToEditDegTypes (__attribute__((unused)) void *Args)
{ {
if (Args) if (Gbl.Hierarchy.Level == Hie_CTR && // Only editable if centre tab is visible
if (Gbl.Hierarchy.Level == Hie_CTR && // Only editable if centre tab is visible DT_CheckIfICanCreateDegreeTypes ())
DT_CheckIfICanCreateDegreeTypes ()) Ico_PutContextualIconToEdit (ActEdiDegTyp,NULL,
Ico_PutContextualIconToEdit (ActEdiDegTyp,NULL, NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

31
swad_file_browser.c
View File

@ -1275,6 +1275,7 @@ static void Brw_SetAndCheckQuota (void);
static void Brw_SetMaxQuota (void); static void Brw_SetMaxQuota (void);
static bool Brw_CheckIfQuotaExceded (void); static bool Brw_CheckIfQuotaExceded (void);
static void Brw_AskEditWorksCrsInternal (__attribute__((unused)) void *Args);
static void Brw_ShowFileBrowserNormal (void); static void Brw_ShowFileBrowserNormal (void);
static void Brw_ShowFileBrowsersAsgWrkCrs (void); static void Brw_ShowFileBrowsersAsgWrkCrs (void);
static void Brw_ShowFileBrowsersAsgWrkUsr (void); static void Brw_ShowFileBrowsersAsgWrkUsr (void);
@ -1282,6 +1283,7 @@ static void Brw_ShowFileBrowsersAsgWrkUsr (void);
static void Brw_FormToChangeCrsGrpZone (void); static void Brw_FormToChangeCrsGrpZone (void);
static void Brw_GetSelectedGroupData (struct GroupData *GrpDat,bool AbortOnError); static void Brw_GetSelectedGroupData (struct GroupData *GrpDat,bool AbortOnError);
static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat); static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat);
static void Brw_ShowFileBrowserOrWorksInternal (__attribute__((unused)) void *Args);
static void Brw_ShowFileBrowser (void); static void Brw_ShowFileBrowser (void);
static void Brw_PutIconsFileBrowser (void *Args); static void Brw_PutIconsFileBrowser (void *Args);
static void Brw_PutIconShowFigure (__attribute__((unused)) void *Args); static void Brw_PutIconShowFigure (__attribute__((unused)) void *Args);
@ -3099,7 +3101,12 @@ static bool Brw_CheckIfQuotaExceded (void)
/************** Request edition of works of users of the course **************/ /************** Request edition of works of users of the course **************/
/*****************************************************************************/ /*****************************************************************************/
void Brw_AskEditWorksCrs (void *Args) void Brw_AskEditWorksCrs (void)
{
Brw_AskEditWorksCrsInternal (NULL);
}
static void Brw_AskEditWorksCrsInternal (__attribute__((unused)) void *Args)
{ {
extern const char *Hlp_FILES_Homework_for_teachers; extern const char *Hlp_FILES_Homework_for_teachers;
extern const char *Txt_Assignments_and_other_works; extern const char *Txt_Assignments_and_other_works;
@ -3460,24 +3467,26 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
void Brw_GetSelectedUsrsAndShowWorks (void) void Brw_GetSelectedUsrsAndShowWorks (void)
{ {
Usr_GetSelectedUsrsAndGoToAct (&Gbl.Usrs.Selected, Usr_GetSelectedUsrsAndGoToAct (&Gbl.Usrs.Selected,
Brw_ShowFileBrowserOrWorks,&Gbl, // when user(s) selected Brw_ShowFileBrowserOrWorksInternal,NULL, // when user(s) selected
Brw_AskEditWorksCrs,&Gbl); // when no user selected Brw_AskEditWorksCrsInternal,NULL); // when no user selected
} }
/*****************************************************************************/ /*****************************************************************************/
/******************** Show a file browser or users' works *******************/ /******************** Show a file browser or users' works *******************/
/*****************************************************************************/ /*****************************************************************************/
void Brw_ShowFileBrowserOrWorks (void *Args) void Brw_ShowFileBrowserOrWorks (void)
{ {
if (Args) Brw_ShowFileBrowserOrWorksInternal (NULL);
{ }
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
/***** Show the file browser or works *****/ static void Brw_ShowFileBrowserOrWorksInternal (__attribute__((unused)) void *Args)
Brw_ShowAgainFileBrowserOrWorks (); {
} /***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
/***** Show the file browser or works *****/
Brw_ShowAgainFileBrowserOrWorks ();
} }
/*****************************************************************************/ /*****************************************************************************/

4
swad_file_browser.h
View File

@ -182,7 +182,7 @@ bool Brw_UpdateFoldersAssigmentsIfExistForAllUsrs (const char *OldFolderName,con
void Brw_RemoveFoldersAssignmentsIfExistForAllUsrs (const char *FolderName); void Brw_RemoveFoldersAssignmentsIfExistForAllUsrs (const char *FolderName);
void Brw_GetSelectedUsrsAndShowWorks (void); void Brw_GetSelectedUsrsAndShowWorks (void);
void Brw_ShowFileBrowserOrWorks (void *Args); void Brw_ShowFileBrowserOrWorks (void);
void Brw_ShowAgainFileBrowserOrWorks (void); void Brw_ShowAgainFileBrowserOrWorks (void);
void Brw_RemoveInsFilesFromDB (long InsCod); void Brw_RemoveInsFilesFromDB (long InsCod);
@ -198,7 +198,7 @@ void Brw_RemoveUsrFilesFromDB (long UsrCod);
void Brw_PutHiddenParamFullTreeIfSelected (void *FullTree); void Brw_PutHiddenParamFullTreeIfSelected (void *FullTree);
void Brw_CreateDirDownloadTmp (void); void Brw_CreateDirDownloadTmp (void);
void Brw_AskEditWorksCrs (void *Args); void Brw_AskEditWorksCrs (void);
void Brw_AskRemFileFromTree (void); void Brw_AskRemFileFromTree (void);
void Brw_RemFileFromTree (void); void Brw_RemFileFromTree (void);
void Brw_RemFolderFromTree (void); void Brw_RemFolderFromTree (void);

4
swad_holiday.c
View File

@ -231,7 +231,7 @@ static void Hld_PutIconsSeeHolidays (void *Args)
NULL,NULL); NULL,NULL);
/***** View calendar *****/ /***** View calendar *****/
Cal_PutIconToSeeCalendar (&Gbl); Cal_PutIconToSeeCalendar (NULL);
} }
} }
@ -560,7 +560,7 @@ static void Hld_ListHolidaysForEdition (void)
/***** Begin box and table *****/ /***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Holidays, Box_BoxTableBegin (NULL,Txt_Holidays,
Cal_PutIconToSeeCalendar,&Gbl, Cal_PutIconToSeeCalendar,NULL,
Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2); Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2);
/***** Write heading *****/ /***** Write heading *****/

2
swad_mail.c
View File

@ -1166,7 +1166,7 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail)
"%upx", "%upx",
Rec_RECORD_WIDTH); Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Email, Box_BoxBegin (StrRecordWidth,Txt_Email,
Acc_PutLinkToRemoveMyAccount,&Gbl, Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE); Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change email *****/ /***** Show form to change email *****/

2
swad_nickname.c
View File

@ -248,7 +248,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
"%upx", "%upx",
Rec_RECORD_WIDTH); Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Nickname, Box_BoxBegin (StrRecordWidth,Txt_Nickname,
Acc_PutLinkToRemoveMyAccount,&Gbl, Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE); Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show possible alerts *****/ /***** Show possible alerts *****/

13
swad_search.c
View File

@ -136,7 +136,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
/***** Begin box *****/ /***** Begin box *****/
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Box_BoxBegin (NULL,Txt_Search, Box_BoxBegin (NULL,Txt_Search,
Crs_PutIconToSelectMyCourses,&Gbl, Crs_PutIconToSelectMyCourses,NULL,
Hlp_START_Search,Box_NOT_CLOSABLE); Hlp_START_Search,Box_NOT_CLOSABLE);
/***** Begin form *****/ /***** Begin form *****/
@ -1168,3 +1168,14 @@ static void Sch_SaveLastSearchIntoSession (void)
Gbl.Usrs.Me.UsrDat.UsrCod); Gbl.Usrs.Me.UsrDat.UsrCod);
} }
} }
/*****************************************************************************/
/*************** Write parameters for link to search courses *****************/
/*****************************************************************************/
void Sch_PutLinkToSearchCoursesParams (__attribute__((unused)) void *Args)
{
Sco_PutParamScope ("ScopeSch",Hie_SYS);
Par_PutHiddenParamUnsigned (NULL,"WhatToSearch",(unsigned) Sch_SEARCH_COURSES);
}

2
swad_search.h
View File

@ -83,4 +83,6 @@ bool Sch_BuildSearchQuery (char SearchQuery[Sch_MAX_BYTES_SEARCH_QUERY + 1],
const char *FieldName, const char *FieldName,
const char *CharSet,const char *Collate); const char *CharSet,const char *Collate);
void Sch_PutLinkToSearchCoursesParams (__attribute__((unused)) void *Args);
#endif #endif