From cd479d7d597fc7461dcc2fbc27d163354e47f2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 8 Oct 2019 22:33:19 +0200 Subject: [PATCH] Version19.31.24 --- swad_changelog.h | 3 +- swad_department.c | 71 ++--- swad_duplicate.c | 31 +- swad_enrolment.c | 49 ++- swad_exam.c | 144 ++++----- swad_figure.c | 745 +++++++++++++++++++------------------------- swad_file_browser.c | 237 +++++++------- swad_follow.c | 13 +- swad_forum.c | 81 ++--- 9 files changed, 604 insertions(+), 770 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b0161b3e6..783d7dccb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.31.23 (2019-10-08)" +#define Log_PLATFORM_VERSION "SWAD 19.31.24 (2019-10-08)" #define CSS_FILE "swad19.29.css" #define JS_FILE "swad19.30.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Un TFG preasignado sin estudiante tiene que salir un triángulo amarillo // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.31.24: Oct 08, 2019 Code refactoring in HTML tables. (246882 lines) Version 19.31.23: Oct 08, 2019 Code refactoring in HTML tables. (247076 lines) Version 19.31.22: Oct 08, 2019 Code refactoring in HTML tables. (247099 lines) Version 19.31.21: Oct 08, 2019 Code refactoring in HTML tables. (247124 lines) diff --git a/swad_department.c b/swad_department.c index 4d687a339..abe6c3255 100644 --- a/swad_department.c +++ b/swad_department.c @@ -148,17 +148,16 @@ void Dpt_SeeDepts (void) /* Write data of this department */ Tbl_StartRow (); - fprintf (Gbl.F.Out,"" - "" + Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"" "%s" "", Gbl.Dpts.Lst[NumDpt].WWW, Gbl.Dpts.Lst[NumDpt].FullName); Tbl_EndCell (); - fprintf (Gbl.F.Out,"" - "%u", - Gbl.Dpts.Lst[NumDpt].NumTchs); + Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%u",Gbl.Dpts.Lst[NumDpt].NumTchs); Tbl_EndCell (); Tbl_EndRow (); @@ -170,8 +169,8 @@ void Dpt_SeeDepts (void) /***** Separation row *****/ Tbl_StartRow (); - fprintf (Gbl.F.Out,"" - " "); + Tbl_StartCellAttr ("colspan=\"3\" class=\"DAT\""); + fprintf (Gbl.F.Out," "); Tbl_EndCell (); Tbl_EndRow (); @@ -179,14 +178,12 @@ void Dpt_SeeDepts (void) NumTchsInOtherDpts = Usr_GetNumTchsCurrentInsInDepartment (0); Tbl_StartRow (); - fprintf (Gbl.F.Out,"" - "%s", - Txt_Other_departments); + Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Other_departments); Tbl_EndCell (); - fprintf (Gbl.F.Out,"" - "%u", - NumTchsInOtherDpts); + Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%u",NumTchsInOtherDpts); Tbl_EndCell (); Tbl_EndRow (); @@ -195,13 +192,12 @@ void Dpt_SeeDepts (void) /***** Write teachers with no department *****/ Tbl_StartRow (); - fprintf (Gbl.F.Out,"" - "%s", - Txt_Department_unspecified); + Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Department_unspecified); Tbl_EndCell (); - fprintf (Gbl.F.Out,"" - "%u", + Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%u", Usr_GetTotalNumberOfUsersInCourses (Hie_INS, 1 << Rol_NET | 1 << Rol_TCH) - @@ -518,9 +514,10 @@ static void Dpt_ListDepartmentsForEdition (void) Ins.InsCod = Dpt->InsCod; Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA); - /* Put icon to remove department */ Tbl_StartRow (); - fprintf (Gbl.F.Out,""); + + /* Put icon to remove department */ + Tbl_StartCellAttr ("class=\"BM\""); if (Dpt->NumTchs) // Department has teachers ==> deletion forbidden Ico_PutIconRemovalNotAllowed (); else @@ -533,13 +530,12 @@ static void Dpt_ListDepartmentsForEdition (void) Tbl_EndCell (); /* Department code */ - fprintf (Gbl.F.Out,"" - "%ld ", - Dpt->DptCod); + Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%ld ",Dpt->DptCod); Tbl_EndCell (); /* Institution */ - fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\""); Frm_StartForm (ActChgDptIns); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\""); Frm_StartForm (ActRenDptFul); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\""); Frm_StartForm (ActChgDptWWW); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"" - "%u", - Dpt->NumTchs); + Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%u",Dpt->NumTchs); Tbl_EndCell (); Tbl_EndRow (); @@ -940,8 +935,8 @@ static void Dpt_PutFormToCreateDepartment (void) Tbl_StartRow (); /***** Institution *****/ - fprintf (Gbl.F.Out,"" - "" "