Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-29 04:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.16.6

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-09-27 00:46:02 +02:00
parent e42221bdb8
commit f6bf59fc17
4 changed files with 71 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
swad_assignment.c
View File

@ -344,6 +344,7 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
struct Assignment Asg; struct Assignment Asg;
Dat_StartEndTime_t StartEndTime;
char Txt[Cns_MAX_BYTES_TEXT + 1]; char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get data of this assignment *****/ /***** Get data of this assignment *****/
@ -366,10 +367,15 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
} }
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Start date/time */ /* Start/end date/time */
UniqueId++; UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"asg_date_start_%u\" class=\"%s LEFT_BOTTOM",
UniqueId, for (StartEndTime = (Dat_StartEndTime_t) 0;
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
StartEndTime++)
{
fprintf (Gbl.F.Out,"<td id=\"asg_date_%u_%u\" class=\"%s LEFT_BOTTOM",
(unsigned) StartEndTime,UniqueId,
Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") : "DATE_RED_LIGHT") :
(Asg.Open ? "DATE_GREEN" : (Asg.Open ? "DATE_GREEN" :
@ -378,31 +384,13 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">" fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">" "<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_date_start_%u',%ld," "writeLocalDateHMSFromUTC('asg_date_%u_%u',%ld,"
"%u,'<br />','%s',true,true,0x7);" "%u,'<br />','%s',true,true,0x7);"
"</script>" "</script>"
"</td>", "</td>",
UniqueId,Asg.TimeUTC[Dat_START_TIME], (unsigned) StartEndTime,UniqueId,Asg.TimeUTC[StartEndTime],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
/* End date/time */
UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"asg_date_end_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Asg.Open ? "DATE_GREEN" :
"DATE_RED"));
if (!PrintView)
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('asg_date_end_%u',%ld,"
"%u,'<br />','%s',false,true,0x7);"
"</script>"
"</td>",
UniqueId,Asg.TimeUTC[Dat_END_TIME],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today); (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
}
/* Assignment title */ /* Assignment title */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP", fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP",

34
swad_attendance.c
View File

@ -375,6 +375,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
extern const char *Txt_View_event; extern const char *Txt_View_event;
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
Dat_StartEndTime_t StartEndTime;
char Description[Cns_MAX_BYTES_TEXT + 1]; char Description[Cns_MAX_BYTES_TEXT + 1];
/***** Get data of this attendance event *****/ /***** Get data of this attendance event *****/
@ -402,10 +403,14 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
} }
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Start date/time */ /* Start/end date/time */
UniqueId++; UniqueId++;
fprintf (Gbl.F.Out,"<td id=\"att_date_start_%u\" class=\"%s LEFT_BOTTOM", for (StartEndTime = (Dat_StartEndTime_t) 0;
UniqueId, StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
StartEndTime++)
{
fprintf (Gbl.F.Out,"<td id=\"att_date_%u_%u\" class=\"%s LEFT_BOTTOM",
(unsigned) StartEndTime,UniqueId,
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" : Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") : "DATE_RED_LIGHT") :
(Att->Open ? "DATE_GREEN" : (Att->Open ? "DATE_GREEN" :
@ -414,30 +419,13 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">" fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">" "<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld," "writeLocalDateHMSFromUTC('att_date_%u_%u',%ld,"
"%u,'<br />','%s',true,true,0x7);" "%u,'<br />','%s',true,true,0x7);"
"</script>" "</script>"
"</td>", "</td>",
UniqueId,Att->TimeUTC[Att_START_TIME], (unsigned) StartEndTime,UniqueId,Att->TimeUTC[StartEndTime],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
/* End date/time */
fprintf (Gbl.F.Out,"<td id=\"att_date_end_%u\" class=\"%s LEFT_BOTTOM",
UniqueId,
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Att->Open ? "DATE_GREEN" :
"DATE_RED"));
if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_end_%u',%ld,"
"%u,'<br />','%s',false,true,0x7);"
"</script>"
"</td>",
UniqueId,Att->TimeUTC[Att_END_TIME],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today); (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
}
/* Attendance event title */ /* Attendance event title */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP"); fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP");

6
swad_changelog.h
View File

@ -470,11 +470,13 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.16.4 (2019-09-27)" #define Log_PLATFORM_VERSION "SWAD 19.16.6 (2019-09-27)"
#define CSS_FILE "swad19.15.css" #define CSS_FILE "swad19.15.css"
#define JS_FILE "swad19.15.js" #define JS_FILE "swad19.15.js"
/* /*
Version 19.16.4: Sep 27, 2019 Code refactoring in agenda. (246407 lines) Version 19.16.6: Sep 27, 2019 Code refactoring in match dates. (246378 lines)
Version 19.16.5: Sep 27, 2019 Code refactoring in assignment dates. (246396 lines)
Version 19.16.4: Sep 27, 2019 Code refactoring in agenda dates. (246407 lines)
Version 19.16.3: Sep 27, 2019 Code refactoring in game dates. (246414 lines) Version 19.16.3: Sep 27, 2019 Code refactoring in game dates. (246414 lines)
Version 19.16.2: Sep 26, 2019 Fixed bugs in edition of games. Version 19.16.2: Sep 26, 2019 Fixed bugs in edition of games.
Changed listing of games and surveys. (246422 lines) Changed listing of games and surveys. (246422 lines)

32
swad_match.c
View File

@ -3554,6 +3554,7 @@ void Mch_ShowOneMchResult (void)
Usr_MeOrOther_t MeOrOther; Usr_MeOrOther_t MeOrOther;
struct UsrData *UsrDat; struct UsrData *UsrDat;
time_t TimeUTC[Dat_NUM_START_END_TIME]; // Match result UTC date-time time_t TimeUTC[Dat_NUM_START_END_TIME]; // Match result UTC date-time
Dat_StartEndTime_t StartEndTime;
unsigned NumQsts; unsigned NumQsts;
unsigned NumQstsNotBlank; unsigned NumQstsNotBlank;
double TotalScore; double TotalScore;
@ -3695,35 +3696,26 @@ void Mch_ShowOneMchResult (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/* Start time (for user in this match) */ /* Start/end time (for user in this match) */
for (StartEndTime = (Dat_StartEndTime_t) 0;
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
StartEndTime++)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT_N RIGHT_TOP\">" "<td class=\"DAT_N RIGHT_TOP\">"
"%s:" "%s:"
"</td>" "</td>"
"<td id=\"match_start\" class=\"DAT LEFT_TOP\">" "<td id=\"match_%u\" class=\"DAT LEFT_TOP\">"
"<script type=\"text/javascript\">" "<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('match_start',%ld," "writeLocalDateHMSFromUTC('match_%u',%ld,"
"%u,',&nbsp;','%s',true,true,0x7);" "%u,',&nbsp;','%s',true,true,0x7);"
"</script>" "</script>"
"</td>" "</td>"
"</tr>", "</tr>",
Txt_START_END_TIME[Dat_START_TIME], Txt_START_END_TIME[StartEndTime],
TimeUTC[Dat_START_TIME],(unsigned) Gbl.Prefs.DateFormat,Txt_Today); (unsigned) StartEndTime,
(unsigned) StartEndTime,
/* End time (for user in this match) */ TimeUTC[StartEndTime],
fprintf (Gbl.F.Out,"<tr>" (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
"<td class=\"DAT_N RIGHT_TOP\">"
"%s:"
"</td>"
"<td id=\"match_end\" class=\"DAT LEFT_TOP\">"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('match_end',%ld,"
"%u,',&nbsp;','%s',true,true,0x7);"
"</script>"
"</td>"
"</tr>",
Txt_START_END_TIME[Dat_END_TIME],
TimeUTC[Dat_END_TIME],(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
/* Number of questions */ /* Number of questions */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"