From b5edda72ee0716f9ab6ed78a8c0dede0594b6f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 17 Jan 2017 14:52:13 +0100 Subject: [PATCH] Version 16.119.1 --- css/swad16.119.css | 4 ++-- swad_attendance.c | 4 ++-- swad_attendance.h | 5 ++++- swad_changelog.h | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/css/swad16.119.css b/css/swad16.119.css index 835d34100..e3d9ec952 100644 --- a/css/swad16.119.css +++ b/css/swad16.119.css @@ -275,8 +275,7 @@ a:hover /* Default ==> underlined */ { box-sizing:border-box; width:80px; - /* margin-left:6px; */ - margin:0 auto; + margin-left:6px; border-radius:4px; box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 2px 1px -2px rgba(0,0,0,0.2), 0 1px 5px 0 rgba(0,0,0,0.12); } @@ -300,6 +299,7 @@ a:hover /* Default ==> underlined */ } #current_time { + border-radius:0 0 4px 4px; background-color:rgba(255, 255, 255, 0.8);; color:#606060; font-size:12pt; diff --git a/swad_attendance.c b/swad_attendance.c index 41abf9b6d..d25718bae 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -811,6 +811,8 @@ static void Att_ResetAttendanceEvent (struct AttendanceEvent *Att) if (Att->AttCod <= 0) // If > 0 ==> keep values of AttCod and Selected { Att->AttCod = -1L; + Att->NumStdsTotal = 0; + Att->NumStdsFromList = 0; Att->Selected = false; } Att->CrsCod = -1L; @@ -821,8 +823,6 @@ static void Att_ResetAttendanceEvent (struct AttendanceEvent *Att) Att->Open = false; Att->Title[0] = '\0'; Att->CommentTchVisible = false; - Att->NumStdsTotal = 0; - Att->NumStdsFromList = 0; } /*****************************************************************************/ diff --git a/swad_attendance.h b/swad_attendance.h index 1d9e956d0..81b83b719 100644 --- a/swad_attendance.h +++ b/swad_attendance.h @@ -45,6 +45,7 @@ typedef enum struct AttendanceEvent { + /* Fields stored in database */ long AttCod; long CrsCod; bool Hidden; @@ -53,9 +54,11 @@ struct AttendanceEvent bool Open; char Title[Att_MAX_LENGTH_ATTENDANCE_EVENT_TITLE + 1]; bool CommentTchVisible; + + /* Fields computed, not associated to the event in database */ unsigned NumStdsTotal; // Number total of students who have assisted to the event unsigned NumStdsFromList; // Number of students (taken from a list) who has assisted to the event - bool Selected; // I have selected this attendance event + bool Selected; // I have selected this attendance event }; typedef enum diff --git a/swad_changelog.h b/swad_changelog.h index 6fedb5f51..c7fd679a8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -191,13 +191,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.119 (2017-01-17)" +#define Log_PLATFORM_VERSION "SWAD 16.119.1 (2017-01-17)" #define CSS_FILE "swad16.119.css" #define JS_FILE "swad16.119.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.119.1: Jan 17, 2017 Fixed bug in attendance. (211877 lines) Version 16.119: Jan 17, 2017 Changes in layout of current data and time. Fixed bug in attendance, reported by Javier Fernández Baldomero. (211874 lines) Version 16.118.2: Jan 17, 2017 Fix bug in string concatenation. (211854 lines)