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

This commit is contained in:
Antonio Cañas Vargas 2016-11-30 22:49:48 +01:00
parent df9c29c8b6
commit af3e9c48bf
11 changed files with 1433 additions and 1599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -39,7 +39,7 @@ OBJS = swad_account.o swad_action.o swad_agenda.o swad_announcement.o \
swad_help.o swad_hierarchy.o swad_holiday.o \ swad_help.o swad_hierarchy.o swad_holiday.o \
swad_icon.o swad_ID.o swad_image.o swad_indicator.o \ swad_icon.o swad_ID.o swad_image.o swad_indicator.o \
swad_info.o swad_institution.o \ swad_info.o swad_institution.o \
swad_layout.o swad_link.o swad_location.o swad_logo.o \ swad_layout.o swad_link.o swad_logo.o \
swad_mail.o swad_main.o swad_mark.o swad_menu.o swad_message.o \ swad_mail.o swad_main.o swad_mark.o swad_menu.o swad_message.o \
swad_MFU.o \ swad_MFU.o \
swad_network.o swad_nickname.o swad_notice.o swad_notification.o \ swad_network.o swad_nickname.o swad_notice.o swad_notification.o \

9
swad_action.c
View File

@ -49,7 +49,6 @@
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
#include "swad_indicator.h" #include "swad_indicator.h"
#include "swad_location.h"
#include "swad_mail.h" #include "swad_mail.h"
#include "swad_mark.h" #include "swad_mark.h"
#include "swad_MFU.h" #include "swad_MFU.h"
@ -1327,8 +1326,7 @@ Profile:
1140. ActFrmRolSes Show form to log out and to change current role in this session 1140. ActFrmRolSes Show form to log out and to change current role in this session
1141. ActMyCrs Select one of my courses 1141. ActMyCrs Select one of my courses
1142. ActSeeMyTT Show the timetable of all courses of the logged user 1142. ActSeeMyTT Show the timetable of all courses of the logged user
1143. ActSeeMyAgd Show my agenda (personal organizer) 1144. ActSeeMyLoc Show my agenda (personal organizer)
1144. ActSeeMyLoc Show my locations
1145. ActFrmMyAcc Show form to the creation or change of user's account 1145. ActFrmMyAcc Show form to the creation or change of user's account
1146. ActReqEdiRecCom Request the edition of the record with the personal data of the user 1146. ActReqEdiRecCom Request the edition of the record with the personal data of the user
1147. ActEdiPrf Show forms to edit preferences 1147. ActEdiPrf Show forms to edit preferences
@ -2776,8 +2774,7 @@ 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" }, /* 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 ,"mygroups64x64.gif" }, /* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"mygroups64x64.gif" },
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" }, /* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActSeeMyAgd */{1581, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, /* ActSeeMyLoc */{1602, 5,TabPrf,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_SeeLocations ,"date64x64.gif" },
/* ActSeeMyLoc */{1602, 5,TabPrf,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_SeeLocations ,"mapmarker64x64.png" },
/* ActFrmMyAcc */{ 36, 6,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" }, /* ActFrmMyAcc */{ 36, 6,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 7,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" }, /* ActReqEdiRecCom */{ 285, 7,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 8,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" }, /* ActEdiPrf */{ 673, 8,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
@ -4473,7 +4470,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActLstDupUsr, // #1578 ActLstDupUsr, // #1578
ActLstSimUsr, // #1579 ActLstSimUsr, // #1579
ActRemDupUsr, // #1580 ActRemDupUsr, // #1580
ActSeeMyAgd, // #1581 -1, // #1581 (obsolete action)
ActSeeMyUsgRep, // #1582 ActSeeMyUsgRep, // #1582
-1, // #1583 (obsolete action) -1, // #1583 (obsolete action)
ActChkUsrAcc, // #1584 ActChkUsrAcc, // #1584

181
swad_action.h
View File

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

1292
swad_agenda.c
View File

File diff suppressed because it is too large Load Diff

70
swad_agenda.h
View File

@ -24,25 +24,75 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/*****************************************************************************/ /*****************************************************************************/
/********************************** Headers **********************************/ /********************************* Headers ***********************************/
/*****************************************************************************/ /*****************************************************************************/
// #include <stdlib.h> // For malloc #include "swad_date.h"
#include "swad_user.h"
// #include "swad_user.h"
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public constants *****************************/ /************************** Public types and constants ***********************/
/*****************************************************************************/ /*****************************************************************************/
/*****************************************************************************/ #define Loc_MAX_LENGTH_LOCATION 255
/******************************** Public types *******************************/ #define Loc_MAX_LENGTH_EVENT 255
/*****************************************************************************/
#define Loc_MAX_LENGTH_FOLDER 32
#define Loc_NUM_TYPES_SEND_WORK 2
typedef enum
{
Loc_DO_NOT_SEND_WORK = 0,
Loc_SEND_WORK = 1,
} Loc_SendWork_t;
#define Loc_NUM_DATES 2
typedef enum
{
Loc_START_TIME = 0,
Loc_END_TIME = 1,
} Loc_StartOrEndTime_t;
struct Location
{
long LocCod;
bool Hidden;
long UsrCod;
time_t TimeUTC[Loc_NUM_DATES];
bool Open;
char Location[Loc_MAX_LENGTH_LOCATION+1];
char Event[Loc_MAX_LENGTH_EVENT+1];
};
typedef enum
{
Loc_ORDER_BY_START_DATE = 0,
Loc_ORDER_BY_END_DATE = 1,
} Loc_Order_t;
#define Loc_DEFAULT_ORDER_TYPE Loc_ORDER_BY_START_DATE
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public prototypes ****************************/ /***************************** Public prototypes *****************************/
/*****************************************************************************/ /*****************************************************************************/
void Agd_ShowMyAgenda (void); void Loc_SeeLocations (void);
void Loc_PutHiddenParamLocOrderType (void);
void Loc_RequestCreatOrEditLoc (void);
void Loc_GetListLocations (void);
void Loc_GetDataOfLocationByCod (struct Location *Loc);
void Loc_FreeListLocations (void);
long Loc_GetParamLocCod (void);
void Loc_AskRemLocation (void);
void Loc_RemoveLocation (void);
void Loc_HideLocation (void);
void Loc_ShowLocation (void);
void Loc_RecFormLocation (void);
void Loc_RemoveUsrLocations (long UsrCod);
unsigned Loc_GetNumLocationsFromUsr (long UsrCod);
unsigned Loc_GetNumUsrsWithLocations (Sco_Scope_t Scope);
unsigned Loc_GetNumLocations (Sco_Scope_t Scope);
#endif #endif

6
swad_changelog.h
View File

@ -183,13 +183,17 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.79.2 (2016-11-30)" #define Log_PLATFORM_VERSION "SWAD 16.80 (2016-11-30)"
#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.80: Nov 30, 2016 Changed location to agenda. (209428 lines)
1 change necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='1581';
Version 16.79.2: Nov 30, 2016 Changed location to event in agenda. (209566 lines) Version 16.79.2: Nov 30, 2016 Changed location to event in agenda. (209566 lines)
Version 16.79.1: Nov 30, 2016 Changed location to event in agenda. (209559 lines) Version 16.79.1: Nov 30, 2016 Changed location to event in agenda. (209559 lines)
Version 16.79: Nov 30, 2016 In locations, split Title into Event (What?) and Location (Where?). (209534 lines) Version 16.79: Nov 30, 2016 In locations, split Title into Event (What?) and Location (Where?). (209534 lines)

2
swad_global.h
View File

@ -32,6 +32,7 @@
#include <sys/time.h> // For tz #include <sys/time.h> // For tz
#include <mysql/mysql.h> // To access MySQL databases #include <mysql/mysql.h> // To access MySQL databases
#include "swad_agenda.h"
#include "swad_assignment.h" #include "swad_assignment.h"
#include "swad_attendance.h" #include "swad_attendance.h"
#include "swad_banner.h" #include "swad_banner.h"
@ -53,7 +54,6 @@
#include "swad_institution.h" #include "swad_institution.h"
#include "swad_layout.h" #include "swad_layout.h"
#include "swad_link.h" #include "swad_link.h"
#include "swad_location.h"
#include "swad_mail.h" #include "swad_mail.h"
#include "swad_mark.h" #include "swad_mark.h"
#include "swad_message.h" #include "swad_message.h"

1325
swad_location.c
View File

File diff suppressed because it is too large Load Diff

98
swad_location.h
View File

@ -1,98 +0,0 @@
// swad_location.h: teacher's location
#ifndef _SWAD_LOC
#define _SWAD_LOC
/*
SWAD (Shared Workspace At a Distance in Spanish),
is a web platform developed at the University of Granada (Spain),
and used to support university teaching.
This file is part of SWAD core.
Copyright (C) 1999-2016 Antonio Cañas Vargas
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*****************************************************************************/
/********************************* Headers ***********************************/
/*****************************************************************************/
#include "swad_date.h"
#include "swad_user.h"
/*****************************************************************************/
/************************** Public types and constants ***********************/
/*****************************************************************************/
#define Loc_MAX_LENGTH_LOCATION 255
#define Loc_MAX_LENGTH_EVENT 255
#define Loc_MAX_LENGTH_FOLDER 32
#define Loc_NUM_TYPES_SEND_WORK 2
typedef enum
{
Loc_DO_NOT_SEND_WORK = 0,
Loc_SEND_WORK = 1,
} Loc_SendWork_t;
#define Loc_NUM_DATES 2
typedef enum
{
Loc_START_TIME = 0,
Loc_END_TIME = 1,
} Loc_StartOrEndTime_t;
struct Location
{
long LocCod;
bool Hidden;
long UsrCod;
time_t TimeUTC[Loc_NUM_DATES];
bool Open;
char Location[Loc_MAX_LENGTH_LOCATION+1];
char Event[Loc_MAX_LENGTH_EVENT+1];
};
typedef enum
{
Loc_ORDER_BY_START_DATE = 0,
Loc_ORDER_BY_END_DATE = 1,
} Loc_Order_t;
#define Loc_DEFAULT_ORDER_TYPE Loc_ORDER_BY_START_DATE
/*****************************************************************************/
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Loc_SeeLocations (void);
void Loc_PutHiddenParamLocOrderType (void);
void Loc_RequestCreatOrEditLoc (void);
void Loc_GetListLocations (void);
void Loc_GetDataOfLocationByCod (struct Location *Loc);
void Loc_FreeListLocations (void);
long Loc_GetParamLocCod (void);
void Loc_AskRemLocation (void);
void Loc_RemoveLocation (void);
void Loc_HideLocation (void);
void Loc_ShowLocation (void);
void Loc_RecFormLocation (void);
void Loc_RemoveUsrLocations (long UsrCod);
unsigned Loc_GetNumLocationsFromUsr (long UsrCod);
unsigned Loc_GetNumUsrsWithLocations (Sco_Scope_t Scope);
unsigned Loc_GetNumLocations (Sco_Scope_t Scope);
#endif

1
swad_menu.c
View File

@ -186,7 +186,6 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
ActFrmRolSes, ActFrmRolSes,
ActMyCrs, ActMyCrs,
ActSeeMyTT, ActSeeMyTT,
ActSeeMyAgd,
ActSeeMyLoc, ActSeeMyLoc,
ActFrmMyAcc, ActFrmMyAcc,
ActReqEdiRecCom, ActReqEdiRecCom,

46
swad_text.c
View File

@ -19536,7 +19536,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Hor&aacute;rio" "Hor&aacute;rio"
#endif #endif
, ,
// ActSeeMyAgd // ActSeeMyLoc
#if L==1 #if L==1
"Agenda" "Agenda"
#elif L==2 #elif L==2
@ -19555,27 +19555,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Pami&eogon;tnik" "Pami&eogon;tnik"
#elif L==9 #elif L==9
"Agenda" "Agenda"
#endif
,
// ActSeeMyLoc
#if L==1
"Ubicaci&oacute;"
#elif L==2
"Standort"
#elif L==3
"Location"
#elif L==4
"Ubicaci&oacute;n"
#elif L==5
"Emplacement"
#elif L==6
"Ubicaci&oacute;n" // Okoteve traducción
#elif L==7
"Posizione"
#elif L==8
"Lokacja"
#elif L==9
"Localiza&ccedil;&atilde;o"
#endif #endif
, ,
// ActFrmMyAcc // ActFrmMyAcc
@ -21430,7 +21409,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Hor&aacute;rio minha disciplinas" "Hor&aacute;rio minha disciplinas"
#endif #endif
, ,
// ActSeeMyAgd // ActSeeMyLoc
#if L==1 #if L==1
"Agenda" "Agenda"
#elif L==2 #elif L==2
@ -21449,27 +21428,6 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Pami&eogon;tnik" "Pami&eogon;tnik"
#elif L==9 #elif L==9
"Agenda" "Agenda"
#endif
,
// ActSeeMyLoc
#if L==1
"La meva ubicaci&oacute;"
#elif L==2
"Mein Standort"
#elif L==3
"My location"
#elif L==4
"Mi ubicaci&oacute;n"
#elif L==5
"Mon emplacement"
#elif L==6
"Mi ubicaci&oacute;n" // Okoteve traducción
#elif L==7
"La mia posizione"
#elif L==8
"Moja lokacja"
#elif L==9
"Minha localiza&ccedil;&atilde;o"
#endif #endif
, ,
// ActFrmMyAcc // ActFrmMyAcc