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

Version19.30.6

This commit is contained in:
Antonio Cañas Vargas 2019-10-03 22:55:00 +02:00
parent add8f007ba
commit 7e7137d1bf
14 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_attendance.c
View File

@ -3537,7 +3537,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
/***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s LEFT_MIDDLE\">",
UsrDat->Accepted ? "DAT_N" :
@ -3555,7 +3555,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
fprintf (Gbl.F.Out,", %s</td>"
"</tr>",
UsrDat->FirstName);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

3
swad_changelog.h
View File

@ -487,12 +487,13 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.30.5 (2019-10-03)"
#define Log_PLATFORM_VERSION "SWAD 19.30.6 (2019-10-03)"
#define CSS_FILE "swad19.29.css"
#define JS_FILE "swad19.30.js"
/*
// TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas)
Version 19.30.6: Oct 03, 2019 Code refactoring in HTML tables. (246928 lines)
Version 19.30.5: Oct 03, 2019 Code refactoring in HTML tables. (246922 lines)
Version 19.30.4: Oct 03, 2019 Code refactoring in HTML tables. (246897 lines)
Version 19.30.3: Oct 03, 2019 Changes in help links. (246895 lines)

4
swad_connected.c
View File

@ -288,7 +288,7 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void)
Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (Rol_STD);
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (Rol_GST);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Put link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
@ -337,7 +337,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Rol_TCH);
Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Rol_NET);
Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Rol_STD);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");

9
swad_date.c
View File

@ -37,6 +37,7 @@
#include "swad_global.h"
#include "swad_parameter.h"
#include "swad_setting.h"
#include "swad_table.h"
/*****************************************************************************/
/************** External global variables from others modules ****************/
@ -549,7 +550,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
/***** Start table *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>");
/***** Year *****/
@ -665,7 +666,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
/***** End table *****/
fprintf (Gbl.F.Out,"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Hidden field with UTC time (seconds since 1970) used to send time *****/
fprintf (Gbl.F.Out,"<input type=\"hidden\""
@ -816,7 +817,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
unsigned NumDaysSelectedMonth;
/***** Start table *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>");
/***** Year *****/
@ -895,7 +896,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
/***** End table *****/
fprintf (Gbl.F.Out,"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/*****************************************************************************/

14
swad_file_browser.c
View File

@ -3670,7 +3670,7 @@ static void Brw_ShowFileBrowser (void)
false, // Tree not contracted
Gbl.FileBrowser.Priv.PathRootFolder,
Brw_RootFolderInternalNames[Gbl.FileBrowser.Type]);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Show and store number of documents found *****/
Brw_ShowAndStoreSizeOfFileTree ();
@ -5591,7 +5591,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
fprintf (Gbl.F.Out,"<td class=\"NO_BR LEFT_TOP COLOR%u\""
" style=\"width:99%%;\">",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>");
/* Indent depending on level */
@ -5629,7 +5629,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
/* End column */
fprintf (Gbl.F.Out,"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
fprintf (Gbl.F.Out,"</td>");
if (AdminMarks)
@ -5819,7 +5819,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,
Brw_IconTree_t IconThisRow)
{
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>");
Brw_IndentDependingOnLevel (Level);
@ -5855,7 +5855,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
fprintf (Gbl.F.Out,"</td>");
}
@ -8506,7 +8506,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
FileNameToShow);
/***** URL *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"NewLinkURL\" class=\"%s\">"
@ -8538,7 +8538,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
"</tr>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional,
Brw_MAX_CHARS_FOLDER);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_link);

5
swad_follow.c
View File

@ -36,6 +36,7 @@
#include "swad_notification.h"
#include "swad_privacy.h"
#include "swad_profile.h"
#include "swad_table.h"
#include "swad_user.h"
/*****************************************************************************/
@ -216,7 +217,7 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
Frm_EndForm ();
/***** Start table *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@ -241,7 +242,7 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
Usr_UsrDataDestructor (&UsrDat);
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");

2
swad_indicator.c
View File

@ -1386,7 +1386,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
}
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/*****************************************************************************/

3
swad_layout.c
View File

@ -52,6 +52,7 @@
#include "swad_parameter.h"
#include "swad_setting.h"
#include "swad_tab.h"
#include "swad_table.h"
#include "swad_theme.h"
#include "swad_timeline.h"
@ -1682,7 +1683,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
/***** End table *****/
fprintf (Gbl.F.Out,"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/*****************************************************************************/

8
swad_message.c
View File

@ -3349,7 +3349,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
char PhotoURL[PATH_MAX + 1];
/***** Put an icon to show if user has read the message *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
"<img src=\"%s/%s\""
@ -3393,7 +3393,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
Txt_ROLES_SINGUL_abc[Rol_UNK][Usr_SEX_UNKNOWN]); // User not found, likely an old user who has been removed
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/*****************************************************************************/
@ -3475,7 +3475,7 @@ static void Msg_WriteMsgTo (long MsgCod)
if (NumRecipientsTotal)
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
/***** How many recipients will be shown? *****/
if (NumRecipientsKnown <= Msg_MAX_RECIPIENTS_TO_SHOW)
@ -3581,7 +3581,7 @@ static void Msg_WriteMsgTo (long MsgCod)
Usr_UsrDataDestructor (&UsrDat);
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/***** Free structure that stores the query result *****/

9
swad_profile.c
View File

@ -44,6 +44,7 @@
#include "swad_role.h"
#include "swad_role_type.h"
#include "swad_setting.h"
#include "swad_table.h"
#include "swad_theme.h"
#include "swad_timeline.h"
#include "swad_user.h"
@ -1537,7 +1538,7 @@ void Prf_ShowRankingFigure (MYSQL_RES **mysql_res,unsigned NumUsrs)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
for (NumUsr = 1, Rank = 1, Gbl.RowEvenOdd = 0;
NumUsr <= NumUsrs;
@ -1572,7 +1573,7 @@ void Prf_ShowRankingFigure (MYSQL_RES **mysql_res,unsigned NumUsrs)
Figure);
}
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
@ -1706,7 +1707,7 @@ void Prf_GetAndShowRankingClicksPerDay (void)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
for (NumUsr = 1, Rank = 1, Gbl.RowEvenOdd = 0;
NumUsr <= NumUsrs;
@ -1738,7 +1739,7 @@ void Prf_GetAndShowRankingClicksPerDay (void)
"</tr>");
}
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);

6
swad_statistic.c
View File

@ -381,11 +381,11 @@ void Sta_AskShowCrsHits (void)
"<td colspan=\"2\" class=\"%s LEFT_TOP\">",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users,
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
Usr_ListUsersToSelect (Rol_TCH);
Usr_ListUsersToSelect (Rol_NET);
Usr_ListUsersToSelect (Rol_STD);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -1470,7 +1470,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
Sta_ShowNumHitsPerCourse (NumRows,mysql_res);
break;
}
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
/* End box and section */
Box_EndBox ();

8
swad_test_import.c
View File

@ -1045,7 +1045,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
if (Gbl.Test.Tags.Num)
{
/***** Write the tags *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
for (NumTag = 0;
NumTag < Gbl.Test.Tags.Num;
NumTag++)
@ -1059,7 +1059,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
"</tr>",
ClassData,
ClassData,Gbl.Test.Tags.Txt[NumTag]);
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
else // no tags for this question
fprintf (Gbl.F.Out,"<span class=\"%s\">&nbsp;(%s)&nbsp;</span>",
@ -1114,7 +1114,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
case Tst_ANS_UNIQUE_CHOICE:
case Tst_ANS_MULTIPLE_CHOICE:
case Tst_ANS_TEXT:
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
for (NumOpt = 0;
NumOpt < Gbl.Test.Answer.NumOptions;
NumOpt++)
@ -1186,7 +1186,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
if (AnswerFeedbackLength)
free ((void *) AnswerFeedback);
}
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
break;
default:
break;

3
swad_timetable.c
View File

@ -39,6 +39,7 @@
#include "swad_language.h"
#include "swad_parameter.h"
#include "swad_setting.h"
#include "swad_table.h"
#include "swad_timetable.h"
/*****************************************************************************/
@ -1259,7 +1260,7 @@ static void TT_DrawTimeTable (void)
TT_TimeTableDrawAdjustRow ();
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
/*****************************************************************************/

4
swad_user.c
View File

@ -7382,7 +7382,7 @@ void Usr_ListDataAdms (void)
fprintf (Gbl.F.Out,"</div>");
/***** Heading row with column names *****/
fprintf (Gbl.F.Out,"<table>");
Tbl_StartTable ();
fprintf (Gbl.F.Out,"<tr>");
for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_ADM;
@ -7415,7 +7415,7 @@ void Usr_ListDataAdms (void)
Usr_UsrDataDestructor (&UsrDat);
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
}
else // Gbl.Usrs.LstUsrs[Rol_DEG_ADM].NumUsrs == 0
/***** Show warning indicating no admins found *****/