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

Version 18.19

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2018-12-03 19:49:54 +01:00
parent c652aff79b
commit 57c6ed0fa7
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
swad_attendance.c
View File

@ -113,6 +113,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att);
static void Att_WriteRowStdToCallTheRoll (unsigned NumStd, static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,
struct UsrData *UsrDat, struct UsrData *UsrDat,
struct AttendanceEvent *Att); struct AttendanceEvent *Att);
static void Att_PutLinkAttEvent (struct AttendanceEvent *AttEvent,
const char *Title,const char *Txt,
const char *LinkStyle);
static void Att_PutParamsCodGrps (long AttCod); static void Att_PutParamsCodGrps (long AttCod);
static void Att_GetNumStdsTotalWhoAreInAttEvent (struct AttendanceEvent *Att); static void Att_GetNumStdsTotalWhoAreInAttEvent (struct AttendanceEvent *Att);
static unsigned Att_GetNumStdsFromAListWhoAreInAttEvent (long AttCod,long LstSelectedUsrCods[],unsigned NumStdsInList); static unsigned Att_GetNumStdsFromAListWhoAreInAttEvent (long AttCod,long LstSelectedUsrCods[],unsigned NumStdsInList);
@ -441,15 +444,9 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
if (!ShowOnlyThisAttEventComplete) if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"); fprintf (Gbl.F.Out,"\">");
Att_PutLinkAttEvent (Att,Txt_View_event,Att->Title,
/* Put form to view attendance event */ Att->Hidden ? "ASG_TITLE_LIGHT" :
Frm_StartForm (ActSeeOneAtt); "ASG_TITLE");
Att_PutParamAttCod (Att->AttCod);
Att_PutParamsCodGrps (Att->AttCod);
Frm_LinkFormSubmit (Txt_View_event,Att->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",NULL);
fprintf (Gbl.F.Out,"%s</a>",Att->Title);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Number of students in this event */ /* Number of students in this event */
@ -2196,6 +2193,22 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
/*****************************************************************************/
/**************** Put link to view one attendance event **********************/
/*****************************************************************************/
static void Att_PutLinkAttEvent (struct AttendanceEvent *AttEvent,
const char *Title,const char *Txt,
const char *LinkStyle)
{
Frm_StartForm (ActSeeOneAtt);
Att_PutParamAttCod (AttEvent->AttCod);
Att_PutParamsCodGrps (AttEvent->AttCod);
Frm_LinkFormSubmit (Title,LinkStyle,NULL);
fprintf (Gbl.F.Out,"%s</a>",Txt);
Frm_EndForm ();
}
/*****************************************************************************/ /*****************************************************************************/
/****** Put parameters with the default groups in an attendance event ********/ /****** Put parameters with the default groups in an attendance event ********/
/*****************************************************************************/ /*****************************************************************************/
@ -3372,6 +3385,7 @@ static void Att_WriteTableHeadSeveralAttEvents (void)
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Attendance; extern const char *Txt_Attendance;
unsigned NumAttEvent; unsigned NumAttEvent;
char StrNumAttEvent[10 + 1];
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<th colspan=\"%u\" class=\"LEFT_MIDDLE\">" "<th colspan=\"%u\" class=\"LEFT_MIDDLE\">"
@ -3389,11 +3403,17 @@ static void Att_WriteTableHeadSeveralAttEvents (void)
/***** Get data of this attendance event *****/ /***** Get data of this attendance event *****/
Att_GetDataOfAttEventByCodAndCheckCrs (&Gbl.AttEvents.Lst[NumAttEvent]); Att_GetDataOfAttEventByCodAndCheckCrs (&Gbl.AttEvents.Lst[NumAttEvent]);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\" title=\"%s\">" /***** Put link to this attendance event *****/
"%u" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\" title=\"%s\">",
"</th>", Gbl.AttEvents.Lst[NumAttEvent].Title);
Gbl.AttEvents.Lst[NumAttEvent].Title, snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),
NumAttEvent + 1); "%u",
NumAttEvent + 1);
Att_PutLinkAttEvent (&Gbl.AttEvents.Lst[NumAttEvent],
Gbl.AttEvents.Lst[NumAttEvent].Title,
StrNumAttEvent,
NULL);
fprintf (Gbl.F.Out,"</th>");
} }
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"

5
swad_changelog.h
View File

@ -329,7 +329,7 @@ Buenos d
// TODO: Pedro Villar Castro: // TODO: Pedro Villar Castro:
// Al asignar un TFG a alumnos, no escribir el DNI del alumno, sino escogerlo de una lista de entre los alumnos inscritos en la asignatura. // Al asignar un TFG a alumnos, no escribir el DNI del alumno, sino escogerlo de una lista de entre los alumnos inscritos en la asignatura.
// TODO: Al listar asistencia de un estudiante, en los números de cada una de las actividades, poner un enlace a dicha actividad. // TODO: No se puede pulsar sobre la foto de un remitente de un mensaje recibido.
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
@ -350,10 +350,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.18.4 (2018-12-03)" #define Log_PLATFORM_VERSION "SWAD 18.19 (2018-12-03)"
#define CSS_FILE "swad18.4.css" #define CSS_FILE "swad18.4.css"
#define JS_FILE "swad17.17.1.js" #define JS_FILE "swad17.17.1.js"
/* /*
Version 18.19: Dec 03, 2018 Links to attendance events in attendance list. (237054 lines)
Version 18.18.4: Dec 03, 2018 Removed MOOC advertisement. (237034 lines) Version 18.18.4: Dec 03, 2018 Removed MOOC advertisement. (237034 lines)
Version 18.18.3: Nov 20, 2018 Fixed bug in user's public profile. (237031 lines) Version 18.18.3: Nov 20, 2018 Fixed bug in user's public profile. (237031 lines)
Version 18.18.2: Nov 16, 2018 Hierarchy menu shown in list of countries. (237028 lines) Version 18.18.2: Nov 16, 2018 Hierarchy menu shown in list of countries. (237028 lines)