"
- "| "
+ " | "
""
" | ",
UniqueId,
@@ -286,9 +320,9 @@ static void Agd_ShowOneEvent (long AgdCod)
/* End date/time */
UniqueId++;
- fprintf (Gbl.F.Out,""
+ fprintf (Gbl.F.Out," | "
""
" | ",
UniqueId,
@@ -327,19 +361,13 @@ static void Agd_ShowOneEvent (long AgdCod)
Agd_WriteEventAuthor (&AgdEvent);
/* Forms to remove/edit this event */
- switch (Gbl.Usrs.Me.LoggedRole)
- {
- case Rol_TEACHER:
- case Rol_SYS_ADM:
- Agd_PutFormsToRemEditOneEvent (AgdEvent.AgdCod,AgdEvent.Hidden);
- break;
- default:
- break;
- }
+ if (AgendaType == Agd_MY_AGENDA)
+ Agd_PutFormsToRemEditOneEvent (AgdEvent.AgdCod,AgdEvent.Hidden);
+
fprintf (Gbl.F.Out,"");
/* Text of the event */
- Agd_GetEventTxtFromDB (AgdEvent.AgdCod,Txt);
+ Agd_GetEventTxtFromDB (&AgdEvent,Txt);
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
@@ -413,9 +441,9 @@ static void Agd_GetParamEventOrderType (void)
Par_GetParToText ("Order",UnsignedStr,10);
if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1)
- Gbl.Usrs.Me.Locs.SelectedOrderType = (Loc_Order_t) UnsignedNum;
+ Gbl.Agenda.SelectedOrderType = (Loc_Order_t) UnsignedNum;
else
- Gbl.Usrs.Me.Locs.SelectedOrderType = Loc_DEFAULT_ORDER_TYPE;
+ Gbl.Agenda.SelectedOrderType = Loc_DEFAULT_ORDER_TYPE;
}
/*****************************************************************************/
@@ -424,7 +452,7 @@ static void Agd_GetParamEventOrderType (void)
void Agd_PutHiddenParamEventsOrderType (void)
{
- Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Usrs.Me.Locs.SelectedOrderType);
+ Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Agenda.SelectedOrderType);
}
/*****************************************************************************/
@@ -440,7 +468,7 @@ static void Agd_PutFormsToRemEditOneEvent (long AgdCod,bool Hidden)
fprintf (Gbl.F.Out,"");
- Gbl.Usrs.Me.Locs.LocCodToEdit = AgdCod; // Used as parameter in contextual links
+ Gbl.Agenda.AgdCodToEdit = AgdCod; // Used as parameter in contextual links
/***** Put form to remove event *****/
Lay_PutContextualLink (ActReqRemEvtMyAgd,Agd_PutParams,
@@ -475,41 +503,29 @@ static void Agd_PutFormsToRemEditOneEvent (long AgdCod,bool Hidden)
static void Agd_PutParams (void)
{
- Agd_PutParamAgdCod (Gbl.Usrs.Me.Locs.LocCodToEdit);
+ Agd_PutParamAgdCod (Gbl.Agenda.AgdCodToEdit);
Agd_PutHiddenParamEventsOrderType ();
- Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
}
/*****************************************************************************/
-/*************************** List all the events *****************************/
+/************************* Get list of agenda events *************************/
/*****************************************************************************/
-void Agd_GetListEvents (void)
+static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
{
- char HiddenSubQuery[256];
char OrderBySubQuery[256];
char Query[2048];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
- unsigned NumLoc;
+ unsigned NumEvent;
- if (Gbl.Usrs.Me.Locs.LstIsRead)
+ if (Gbl.Agenda.LstIsRead)
Agd_FreeListEvents ();
/***** Get list of events from database *****/
- switch (Gbl.Usrs.Me.LoggedRole)
- {
- case Rol_TEACHER:
- case Rol_SYS_ADM:
- HiddenSubQuery[0] = '\0';
- break;
- default:
- sprintf (HiddenSubQuery,"AND Hidden='N'");
- break;
- }
- switch (Gbl.Usrs.Me.Locs.SelectedOrderType)
+ switch (Gbl.Agenda.SelectedOrderType)
{
case Loc_ORDER_BY_START_DATE:
sprintf (OrderBySubQuery,"StartTime DESC,EndTime DESC,Location DESC,Event DESC");
@@ -518,46 +534,59 @@ void Agd_GetListEvents (void)
sprintf (OrderBySubQuery,"EndTime DESC,StartTime DESC,Location DESC,Event DESC");
break;
}
- sprintf (Query,"SELECT AgdCod"
- " FROM agendas"
- " WHERE UsrCod='%ld'%s"
- " ORDER BY %s",
- Gbl.Usrs.Me.UsrDat.UsrCod,HiddenSubQuery,OrderBySubQuery);
+ switch (AgendaType)
+ {
+ case Agd_USR_AGENDA:
+ sprintf (Query,"SELECT AgdCod"
+ " FROM agendas"
+ " WHERE UsrCod='%ld' AND Hidden='N'"
+ " AND EndTime>NOW()" // Only not obsolete events
+ " ORDER BY %s",
+ Gbl.Usrs.Other.UsrDat.UsrCod,OrderBySubQuery);
+ break;
+ case Agd_MY_AGENDA:
+ sprintf (Query,"SELECT AgdCod"
+ " FROM agendas"
+ " WHERE UsrCod='%ld'"
+ " ORDER BY %s",
+ Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
+ break;
+ }
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get agenda events");
if (NumRows) // Events found...
{
- Gbl.Usrs.Me.Locs.Num = (unsigned) NumRows;
+ Gbl.Agenda.Num = (unsigned) NumRows;
/***** Create list of events *****/
- if ((Gbl.Usrs.Me.Locs.LstLocCods = (long *) calloc (NumRows,sizeof (long))) == NULL)
+ if ((Gbl.Agenda.LstAgdCods = (long *) calloc (NumRows,sizeof (long))) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store list of agenda events.");
/***** Get the events codes *****/
- for (NumLoc = 0;
- NumLoc < Gbl.Usrs.Me.Locs.Num;
- NumLoc++)
+ for (NumEvent = 0;
+ NumEvent < Gbl.Agenda.Num;
+ NumEvent++)
{
/* Get next event code */
row = mysql_fetch_row (mysql_res);
- if ((Gbl.Usrs.Me.Locs.LstLocCods[NumLoc] = Str_ConvertStrCodToLongCod (row[0])) < 0)
+ if ((Gbl.Agenda.LstAgdCods[NumEvent] = Str_ConvertStrCodToLongCod (row[0])) < 0)
Lay_ShowErrorAndExit ("Error: wrong event code.");
}
}
else
- Gbl.Usrs.Me.Locs.Num = 0;
+ Gbl.Agenda.Num = 0;
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
- Gbl.Usrs.Me.Locs.LstIsRead = true;
+ Gbl.Agenda.LstIsRead = true;
}
/*****************************************************************************/
/*********************** Get event data using its code ***********************/
/*****************************************************************************/
-void Agd_GetDataOfEventByCod (struct AgendaEvent *AgdEvent)
+static void Agd_GetDataOfEventByCod (struct AgendaEvent *AgdEvent)
{
char Query[1024];
@@ -569,7 +598,7 @@ void Agd_GetDataOfEventByCod (struct AgendaEvent *AgdEvent)
"Event,Location"
" FROM agendas"
" WHERE AgdCod='%ld' AND UsrCod='%ld'",
- AgdEvent->AgdCod,Gbl.Usrs.Me.UsrDat.UsrCod);
+ AgdEvent->AgdCod,AgdEvent->UsrCod);
/***** Get data of event *****/
Agd_GetDataOfEvent (AgdEvent,Query);
@@ -638,13 +667,13 @@ static void Agd_GetDataOfEvent (struct AgendaEvent *AgdEvent,const char *Query)
void Agd_FreeListEvents (void)
{
- if (Gbl.Usrs.Me.Locs.LstIsRead && Gbl.Usrs.Me.Locs.LstLocCods)
+ if (Gbl.Agenda.LstIsRead && Gbl.Agenda.LstAgdCods)
{
/***** Free memory used by the list of events *****/
- free ((void *) Gbl.Usrs.Me.Locs.LstLocCods);
- Gbl.Usrs.Me.Locs.LstLocCods = NULL;
- Gbl.Usrs.Me.Locs.Num = 0;
- Gbl.Usrs.Me.Locs.LstIsRead = false;
+ free ((void *) Gbl.Agenda.LstAgdCods);
+ Gbl.Agenda.LstAgdCods = NULL;
+ Gbl.Agenda.Num = 0;
+ Gbl.Agenda.LstIsRead = false;
}
}
@@ -652,7 +681,7 @@ void Agd_FreeListEvents (void)
/*********************** Get event text from database ************************/
/*****************************************************************************/
-static void Agd_GetEventTxtFromDB (long AgdCod,char *Txt)
+static void Agd_GetEventTxtFromDB (struct AgendaEvent *AgdEvent,char *Txt)
{
char Query[512];
MYSQL_RES *mysql_res;
@@ -662,7 +691,7 @@ static void Agd_GetEventTxtFromDB (long AgdCod,char *Txt)
/***** Get text of event from database *****/
sprintf (Query,"SELECT Txt FROM agendas"
" WHERE AgdCod='%ld' AND UsrCod='%ld'",
- AgdCod,Gbl.Usrs.Me.UsrDat.UsrCod);
+ AgdEvent->AgdCod,AgdEvent->UsrCod);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get event text");
/***** The result of the query must have one row or none *****/
@@ -716,21 +745,20 @@ void Agd_AskRemEvent (void)
/***** Get parameters *****/
Agd_GetParamEventOrderType ();
- Grp_GetParamWhichGrps ();
- Pag_GetParamPagNum (Pag_ASSIGNMENTS);
+ Pag_GetParamPagNum (Pag_MY_AGENDA);
/***** Get event code *****/
if ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L)
Lay_ShowErrorAndExit ("Code of event is missing.");
/***** Get data of the event from database *****/
+ AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
Agd_GetDataOfEventByCod (&AgdEvent);
/***** Button of confirmation of removing *****/
Act_FormStart (ActRemEvtMyAgd);
Agd_PutParamAgdCod (AgdEvent.AgdCod);
Agd_PutHiddenParamEventsOrderType ();
- Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
/***** Ask for confirmation of removing *****/
@@ -741,7 +769,7 @@ void Agd_AskRemEvent (void)
Act_FormEnd ();
/***** Show events again *****/
- Agd_SeeEvents ();
+ Agd_ShowMyAgenda ();
}
/*****************************************************************************/
@@ -759,6 +787,7 @@ void Agd_RemoveEvent (void)
Lay_ShowErrorAndExit ("Code of event is missing.");
/***** Get data of the event from database *****/
+ AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
Agd_GetDataOfEventByCod (&AgdEvent); // Inside this function, the course is checked to be the current one
/***** Remove event *****/
@@ -772,7 +801,7 @@ void Agd_RemoveEvent (void)
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
/***** Show events again *****/
- Agd_SeeEvents ();
+ Agd_ShowMyAgenda ();
}
/*****************************************************************************/
@@ -790,6 +819,7 @@ void Agd_HideEvent (void)
Lay_ShowErrorAndExit ("Code of event is missing.");
/***** Get data of the event from database *****/
+ AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
Agd_GetDataOfEventByCod (&AgdEvent);
/***** Hide event *****/
@@ -803,7 +833,7 @@ void Agd_HideEvent (void)
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
/***** Show events again *****/
- Agd_SeeEvents ();
+ Agd_ShowMyAgenda ();
}
/*****************************************************************************/
@@ -821,6 +851,7 @@ void Agd_ShowEvent (void)
Lay_ShowErrorAndExit ("Code of event is missing.");
/***** Get data of the event from database *****/
+ AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
Agd_GetDataOfEventByCod (&AgdEvent);
/***** Hide event *****/
@@ -835,7 +866,7 @@ void Agd_ShowEvent (void)
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
/***** Show events again *****/
- Agd_SeeEvents ();
+ Agd_ShowMyAgenda ();
}
/*****************************************************************************/
@@ -875,8 +906,7 @@ void Agd_RequestCreatOrEditEvent (void)
/***** Get parameters *****/
Agd_GetParamEventOrderType ();
- Grp_GetParamWhichGrps ();
- Pag_GetParamPagNum (Pag_ASSIGNMENTS);
+ Pag_GetParamPagNum (Pag_MY_AGENDA);
/***** Get the code of the event *****/
ItsANewEvent = ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L);
@@ -895,11 +925,13 @@ void Agd_RequestCreatOrEditEvent (void)
}
else
{
+ AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
+
/* Get data of the event from database */
Agd_GetDataOfEventByCod (&AgdEvent);
/* Get text of the event from database */
- Agd_GetEventTxtFromDB (AgdEvent.AgdCod,Txt);
+ Agd_GetEventTxtFromDB (&AgdEvent,Txt);
}
/***** Start form *****/
@@ -911,7 +943,6 @@ void Agd_RequestCreatOrEditEvent (void)
Agd_PutParamAgdCod (AgdEvent.AgdCod);
}
Agd_PutHiddenParamEventsOrderType ();
- Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
/***** Table start *****/
@@ -979,7 +1010,7 @@ void Agd_RequestCreatOrEditEvent (void)
Act_FormEnd ();
/***** Show current events, if any *****/
- Agd_ShowAllEvents ();
+ Agd_ShowEvents (Agd_MY_AGENDA);
}
/*****************************************************************************/
@@ -992,57 +1023,58 @@ void Agd_RecFormEvent (void)
extern const char *Txt_You_must_specify_the_title_of_the_event;
extern const char *Txt_Created_new_event_X;
extern const char *Txt_The_event_has_been_modified;
- struct AgendaEvent OldLoc;
- struct AgendaEvent NewLoc;
+ struct AgendaEvent OldAgdEvent;
+ struct AgendaEvent NewAgdEvent;
bool ItsANewEvent;
bool NewEventIsCorrect = true;
char Txt[Cns_MAX_BYTES_TEXT+1];
/***** Get the code of the event *****/
- ItsANewEvent = ((NewLoc.AgdCod = Agd_GetParamAgdCod ()) == -1L);
+ ItsANewEvent = ((NewAgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L);
if (!ItsANewEvent)
{
/* Get data of the old (current) event from database */
- OldLoc.AgdCod = NewLoc.AgdCod;
- Agd_GetDataOfEventByCod (&OldLoc);
+ OldAgdEvent.AgdCod = NewAgdEvent.AgdCod;
+ OldAgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
+ Agd_GetDataOfEventByCod (&OldAgdEvent);
}
/***** Get start/end date-times *****/
- NewLoc.TimeUTC[Loc_START_TIME] = Dat_GetTimeUTCFromForm ("StartTimeUTC");
- NewLoc.TimeUTC[Loc_END_TIME ] = Dat_GetTimeUTCFromForm ("EndTimeUTC" );
+ NewAgdEvent.TimeUTC[Loc_START_TIME] = Dat_GetTimeUTCFromForm ("StartTimeUTC");
+ NewAgdEvent.TimeUTC[Loc_END_TIME ] = Dat_GetTimeUTCFromForm ("EndTimeUTC" );
/***** Get event *****/
- Par_GetParToText ("Location",NewLoc.Location,Loc_MAX_LENGTH_LOCATION);
+ Par_GetParToText ("Location",NewAgdEvent.Location,Loc_MAX_LENGTH_LOCATION);
/***** Get event *****/
- Par_GetParToText ("Event",NewLoc.Event,Loc_MAX_LENGTH_EVENT);
+ Par_GetParToText ("Event",NewAgdEvent.Event,Loc_MAX_LENGTH_EVENT);
/***** Get text *****/
Par_GetParToHTML ("Txt",Txt,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
/***** Adjust dates *****/
- if (NewLoc.TimeUTC[Loc_START_TIME] == 0)
- NewLoc.TimeUTC[Loc_START_TIME] = Gbl.StartExecutionTimeUTC;
- if (NewLoc.TimeUTC[Loc_END_TIME] == 0)
- NewLoc.TimeUTC[Loc_END_TIME] = NewLoc.TimeUTC[Loc_START_TIME] + 2*60*60; // +2 hours
+ if (NewAgdEvent.TimeUTC[Loc_START_TIME] == 0)
+ NewAgdEvent.TimeUTC[Loc_START_TIME] = Gbl.StartExecutionTimeUTC;
+ if (NewAgdEvent.TimeUTC[Loc_END_TIME] == 0)
+ NewAgdEvent.TimeUTC[Loc_END_TIME] = NewAgdEvent.TimeUTC[Loc_START_TIME] + 2*60*60; // +2 hours
/***** Check if event is correct *****/
- if (!NewLoc.Location[0]) // If there is no event
+ if (!NewAgdEvent.Location[0]) // If there is no event
{
NewEventIsCorrect = false;
Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_title_of_the_event);
}
/***** Check if event is correct *****/
- if (NewLoc.Event[0]) // If there's event
+ if (NewAgdEvent.Event[0]) // If there's event
{
/* If title of event was in database... */
- if (Agd_CheckIfSimilarEventExists ("Event",NewLoc.Event,NewLoc.AgdCod))
+ if (Agd_CheckIfSimilarEventExists ("Event",NewAgdEvent.Event,NewAgdEvent.AgdCod))
{
NewEventIsCorrect = false;
sprintf (Gbl.Message,Txt_Already_existed_an_event_with_the_title_X,
- NewLoc.Event);
+ NewAgdEvent.Event);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
}
}
@@ -1057,15 +1089,15 @@ void Agd_RecFormEvent (void)
{
if (ItsANewEvent)
{
- Agd_CreateEvent (&NewLoc,Txt); // Add new event to database
+ Agd_CreateEvent (&NewAgdEvent,Txt); // Add new event to database
/***** Write success message *****/
- sprintf (Gbl.Message,Txt_Created_new_event_X,NewLoc.Event);
+ sprintf (Gbl.Message,Txt_Created_new_event_X,NewAgdEvent.Event);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
}
else
{
- Agd_UpdateEvent (&NewLoc,Txt);
+ Agd_UpdateEvent (&NewAgdEvent,Txt);
/***** Write success message *****/
Lay_ShowAlert (Lay_SUCCESS,Txt_The_event_has_been_modified);
@@ -1075,7 +1107,7 @@ void Agd_RecFormEvent (void)
Grp_FreeListCodSelectedGrps ();
/***** Show events again *****/
- Agd_SeeEvents ();
+ Agd_ShowMyAgenda ();
}
else
// TODO: The form should be filled with partial data, now is always empty
diff --git a/swad_agenda.h b/swad_agenda.h
index ff32f8892..3c48d637c 100644
--- a/swad_agenda.h
+++ b/swad_agenda.h
@@ -76,11 +76,11 @@ typedef enum
/***************************** Public prototypes *****************************/
/*****************************************************************************/
-void Agd_SeeEvents (void);
+void Agd_ShowUsrAgenda (void);
+void Agd_ShowMyAgenda (void);
+
void Agd_PutHiddenParamEventsOrderType (void);
void Agd_RequestCreatOrEditEvent (void);
-void Agd_GetListEvents (void);
-void Agd_GetDataOfEventByCod (struct AgendaEvent *AgdEvent);
void Agd_FreeListEvents (void);
long Agd_GetParamAgdCod (void);
diff --git a/swad_changelog.h b/swad_changelog.h
index a094767b3..8f2427df7 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -185,13 +185,26 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.81.5 (2016-12-01)"
+#define Log_PLATFORM_VERSION "SWAD 16.82 (2016-12-02)"
#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.82: Dec 02, 2016 New action to show agenda another user's agenda. (209425 lines)
+ 10 changes necessary in database:
+UPDATE actions SET Txt='Ver mi agenda' WHERE ActCod='1602' AND Language='es';
+UPDATE actions SET Txt='Solicitar creación evento mi agenda' WHERE ActCod='1603' AND Language='es';
+UPDATE actions SET Txt='Solicitar edición evento mi agenda' WHERE ActCod='1604' AND Language='es';
+UPDATE actions SET Txt='Crear evento mi agenda' WHERE ActCod='1605' AND Language='es';
+UPDATE actions SET Txt='Cambiar evento mi agenda' WHERE ActCod='1606' AND Language='es';
+UPDATE actions SET Txt='Solicitar eliminación evento mi agenda' WHERE ActCod='1607' AND Language='es';
+UPDATE actions SET Txt='Eliminar evento mi agenda' WHERE ActCod='1608' AND Language='es';
+INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1609','es','N','Hacer privado evento mi agenda');
+INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1610','es','N','Hacer público evento mi agenda');
+INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1611','es','N','Ver agenda otro usuario');
+
Version 16.81.5: Dec 01, 2016 Link in teacher's record card to show agenda. (209313 lines)
Copy the following icon to icon public directory:
sudo cp icon/date64x64.gif /var/www/html/swad/icon/
diff --git a/swad_global.h b/swad_global.h
index 8887b33bf..08b667914 100644
--- a/swad_global.h
+++ b/swad_global.h
@@ -355,14 +355,6 @@ struct Globals
long DegCod;
} Crss[Crs_MAX_COURSES_PER_USR];
} MyCrss;
- struct
- {
- bool LstIsRead; // Is the list already read from database, or it needs to be read?
- unsigned Num; // Number of locations
- long *LstLocCods; // List of location codes
- Loc_Order_t SelectedOrderType;
- long LocCodToEdit; // Used as parameter in contextual links
- } Locs;
Usr_ShowUsrsType_t ListType; // My preference about user's list type
unsigned NumFollowers; // Number of users who follow me
unsigned NumFollowing; // Number of users I follow
@@ -413,6 +405,14 @@ struct Globals
struct UsrData *UsrDat;
Rec_SharedRecordViewType_t TypeOfView;
} Record;
+ struct
+ {
+ bool LstIsRead; // Is the list already read from database, or it needs to be read?
+ unsigned Num; // Number of events
+ long *LstAgdCods; // List of agenda codes
+ Loc_Order_t SelectedOrderType;
+ long AgdCodToEdit; // Used as parameter in contextual links
+ } Agenda;
struct
{
Sco_Scope_t Current;
diff --git a/swad_pagination.c b/swad_pagination.c
index ca32a126f..f942d38b0 100644
--- a/swad_pagination.c
+++ b/swad_pagination.c
@@ -131,6 +131,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (1);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (1);
@@ -164,6 +170,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (1);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
1,(unsigned) Pagination->NumPags);
@@ -208,6 +219,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (1);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (1);
@@ -241,6 +258,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (1);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
1,(unsigned) Pagination->NumPags);
@@ -268,6 +290,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (Pagination->LeftPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (Pagination->LeftPage);
@@ -301,6 +329,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (Pagination->LeftPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
(unsigned) Pagination->LeftPage,(unsigned) Pagination->NumPags);
@@ -335,6 +368,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (NumPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (NumPage);
@@ -368,6 +407,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (NumPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
(unsigned) NumPage,(unsigned) Pagination->NumPags);
@@ -398,6 +442,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (Pagination->RightPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (Pagination->RightPage);
@@ -431,6 +481,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (Pagination->RightPage);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
(unsigned) Pagination->RightPage,(unsigned) Pagination->NumPags);
@@ -458,6 +513,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_USR_AGENDA:
+ Act_FormStart (ActSeeUsrAgd);
+ Pag_PutHiddenParamPagNum (Pagination->NumPags);
+ Agd_PutHiddenParamEventsOrderType ();
+ Usr_PutParamOtherUsrCodEncrypted ();
+ break;
case Pag_ATT_EVENTS:
Act_FormStart (ActSeeAtt);
Pag_PutHiddenParamPagNum (Pagination->NumPags);
@@ -491,6 +552,11 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
break;
+ case Pag_MY_AGENDA:
+ Act_FormStart (ActSeeMyAgd);
+ Pag_PutHiddenParamPagNum (Pagination->NumPags);
+ Agd_PutHiddenParamEventsOrderType ();
+ break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
(unsigned) Pagination->NumPags,(unsigned) Pagination->NumPags);
diff --git a/swad_pagination.h b/swad_pagination.h
index a082e6f8e..8d86df76d 100644
--- a/swad_pagination.h
+++ b/swad_pagination.h
@@ -40,12 +40,14 @@
typedef enum
{
Pag_ASSIGNMENTS,
+ Pag_USR_AGENDA,
Pag_ATT_EVENTS,
Pag_MESSAGES_RECEIVED,
Pag_MESSAGES_SENT,
Pag_THREADS_FORUM,
Pag_POSTS_FORUM,
Pag_SURVEYS,
+ Pag_MY_AGENDA,
} Pag_WhatPaginate_t;
struct Pagination // Used for threads and messages pagination
diff --git a/swad_record.c b/swad_record.c
index 0a73a1767..51e5ad57f 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -2367,7 +2367,7 @@ static void Rec_PutIconsCommands (void)
// The following slow check is made only if the previous fails
ICanViewAgenda = Usr_CheckIfUsrSharesAnyOfMyCrs (Gbl.Record.UsrDat->UsrCod);
if (ICanViewAgenda)
- Lay_PutContextualLink (ActSeeMyAgd,
+ Lay_PutContextualLink (ActSeeUsrAgd,
Rec_PutParamUsrCodEncrypted,
"date64x64.gif",
Txt_View_agenda,NULL,
diff --git a/swad_text.c b/swad_text.c
index 157755001..e6eb23c4a 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -2090,27 +2090,6 @@ const char *Txt_Admin_several_teachers =
"Gerenciar vários professores";
#endif
-const char *Txt_Agenda =
-#if L==1
- "Agenda";
-#elif L==2
- "Organizer";
-#elif L==3
- "Agenda";
-#elif L==4
- "Agenda";
-#elif L==5
- "Agenda";
-#elif L==6
- "Aporyrã";
-#elif L==7
- "Agenda";
-#elif L==8
- "Pamiętnik";
-#elif L==9
- "Agenda";
-#endif
-
const char *Txt_all =
#if L==1
"tot";
@@ -23198,6 +23177,27 @@ const char *Txt_Multiple_enrollment = // (to a type of group)
"Inscrição múltiplas?";
#endif
+const char *Txt_My_agenda =
+#if L==1
+ "La meva agenda";
+#elif L==2
+ "Mein Organizer";
+#elif L==3
+ "My agenda";
+#elif L==4
+ "Mi agenda";
+#elif L==5
+ "Mon agenda";
+#elif L==6
+ "Che aporyrã";
+#elif L==7
+ "La mia agenda";
+#elif L==8
+ "Moja pamiętnik";
+#elif L==9
+ "Minha agenda";
+#endif
+
const char *Txt_My_courses =
#if L==1
"Les meves assignatures";