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 15.54.1

This commit is contained in:
Antonio Cañas Vargas 2015-12-01 01:09:55 +01:00
parent 271e55d00f
commit d52835d22d
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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.

12
swad_record.c
View File

@ -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 ();
}

4
swad_timetable.c
View File

@ -343,7 +343,7 @@ void TT_EditCrsTimeTable (void)
fprintf (Gbl.F.Out,"</div>");
/***** 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,"</div>");
/***** 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 ();
}