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 16.86.2

This commit is contained in:
Antonio Cañas Vargas 2016-12-05 23:13:58 +01:00
parent 986a48d830
commit 820a6779e6
4 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_action.c
View File

@ -2786,8 +2786,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
/* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"hierarchy64x64.png" },
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
// /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, // TODO: Remove when debugged
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
// /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, // TODO: Remove when debugged
/* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },

21
swad_agenda.c
View File

@ -72,6 +72,7 @@ typedef enum
static void Agd_ShowEvents (Agd_AgendaType_t AgendaType);
static void Agd_PutIconToViewEditMyAgenda (void);
static void Agd_PutIconsListEvents (void);
static void Agd_PutIconToCreateNewEvent (void);
static void Agd_PutIconToShowQR (void);
@ -185,6 +186,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
extern const char *Txt_Event;
extern const char *Txt_Location;
extern const char *Txt_No_events;
bool ItsMe;
Agd_Order_t Order;
struct Pagination Pagination;
unsigned NumEvent;
@ -216,8 +218,10 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
case Agd_USR_AGENDA:
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName);
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_StartRoundFrame ("100%",Gbl.Title,
NULL,
ItsMe ? Agd_PutIconToViewEditMyAgenda :
NULL,
Hlp_PROFILE_Agenda); // TODO: Change
break;
case Agd_MY_AGENDA:
@ -314,6 +318,21 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
Agd_FreeListEvents ();
}
/*****************************************************************************/
/*************** Put contextual icon to view/edit my agenda ******************/
/*****************************************************************************/
static void Agd_PutIconToViewEditMyAgenda (void)
{
extern const char *Txt_Edit;
/***** Put icon to view/edit my agenda *****/
Lay_PutContextualLink (ActSeeMyAgd,NULL,
"edit64x64.png",
Txt_Edit,NULL,
NULL);
}
/*****************************************************************************/
/***************** Put contextual icons in list of events ********************/
/*****************************************************************************/

13
swad_changelog.h
View File

@ -179,18 +179,21 @@
// TODO: When teacher sees "No hay estudiantes", put a button to add students
// TODO: When admin sees "No hay profesores", put a button to add teachers
// TODO: Do not show hidden events of my agenda when selected "Only public events"
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.87.1 (2016-12-05)"
#define Log_PLATFORM_VERSION "SWAD 16.87.2 (2016-12-05)"
#define CSS_FILE "swad16.86.5.css"
#define JS_FILE "swad16.84.2.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.87.1: Dec 05, 2016 Temporary permissions to debug agendas. (209963 lines)
Version 16.87.2: Dec 05, 2016 Icon to edit user's agenda. (209987 lines)
Version 16.87.1: Dec 05, 2016 Temporary permissions to debug agendas. (209969 lines)
Copy the following icons to icon public directory:
sudo cp icon/lock-on64x64.png /var/www/html/swad/icon/
sudo cp icon/lock-off64x64.png /var/www/html/swad/icon/
@ -198,6 +201,12 @@ sudo cp icon/unlock-off64x64.png /var/www/html/swad/icon/
sudo cp icon/unlock-on64x64.png /var/www/html/swad/icon/
sudo cp icon/lockunlock64x64.png /var/www/html/swad/icon/
sudo cp icon/unlock64x64.png /var/www/html/swad/icon/
sudo cp icon/iconset/awesome/action64x64/hierarchy64x64.png /var/www/html/swad/icon/iconset/awesome/action64x64/
sudo cp icon/iconset/nuvola/action64x64/hierarchy64x64.png /var/www/html/swad/icon/iconset/nuvola/action64x64/
sudo cp icon/hierarchy64x64.png /var/www/html/swad/icon/
sudo cp icon/myhierarchy64x64.png /var/www/html/swad/icon/
If you prefer MyISAM tables:
ALTER TABLE agendas ENGINE=MyISAM;
Version 16.87: Dec 05, 2016 Change language after log in to view another user's public agenda. (209952 lines)
1 change necessary in database:

4
swad_holiday.c
View File

@ -764,8 +764,8 @@ static void Hld_ChangeDate (Hld_StartOrEndDate_t StartOrEndDate)
char Query[512];
struct Holiday *Hld;
struct Date NewDate;
struct Date *PtrDate = NULL; // Initialized to avoid warning
const char *StrStartOrEndDate;
struct Date *PtrDate = NULL; // Initialized to avoid warning
const char *StrStartOrEndDate = NULL; // Initialized to avoid warning
char StrDate[11];
Hld = &Gbl.Hlds.EditingHld;