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

This commit is contained in:
Antonio Cañas Vargas 2016-12-02 00:58:07 +01:00
parent 98db84fe19
commit b58dac1a7b
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swad_action.c
View File

@ -2364,7 +2364,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActChgVisFie */{ 297,-1,TabUnk,ActLstStd ,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ChangeVisibilityField ,NULL},
/* ActRcvRecCrs */{ 301,-1,TabUnk,ActLstStd ,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_UpdateAndShowMyCrsRecord ,NULL},
/* ActSeeUsrAgd */{1611,-1,TabUnk,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowUsrAgenda ,NULL},
/* ActSeeUsrAgd */{1611,-1,TabUnk,ActLstTch ,0x1FC,0x1FC,0x1FC,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowUsrAgenda ,NULL},
/* ActReqEnrSevStd */{1426,-1,TabUnk,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminStds ,NULL},
/* ActReqEnrSevTch */{1427,-1,TabUnk,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminTchs ,NULL},
@ -2795,14 +2795,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActAnnSee */{1234,-1,TabUnk,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ann_MarkAnnouncementAsSeen ,NULL},
/* ActChgMyRol */{ 589,-1,TabUnk,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Rol_ChangeMyRole ,Usr_ShowFormsLogoutAndRole ,NULL},
/* ActFrmNewEvtMyAgd */{1603,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
/* ActEdiOneEvtMyAgd */{1604,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
/* ActNewEvtMyAgd */{1605,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
/* ActChgEvtMyAgd */{1606,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
/* ActReqRemEvtMyAgd */{1607,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_AskRemEvent ,NULL},
/* ActRemEvtMyAgd */{1608,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RemoveEvent ,NULL},
/* ActHidEvtMyAgd */{1609,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_HideEvent ,NULL},
/* ActShoEvtMyAgd */{1610,-1,TabUnk,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowEvent ,NULL},
/* ActFrmNewEvtMyAgd */{1603,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
/* ActEdiOneEvtMyAgd */{1604,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
/* ActNewEvtMyAgd */{1605,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
/* ActChgEvtMyAgd */{1606,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
/* ActReqRemEvtMyAgd */{1607,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_AskRemEvent ,NULL},
/* ActRemEvtMyAgd */{1608,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RemoveEvent ,NULL},
/* ActHidEvtMyAgd */{1609,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_HideEvent ,NULL},
/* ActShoEvtMyAgd */{1610,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowEvent ,NULL},
/* ActChkUsrAcc */{1584,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_CheckIfEmptyAccountExists ,NULL},
/* ActCreUsrAcc */{1163,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_AfterCreationNewAccount ,NULL},

28
swad_agenda.c
View File

@ -122,6 +122,7 @@ void Agd_ShowMyAgenda (void)
static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
{
extern const char *Hlp_PROFILE_Agenda;
extern const char *Txt_Agenda_USER;
extern const char *Txt_My_agenda;
extern const char *Txt_ASG_ATT_OR_SVY_HELP_ORDER[2];
extern const char *Txt_ASG_ATT_OR_SVY_ORDER[2];
@ -136,16 +137,6 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
Pag_USR_AGENDA,
Pag_MY_AGENDA,
};
void (*FunctionToDrawContextualIcons[Agd_NUM_AGENDA_TYPES]) (void) =
{
NULL,
Agd_PutIconToCreateNewEvent,
};
const char *Title[Agd_NUM_AGENDA_TYPES] =
{
"Agenda de otro usuario",
Txt_My_agenda,
};
/***** Get parameters *****/
Agd_GetParamEventOrderType ();
@ -165,9 +156,20 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
Pag_WriteLinksToPagesCentered (WhatPaginate[AgendaType],0,&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Title[AgendaType],
FunctionToDrawContextualIcons[AgendaType],
Hlp_PROFILE_Agenda);
switch (AgendaType)
{
case Agd_USR_AGENDA:
sprintf (Gbl.Title,Txt_Agenda_USER,Gbl.Usrs.Other.UsrDat.FullName); // TODO: Need translation!!!!!
Lay_StartRoundFrame ("100%",Gbl.Title,
NULL,
Hlp_PROFILE_Agenda); // TODO: Change
break;
case Agd_MY_AGENDA:
Lay_StartRoundFrame ("100%",Txt_My_agenda,
Agd_PutIconToCreateNewEvent,
Hlp_PROFILE_Agenda);
break;
}
if (Gbl.Agenda.Num)
{

7
swad_changelog.h
View File

@ -179,19 +179,22 @@
// 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: Cuando el alumno vea la agenda del profesor, sólo se mostrarán los eventos públicos cuya fecha final esté en el futuro
// TODO: Cuando un alumno (no profesor en ninguna asignatura) vea su agenda, no tienen sentido los candados
// TODO: Eliminar agenda de un usuario al eliminarlo completamente
// TODO: Sólo horas y minutos en la agenda
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.82 (2016-12-02)"
#define Log_PLATFORM_VERSION "SWAD 16.82.1 (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.1: Dec 02, 2016 Changes in another user's agenda. (209450 lines)
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';

21
swad_text.c
View File

@ -2090,6 +2090,27 @@ const char *Txt_Admin_several_teachers =
"Gerenciar vários professores";
#endif
const char *Txt_Agenda_USER = // Warning: it is very important to include %s in the following sentences
#if L==1
"Agenda de %s";
#elif L==2
"Organizer von %s";
#elif L==3
"%s's agenda";
#elif L==4
"Agenda de %s";
#elif L==5
"Agenda de %s";
#elif L==6
"Aporyrã %s";
#elif L==7
"Agenda di %s";
#elif L==8
"Pamiętnik %s";
#elif L==9
"Agenda de %s";
#endif
const char *Txt_all =
#if L==1
"tot";