diff --git a/css/swad18.41.css b/css/swad18.41.1.css similarity index 99% rename from css/swad18.41.css rename to css/swad18.41.1.css index 364c05267..130a61b46 100644 --- a/css/swad18.41.css +++ b/css/swad18.41.1.css @@ -2105,7 +2105,8 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT {color:#606060; font-size:13pt;} .DAT_NOBR {color:#606060; font-size:13pt; white-space:nowrap;} .DAT_BOLD {color:#606060; font-size:13pt; font-weight:bold;} -.DAT_GREEN {color:#008000; font-size:13pt;} +.DAT_GREEN {color:darkgreen; font-size:13pt;} +.DAT_RED {color:darkred; font-size:13pt;} .DAT_LIGHT {color:#A0A0A0; font-size:13pt;} .DAT_N {color:black; font-size:13pt;} .DAT_NOBR_N {color:black; font-size:13pt; white-space:nowrap;} @@ -2705,15 +2706,17 @@ a:hover img.CENTRE_PHOTO_SHOW .ATT_CHECK { display:inline-block; - font-size:16pt; + font-size:13pt; + font-weight:bold; color:darkgreen; } .ATT_CROSS { display:inline-block; - font-size:16pt; + font-size:13pt; + font-weight:bold; color:darkred; - opacity:0.2; + opacity:0.1; } /**************************** Enrolment requests *****************************/ diff --git a/swad_attendance.c b/swad_attendance.c index 681dcaddb..32a398200 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -2113,8 +2113,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd, fprintf (Gbl.F.Out,"" "%u" "", - UsrDat->Accepted ? "DAT_SMALL_N" : - "DAT_SMALL", + UsrDat->Accepted ? "DAT_N" : + "DAT", Gbl.RowEvenOdd, NumStd); @@ -3206,7 +3206,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) /* Write a row for this event */ fprintf (Gbl.F.Out,"" - "" + "" "" "" - "" + "" "" "" - "" + "" "" @@ -3228,7 +3228,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) "%u,', ','%s',true,true,0x7);" "" "" - "" + "" "%u" "" "", @@ -3432,8 +3432,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr "" "%u" "", - UsrDat->Accepted ? "DAT_SMALL_N" : - "DAT_SMALL", + UsrDat->Accepted ? "DAT_N" : + "DAT", Gbl.RowEvenOdd, NumStd + 1); @@ -3590,18 +3590,18 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) char CommentTch[Cns_MAX_BYTES_TEXT + 1]; /***** Write number of student in the list *****/ + NumStd++; fprintf (Gbl.F.Out,"" "" "%u:" "", - UsrDat->Accepted ? "DAT_SMALL_N" : - "DAT_SMALL", + UsrDat->Accepted ? "DAT_N" : + "DAT", Gbl.RowEvenOdd, - NumStd + 1); + NumStd); /***** Show student's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3615,8 +3615,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) "" "", Gbl.RowEvenOdd, - UsrDat->Accepted ? "DAT_SMALL_N" : - "DAT_SMALL"); + UsrDat->Accepted ? "DAT_N" : + "DAT"); ID_WriteUsrIDs (UsrDat,NULL); fprintf (Gbl.F.Out,""); @@ -3654,25 +3654,32 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) /***** Write a row for this event *****/ fprintf (Gbl.F.Out,"" "" - "" + "" "%u:" "" - "", + "", Gbl.RowEvenOdd, + Present ? "DAT_GREEN" : + "DAT_RED", Gbl.RowEvenOdd, NumAttEvent + 1, Gbl.RowEvenOdd); Att_PutCheckOrCross (Present); - fprintf (Gbl.F.Out," %s" + fprintf (Gbl.F.Out,"" + "" + "" + "
%s" "" "" "", - UniqueId, + Gbl.RowEvenOdd, + NumStd,UniqueId, Gbl.AttEvents.Lst[NumAttEvent].Title, - UniqueId,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME], + NumStd,UniqueId, + Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME], (unsigned) Gbl.Prefs.DateFormat,Txt_Today); /***** Write comments for this student *****/ @@ -3681,10 +3688,12 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) fprintf (Gbl.F.Out,"" "" "" + "" "" "
", Gbl.RowEvenOdd, Gbl.RowEvenOdd, + Gbl.RowEvenOdd, Gbl.RowEvenOdd); if (ShowCommentStd) { diff --git a/swad_changelog.h b/swad_changelog.h index 0a0ae4e31..33238e8ac 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -384,10 +384,12 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.41 (2019-02-13)" -#define CSS_FILE "swad18.41.css" +#define Log_PLATFORM_VERSION "SWAD 18.41.1 (2019-02-14)" +#define CSS_FILE "swad18.41.1.css" #define JS_FILE "swad18.32.1.js" /* + Version 18.41.1: Feb 14, 2019 Fixed bug in attendance list. + Changes in layout of attendance list. (239218 lines) Version 18.41: Feb 13, 2019 Changes in attendance marks for present/absent. (239203 lines) Version 18.40.1: Feb 13, 2019 Code refactorization in firewall. (239201 lines) Version 18.40: Feb 13, 2019 New table for banned IPs to mitigate DoS attacks. (239198 lines) diff --git a/swad_firewall.c b/swad_firewall.c index ec2784ad9..78be37b3a 100644 --- a/swad_firewall.c +++ b/swad_firewall.c @@ -25,6 +25,8 @@ /********************************* Headers ***********************************/ /*****************************************************************************/ +#include // For exit + #include "swad_database.h" #include "swad_global.h"