diff --git a/swad_changelog.h b/swad_changelog.h index 639ed9a8..84f5acb5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -178,13 +178,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.71.6 (2016-11-26)" +#define Log_PLATFORM_VERSION "SWAD 16.71.7 (2016-11-26)" #define CSS_FILE "swad16.69.css" #define JS_FILE "swad16.46.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.71.7: Nov 26, 2016 Code refactoring in timetable. (207626 lines) Version 16.71.6: Nov 26, 2016 Selector "Only my groups"/"All groups" only of the course has groups. Code refactoring in timetable. (207619 lines) Version 16.71.5: Nov 26, 2016 Contextual help on course timetable. (207611 lines) diff --git a/swad_timetable.c b/swad_timetable.c index 9f683f3c..56750aff 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -116,6 +116,7 @@ bool TimeTableHoursChecked[TT_HOURS_PER_DAY*2]; static void TT_ShowTimeTableGrpsSelected (void); static void TT_GetParamsTimeTable (void); static void TT_PutContextualIcons (void); +static void TT_PutFormToSelectWhichGroupsToShow (void); static void TT_PutIconToViewCrsTT (void); static void TT_PutIconToViewMyTT (void); @@ -230,12 +231,6 @@ void TT_ShowClassTimeTable (void) Hlp_PROFILE_Timetable, // TT_MY_TIMETABLE NULL, // TT_TUTOR_TIMETABLE }; - Act_Action_t ActSeeTT[TT_NUM_TIMETABLE_TYPES] = - { - ActSeeCrsTT, // TT_COURSE_TIMETABLE - ActSeeMyTT, // TT_MY_TIMETABLE - ActUnk, // TT_TUTOR_TIMETABLE - }; Act_Action_t ActChgTT1stDay[TT_NUM_TIMETABLE_TYPES] = { ActChgCrsTT1stDay,// TT_COURSE_TIMETABLE @@ -292,11 +287,7 @@ void TT_ShowClassTimeTable (void) { /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) - { - Act_FormStart (ActSeeTT[Gbl.TimeTable.Type]); - Grp_ShowSelectorWhichGrps (); - Act_FormEnd (); - } + TT_PutFormToSelectWhichGroupsToShow (); /***** Show form to change first day of week *****/ Cal_ShowFormToSelFirstDayOfWeek (ActChgTT1stDay[Gbl.TimeTable.Type], @@ -341,6 +332,24 @@ static void TT_PutContextualIcons (void) NULL); } +/*****************************************************************************/ +/***************** Put form to select which groups to show *******************/ +/*****************************************************************************/ + +static void TT_PutFormToSelectWhichGroupsToShow (void) + { + Act_Action_t ActSeeTT[TT_NUM_TIMETABLE_TYPES] = + { + ActSeeCrsTT, // TT_COURSE_TIMETABLE + ActSeeMyTT, // TT_MY_TIMETABLE + ActUnk, // TT_TUTOR_TIMETABLE + }; + + Act_FormStart (ActSeeTT[Gbl.TimeTable.Type]); + Grp_ShowSelectorWhichGrps (); + Act_FormEnd (); + } + /*****************************************************************************/ /********************** Show course timetable for edition ********************/ /*****************************************************************************/