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

Version 18.41.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-02-14 10:25:08 +01:00
parent 7e239741b6
commit 5c25d23ba3
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swad_attendance.c
View File

@ -3185,7 +3185,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
"<th colspan=\"3\" class=\"LEFT_MIDDLE\">"
"<th colspan=\"4\" class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE\">"
@ -3221,13 +3221,16 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"</td>"
"<td class=\"DAT LEFT_TOP COLOR%u\">"
"<label for=\"Att%u\">"
"<span id=\"att_date_start_%u\"></span>&nbsp;%s"
"<span id=\"att_date_start_%u\"></span>"
"</label>"
"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_start_%u',%ld,"
"%u,',&nbsp;','%s',true,true,0x7);"
"</script>"
"</td>"
"<td class=\"DAT LEFT_TOP COLOR%u\">"
"%s"
"</td>"
"<td class=\"DAT RIGHT_TOP COLOR%u\">"
"%u"
"</td>"
@ -3235,10 +3238,12 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
Gbl.RowEvenOdd,
NumAttEvent,NumAttEvent + 1,
Gbl.RowEvenOdd,
NumAttEvent,UniqueId,Gbl.AttEvents.Lst[NumAttEvent].Title,
NumAttEvent,UniqueId,
UniqueId,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today,
Gbl.RowEvenOdd,
Gbl.AttEvents.Lst[NumAttEvent].Title,
Gbl.RowEvenOdd,
Gbl.AttEvents.Lst[NumAttEvent].NumStdsTotal);
}
@ -3246,7 +3251,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
if (NormalView)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" class=\"CENTER_MIDDLE\">");
"<td colspan=\"5\" class=\"CENTER_MIDDLE\">");
Frm_LinkFormSubmitAnimated (Txt_Update_attendance,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);

4
swad_changelog.h
View File

@ -384,10 +384,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.41.1 (2019-02-14)"
#define Log_PLATFORM_VERSION "SWAD 18.41.2 (2019-02-14)"
#define CSS_FILE "swad18.41.1.css"
#define JS_FILE "swad18.32.1.js"
/*
Version 18.41.2: Feb 14, 2019 Change in layout of attendance list.
Fixed bug in search of files. (239225 lines)
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)

38
swad_file_browser.c
View File

@ -6259,7 +6259,7 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *
fprintf (Gbl.F.Out," style=\"display:none;\"");
fprintf (Gbl.F.Out,">");
/***** Form and icon *****/
/***** Icon *****/
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_OPT CONTEXT_ICO_16x16\" />",
@ -12414,30 +12414,30 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
/* Start form */
Action = Brw_ActReqDatFile[Brw_FileBrowserForFoundDocs[FileMetadata.FileBrowser]];
if (CrsCod > 0 && CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // Not the current course
if (CrsCod > 0)
{
Frm_StartFormGoTo (Action);
Crs_PutParamCrsCod (CrsCod); // Go to course
if (GrpCod > 0)
Grp_PutParamGrpCod (GrpCod);
}
else if (DegCod > 0)
{
Frm_StartFormGoTo (Action);
Crs_PutParamCrsCod (CrsCod); // Go to another course
Frm_StartFormGoTo (Action);
Deg_PutParamDegCod (DegCod); // Go to degree
}
else if (DegCod > 0 && DegCod != Gbl.CurrentDeg.Deg.DegCod) // Not the current degree
else if (CtrCod > 0)
{
Frm_StartFormGoTo (Action);
Deg_PutParamDegCod (DegCod); // Go to another degree
Frm_StartFormGoTo (Action);
Ctr_PutParamCtrCod (CtrCod); // Go to centre
}
else if (CtrCod > 0 && CtrCod != Gbl.CurrentCtr.Ctr.CtrCod) // Not the current centre
else if (InsCod > 0)
{
Frm_StartFormGoTo (Action);
Ctr_PutParamCtrCod (CtrCod); // Go to another centre
}
else if (InsCod > 0 && InsCod != Gbl.CurrentIns.Ins.InsCod) // Not the current institution
{
Frm_StartFormGoTo (Action);
Ins_PutParamInsCod (InsCod); // Go to another institution
Frm_StartFormGoTo (Action);
Ins_PutParamInsCod (InsCod); // Go to institution
}
else
Frm_StartForm (Action);
if (GrpCod > 0)
Grp_PutParamGrpCod (GrpCod);
/* Parameters to go to file / folder */
Brw_PutParamsFileBrowser (ActUnk,
@ -12453,9 +12453,9 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL);
if (FileMetadata.FileType == Brw_IS_FOLDER)
/* Icon with folder */
fprintf (Gbl.F.Out,"<img src=\"%s/folder-closed16x16.gif\""
fprintf (Gbl.F.Out,"<img src=\"%s/folder-yellow.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
" class=\"CONTEXT_ICO_16x16\" />",
Gbl.Prefs.URLIcons,
Txt_Folder,Txt_Folder);
else