diff --git a/swad_ID.c b/swad_ID.c index 29b3286c..437060a9 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -296,7 +296,8 @@ void ID_GetParamOtherUsrIDPlain (void) ID_ReallocateListIDs (&Gbl.Usrs.Other.UsrDat,1); /***** Get parameter *****/ - Par_GetParToText ("OtherUsrID",Gbl.Usrs.Other.UsrDat.IDs.List[0].ID,ID_MAX_LENGTH_USR_ID); + Par_GetParToText ("OtherUsrID",Gbl.Usrs.Other.UsrDat.IDs.List[0].ID, + ID_MAX_LENGTH_USR_ID); // Users' IDs are always stored internally in capitals and without leading zeros Str_RemoveLeadingZeros (Gbl.Usrs.Other.UsrDat.IDs.List[0].ID); Str_ConvertToUpperText (Gbl.Usrs.Other.UsrDat.IDs.List[0].ID); diff --git a/swad_agenda.c b/swad_agenda.c index d90af5ae..0ffceab7 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -90,7 +90,7 @@ static void Agd_PutIconsOtherPublicAgenda (void); static void Agd_PutButtonToCreateNewEvent (void); static void Agd_PutParamsToCreateNewEvent (void); static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod); -static void Agd_GetParamEventOrderType (void); +static void Agd_GetParamEventOrder (void); static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent); static void Agd_PutParams (void); @@ -279,7 +279,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) }; /***** Get parameters *****/ - Agd_GetParamEventOrderType (); + Agd_GetParamEventOrder (); Pag_GetParamPagNum (WhatPaginate[AgendaType]); /***** Get list of events *****/ @@ -342,7 +342,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType) unsigned NumEvent; /***** Get parameters *****/ - Agd_GetParamEventOrderType (); + Agd_GetParamEventOrder (); /***** Get list of events *****/ Agd_GetListEvents (AgendaType); @@ -424,10 +424,10 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); - if (Order == Gbl.Agenda.SelectedOrderType) + if (Order == Gbl.Agenda.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); - if (Order == Gbl.Agenda.SelectedOrderType) + if (Order == Gbl.Agenda.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); @@ -567,7 +567,7 @@ static void Agd_PutButtonToCreateNewEvent (void) static void Agd_PutParamsToCreateNewEvent (void) { - Agd_PutHiddenParamEventsOrderType (); + Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -691,20 +691,16 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod) /********** Get parameter with the type or order in list of events ***********/ /*****************************************************************************/ -static void Agd_GetParamEventOrderType (void) +static void Agd_GetParamEventOrder (void) { - char UnsignedStr[10 + 1]; - unsigned UnsignedNum; static bool AlreadyGot = false; if (!AlreadyGot) { - Par_GetParToText ("Order",UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) - Gbl.Agenda.SelectedOrderType = (Agd_Order_t) UnsignedNum; - else - Gbl.Agenda.SelectedOrderType = Agd_DEFAULT_ORDER_TYPE; - + Gbl.Agenda.SelectedOrder = (Agd_Order_t) Par_GetParToUnsigned ("Order", + (unsigned) Agd_ORDER_BY_START_DATE, + (unsigned) Agd_ORDER_BY_END_DATE, + (unsigned) Agd_ORDER_DEFAULT); AlreadyGot = true; } } @@ -713,9 +709,9 @@ static void Agd_GetParamEventOrderType (void) /****** Put a hidden parameter with the type of order in list of events ******/ /*****************************************************************************/ -void Agd_PutHiddenParamEventsOrderType (void) +void Agd_PutHiddenParamEventsOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Agenda.SelectedOrderType); + Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Agenda.SelectedOrder); } /*****************************************************************************/ @@ -777,7 +773,7 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent) static void Agd_PutParams (void) { Agd_PutParamAgdCod (Gbl.Agenda.AgdCodToEdit); - Agd_PutHiddenParamEventsOrderType (); + Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -798,7 +794,7 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType) Agd_FreeListEvents (); /***** Get list of events from database *****/ - switch (Gbl.Agenda.SelectedOrderType) + switch (Gbl.Agenda.SelectedOrder) { case Agd_ORDER_BY_START_DATE: sprintf (OrderBySubQuery,"StartTime," @@ -1054,7 +1050,7 @@ void Agd_AskRemEvent (void) struct AgendaEvent AgdEvent; /***** Get parameters *****/ - Agd_GetParamEventOrderType (); + Agd_GetParamEventOrder (); Pag_GetParamPagNum (Pag_MY_FULL_AGENDA); /***** Get event code *****/ @@ -1068,7 +1064,7 @@ void Agd_AskRemEvent (void) /***** Button of confirmation of removing *****/ Act_FormStart (ActRemEvtMyAgd); Agd_PutParamAgdCod (AgdEvent.AgdCod); - Agd_PutHiddenParamEventsOrderType (); + Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); /***** Ask for confirmation of removing *****/ @@ -1265,7 +1261,7 @@ void Agd_RequestCreatOrEditEvent (void) char Txt[Cns_MAX_BYTES_TEXT + 1]; /***** Get parameters *****/ - Agd_GetParamEventOrderType (); + Agd_GetParamEventOrder (); Pag_GetParamPagNum (Pag_MY_FULL_AGENDA); /***** Get the code of the event *****/ @@ -1300,7 +1296,7 @@ void Agd_RequestCreatOrEditEvent (void) Act_FormStart (ActChgEvtMyAgd); Agd_PutParamAgdCod (AgdEvent.AgdCod); } - Agd_PutHiddenParamEventsOrderType (); + Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); /***** Table start *****/ diff --git a/swad_agenda.h b/swad_agenda.h index b2ecf9fb..1112e33b 100644 --- a/swad_agenda.h +++ b/swad_agenda.h @@ -67,8 +67,7 @@ typedef enum Agd_ORDER_BY_START_DATE = 0, Agd_ORDER_BY_END_DATE = 1, } Agd_Order_t; - -#define Agd_DEFAULT_ORDER_TYPE Agd_ORDER_BY_START_DATE +#define Agd_ORDER_DEFAULT Agd_ORDER_BY_START_DATE /*****************************************************************************/ /***************************** Public prototypes *****************************/ @@ -82,7 +81,7 @@ void Agd_ShowMyPublicAgenda (void); void Agd_ShowUsrAgenda (void); void Agd_ShowOtherAgendaAfterLogIn (void); -void Agd_PutHiddenParamEventsOrderType (void); +void Agd_PutHiddenParamEventsOrder (void); void Agd_RequestCreatOrEditEvent (void); void Agd_FreeListEvents (void); diff --git a/swad_assignment.c b/swad_assignment.c index fc22544e..e72c5aea 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -73,7 +73,7 @@ static void Asg_ParamsWhichGroupsToShow (void); static void Asg_ShowOneAssignment (long AsgCod); static void Asg_WriteAsgAuthor (struct Assignment *Asg); static void Asg_WriteAssignmentFolder (struct Assignment *Asg); -static void Asg_GetParamAsgOrderType (void); +static void Asg_GetParamAsgOrder (void); static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden); static void Asg_PutParams (void); @@ -99,7 +99,7 @@ static bool Asg_CheckIfIBelongToCrsOrGrpsThisAssignment (long AsgCod); void Asg_SeeAssignments (void) { /***** Get parameters *****/ - Asg_GetParamAsgOrderType (); + Asg_GetParamAsgOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ASSIGNMENTS); @@ -161,10 +161,10 @@ static void Asg_ShowAllAssignments (void) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); - if (Order == Gbl.Asgs.SelectedOrderType) + if (Order == Gbl.Asgs.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); - if (Order == Gbl.Asgs.SelectedOrderType) + if (Order == Gbl.Asgs.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); @@ -271,7 +271,7 @@ static void Asg_PutButtonToCreateNewAsg (void) static void Asg_PutParamsToCreateNewAsg (void) { - Asg_PutHiddenParamAsgOrderType (); + Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -289,7 +289,7 @@ static void Asg_PutFormToSelectWhichGroupsToShow (void) static void Asg_ParamsWhichGroupsToShow (void) { - Asg_PutHiddenParamAsgOrderType (); + Asg_PutHiddenParamAsgOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -521,25 +521,21 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg) /******* Get parameter with the type or order in list of assignments *********/ /*****************************************************************************/ -static void Asg_GetParamAsgOrderType (void) +static void Asg_GetParamAsgOrder (void) { - char UnsignedStr[10 + 1]; - unsigned UnsignedNum; - - Par_GetParToText ("Order",UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) - Gbl.Asgs.SelectedOrderType = (Dat_StartEndTime_t) UnsignedNum; - else - Gbl.Asgs.SelectedOrderType = Asg_DEFAULT_ORDER_TYPE; + Gbl.Asgs.SelectedOrder = (Dat_StartEndTime_t) Par_GetParToUnsigned ("Order", + (unsigned) Dat_START_TIME, + (unsigned) Dat_END_TIME, + (unsigned) Asg_ORDER_DEFAULT); } /*****************************************************************************/ /*** Put a hidden parameter with the type of order in list of assignments ****/ /*****************************************************************************/ -void Asg_PutHiddenParamAsgOrderType (void) +void Asg_PutHiddenParamAsgOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Asgs.SelectedOrderType); + Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Asgs.SelectedOrder); } /*****************************************************************************/ @@ -591,7 +587,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) static void Asg_PutParams (void) { Asg_PutParamAsgCod (Gbl.Asgs.AsgCodToEdit); - Asg_PutHiddenParamAsgOrderType (); + Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -624,7 +620,7 @@ void Asg_GetListAssignments (void) sprintf (HiddenSubQuery,"AND Hidden='N'"); break; } - switch (Gbl.Asgs.SelectedOrderType) + switch (Gbl.Asgs.SelectedOrder) { case Dat_START_TIME: sprintf (OrderBySubQuery,"StartTime DESC,EndTime DESC,Title DESC"); @@ -944,7 +940,7 @@ void Asg_ReqRemAssignment (void) struct Assignment Asg; /***** Get parameters *****/ - Asg_GetParamAsgOrderType (); + Asg_GetParamAsgOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ASSIGNMENTS); @@ -958,7 +954,7 @@ void Asg_ReqRemAssignment (void) /***** Button of confirmation of removing *****/ Act_FormStart (ActRemAsg); Asg_PutParamAsgCod (Asg.AsgCod); - Asg_PutHiddenParamAsgOrderType (); + Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -1116,7 +1112,7 @@ void Asg_RequestCreatOrEditAsg (void) char Txt[Cns_MAX_BYTES_TEXT + 1]; /***** Get parameters *****/ - Asg_GetParamAsgOrderType (); + Asg_GetParamAsgOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ASSIGNMENTS); @@ -1153,7 +1149,7 @@ void Asg_RequestCreatOrEditAsg (void) Act_FormStart (ActChgAsg); Asg_PutParamAsgCod (Asg.AsgCod); } - Asg_PutHiddenParamAsgOrderType (); + Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); diff --git a/swad_assignment.h b/swad_assignment.h index 88ae253c..0db00cad 100644 --- a/swad_assignment.h +++ b/swad_assignment.h @@ -61,14 +61,14 @@ struct Assignment // I belong to any of the groups) }; -#define Asg_DEFAULT_ORDER_TYPE Dat_START_TIME +#define Asg_ORDER_DEFAULT Dat_START_TIME /*****************************************************************************/ /***************************** Public prototypes *****************************/ /*****************************************************************************/ void Asg_SeeAssignments (void); -void Asg_PutHiddenParamAsgOrderType (void); +void Asg_PutHiddenParamAsgOrder (void); void Asg_RequestCreatOrEditAsg (void); void Asg_GetListAssignments (void); void Asg_GetDataOfAssignmentByCod (struct Assignment *Asg); diff --git a/swad_attendance.c b/swad_attendance.c index 9eeb0608..0409a06e 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -78,7 +78,7 @@ static void Att_PutButtonToCreateNewAttEvent (void); static void Att_PutParamsToCreateNewAttEvent (void); static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAttEventComplete); static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att); -static void Att_GetParamAttOrderType (void); +static void Att_GetParamAttOrder (void); static void Att_PutFormToListMyAttendance (void); static void Att_PutFormToListStdsAttendance (void); @@ -146,7 +146,7 @@ void Att_SeeAttEvents (void) char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1]; /***** Get parameters *****/ - Att_GetParamAttOrderType (); + Att_GetParamAttOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ATT_EVENTS); @@ -243,10 +243,10 @@ static void Att_ShowAllAttEvents (void) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); - if (Order == Gbl.AttEvents.SelectedOrderType) + if (Order == Gbl.AttEvents.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); - if (Order == Gbl.AttEvents.SelectedOrderType) + if (Order == Gbl.AttEvents.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Act_FormEnd (); @@ -302,7 +302,7 @@ static void Att_PutFormToSelectWhichGroupsToShow (void) static void Att_ParamsWhichGroupsToShow (void) { - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -341,7 +341,7 @@ static void Att_PutButtonToCreateNewAttEvent (void) static void Att_PutParamsToCreateNewAttEvent (void) { - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -520,25 +520,21 @@ static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att) /**** Get parameter with the type or order in list of attendance events ******/ /*****************************************************************************/ -static void Att_GetParamAttOrderType (void) +static void Att_GetParamAttOrder (void) { - char UnsignedStr[10 + 1]; - unsigned UnsignedNum; - - Par_GetParToText ("Order",UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) - Gbl.AttEvents.SelectedOrderType = (Dat_StartEndTime_t) UnsignedNum; - else - Gbl.AttEvents.SelectedOrderType = Att_DEFAULT_ORDER_TYPE; + Gbl.AttEvents.SelectedOrder = (Dat_StartEndTime_t) Par_GetParToUnsigned ("Order", + (unsigned) Dat_START_TIME, + (unsigned) Dat_END_TIME, + (unsigned) Att_ORDER_DEFAULT); } /*****************************************************************************/ /*** Put a hidden parameter with the type of order in list of att. events ****/ /*****************************************************************************/ -void Att_PutHiddenParamAttOrderType (void) +void Att_PutHiddenParamAttOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.AttEvents.SelectedOrderType); + Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.AttEvents.SelectedOrder); } /*****************************************************************************/ @@ -571,7 +567,7 @@ static void Att_PutFormToListStdsAttendance (void) static void Att_PutFormToListStdsParams (void) { - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -624,7 +620,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden) static void Att_PutParams (void) { Att_PutParamAttCod (Gbl.AttEvents.AttCodToEdit); - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); } @@ -657,7 +653,7 @@ static void Att_GetListAttEvents (Att_OrderTime_t Order) sprintf (HiddenSubQuery,"AND Hidden='N'"); break; } - switch (Gbl.AttEvents.SelectedOrderType) + switch (Gbl.AttEvents.SelectedOrder) { case Dat_START_TIME: if (Order == Att_NEWEST_FIRST) @@ -908,7 +904,7 @@ void Att_AskRemAttEvent (void) struct AttendanceEvent Att; /***** Get parameters *****/ - Att_GetParamAttOrderType (); + Att_GetParamAttOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ATT_EVENTS); @@ -922,7 +918,7 @@ void Att_AskRemAttEvent (void) /***** Button of confirmation of removing *****/ Act_FormStart (ActRemAtt); Att_PutParamAttCod (Att.AttCod); - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -1083,7 +1079,7 @@ void Att_RequestCreatOrEditAttEvent (void) char Txt[Cns_MAX_BYTES_TEXT + 1]; /***** Get parameters *****/ - Att_GetParamAttOrderType (); + Att_GetParamAttOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ATT_EVENTS); @@ -1122,7 +1118,7 @@ void Att_RequestCreatOrEditAttEvent (void) Act_FormStart (ActChgAtt); Att_PutParamAttCod (Att.AttCod); } - Att_PutHiddenParamAttOrderType (); + Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -1845,7 +1841,7 @@ void Att_SeeOneAttEvent (void) Lay_ShowErrorAndExit ("Code of attendance event is missing."); /***** Get parameters *****/ - Att_GetParamAttOrderType (); + Att_GetParamAttOrder (); Grp_GetParamWhichGrps (); Pag_GetParamPagNum (Pag_ATT_EVENTS); diff --git a/swad_attendance.h b/swad_attendance.h index 81b83b71..bf29fa9e 100644 --- a/swad_attendance.h +++ b/swad_attendance.h @@ -67,14 +67,14 @@ typedef enum Att_OLDEST_FIRST, } Att_OrderTime_t; -#define Att_DEFAULT_ORDER_TYPE Dat_START_TIME +#define Att_ORDER_DEFAULT Dat_START_TIME /*****************************************************************************/ /***************************** Public prototypes *****************************/ /*****************************************************************************/ void Att_SeeAttEvents (void); -void Att_PutHiddenParamAttOrderType (void); +void Att_PutHiddenParamAttOrder (void); void Att_RequestCreatOrEditAttEvent (void); bool Att_GetDataOfAttEventByCod (struct AttendanceEvent *Att); void Att_FreeListAttEvents (void); diff --git a/swad_calendar.c b/swad_calendar.c index 099c0eef..b76d1637 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -160,14 +160,12 @@ void Cal_ChangeFirstDayOfWeek (void) static unsigned Cal_GetParamFirstDayOfWeek (void) { - char UnsignedStr[10 + 1]; - unsigned UnsignedNum; - unsigned FirstDayOfWeek = Cal_FIRST_DAY_OF_WEEK_DEFAULT; + unsigned FirstDayOfWeek; - Par_GetParToText ("FirstDayOfWeek",UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) - if (Cal_DayIsValidAsFirstDayOfWeek[UnsignedNum]) - FirstDayOfWeek = UnsignedNum; + FirstDayOfWeek = Par_GetParToUnsigned ("FirstDayOfWeek",0,6, + Cal_FIRST_DAY_OF_WEEK_DEFAULT); + if (!Cal_DayIsValidAsFirstDayOfWeek[FirstDayOfWeek]) + FirstDayOfWeek = Cal_FIRST_DAY_OF_WEEK_DEFAULT; return FirstDayOfWeek; } @@ -184,7 +182,7 @@ void Cal_DrawCurrentMonth (void) /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) { - Gbl.Hlds.SelectedOrderType = Hld_ORDER_BY_START_DATE; + Gbl.Hlds.SelectedOrder = Hld_ORDER_BY_START_DATE; Hld_GetListHolidays (); } @@ -240,7 +238,7 @@ void Cal_DrawCalendar (void) /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) { - Gbl.Hlds.SelectedOrderType = Hld_ORDER_BY_START_DATE; + Gbl.Hlds.SelectedOrder = Hld_ORDER_BY_START_DATE; Hld_GetListHolidays (); } diff --git a/swad_centre.c b/swad_centre.c index a70e312e..c8d9ba51 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -85,7 +85,7 @@ static bool Ctr_CheckIfICanCreateCentres (void); static void Ctr_PutIconsListCentres (void); static void Ctr_PutIconToEditCentres (void); static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr); -static void Ctr_GetParamCtrOrderType (void); +static void Ctr_GetParamCtrOrder (void); static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution); static void Ctr_FreePhotoAttribution (char **PhotoAttribution); static void Ctr_ListCentresForEdition (void); @@ -718,7 +718,7 @@ void Ctr_ShowCtrsOfCurrentIns (void) if (Gbl.CurrentIns.Ins.InsCod > 0) { /***** Get parameter with the type of order in the list of centres *****/ - Ctr_GetParamCtrOrderType (); + Ctr_GetParamCtrOrder (); /***** Get list of centres *****/ Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod); @@ -916,16 +916,12 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) /********** Get parameter with the type or order in list of centres **********/ /*****************************************************************************/ -static void Ctr_GetParamCtrOrderType (void) +static void Ctr_GetParamCtrOrder (void) { - char UnsignedStr[10 + 1]; - unsigned UnsignedNum; - - Par_GetParToText ("Order",UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) - Gbl.Ctrs.SelectedOrderType = (tCtrsOrderType) UnsignedNum; - else - Gbl.Ctrs.SelectedOrderType = Ctr_DEFAULT_ORDER_TYPE; + Gbl.Ctrs.SelectedOrder = (Ctr_Order_t) Par_GetParToUnsigned ("Order", + (unsigned) Ctr_ORDER_BY_CENTRE, + (unsigned) Ctr_ORDER_BY_NUM_TCHS, + (unsigned) Ctr_ORDER_DEFAULT); } /*****************************************************************************/ @@ -971,7 +967,7 @@ void Ctr_GetListCentres (long InsCod) struct Centre *Ctr; /***** Get centres from database *****/ - switch (Gbl.Ctrs.SelectedOrderType) + switch (Gbl.Ctrs.SelectedOrder) { case Ctr_ORDER_BY_CENTRE: sprintf (OrderBySubQuery,"FullName"); @@ -2073,7 +2069,6 @@ void Ctr_ChangeCtrStatus (void) extern const char *Txt_The_status_of_the_centre_X_has_changed; struct Centre *Ctr; char Query[256]; - char UnsignedNum[10 + 1]; Ctr_Status_t Status; Ctr_StatusTxt_t StatusTxt; @@ -2084,8 +2079,9 @@ void Ctr_ChangeCtrStatus (void) Ctr->CtrCod = Ctr_GetAndCheckParamOtherCtrCod (); /* Get parameter with status */ - Par_GetParToText ("Status",UnsignedNum,1); - if (sscanf (UnsignedNum,"%u",&Status) != 1) + Status = (Ctr_Status_t) Par_GetParToUnsigned ("Status",0,UINT_MAX, + (unsigned) Ctr_WRONG_STATUS); + if (Status == Ctr_WRONG_STATUS) Lay_ShowErrorAndExit ("Wrong status."); StatusTxt = Ctr_GetStatusTxtFromStatusBits (Status); Status = Ctr_GetStatusBitsFromStatusTxt (StatusTxt); // New status @@ -2516,7 +2512,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; extern const char *Txt_Status; - tCtrsOrderType Order; + Ctr_Order_t Order; fprintf (Gbl.F.Out,"