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 18.41.1

This commit is contained in:
Antonio Cañas Vargas 2019-02-14 00:33:51 +01:00
parent 139d21814c
commit 7e239741b6
4 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/swad18.41.css → css/swad18.41.1.css
View File

@ -2105,7 +2105,8 @@ a:hover img.CENTRE_PHOTO_SHOW
.DAT {color:#606060; font-size:13pt;} .DAT {color:#606060; font-size:13pt;}
.DAT_NOBR {color:#606060; font-size:13pt; white-space:nowrap;} .DAT_NOBR {color:#606060; font-size:13pt; white-space:nowrap;}
.DAT_BOLD {color:#606060; font-size:13pt; font-weight:bold;} .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_LIGHT {color:#A0A0A0; font-size:13pt;}
.DAT_N {color:black; font-size:13pt;} .DAT_N {color:black; font-size:13pt;}
.DAT_NOBR_N {color:black; font-size:13pt; white-space:nowrap;} .DAT_NOBR_N {color:black; font-size:13pt; white-space:nowrap;}
@ -2705,15 +2706,17 @@ a:hover img.CENTRE_PHOTO_SHOW
.ATT_CHECK .ATT_CHECK
{ {
display:inline-block; display:inline-block;
font-size:16pt; font-size:13pt;
font-weight:bold;
color:darkgreen; color:darkgreen;
} }
.ATT_CROSS .ATT_CROSS
{ {
display:inline-block; display:inline-block;
font-size:16pt; font-size:13pt;
font-weight:bold;
color:darkred; color:darkred;
opacity:0.2; opacity:0.1;
} }
/**************************** Enrolment requests *****************************/ /**************************** Enrolment requests *****************************/

51
swad_attendance.c
View File

@ -2113,8 +2113,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">"
"%u" "%u"
"</td>", "</td>",
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_N" :
"DAT_SMALL", "DAT",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
NumStd); NumStd);
@ -3206,7 +3206,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
/* Write a row for this event */ /* Write a row for this event */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT CENTER_MIDDLE COLOR%u\">" "<td class=\"DAT CENTER_TOP COLOR%u\">"
"<input type=\"checkbox\"" "<input type=\"checkbox\""
" id=\"Att%u\" name=\"AttCods\" value=\"%ld\"", " id=\"Att%u\" name=\"AttCods\" value=\"%ld\"",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
@ -3216,10 +3216,10 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />" fprintf (Gbl.F.Out," />"
"</td>" "</td>"
"<td class=\"DAT RIGHT_MIDDLE COLOR%u\">" "<td class=\"DAT RIGHT_TOP COLOR%u\">"
"<label for=\"Att%u\">%u:</label>" "<label for=\"Att%u\">%u:</label>"
"</td>" "</td>"
"<td class=\"DAT LEFT_MIDDLE COLOR%u\">" "<td class=\"DAT LEFT_TOP COLOR%u\">"
"<label for=\"Att%u\">" "<label for=\"Att%u\">"
"<span id=\"att_date_start_%u\"></span>&nbsp;%s" "<span id=\"att_date_start_%u\"></span>&nbsp;%s"
"</label>" "</label>"
@ -3228,7 +3228,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"%u,',&nbsp;','%s',true,true,0x7);" "%u,',&nbsp;','%s',true,true,0x7);"
"</script>" "</script>"
"</td>" "</td>"
"<td class=\"DAT RIGHT_MIDDLE COLOR%u\">" "<td class=\"DAT RIGHT_TOP COLOR%u\">"
"%u" "%u"
"</td>" "</td>"
"</tr>", "</tr>",
@ -3432,8 +3432,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
"<td class=\"%s RIGHT_MIDDLE COLOR%u\">" "<td class=\"%s RIGHT_MIDDLE COLOR%u\">"
"%u" "%u"
"</td>", "</td>",
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_N" :
"DAT_SMALL", "DAT",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
NumStd + 1); NumStd + 1);
@ -3590,18 +3590,18 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
char CommentTch[Cns_MAX_BYTES_TEXT + 1]; char CommentTch[Cns_MAX_BYTES_TEXT + 1];
/***** Write number of student in the list *****/ /***** Write number of student in the list *****/
NumStd++;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE COLOR%u\">" "<td class=\"%s RIGHT_MIDDLE COLOR%u\">"
"%u:" "%u:"
"</td>", "</td>",
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_N" :
"DAT_SMALL", "DAT",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
NumStd + 1); NumStd);
/***** Show student's photo *****/ /***** Show student's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\"" fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"RIGHT_MIDDLE COLOR%u\">",
" style=\"width:22px;\">",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
@ -3615,8 +3615,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
"<tr>" "<tr>"
"<td class=\"%s LEFT_MIDDLE\">", "<td class=\"%s LEFT_MIDDLE\">",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_N" :
"DAT_SMALL"); "DAT");
ID_WriteUsrIDs (UsrDat,NULL); ID_WriteUsrIDs (UsrDat,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
@ -3654,25 +3654,32 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
/***** Write a row for this event *****/ /***** Write a row for this event *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"COLOR%u\"></td>" "<td class=\"COLOR%u\"></td>"
"<td class=\"DAT RIGHT_TOP COLOR%u\">" "<td class=\"%s RIGHT_TOP COLOR%u\">"
"%u:" "%u:"
"</td>" "</td>"
"<td class=\"DAT LEFT_TOP COLOR%u\">", "<td class=\"BT%u\">",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Present ? "DAT_GREEN" :
"DAT_RED",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
NumAttEvent + 1, NumAttEvent + 1,
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Att_PutCheckOrCross (Present); Att_PutCheckOrCross (Present);
fprintf (Gbl.F.Out,"<span id=\"att_date_start_%u\"></span> %s" fprintf (Gbl.F.Out,"</td>"
"<td class=\"DAT LEFT_TOP COLOR%u\">"
"<span id=\"att_date_start_%u_%u\"></span>"
"<br />%s"
"<script type=\"text/javascript\">" "<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld," "writeLocalDateHMSFromUTC('att_date_start_%u_%u',%ld,"
"%u,',&nbsp;','%s',true,true,0x7);" "%u,',&nbsp;','%s',true,true,0x7);"
"</script>" "</script>"
"</td>" "</td>"
"</tr>", "</tr>",
UniqueId, Gbl.RowEvenOdd,
NumStd,UniqueId,
Gbl.AttEvents.Lst[NumAttEvent].Title, 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); (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
/***** Write comments for this student *****/ /***** Write comments for this student *****/
@ -3681,10 +3688,12 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"COLOR%u\"></td>" "<td class=\"COLOR%u\"></td>"
"<td class=\"COLOR%u\"></td>" "<td class=\"COLOR%u\"></td>"
"<td class=\"BT%u\"></td>"
"<td class=\"DAT LEFT_MIDDLE COLOR%u\">" "<td class=\"DAT LEFT_MIDDLE COLOR%u\">"
"<dl>", "<dl>",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Gbl.RowEvenOdd,
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
if (ShowCommentStd) if (ShowCommentStd)
{ {

6
swad_changelog.h
View File

@ -384,10 +384,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.41 (2019-02-13)" #define Log_PLATFORM_VERSION "SWAD 18.41.1 (2019-02-14)"
#define CSS_FILE "swad18.41.css" #define CSS_FILE "swad18.41.1.css"
#define JS_FILE "swad18.32.1.js" #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.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.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) Version 18.40: Feb 13, 2019 New table for banned IPs to mitigate DoS attacks. (239198 lines)

2
swad_firewall.c
View File

@ -25,6 +25,8 @@
/********************************* Headers ***********************************/ /********************************* Headers ***********************************/
/*****************************************************************************/ /*****************************************************************************/
#include <stdlib.h> // For exit
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"