Version 16.86.2

This commit is contained in:
Antonio Cañas Vargas 2016-12-04 12:42:45 +01:00
parent bdb9ab0bf9
commit 8978adb95c
4 changed files with 13 additions and 5 deletions

View File

@ -77,7 +77,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
Lay_StartRoundFrame (NULL,Txt_Calendar,
Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar);
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICO40x40B");
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO40x40B");
Lay_EndRoundFrame ();
}
@ -96,7 +96,8 @@ static void Cal_PutIconsFirstDayOfWeek (void)
/************** Show form to select the first day of the week ****************/
/*****************************************************************************/
void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon)
void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (),
const char *ClassIcon)
{
extern const char *Txt_First_day_of_the_week;
extern const char *Txt_DAYS_SMALL[7];
@ -114,6 +115,8 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon)
"PREF_OFF");
Act_FormStart (Action);
Par_PutHiddenParamUnsigned ("FirstDayOfWeek",FirstDayOfWeek);
if (FuncParams) // Extra parameters depending on the action
FuncParams ();
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/first-day-of-week-%u-64x64.png\""
" alt=\"%s\" title=\"%s: %s\" class=\"%s\""
" style=\"margin:0 auto;\" />",
@ -255,7 +258,7 @@ void Cal_DrawCalendar (void)
/***** Draw several months *****/
/* Show form to change first day of week */
if (!PrintView)
Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,"ICO25x25");
Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,NULL,"ICO25x25");
/* JavaScript will write HTML here */
fprintf (Gbl.F.Out,"<div id=\"calendar\">"

View File

@ -44,7 +44,8 @@
/*****************************************************************************/
void Cal_PutIconsToSelectFirstDayOfWeek (void);
void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon);
void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (),
const char *ClassIcon);
void Cal_ChangeFirstDayOfWeek (void);
void Cal_DrawCurrentMonth (void);

View File

@ -190,6 +190,7 @@
// 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.86.2: Dec 04, 2016 Fixed bugs in my timetable. (209814 lines)
Version 16.86.1: Dec 04, 2016 New action to show another user's agenda after log in. (209806 lines)
4 changes necessary in database:
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1612','es','N','Ocultar evento agenda');

View File

@ -286,11 +286,14 @@ void TT_ShowClassTimeTable (void)
else
{
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
if ( Gbl.TimeTable.Type == TT_MY_TIMETABLE ||
(Gbl.TimeTable.Type == TT_COURSE_TIMETABLE &&
Gbl.CurrentCrs.Grps.NumGrps))
TT_PutFormToSelectWhichGroupsToShow ();
/***** Show form to change first day of week *****/
Cal_ShowFormToSelFirstDayOfWeek (ActChgTT1stDay[Gbl.TimeTable.Type],
Grp_PutParamWhichGrps,
"ICO25x25");
}