mirror of https://github.com/acanas/swad-core.git
Version 16.71.4
This commit is contained in:
parent
fcc432367c
commit
792f11274b
|
@ -2840,8 +2840,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActPrnUsrQR */{1022,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,QR_PrintQRCode ,NULL},
|
||||
|
||||
/* ActPrnMyTT */{ 409,-1,TabUnk,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,TT_ShowClassTimeTable ,NULL},
|
||||
/* ActEdiTut */{ 65,-1,TabUnk,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowMyTutTimeTable ,NULL},
|
||||
/* ActChgTut */{ 48,-1,TabUnk,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowMyTutTimeTable ,NULL},
|
||||
/* ActEdiTut */{ 65,-1,TabUnk,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_EditMyTutTimeTable ,NULL},
|
||||
/* ActChgTut */{ 48,-1,TabUnk,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_EditMyTutTimeTable ,NULL},
|
||||
/* ActChgMyTT1stDay */{1487,-1,TabUnk,ActSeeMyTT ,0x1FF,0x1FF,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Cal_ChangeFirstDayOfWeek ,TT_ShowClassTimeTable ,NULL},
|
||||
|
||||
/* ActReqRemFilBrf */{ 286,-1,TabUnk,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Brw_AskRemFileFromTree ,NULL},
|
||||
|
|
|
@ -178,13 +178,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.71.3 (2016-11-26)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.71.4 (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.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)
|
||||
Version 16.71.2: Nov 25, 2016 Fix bug in shared record card. (207569 lines)
|
||||
Version 16.71.1: Nov 25, 2016 Contextual help on test results. (207568 lines)
|
||||
|
|
|
@ -185,6 +185,8 @@ const char *Hlp_PROFILE_Password = WIKI "PROFILE.Password";
|
|||
|
||||
const char *Hlp_PROFILE_Courses = WIKI "PROFILE.Courses";
|
||||
|
||||
const char *Hlp_PROFILE_Timetable = WIKI "PROFILE.Timetable";
|
||||
|
||||
const char *Hlp_PROFILE_Record = WIKI "PROFILE.Record";
|
||||
const char *Hlp_PROFILE_Institution = WIKI "PROFILE.Institution";
|
||||
const char *Hlp_PROFILE_Webs = WIKI "PROFILE.Webs";
|
||||
|
|
|
@ -351,7 +351,7 @@ void Ntf_ShowMyNotifications (void)
|
|||
/* Write form to show all notifications */
|
||||
Ntf_WriteFormAllNotifications (AllNotifications);
|
||||
|
||||
if (NumNotifications)
|
||||
if (NumNotifications) // TODO: Show message only when I don't have notificacions at all
|
||||
/* Put form to change notification preferences */
|
||||
Lay_PutContextualLink (ActMrkNtfSee,NULL,
|
||||
"eye-on64x64.png",
|
||||
|
|
|
@ -222,7 +222,14 @@ static void TT_GetParamsTimeTable (void)
|
|||
|
||||
void TT_ShowClassTimeTable (void)
|
||||
{
|
||||
extern const char *Hlp_PROFILE_Timetable;
|
||||
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
|
||||
const char *Help[TT_NUM_TIMETABLE_TYPES] =
|
||||
{
|
||||
NULL, // TT_COURSE_TIMETABLE
|
||||
Hlp_PROFILE_Timetable, // TT_MY_TIMETABLE
|
||||
NULL, // TT_TUTOR_TIMETABLE
|
||||
};
|
||||
bool PrintView = (Gbl.Action.Act == ActPrnCrsTT ||
|
||||
Gbl.Action.Act == ActPrnMyTT);;
|
||||
|
||||
|
@ -259,7 +266,7 @@ void TT_ShowClassTimeTable (void)
|
|||
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
|
||||
Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons :
|
||||
NULL,
|
||||
NULL);
|
||||
Help[Gbl.TimeTable.Type]);
|
||||
|
||||
/***** Start time table drawing *****/
|
||||
if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE)
|
||||
|
@ -350,14 +357,15 @@ void TT_EditCrsTimeTable (void)
|
|||
/********************* Show tutor timetable for edition **********************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void TT_ShowMyTutTimeTable (void)
|
||||
void TT_EditMyTutTimeTable (void)
|
||||
{
|
||||
extern const char *Hlp_PROFILE_Timetable;
|
||||
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
|
||||
|
||||
/***** Time table *****/
|
||||
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
|
||||
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
|
||||
TT_PutIconToViewMyTT,NULL);
|
||||
TT_PutIconToViewMyTT,Hlp_PROFILE_Timetable);
|
||||
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
|
@ -372,7 +380,7 @@ static void TT_PutIconToViewCrsTT (void)
|
|||
|
||||
/***** Link (form) to see course timetable *****/
|
||||
Lay_PutContextualLink (ActSeeCrsTT,NULL,
|
||||
"clock64x64.gif",
|
||||
"eye-on64x64.png",
|
||||
Txt_Show_timetable,NULL,
|
||||
NULL);
|
||||
}
|
||||
|
@ -387,7 +395,7 @@ static void TT_PutIconToViewMyTT (void)
|
|||
|
||||
/***** Link (form) to see my timetable *****/
|
||||
Lay_PutContextualLink (ActSeeMyTT,NULL,
|
||||
"clock64x64.gif",
|
||||
"eye-on64x64.png",
|
||||
Txt_Show_timetable,NULL,
|
||||
NULL);
|
||||
}
|
||||
|
|
|
@ -66,7 +66,7 @@ typedef enum
|
|||
|
||||
void TT_ShowClassTimeTable (void);
|
||||
void TT_EditCrsTimeTable (void);
|
||||
void TT_ShowMyTutTimeTable (void);
|
||||
void TT_EditMyTutTimeTable (void);
|
||||
void TT_ShowTimeTable (long UsrCod);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue