From d52835d22d0aca770aea0bc57a4a0c6cecfacafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 1 Dec 2015 01:09:55 +0100 Subject: [PATCH] Version 15.54.1 --- swad_changelog.h | 3 ++- swad_record.c | 12 ++++++++++-- swad_timetable.c | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e0762f53b..e8a723752 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -115,12 +115,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.54 (2015/12/01)" +#define Log_PLATFORM_VERSION "SWAD 15.54.1 (2015/12/01)" #define CSS_FILE "swad15.54.css" // 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 15.54.1: Dec 01, 2015 Some settings related with timetables. (186743 lines) Version 15.54: Dec 01, 2015 Selection of the first day of the week in timetables. (186736 lines) Version 15.53: Nov 30, 2015 Sunday can be the first day of the week in timetable, depending on user's preferences. (186689 lines) Version 15.52: Nov 30, 2015 Timetable now starts at 6 a.m. instead of 7 a.m. diff --git a/swad_record.c b/swad_record.c index b7a2c4344..b13d3eb23 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1153,6 +1153,10 @@ void Rec_GetUsrAndShowRecordOneTchCrs (void) static void Rec_ShowRecordOneTchCrs (void) { extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES]; + char Width[10+2+1]; + + /***** Width for office hours *****/ + sprintf (Width,"%upx",Rec_RECORD_WIDTH_WIDE); /***** Get if teacher has accepted enrollment in current course *****/ Gbl.Usrs.Other.UsrDat.Accepted = Usr_CheckIfUsrBelongsToCrs (Gbl.Usrs.Other.UsrDat.UsrCod, @@ -1185,7 +1189,7 @@ static void Rec_ShowRecordOneTchCrs (void) Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /* Office hours */ - Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); + Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod); Lay_EndRoundFrame (); @@ -1206,6 +1210,10 @@ void Rec_ListRecordsTchs (void) Rec_RECORD_PRINT; struct UsrData UsrDat; bool ShowOfficeHours; + char Width[10+2+1]; + + /***** Width for office hours *****/ + sprintf (Width,"%upx",Rec_RECORD_WIDTH_WIDE); /***** Asign users listing type depending on current action *****/ Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_TEACHERS; @@ -1281,7 +1289,7 @@ void Rec_ListRecordsTchs (void) /* Office hours */ if (ShowOfficeHours) { - Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); + Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod); Lay_EndRoundFrame (); } diff --git a/swad_timetable.c b/swad_timetable.c index 5bd147352..a5a155b36 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -343,7 +343,7 @@ void TT_EditCrsTimeTable (void) fprintf (Gbl.F.Out,""); /***** Editable time table *****/ - Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]); + Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]); TT_ShowTimeTable (TT_COURSE_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod); Lay_EndRoundFrame (); } @@ -363,7 +363,7 @@ void TT_ShowMyTutTimeTable (void) fprintf (Gbl.F.Out,""); /***** Time table *****/ - Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); + Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod); Lay_EndRoundFrame (); }