Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-26 10:25:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.242

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-07-07 00:20:31 +02:00
parent cca4061d52
commit 8be0d5336c
7 changed files with 141 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -26,8 +26,8 @@
# #
###############################################################################
OBJS = swad_account.o swad_action.o swad_announcement.o swad_assignment.o \
swad_attendance.o \
OBJS = swad_account.o swad_action.o swad_agenda.o swad_announcement.o \
swad_assignment.o swad_attendance.o \
swad_banner.o \
swad_calendar.o swad_centre.o swad_chat.o swad_config.o \
swad_connected.o swad_country.o swad_course.o swad_cryptography.o \

14
swad_action.c
View File

@ -32,6 +32,7 @@
#include "swad_account.h"
#include "swad_action.h"
#include "swad_agenda.h"
#include "swad_announcement.h"
#include "swad_banner.h"
#include "swad_calendar.h"
@ -1312,6 +1313,7 @@ Profile:
1127. ActFrmRolSes Show form to log out and to change current role in this session
1128. ActMyCrs Select one of my courses
1129. ActSeeMyTT Show the timetable of all courses of the logged user
NEW. ActSeeMyAgd Show my agenda (personal organizer)
1130. ActFrmUsrAcc Show form to the creation or change of user's account
1131. ActReqEdiRecCom Request the edition of the record with the personal data of the user
1132. ActEdiPrf Show forms to edit preferences
@ -2738,11 +2740,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
/* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"mygroups64x64.gif" },
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActFrmUsrAcc */{ 36, 4,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Acc_ShowFormAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 5,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ShowFormMyCommRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 6,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
/* ActAdmBrf */{ 23, 7,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"pendrive64x64.gif" },
/* ActMFUAct */{ 993, 8,TabPrf,ActMFUAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
/* ActSeeMyAgd */{1581, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
/* ActFrmUsrAcc */{ 36, 5,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Acc_ShowFormAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ShowFormMyCommRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
/* ActAdmBrf */{ 23, 8,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"pendrive64x64.gif" },
/* ActMFUAct */{ 993, 9,TabPrf,ActMFUAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
// Actions not in menu:
/* ActReqSndNewPwd */{ 665,-1,TabPrf,ActFrmLogIn ,0x000,0x001,0x001,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormSendNewPwd ,NULL},
@ -4424,6 +4427,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActLstDupUsr, // #1578
ActLstSimUsr, // #1579
ActRemDupUsr, // #1580
ActSeeMyAgd, // #1581
};
/*****************************************************************************/

165
swad_action.h
View File

@ -72,9 +72,9 @@ typedef enum
typedef int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
#define Act_NUM_ACTIONS (1+9+51+15+90+70+67+246+186+156+172+36+28+84)
#define Act_NUM_ACTIONS (1+9+51+15+90+70+67+246+186+156+172+36+28+85)
#define Act_MAX_ACTION_COD 1580
#define Act_MAX_ACTION_COD 1581
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20
@ -1369,97 +1369,98 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
#define ActFrmRolSes (ActSeeAllStaCrs+ 2)
#define ActMyCrs (ActSeeAllStaCrs+ 3)
#define ActSeeMyTT (ActSeeAllStaCrs+ 4)
#define ActFrmUsrAcc (ActSeeAllStaCrs+ 5)
#define ActReqEdiRecCom (ActSeeAllStaCrs+ 6)
#define ActEdiPrf (ActSeeAllStaCrs+ 7)
#define ActAdmBrf (ActSeeAllStaCrs+ 8)
#define ActMFUAct (ActSeeAllStaCrs+ 9)
#define ActSeeMyAgd (ActSeeAllStaCrs+ 5)
#define ActFrmUsrAcc (ActSeeAllStaCrs+ 6)
#define ActReqEdiRecCom (ActSeeAllStaCrs+ 7)
#define ActEdiPrf (ActSeeAllStaCrs+ 8)
#define ActAdmBrf (ActSeeAllStaCrs+ 9)
#define ActMFUAct (ActSeeAllStaCrs+10)
// Secondary actions
#define ActReqSndNewPwd (ActSeeAllStaCrs+10)
#define ActSndNewPwd (ActSeeAllStaCrs+11)
#define ActLogOut (ActSeeAllStaCrs+12)
#define ActAutUsrInt (ActSeeAllStaCrs+13)
#define ActAutUsrExt (ActSeeAllStaCrs+14)
#define ActAutUsrChgLan (ActSeeAllStaCrs+15)
#define ActAnnSee (ActSeeAllStaCrs+16)
#define ActChgMyRol (ActSeeAllStaCrs+17)
#define ActCreUsrAcc (ActSeeAllStaCrs+18)
#define ActRemID_Me (ActSeeAllStaCrs+19)
#define ActNewIDMe (ActSeeAllStaCrs+20)
#define ActRemOldNic (ActSeeAllStaCrs+21)
#define ActChgNic (ActSeeAllStaCrs+22)
#define ActRemMaiMe (ActSeeAllStaCrs+23)
#define ActNewMaiMe (ActSeeAllStaCrs+24)
#define ActCnfMai (ActSeeAllStaCrs+25)
#define ActFrmChgMyPwd (ActSeeAllStaCrs+26)
#define ActChgPwd (ActSeeAllStaCrs+27)
#define ActReqRemMyAcc (ActSeeAllStaCrs+28)
#define ActRemMyAcc (ActSeeAllStaCrs+29)
#define ActReqSndNewPwd (ActSeeAllStaCrs+11)
#define ActSndNewPwd (ActSeeAllStaCrs+12)
#define ActLogOut (ActSeeAllStaCrs+13)
#define ActAutUsrInt (ActSeeAllStaCrs+14)
#define ActAutUsrExt (ActSeeAllStaCrs+15)
#define ActAutUsrChgLan (ActSeeAllStaCrs+16)
#define ActAnnSee (ActSeeAllStaCrs+17)
#define ActChgMyRol (ActSeeAllStaCrs+18)
#define ActCreUsrAcc (ActSeeAllStaCrs+19)
#define ActRemID_Me (ActSeeAllStaCrs+20)
#define ActNewIDMe (ActSeeAllStaCrs+21)
#define ActRemOldNic (ActSeeAllStaCrs+22)
#define ActChgNic (ActSeeAllStaCrs+23)
#define ActRemMaiMe (ActSeeAllStaCrs+24)
#define ActNewMaiMe (ActSeeAllStaCrs+25)
#define ActCnfMai (ActSeeAllStaCrs+26)
#define ActFrmChgMyPwd (ActSeeAllStaCrs+27)
#define ActChgPwd (ActSeeAllStaCrs+28)
#define ActReqRemMyAcc (ActSeeAllStaCrs+29)
#define ActRemMyAcc (ActSeeAllStaCrs+30)
#define ActChgMyData (ActSeeAllStaCrs+30)
#define ActChgMyData (ActSeeAllStaCrs+31)
#define ActReqMyPho (ActSeeAllStaCrs+31)
#define ActDetMyPho (ActSeeAllStaCrs+32)
#define ActUpdMyPho (ActSeeAllStaCrs+33)
#define ActReqRemMyPho (ActSeeAllStaCrs+34)
#define ActRemMyPho (ActSeeAllStaCrs+35)
#define ActReqMyPho (ActSeeAllStaCrs+32)
#define ActDetMyPho (ActSeeAllStaCrs+33)
#define ActUpdMyPho (ActSeeAllStaCrs+34)
#define ActReqRemMyPho (ActSeeAllStaCrs+35)
#define ActRemMyPho (ActSeeAllStaCrs+36)
#define ActEdiPri (ActSeeAllStaCrs+36)
#define ActChgPriPho (ActSeeAllStaCrs+37)
#define ActChgPriPrf (ActSeeAllStaCrs+38)
#define ActEdiPri (ActSeeAllStaCrs+37)
#define ActChgPriPho (ActSeeAllStaCrs+38)
#define ActChgPriPrf (ActSeeAllStaCrs+39)
#define ActReqEdiMyIns (ActSeeAllStaCrs+39)
#define ActChgCtyMyIns (ActSeeAllStaCrs+40)
#define ActChgMyIns (ActSeeAllStaCrs+41)
#define ActChgMyCtr (ActSeeAllStaCrs+42)
#define ActChgMyDpt (ActSeeAllStaCrs+43)
#define ActChgMyOff (ActSeeAllStaCrs+44)
#define ActChgMyOffPho (ActSeeAllStaCrs+45)
#define ActReqEdiMyIns (ActSeeAllStaCrs+40)
#define ActChgCtyMyIns (ActSeeAllStaCrs+41)
#define ActChgMyIns (ActSeeAllStaCrs+42)
#define ActChgMyCtr (ActSeeAllStaCrs+43)
#define ActChgMyDpt (ActSeeAllStaCrs+44)
#define ActChgMyOff (ActSeeAllStaCrs+45)
#define ActChgMyOffPho (ActSeeAllStaCrs+46)
#define ActReqEdiMyNet (ActSeeAllStaCrs+46)
#define ActChgMyNet (ActSeeAllStaCrs+47)
#define ActReqEdiMyNet (ActSeeAllStaCrs+47)
#define ActChgMyNet (ActSeeAllStaCrs+48)
#define ActChgThe (ActSeeAllStaCrs+48)
#define ActReqChgLan (ActSeeAllStaCrs+49)
#define ActChgLan (ActSeeAllStaCrs+50)
#define ActChg1stDay (ActSeeAllStaCrs+51)
#define ActChgCol (ActSeeAllStaCrs+52)
#define ActHidLftCol (ActSeeAllStaCrs+53)
#define ActHidRgtCol (ActSeeAllStaCrs+54)
#define ActShoLftCol (ActSeeAllStaCrs+55)
#define ActShoRgtCol (ActSeeAllStaCrs+56)
#define ActChgIco (ActSeeAllStaCrs+57)
#define ActChgMnu (ActSeeAllStaCrs+58)
#define ActChgNtfPrf (ActSeeAllStaCrs+59)
#define ActChgThe (ActSeeAllStaCrs+49)
#define ActReqChgLan (ActSeeAllStaCrs+50)
#define ActChgLan (ActSeeAllStaCrs+51)
#define ActChg1stDay (ActSeeAllStaCrs+52)
#define ActChgCol (ActSeeAllStaCrs+53)
#define ActHidLftCol (ActSeeAllStaCrs+54)
#define ActHidRgtCol (ActSeeAllStaCrs+55)
#define ActShoLftCol (ActSeeAllStaCrs+56)
#define ActShoRgtCol (ActSeeAllStaCrs+57)
#define ActChgIco (ActSeeAllStaCrs+58)
#define ActChgMnu (ActSeeAllStaCrs+59)
#define ActChgNtfPrf (ActSeeAllStaCrs+60)
#define ActPrnUsrQR (ActSeeAllStaCrs+60)
#define ActPrnUsrQR (ActSeeAllStaCrs+61)
#define ActPrnMyTT (ActSeeAllStaCrs+61)
#define ActEdiTut (ActSeeAllStaCrs+62)
#define ActChgTut (ActSeeAllStaCrs+63)
#define ActChgMyTT1stDay (ActSeeAllStaCrs+64)
#define ActPrnMyTT (ActSeeAllStaCrs+62)
#define ActEdiTut (ActSeeAllStaCrs+63)
#define ActChgTut (ActSeeAllStaCrs+64)
#define ActChgMyTT1stDay (ActSeeAllStaCrs+65)
#define ActReqRemFilBrf (ActSeeAllStaCrs+65)
#define ActRemFilBrf (ActSeeAllStaCrs+66)
#define ActRemFolBrf (ActSeeAllStaCrs+67)
#define ActCopBrf (ActSeeAllStaCrs+68)
#define ActPasBrf (ActSeeAllStaCrs+69)
#define ActRemTreBrf (ActSeeAllStaCrs+70)
#define ActFrmCreBrf (ActSeeAllStaCrs+71)
#define ActCreFolBrf (ActSeeAllStaCrs+72)
#define ActCreLnkBrf (ActSeeAllStaCrs+73)
#define ActRenFolBrf (ActSeeAllStaCrs+74)
#define ActRcvFilBrfDZ (ActSeeAllStaCrs+75)
#define ActRcvFilBrfCla (ActSeeAllStaCrs+76)
#define ActExpBrf (ActSeeAllStaCrs+77)
#define ActConBrf (ActSeeAllStaCrs+78)
#define ActZIPBrf (ActSeeAllStaCrs+79)
#define ActReqDatBrf (ActSeeAllStaCrs+80)
#define ActChgDatBrf (ActSeeAllStaCrs+81)
#define ActDowBrf (ActSeeAllStaCrs+82)
#define ActReqRemFilBrf (ActSeeAllStaCrs+66)
#define ActRemFilBrf (ActSeeAllStaCrs+67)
#define ActRemFolBrf (ActSeeAllStaCrs+68)
#define ActCopBrf (ActSeeAllStaCrs+69)
#define ActPasBrf (ActSeeAllStaCrs+70)
#define ActRemTreBrf (ActSeeAllStaCrs+71)
#define ActFrmCreBrf (ActSeeAllStaCrs+72)
#define ActCreFolBrf (ActSeeAllStaCrs+73)
#define ActCreLnkBrf (ActSeeAllStaCrs+74)
#define ActRenFolBrf (ActSeeAllStaCrs+75)
#define ActRcvFilBrfDZ (ActSeeAllStaCrs+76)
#define ActRcvFilBrfCla (ActSeeAllStaCrs+77)
#define ActExpBrf (ActSeeAllStaCrs+78)
#define ActConBrf (ActSeeAllStaCrs+79)
#define ActZIPBrf (ActSeeAllStaCrs+80)
#define ActReqDatBrf (ActSeeAllStaCrs+81)
#define ActChgDatBrf (ActSeeAllStaCrs+82)
#define ActDowBrf (ActSeeAllStaCrs+83)
#define ActReqRemOldBrf (ActSeeAllStaCrs+83)
#define ActRemOldBrf (ActSeeAllStaCrs+84)
#define ActReqRemOldBrf (ActSeeAllStaCrs+84)
#define ActRemOldBrf (ActSeeAllStaCrs+85)
/*****************************************************************************/
/******************************** Public types *******************************/

3
swad_changelog.h
View File

@ -133,13 +133,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.241.7 (2016-07-06)"
#define Log_PLATFORM_VERSION "SWAD 15.242 (2016-07-07)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.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 15.242: Jul 07, 2016 New option Profile > Agenda. Not implemented. (203781 lines)
Version 15.241.7: Jul 06, 2016 Removed cookies in swad.ugr.es.
Removed unused database tables. (203641 lines)
1 change necessary in database:

4
swad_config.h
View File

@ -28,9 +28,9 @@
/** Uncomment one of the following installations of SWAD or create your own **/
/*****************************************************************************/
//#define LOCALHOST_UBUNTU // Comment this line if not applicable
#define LOCALHOST_UBUNTU // Comment this line if not applicable
//#define OPENSWAD_ORG // Comment this line if not applicable
#define SWAD_UGR_ES // Comment this line if not applicable
//#define SWAD_UGR_ES // Comment this line if not applicable
//#define SWADBERRY_UGR_ES // Comment this line if not applicable
/*****************************************************************************/

1
swad_menu.c
View File

@ -184,6 +184,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
ActFrmRolSes,
ActMyCrs,
ActSeeMyTT,
ActSeeMyAgd,
ActFrmUsrAcc,
ActReqEdiRecCom,
ActEdiPrf,

42
swad_text.c
View File

@ -19047,6 +19047,27 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Plan"
#elif L==9
"Horário"
#endif
,
// ActSeeMyAgd
#if L==1
"Agenda"
#elif L==2
"Organizer"
#elif L==3
"Agenda"
#elif L==4
"Agenda"
#elif L==5
"Agenda"
#elif L==6
"Agenda" // Okoteve traducción
#elif L==7
"Agenda"
#elif L==8
"Pamiętnik"
#elif L==9
"Agenda"
#endif
,
// ActFrmUsrAcc
@ -21061,6 +21082,27 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Mój plan lekcji"
#elif L==9
"Horário minha disciplinas"
#endif
,
// ActSeeMyAgd
#if L==1
"Agenda"
#elif L==2
"Organizer"
#elif L==3
"Agenda (personal organizer)"
#elif L==4
"Agenda"
#elif L==5
"Agenda"
#elif L==6
"Agenda" // Okoteve traducción
#elif L==7
"Agenda"
#elif L==8
"Pamiętnik"
#elif L==9
"Agenda"
#endif
,
// ActFrmUsrAcc