diff --git a/swad_changelog.h b/swad_changelog.h index 4f114fce3..f22fc5521 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.32.3 (2019-10-11)" +#define Log_PLATFORM_VERSION "SWAD 19.32.4 (2019-10-12)" #define CSS_FILE "swad19.29.css" #define JS_FILE "swad19.30.js" /* @@ -496,6 +496,7 @@ ps2pdf source.ps destination.pdf // TODO: En un TFG no preasignado con 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.32.4: Oct 12, 2019 Code refactoring in HTML. (246276 lines) Version 19.32.3: Oct 11, 2019 Code refactoring in HTML. (246518 lines) Version 19.32.2: Oct 11, 2019 Code refactoring in HTML. (246626 lines) Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines) diff --git a/swad_figure.c b/swad_figure.c index f24dcf0b4..ba87853cf 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -4829,26 +4829,27 @@ static void Fig_GetAndShowSurveysStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Number_of_BR_surveys, - Txt_Number_of_BR_courses_with_BR_surveys, - Txt_Average_number_BR_of_surveys_BR_per_course, - Txt_Average_number_BR_of_questions_BR_per_survey, - Txt_Number_of_BR_notifications); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_surveys); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_surveys); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_surveys_BR_per_course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_questions_BR_per_survey); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write number of surveys *****/ @@ -4932,18 +4933,19 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject, /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - TxtObject, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",TxtObject); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each privacy option... *****/ @@ -5028,18 +5030,19 @@ static void Fig_GetAndShowNumUsrsPerCookies (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Cookies, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Cookies); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each option... *****/ @@ -5111,18 +5114,19 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Language, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Language); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each language... *****/ @@ -5195,18 +5199,19 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Calendar, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Calendar); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each day... *****/ @@ -5283,18 +5288,19 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Format, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Format); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each format... *****/ @@ -5367,18 +5373,19 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Icons, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Icons); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each icon set... *****/ @@ -5456,18 +5463,19 @@ static void Fig_GetAndShowNumUsrsPerMenu (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Menu, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Menu); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each menu... *****/ @@ -5544,18 +5552,19 @@ static void Fig_GetAndShowNumUsrsPerTheme (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Theme_SKIN, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Theme_SKIN); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each theme... *****/ @@ -5631,18 +5640,19 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Columns, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Columns); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each language... *****/ diff --git a/swad_file_browser.c b/swad_file_browser.c index 930fa6aaa..b291a581b 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -11806,31 +11806,34 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Institution, - Txt_Centre, - Txt_Degree, - Txt_Course, - Txt_File_zone, - Txt_Document); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institution); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centre); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_File_zone); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Document); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** List documents found *****/ @@ -11846,17 +11849,19 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs, } /***** Write footer *****/ - /* Number of documents not hidden found */ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "("); + fprintf (Gbl.F.Out,""); + + /* Number of documents not hidden found */ + fprintf (Gbl.F.Out,"("); NumDocsHidden = NumDocs - NumDocsNotHidden; if (NumDocsHidden == 1) fprintf (Gbl.F.Out,"1 %s",Txt_hidden_document); else fprintf (Gbl.F.Out,"%lu %s",NumDocsHidden,Txt_hidden_documents); - fprintf (Gbl.F.Out,")" - ""); + fprintf (Gbl.F.Out,")"); + + fprintf (Gbl.F.Out,""); Tbl_TR_End (); /***** End table and box *****/ diff --git a/swad_forum.c b/swad_forum.c index 4206ace00..5e516cb71 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2560,10 +2560,17 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, /***** Heading row *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" // Column for contextual icons - "%s", - Txt_MSG_Subject); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); // Column for contextual icons + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_MSG_Subject); + fprintf (Gbl.F.Out,""); + for (Order = For_FIRST_MSG; Order <= For_LAST_MSG; Order++) @@ -2588,22 +2595,23 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, Frm_EndForm (); Tbl_TH_End (); } - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_BR_msgs, - Txt_Unread_BR_msgs, - Txt_WriBRters, - Txt_ReaBRders); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_BR_msgs); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Unread_BR_msgs); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_WriBRters); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ReaBRders); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** List the threads *****/ diff --git a/swad_game.c b/swad_game.c index 2bd47bc3e..f85ce9cba 100644 --- a/swad_game.c +++ b/swad_game.c @@ -212,7 +212,10 @@ static void Gam_ListAllGames (void) Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); if (Gam_CheckIfICanEditGames ()) - fprintf (Gbl.F.Out,""); // Column for contextual icons + { + fprintf (Gbl.F.Out,""); // Column for contextual icons + fprintf (Gbl.F.Out,""); + } for (Order = (Gam_Order_t) 0; Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); @@ -236,7 +239,9 @@ static void Gam_ListAllGames (void) Tbl_TH_End (); } - fprintf (Gbl.F.Out,"%s",Txt_Matches); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Matches); + fprintf (Gbl.F.Out,""); Tbl_TR_End (); @@ -1645,23 +1650,25 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, /***** Write the heading *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Code, - Txt_Tags, - Txt_Question); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Tags); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Question); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write rows *****/ diff --git a/swad_group.c b/swad_group.c index 9e2249f93..2d86bb22e 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1452,27 +1452,30 @@ static void Grp_WriteHeadingGroupTypes (void) extern const char *Txt_No_of_BR_groups; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s
(%s)" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Type_of_group,Txt_eg_Lectures_Practicals, - Txt_Mandatory_enrolment, - Txt_Multiple_enrolment, - Txt_Opening_of_groups, - Txt_No_of_BR_groups); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s
(%s)",Txt_Type_of_group,Txt_eg_Lectures_Practicals); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Mandatory_enrolment); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Multiple_enrolment); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Opening_of_groups); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_BR_groups); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } @@ -1678,32 +1681,41 @@ static void Grp_WriteHeadingGroups (void) Rol_Role_t Role; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "" - "%s" - "" - "" - "%s
(%s)" - "" - "" - "%s" - "", - Txt_Type_BR_of_group, - Txt_Group_name,Txt_eg_A_B, - Txt_Classroom); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type_BR_of_group); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s
(%s)",Txt_Group_name,Txt_eg_A_B); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Classroom); + fprintf (Gbl.F.Out,""); + for (Role = Rol_TCH; Role >= Rol_STD; Role--) - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_ROLES_PLURAL_BRIEF_Abc[Role]); - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_Max_BR_students); + { + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); + fprintf (Gbl.F.Out,""); + } + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } @@ -2380,30 +2392,35 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) /***** Head row with title of each column *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "", - Txt_Group, - Txt_Classroom); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Group); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Classroom); + fprintf (Gbl.F.Out,""); + for (Role = Rol_TCH; Role >= Rol_STD; Role--) - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_ROLES_PLURAL_BRIEF_Abc[Role]); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Max_BR_students, - Txt_Vacants); + { + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); + fprintf (Gbl.F.Out,""); + } + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Vacants); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_holiday.c b/swad_holiday.c index 787dbc1bb..d9f1b5d94 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -133,14 +133,15 @@ void Hld_SeeHolidays (void) Frm_EndForm (); Tbl_TH_End (); } - fprintf (Gbl.F.Out,"" - " %s " - "" - "" - "%s" - "", - Txt_End_date, - Txt_Holiday); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out," %s ",Txt_End_date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Holiday); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write all the holidays *****/ @@ -973,26 +974,27 @@ static void Hld_PutFormToCreateHoliday (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Place, - Txt_Type, - Txt_START_END_TIME[Dat_START_TIME], - Txt_START_END_TIME[Dat_END_TIME], - Txt_Holiday); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Place); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Holiday); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); @@ -1079,31 +1081,34 @@ static void Hld_PutHeadHolidays (void) extern const char *Txt_Holiday; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_Place, - Txt_Type, - Txt_START_END_TIME[Dat_START_TIME], - Txt_START_END_TIME[Dat_END_TIME], - Txt_Holiday); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Place); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Holiday); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index ec358567d..481f879c3 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -644,17 +644,20 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 Tbl_TABLE_BeginPadding (2); Tbl_TR_Begin (NULL); + if (PutForm) Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Indicators, - Txt_Courses); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Indicators); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Courses); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); + for (Ind = 0; Ind <= Ind_NUM_INDICATORS; Ind++) @@ -766,258 +769,256 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat { case Ind_INDICATORS_BRIEF: Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Degree, - Txt_Course, - Txt_Institutional_BR_code, - Txt_Web_page_of_the_course, - Txt_Indicators); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Indicators); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "(A) %s" - "" - "" - "(B) %s" - "" - "" - "(C) %s" - "" - "" - "(D) %s" - "" - "" - "(E) %s" - "", - Txt_No_INDEX, - Txt_Syllabus_of_the_course, - Txt_Guided_academic_assignments, - Txt_Online_tutoring, - Txt_Materials, - Txt_Assessment_criteria); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(D) %s",Txt_Materials); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_YES, - Txt_NO, - Txt_YES, - Txt_NO, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO); Tbl_TR_End (); break; case Ind_INDICATORS_FULL: Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Degree, - Txt_Course, - Txt_Institutional_BR_code, - Txt_Web_page_of_the_course, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], - Txt_Indicators); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Indicators); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "(A) %s" - "" - "" - "(B) %s" - "" - "" - "(C) %s" - "" - "" - "(D) %s" - "" - "" - "(E) %s" - "", - Txt_No_INDEX, - Txt_Syllabus_of_the_course, - Txt_Guided_academic_assignments, - Txt_Online_tutoring, - Txt_Materials, - Txt_Assessment_criteria); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(D) %s",Txt_Materials); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_YES, - Txt_NO, - Txt_INFO_TITLE[Inf_LECTURES], - Txt_INFO_TITLE[Inf_PRACTICALS], - Txt_INFO_TITLE[Inf_TEACHING_GUIDE], - Txt_YES, - Txt_NO, - Txt_Assignments, - Txt_Files_assignments, - Txt_Files_works, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO, - Txt_Forum_threads, - Txt_Forum_posts, - Txt_Messages_sent_by_teachers, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO, - Txt_No_of_files_in_DOCUM_zones, - Txt_No_of_files_in_SHARE_zones, + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_LECTURES]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_PRACTICALS]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Assignments); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Files_assignments); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Files_works); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Forum_threads); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Forum_posts); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Messages_sent_by_teachers); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_DOCUM_zones); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_SHARE_zones); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_YES); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_NO); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_ASSESSMENT]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); + fprintf (Gbl.F.Out,""); - Txt_YES, - Txt_NO, - Txt_INFO_TITLE[Inf_ASSESSMENT], - Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); Tbl_TR_End (); break; } diff --git a/swad_institution.c b/swad_institution.c index fdac36c32..49ce2fc91 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -174,14 +174,15 @@ void Ins_SeeInsWithPendingCtrs (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Institution, - Txt_Centres_ABBREVIATION); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institution); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** List the institutions *****/ @@ -897,29 +898,32 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) } Tbl_TH_End (); } - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s+
%s" - "" - "" - "", - Txt_Centres_ABBREVIATION, - Txt_Degrees_ABBREVIATION, - Txt_Courses_ABBREVIATION, - Txt_Departments_ABBREVIATION, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Departments_ABBREVIATION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s+
%s", + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } @@ -2329,43 +2333,49 @@ static void Ins_PutHeadInstitutionsForEdition (void) extern const char *Txt_Requester; Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); + fprintf (Gbl.F.Out,"" "%s" "", Txt_Code); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s+
%s" - "" - "" - "%s" - "" - "" - "", - Txt_Short_name_of_the_institution, - Txt_Full_name_of_the_institution, - Txt_WWW, - Txt_Users, - Txt_Centres_ABBREVIATION, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], - Txt_Requester); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_institution); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_institution); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_WWW); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s+
%s", + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Requester); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_link.c b/swad_link.c index 34cf53904..653754b25 100644 --- a/swad_link.c +++ b/swad_link.c @@ -802,23 +802,26 @@ static void Lnk_PutHeadLinks (void) extern const char *Txt_WWW; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_Short_name, - Txt_Full_name, - Txt_WWW); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Short_name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Full_name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_WWW); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_mail.c b/swad_mail.c index 47854c8cd..610807a24 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -753,14 +753,15 @@ static void Mai_PutFormToCreateMailDomain (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], - Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); @@ -802,23 +803,26 @@ static void Mai_PutHeadMailDomains (void) extern const char *Txt_EMAIL_DOMAIN_ORDER[3]; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], - Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ], - Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_match.c b/swad_match.c index 05bf088f2..95edb00a6 100644 --- a/swad_match.c +++ b/swad_match.c @@ -437,34 +437,33 @@ static void Mch_ListOneOrMoreMatchesHeading (bool ICanEditMatches) Tbl_TH_Empty (1); /***** The rest of columns *****/ - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN], - Txt_START_END_TIME[Gam_ORDER_BY_START_DATE], - Txt_START_END_TIME[Gam_ORDER_BY_END_DATE], - Txt_Match, - Txt_Players, - Txt_Status, - Txt_Result); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Gam_ORDER_BY_START_DATE]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Gam_ORDER_BY_END_DATE]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Match); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Players); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Status); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Result); + fprintf (Gbl.F.Out,""); /***** End row *****/ Tbl_TR_End (); diff --git a/swad_match_result.c b/swad_match_result.c index 50c472ff8..831b185ab 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -327,44 +327,46 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther) extern const char *Txt_out_of_PART_OF_A_SCORE; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s
%s
%u" - "", - Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : - Usr_SEX_UNKNOWN], - Txt_START_END_TIME[Dat_START_TIME], - Txt_START_END_TIME[Dat_END_TIME], - Txt_Match, - Txt_Questions, - Txt_Non_blank_BR_questions, - Txt_Total_BR_score, - Txt_Average_BR_score_BR_per_question_BR_from_0_to_1, - Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : + Usr_SEX_UNKNOWN]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Match); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Questions); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Non_blank_BR_questions); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Total_BR_score); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s
%s
%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); + fprintf (Gbl.F.Out,""); + Tbl_TH_Empty (1); + Tbl_TR_End (); } diff --git a/swad_message.c b/swad_message.c index 98d3005da..e8b84e86b 100644 --- a/swad_message.c +++ b/swad_message.c @@ -481,14 +481,16 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) /***** Title *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out," 1) - fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan); - fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE LIGHT_BLUE\">" - "" - "", - StdsAndTchsWritten ? Txt_Other_recipients : - Txt_Recipients); + fprintf (Gbl.F.Out,"",Colspan); + else + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"", + StdsAndTchsWritten ? Txt_Other_recipients : + Txt_Recipients); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Textarea with users' @nicknames, emails or IDs *****/ diff --git a/swad_network.c b/swad_network.c index 4d8a12359..e6a7a1048 100644 --- a/swad_network.c +++ b/swad_network.c @@ -556,18 +556,19 @@ void Net_ShowWebAndSocialNetworksStats (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Web_social_network, - Txt_No_of_users, - Txt_PERCENT_of_users); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Web_social_network); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** For each web / social network... *****/ diff --git a/swad_notification.c b/swad_notification.c index 1d8683bd8..1f63a9632 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -395,26 +395,27 @@ void Ntf_ShowMyNotifications (void) /***** Start table *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Event, - Txt_MSG_From, - Txt_Location, - Txt_Date, - Txt_Email); // Date and time, in YYYY-MM-DD HH:MM:SS format + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Event); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_MSG_From); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Location); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Email); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** List notifications one by one *****/ @@ -1942,15 +1943,17 @@ void Ntf_PutFormChangeNotifSentByEMail (void) /***** List of notifications *****/ Tbl_TABLE_BeginCenterPadding (2); Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Create_BR_notification, - Txt_Notify_me_BR_by_email); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Create_BR_notification); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Notify_me_BR_by_email); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Checkbox to activate internal notifications and email notifications diff --git a/swad_photo.c b/swad_photo.c index 308b549f6..d1757db45 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -2217,21 +2217,24 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Write heading *****/ Tbl_TABLE_BeginCenterPadding (2); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Degree); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + for (Sex = (Usr_Sex_t) 0; Sex < Usr_NUM_SEXS; Sex++) - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_SEX_PLURAL_Abc[Sex]); + { + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_SEX_PLURAL_Abc[Sex]); + fprintf (Gbl.F.Out,""); + } + Tbl_TR_End (); /***** Get degrees *****/ diff --git a/swad_place.c b/swad_place.c index d27721569..407f8cc3c 100644 --- a/swad_place.c +++ b/swad_place.c @@ -862,23 +862,26 @@ static void Plc_PutHeadPlaces (void) extern const char *Txt_Centres; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_Short_name, - Txt_Full_name, - Txt_Centres); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Short_name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Full_name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centres); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_plugin.c b/swad_plugin.c index 2c231a604..29d55850b 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -115,12 +115,14 @@ void Plg_ListPlugins (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "%s" - "", - Txt_Plugin); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Plugin); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write all the plugins *****/ @@ -893,30 +895,31 @@ static void Plg_PutFormToCreatePlugin (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Name, - Txt_Description, - Txt_Logo, - Txt_Application_key, - Txt_URL, - Txt_IP); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Description); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Logo); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Application_key); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_URL); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_IP); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Plugin name *****/ @@ -991,36 +994,40 @@ static void Plg_PutHeadPlugins (void) extern const char *Txt_IP; Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_Name, - Txt_Description, - Txt_Logo, - Txt_Application_key, - Txt_URL, - Txt_IP); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Description); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Logo); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Application_key); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_URL); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_IP); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_project.c b/swad_project.c index 0f1c2833b..f8dbe87bc 100644 --- a/swad_project.c +++ b/swad_project.c @@ -691,7 +691,9 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView) switch (ProjectView) { case Prj_LIST_PROJECTS: - fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); break; default: break; @@ -702,7 +704,8 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView) { case Prj_LIST_PROJECTS: case Prj_FILE_BROWSER_PROJECT: - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); break; default: break; @@ -761,30 +764,48 @@ static void Prj_ShowTableAllProjectsHead (void) for (Order = (Prj_Order_t) 0; Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1); Order++) - fprintf (Gbl.F.Out,"%s", - Txt_PROJECT_ORDER[Order]); + { + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PROJECT_ORDER[Order]); + fprintf (Gbl.F.Out,""); + } - fprintf (Gbl.F.Out,"%s" - "%s", - Txt_Preassigned_QUESTION, - Txt_Number_of_students); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Preassigned_QUESTION); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Number_of_students); + fprintf (Gbl.F.Out,""); for (NumRoleToShow = 0; NumRoleToShow < Brw_NUM_ROLES_TO_SHOW; NumRoleToShow++) - fprintf (Gbl.F.Out,"%s", - Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]]); + { + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]]); + fprintf (Gbl.F.Out,""); + } - fprintf (Gbl.F.Out,"%s" - "%s" - "%s" - "%s" - "%s", - Txt_Proposal, - Txt_Description, - Txt_Required_knowledge, - Txt_Required_materials, - Txt_URL); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Proposal); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Description); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Required_knowledge); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Required_materials); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_URL); + fprintf (Gbl.F.Out,""); Tbl_TR_End (); } diff --git a/swad_record.c b/swad_record.c index 460c77d0d..74decb741 100644 --- a/swad_record.c +++ b/swad_record.c @@ -435,19 +435,21 @@ static void Rec_WriteHeadingRecordFields (void) extern const char *Txt_Visible_by_BR_the_student; Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Field_BR_name, - Txt_No_of_BR_lines, - Txt_Visible_by_BR_the_student); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Field_BR_name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_BR_lines); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Visible_by_BR_the_student); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_statistic.c b/swad_statistic.c index b5b90091a..32955effd 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1669,34 +1669,35 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_User_ID, - Txt_Name, - Txt_Role, - Txt_Date, - Txt_Action, - Txt_LOG_More_info); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_User_ID); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Role); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Action); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_LOG_More_info); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write rows back *****/ @@ -1830,30 +1831,31 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Photo, - Txt_ID, - Txt_Name, - Txt_Role, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Photo); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ID); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Name); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Role); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write rows *****/ @@ -1960,18 +1962,19 @@ static void Sta_ShowNumHitsPerDay (unsigned long NumRows,MYSQL_RES *mysql_res) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Date, - Txt_Day, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Day); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per day *****/ @@ -2158,20 +2161,20 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Date, - Txt_Day, - GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Day); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,"", + GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); Tbl_TR_Begin (NULL); @@ -2555,14 +2558,15 @@ static void Sta_ShowNumHitsPerWeek (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Week, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Week); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per week *****/ @@ -2659,14 +2663,15 @@ static void Sta_ShowNumHitsPerMonth (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Month, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Month); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per month *****/ @@ -2763,14 +2768,15 @@ static void Sta_ShowNumHitsPerYear (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Year, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Year); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per year *****/ @@ -3192,14 +3198,15 @@ static void Sta_ShowNumHitsPerAction (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Action, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Action); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per day *****/ @@ -3250,14 +3257,15 @@ static void Sta_ShowNumHitsPerPlugin (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Plugin, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Plugin); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per plugin *****/ @@ -3309,14 +3317,15 @@ static void Sta_ShowNumHitsPerWSFunction (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Function, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Function); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per function *****/ @@ -3367,14 +3376,15 @@ static void Sta_ShowNumHitsPerBanner (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Banner, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Banner); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of clicks per banner *****/ @@ -3446,18 +3456,19 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Country, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Country); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of hits per country *****/ @@ -3543,18 +3554,19 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Institution, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institution); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of hits per institution *****/ @@ -3642,18 +3654,19 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Centre, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centre); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of hits per centre *****/ @@ -3741,18 +3754,19 @@ static void Sta_ShowNumHitsPerDegree (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Degree, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of hits per degree *****/ @@ -3845,26 +3859,27 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows, /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Degree, - Txt_Year_OF_A_DEGREE, - Txt_Course, - Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Compute maximum number of pages generated per course *****/ @@ -4190,46 +4205,39 @@ void Sta_GetAndShowLastClicks (void) /***** Write list of connected users *****/ Tbl_TABLE_BeginCenterPadding (1); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" // Click - "" - "" - "%s" // Elapsed time - "" - "" - "%s" // Role - "" - "" - "%s" // Country - "" - "" - "%s" // Institution - "" - "" - "%s" // Centre - "" - "" - "%s" // Degree - "" - "" - "%s" // Action - "", - Txt_Click, - Txt_ELAPSED_TIME, - Txt_Role, - Txt_Country, - Txt_Institution, - Txt_Centre, - Txt_Degree, - Txt_Action); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Click); // Click + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_ELAPSED_TIME); // Elapsed time + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Role); // Role + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Country); // Country + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Institution); // Institution + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Centre); // Centre + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); // Degree + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Action); // Action + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); for (NumRow = 0; diff --git a/swad_survey.c b/swad_survey.c index f8ac90cbc..e743ea6f0 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -246,7 +246,10 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) /***** Table head *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,""); // Column for contextual icons + + fprintf (Gbl.F.Out,""); // Column for contextual icons + fprintf (Gbl.F.Out,""); + for (Order = Svy_ORDER_BY_START_DATE; Order <= Svy_ORDER_BY_END_DATE; Order++) @@ -269,14 +272,15 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) Tbl_TH_End (); } - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Survey, - Txt_Status); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Survey); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Status); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write all the surveys *****/ @@ -3219,20 +3223,22 @@ static void Svy_ListSvyQuestions (struct Survey *Svy, /***** Write the heading *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); + if (Svy->Status.ICanEdit) Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Type, - Txt_Question); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Question); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write questions one by one *****/ diff --git a/swad_test.c b/swad_test.c index def6d3677..c691e4a9a 100644 --- a/swad_test.c +++ b/swad_test.c @@ -2828,27 +2828,28 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, /***** Write the heading *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Code, - Txt_Date, - Txt_Tags, - Txt_Shuffle); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Tags); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Shuffle); + fprintf (Gbl.F.Out,""); /* Stem and answers of question */ /* Number of times that the question has been answered */ @@ -3094,35 +3095,37 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows, /***** Write the heading *****/ Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Code, - Txt_Date, - Txt_Tags, - Txt_Type, - Txt_Shuffle, - Txt_Question); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Tags); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Shuffle); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Question); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); /***** Write rows *****/ @@ -7706,35 +7709,37 @@ static void Tst_ShowHeaderTestResults (void) extern const char *Txt_out_of_PART_OF_A_SCORE; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s
%s
%u" - "", - Txt_User[Usr_SEX_UNKNOWN], - Txt_Date, - Txt_Questions, - Txt_Non_blank_BR_questions, - Txt_Total_BR_score, - Txt_Average_BR_score_BR_per_question_BR_from_0_to_1, - Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_User[Usr_SEX_UNKNOWN]); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Date); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Questions); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Non_blank_BR_questions); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Total_BR_score); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s
%s
%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); + fprintf (Gbl.F.Out,""); + Tbl_TH_Empty (1); + Tbl_TR_End (); } diff --git a/swad_test_import.c b/swad_test_import.c index acdfb9162..73dd4be57 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -959,27 +959,29 @@ static void TsI_WriteHeadingListImportedQst (void) /***** Write the heading *****/ Tbl_TR_Begin (NULL); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_No_INDEX, - Txt_Tags, - Txt_Type, - Txt_Shuffle, - Txt_Question); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Tags); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Type); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Shuffle); + fprintf (Gbl.F.Out,""); + + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"%s",Txt_Question); + fprintf (Gbl.F.Out,""); + Tbl_TR_End (); } diff --git a/swad_user.c b/swad_user.c index b3488fc5c..6aa5bc67f 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6312,9 +6312,11 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role) Usr_Sex_t Sex; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "