mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-14 20:54:06 +02:00
Version 16.73
This commit is contained in:
parent
00fa793e11
commit
5e6ff349cc
|
@ -172,19 +172,18 @@
|
||||||
|
|
||||||
// TODO: List only confirmed emails to send a message with MESSAGES > Email ?
|
// TODO: List only confirmed emails to send a message with MESSAGES > Email ?
|
||||||
|
|
||||||
// TODO: Link "Show office hours" in bold when activated
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.72.2 (2016-11-27)"
|
#define Log_PLATFORM_VERSION "SWAD 16.73 (2016-11-27)"
|
||||||
#define CSS_FILE "swad16.69.css"
|
#define CSS_FILE "swad16.69.css"
|
||||||
#define JS_FILE "swad16.46.1.js"
|
#define JS_FILE "swad16.46.1.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 16.73: Nov 27, 2016 Changes in teacher's record card. (207711 lines)
|
||||||
Version 16.72.2: Nov 27, 2016 Fixed bug in answers of survey. (207704 lines)
|
Version 16.72.2: Nov 27, 2016 Fixed bug in answers of survey. (207704 lines)
|
||||||
Version 16.72.1: Nov 27, 2016 Fixed bug in answers of test questions, reported by Javier Fernández Baldomero. (207704 lines)
|
Version 16.72.1: Nov 27, 2016 Fixed bug in answers of test questions, reported by Javier Fernández Baldomero. (207704 lines)
|
||||||
Version 16.72: Nov 27, 2016 Link to show all users' data.
|
Version 16.72: Nov 27, 2016 Link to show all users' data.
|
||||||
|
|
|
@ -78,7 +78,10 @@ static void Rec_ShowRecordOneTchCrs (void);
|
||||||
|
|
||||||
static void Rec_ShowLinkToPrintPreviewOfRecords (void);
|
static void Rec_ShowLinkToPrintPreviewOfRecords (void);
|
||||||
static void Rec_GetParamRecordsPerPage (void);
|
static void Rec_GetParamRecordsPerPage (void);
|
||||||
static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListUsrCods);
|
static void Rec_WriteFormShowOfficeHoursOneTch (bool ShowOfficeHours);
|
||||||
|
static void Rec_WriteFormShowOfficeHoursSeveralTchs (bool ShowOfficeHours);
|
||||||
|
static void Rec_PutParamsShowOfficeHoursOneTch (void);
|
||||||
|
static void Rec_PutParamsShowOfficeHoursSeveralTchs (void);
|
||||||
static bool Rec_GetParamShowOfficeHours (void);
|
static bool Rec_GetParamShowOfficeHours (void);
|
||||||
static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
|
static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
|
||||||
struct UsrData *UsrDat,const char *Anchor);
|
struct UsrData *UsrDat,const char *Anchor);
|
||||||
|
@ -1229,6 +1232,7 @@ static void Rec_ShowRecordOneTchCrs (void)
|
||||||
extern const char *Hlp_USERS_Teachers_timetable;
|
extern const char *Hlp_USERS_Teachers_timetable;
|
||||||
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
|
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
|
||||||
char Width[10+2+1];
|
char Width[10+2+1];
|
||||||
|
bool ShowOfficeHours;
|
||||||
|
|
||||||
/***** Width for office hours *****/
|
/***** Width for office hours *****/
|
||||||
sprintf (Width,"%upx",Rec_RECORD_WIDTH);
|
sprintf (Width,"%upx",Rec_RECORD_WIDTH);
|
||||||
|
@ -1241,11 +1245,14 @@ static void Rec_ShowRecordOneTchCrs (void)
|
||||||
/***** Asign users listing type depending on current action *****/
|
/***** Asign users listing type depending on current action *****/
|
||||||
Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_TEACHERS;
|
Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_TEACHERS;
|
||||||
|
|
||||||
|
/***** Get if I want to see teachers' office hours in teachers' records *****/
|
||||||
|
ShowOfficeHours = Rec_GetParamShowOfficeHours ();
|
||||||
|
|
||||||
/***** Show contextual menu *****/
|
/***** Show contextual menu *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
|
||||||
/* Show office hours? */
|
/* Show office hours? */
|
||||||
Rec_WriteFormShowOfficeHours (true,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
|
Rec_WriteFormShowOfficeHoursOneTch (ShowOfficeHours);
|
||||||
|
|
||||||
/* Link to print view */
|
/* Link to print view */
|
||||||
Act_FormStart (ActPrnRecSevTch);
|
Act_FormStart (ActPrnRecSevTch);
|
||||||
|
@ -1264,11 +1271,14 @@ static void Rec_ShowRecordOneTchCrs (void)
|
||||||
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
|
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
|
||||||
|
|
||||||
/* Office hours */
|
/* Office hours */
|
||||||
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
|
if (ShowOfficeHours)
|
||||||
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
|
{
|
||||||
NULL,Hlp_USERS_Teachers_timetable);
|
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
|
||||||
TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod);
|
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
|
||||||
Lay_EndRoundFrame ();
|
NULL,Hlp_USERS_Teachers_timetable);
|
||||||
|
TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod);
|
||||||
|
Lay_EndRoundFrame ();
|
||||||
|
}
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
}
|
}
|
||||||
|
@ -1320,7 +1330,7 @@ void Rec_ListRecordsTchs (void)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
|
||||||
/* Show office hours? */
|
/* Show office hours? */
|
||||||
Rec_WriteFormShowOfficeHours (ShowOfficeHours,Gbl.Usrs.Select.All);
|
Rec_WriteFormShowOfficeHoursSeveralTchs (ShowOfficeHours);
|
||||||
|
|
||||||
/* Link to print view */
|
/* Link to print view */
|
||||||
Act_FormStart (ActPrnRecSevTch);
|
Act_FormStart (ActPrnRecSevTch);
|
||||||
|
@ -1433,38 +1443,39 @@ static void Rec_GetParamRecordsPerPage (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/************** Write a form to select whether show full tree ****************/
|
/*********** Write a form to select whether show all office hours ************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListUsrCods)
|
static void Rec_WriteFormShowOfficeHoursOneTch (bool ShowOfficeHours)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassForm[The_NUM_THEMES];
|
|
||||||
extern const char *Txt_Show_office_hours;
|
extern const char *Txt_Show_office_hours;
|
||||||
|
|
||||||
/***** Start form *****/
|
Lay_PutContextualCheckbox (ActSeeRecOneTch,Rec_PutParamsShowOfficeHoursOneTch,
|
||||||
Act_FormStart (ActSeeRecSevTch);
|
"ShowOfficeHours",ShowOfficeHours,
|
||||||
Usr_PutHiddenParUsrCodAll (ActSeeRecSevTch,ListUsrCods);
|
Txt_Show_office_hours,
|
||||||
Par_PutHiddenParamChar ("ParamOfficeHours",'Y');
|
Txt_Show_office_hours);
|
||||||
|
}
|
||||||
|
|
||||||
/***** End form *****/
|
static void Rec_WriteFormShowOfficeHoursSeveralTchs (bool ShowOfficeHours)
|
||||||
fprintf (Gbl.F.Out,"<div style=\"margin:0 6px; display:inline;\">"
|
{
|
||||||
"<input type=\"checkbox\" name=\"ShowOfficeHours\" value=\"Y\"");
|
extern const char *Txt_Show_office_hours;
|
||||||
if (ShowOfficeHours)
|
|
||||||
fprintf (Gbl.F.Out," checked=\"checked\"");
|
Lay_PutContextualCheckbox (ActSeeRecSevTch,Rec_PutParamsShowOfficeHoursSeveralTchs,
|
||||||
fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE\""
|
"ShowOfficeHours",ShowOfficeHours,
|
||||||
" onclick=\"document.getElementById('%s').submit();\" />"
|
Txt_Show_office_hours,
|
||||||
"<img src=\"%s/clock64x64.gif\""
|
Txt_Show_office_hours);
|
||||||
" alt=\"%s\" title=\"%s\""
|
}
|
||||||
" class=\"ICO20x20\" />"
|
|
||||||
"<span class=\"%s\"> %s</span>"
|
static void Rec_PutParamsShowOfficeHoursOneTch (void)
|
||||||
"</div>",
|
{
|
||||||
Gbl.Form.Id,
|
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
|
||||||
Gbl.Prefs.IconsURL,
|
Par_PutHiddenParamChar ("ParamOfficeHours",'Y');
|
||||||
Txt_Show_office_hours,
|
}
|
||||||
Txt_Show_office_hours,
|
|
||||||
The_ClassForm[Gbl.Prefs.Theme],
|
static void Rec_PutParamsShowOfficeHoursSeveralTchs (void)
|
||||||
Txt_Show_office_hours);
|
{
|
||||||
Act_FormEnd ();
|
Usr_PutHiddenParUsrCodAll (ActSeeRecSevTch,Gbl.Usrs.Select.All);
|
||||||
|
Par_PutHiddenParamChar ("ParamOfficeHours",'Y');
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user