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

Version 16.71.6

This commit is contained in:
Antonio Cañas Vargas 2016-11-26 22:02:42 +01:00
parent 797c89e71a
commit a8a27fad8f
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -178,13 +178,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.71.5 (2016-11-26)"
#define Log_PLATFORM_VERSION "SWAD 16.71.6 (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.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)
Version 16.71.4: Nov 26, 2016 Contextual help on user's timetable. (207607 lines)
Version 16.71.3: Nov 26, 2016 Change in layout of notifications. (207597 lines)

35
swad_timetable.c
View File

@ -116,7 +116,6 @@ 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_ShowSelectorWhichGrps (Act_Action_t Action);
static void TT_PutIconToViewCrsTT (void);
static void TT_PutIconToViewMyTT (void);
@ -231,6 +230,18 @@ 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
ActChgMyTT1stDay, // TT_MY_TIMETABLE
ActUnk, // TT_TUTOR_TIMETABLE
};
bool PrintView = (Gbl.Action.Act == ActPrnCrsTT ||
Gbl.Action.Act == ActPrnMyTT);;
@ -280,12 +291,15 @@ void TT_ShowClassTimeTable (void)
else
{
/***** Select whether show only my groups or all groups *****/
TT_ShowSelectorWhichGrps (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActSeeCrsTT :
ActSeeMyTT);
if (Gbl.CurrentCrs.Grps.NumGrps)
{
Act_FormStart (ActSeeTT[Gbl.TimeTable.Type]);
Grp_ShowSelectorWhichGrps ();
Act_FormEnd ();
}
/***** Show form to change first day of week *****/
Cal_ShowFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay :
ActChgMyTT1stDay,
Cal_ShowFormToSelFirstDayOfWeek (ActChgTT1stDay[Gbl.TimeTable.Type],
"ICO25x25");
}
@ -327,17 +341,6 @@ static void TT_PutContextualIcons (void)
NULL);
}
/*****************************************************************************/
/************* Select whether show only my groups or all groups **************/
/*****************************************************************************/
static void TT_ShowSelectorWhichGrps (Act_Action_t Action)
{
Act_FormStart (Action);
Grp_ShowSelectorWhichGrps ();
Act_FormEnd ();
}
/*****************************************************************************/
/********************** Show course timetable for edition ********************/
/*****************************************************************************/