diff --git a/swad_changelog.h b/swad_changelog.h index 7be70f72a..ad1863446 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.33.1 (2019-10-12)" +#define Log_PLATFORM_VERSION "SWAD 19.33.2 (2019-10-13)" #define CSS_FILE "swad19.33.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.33.2: Oct 13, 2019 Code refactoring in HTML table headings. (245646 lines) Version 19.33.1: Oct 12, 2019 Code refactoring in HTML table headings. (246205 lines) Version 19.33: Oct 12, 2019 Code refactoring in HTML table headings. Changes in layout of last clicks. (246309 lines) diff --git a/swad_course.c b/swad_course.c index 9f6eac419..647a6f1d0 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1805,31 +1805,13 @@ static void Crs_PutHeadCoursesForSeeing (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Institutional_BR_code); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Year_OF_A_DEGREE); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_Empty (1); Tbl_TR_End (); } @@ -1851,43 +1833,18 @@ static void Crs_PutHeadCoursesForEdition (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code); Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); fprintf (Gbl.F.Out,"%s (%s)",Txt_Institutional_code,Txt_optional); Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Requester); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Year_OF_A_DEGREE); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name_of_the_course); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name_of_the_course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Requester); + Tbl_TH_Empty (1); Tbl_TR_End (); } @@ -3128,31 +3085,13 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Degree); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Year_OF_A_DEGREE); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TR_End (); @@ -3206,28 +3145,12 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s", Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Degree); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Year_OF_A_DEGREE); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TR_End (); diff --git a/swad_degree.c b/swad_degree.c index 802569807..d16cac002 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -187,13 +187,8 @@ void Deg_SeeDegWithPendingCrss (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Degree); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION); Tbl_TR_End (); @@ -1067,25 +1062,12 @@ static void Deg_PutHeadDegreesForSeeing (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - + Tbl_TH (1,1,"BM",NULL); + Tbl_TH_Empty (1); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Degree); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION); Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - Tbl_TH_End (); Tbl_TR_End (); } @@ -1106,41 +1088,16 @@ static void Deg_PutHeadDegreesForEdition (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code); + Tbl_TH_Empty (1); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name_of_the_degree); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name_of_the_degree); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Requester); Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_WWW); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Requester); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - Tbl_TH_End (); Tbl_TR_End (); } diff --git a/swad_degree_type.c b/swad_degree_type.c index 20815adff..35b8c16d5 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -521,7 +521,7 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S Order++) { Tbl_TH_Begin (1,1,Order == DT_ORDER_BY_DEGREE_TYPE ? "LEFT_MIDDLE" : - "RIGHT_MIDDLE"); + "RIGHT_MIDDLE"); /* Start form to change order */ Frm_StartForm (NextAction); @@ -557,20 +557,10 @@ static void DT_PutHeadDegreeTypesForEdition (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type_of_degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degrees); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Code); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Type_of_degree); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees); Tbl_TR_End (); } diff --git a/swad_department.c b/swad_department.c index ad30c3fa7..04a358201 100644 --- a/swad_department.c +++ b/swad_department.c @@ -126,6 +126,7 @@ void Dpt_SeeDepts (void) Order++) { Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); + Frm_StartForm (ActSeeDpt); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL",NULL); @@ -136,6 +137,7 @@ void Dpt_SeeDepts (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Frm_EndForm (); + Tbl_TH_End (); } Tbl_TR_End (); @@ -915,21 +917,10 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Short_name); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Full_name); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_WWW); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Institution); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW); Tbl_TR_End (); @@ -1004,32 +995,13 @@ static void Dpt_PutHeadDepartments (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Short_name); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Full_name); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_WWW); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); + Tbl_TH_Empty (1); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Institution); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); Tbl_TR_End (); } diff --git a/swad_enrolment.c b/swad_enrolment.c index 28a40ace2..c8c155059 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2813,27 +2813,11 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) Tbl_TABLE_BeginCenterPadding (2); Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"LEFT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,2,"LEFT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Requester); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Role); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Date); - Tbl_TH_End (); - + Tbl_TH (1,1,"LEFT_TOP",Txt_Course); + Tbl_TH (1,1,"RIGHT_TOP",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (1,2,"LEFT_TOP",Txt_Requester); + Tbl_TH (1,1,"LEFT_TOP",Txt_Role); + Tbl_TH (1,1,"CENTER_TOP",Txt_Date); Tbl_TH_Empty (2); Tbl_TR_End (); diff --git a/swad_figure.c b/swad_figure.c index 87cd9c865..02790419e 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -373,21 +373,10 @@ static void Fig_GetAndShowUsersStats (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_of_courses_to_which_a_user_belongs); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_of_users_belonging_to_a_course); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_of_courses_to_which_a_user_belongs); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_of_users_belonging_to_a_course); Tbl_TR_End (); @@ -397,10 +386,7 @@ static void Fig_GetAndShowUsersStats (void) Fig_GetAndShowNumUsrsInCrss (Rol_UNK); // Any user in courses Tbl_TR_Begin (NULL); - - Tbl_TH_Begin (1,4,"SEPAR_ROW"); - Tbl_TH_End (); - + Tbl_TH (1,4,"SEPAR_ROW",NULL); Tbl_TR_End (); Fig_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course @@ -516,33 +502,13 @@ static void Fig_GetAndShowUsersRanking (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Clicks); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Clicks_per_day); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Timeline); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Followers); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Downloads); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Forums); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Messages); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Clicks); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Clicks_per_day); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Timeline); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Followers); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Downloads); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Forums); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Messages); Tbl_TR_End (); @@ -1497,13 +1463,8 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, Tbl_TH_Empty (1); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",TxtFigure); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Institution); + Tbl_TH (1,1,"RIGHT_MIDDLE",TxtFigure); Tbl_TR_End (); @@ -2526,37 +2487,14 @@ static void Fig_WriteStatsExpTreesTableHead1 (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_File_zones); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Groups); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Max_levels); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Folders); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Files); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Size); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_File_zones); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Groups); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Max_levels); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Folders); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Files); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Size); Tbl_TR_End (); } @@ -2571,18 +2509,13 @@ static void Fig_WriteStatsExpTreesTableHead2 (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_File_zones); - Tbl_TH_End (); - + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_File_zones); Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Folders,Txt_course); Tbl_TH_End (); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Files,Txt_course); Tbl_TH_End (); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Size,Txt_course); Tbl_TH_End (); @@ -2600,18 +2533,13 @@ static void Fig_WriteStatsExpTreesTableHead3 (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_File_zones); - Tbl_TH_End (); - + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_File_zones); Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Folders,Txt_user[Usr_SEX_UNKNOWN]); Tbl_TH_End (); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Files,Txt_user[Usr_SEX_UNKNOWN]); Tbl_TH_End (); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); fprintf (Gbl.F.Out,"%s/
%s",Txt_Size,Txt_user[Usr_SEX_UNKNOWN]); Tbl_TH_End (); @@ -2835,17 +2763,9 @@ static void Fig_GetAndShowOERsStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_License); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_private_files); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_public_files); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_License); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_private_files); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_public_files); Tbl_TR_End (); @@ -3037,21 +2957,10 @@ static void Fig_GetAndShowAssignmentsStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_assignments); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_assignments); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_ASSIG_BR_per_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_assignments); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_with_BR_assignments); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_BR_of_ASSIG_BR_per_course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_notifications); Tbl_TR_End (); @@ -3107,17 +3016,9 @@ static void Fig_GetAndShowProjectsStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_projects); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_projects); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_projects_BR_per_course); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_projects); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_with_BR_projects); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_BR_of_projects_BR_per_course); Tbl_TR_End (); @@ -3171,41 +3072,15 @@ static void Fig_GetAndShowTestsStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type_of_BR_answers); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_BR_with_test_BR_questions); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_BR_of_test_BR_questions); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type_of_BR_answers); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_BR_with_test_BR_questions); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_BR_of_test_BR_questions); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); Tbl_TR_End (); @@ -3341,17 +3216,9 @@ static void Fig_GetAndShowGamesStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_games); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_games); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_games_BR_per_course); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_games); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_with_BR_games); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_BR_of_games_BR_per_course); Tbl_TR_End (); @@ -3406,25 +3273,11 @@ static void Fig_GetAndShowSocialActivityStats (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_social_posts); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_posts_BR_per_user); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_social_posts); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_posts_BR_per_user); Tbl_TR_End (); @@ -3728,17 +3581,9 @@ static void Fig_GetAndShowFollowStats (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -4030,38 +3875,14 @@ static void Fig_GetAndShowForumStats (void) Txt_Scope, Txt_Scope); Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Forums); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_forums); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_threads); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_posts); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_threads_BR_per_forum); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_posts_BR_per_thread); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_posts_BR_per_forum); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_TOP",Txt_Forums); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_forums); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_threads); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_posts); + Tbl_TH (1,1,"RIGHT_TOP",Txt_Number_of_BR_notifications); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_threads_BR_per_forum); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_posts_BR_per_thread); + Tbl_TH (1,1,"RIGHT_TOP",Txt_No_of_posts_BR_per_forum); Tbl_TR_End (); @@ -4390,25 +4211,11 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Event); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_events); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_emails); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Event); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_events); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_emails); Tbl_TR_End (); @@ -4636,25 +4443,11 @@ static void Fig_GetAndShowNoticesStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_NOTICE_Active_BR_notices); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_NOTICE_Obsolete_BR_notices); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_NOTICE_Deleted_BR_notices); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Total); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_NOTICE_Active_BR_notices); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_NOTICE_Obsolete_BR_notices); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_NOTICE_Deleted_BR_notices); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Total); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_notifications); Tbl_TR_End (); @@ -4721,25 +4514,11 @@ static void Fig_GetAndShowMsgsStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Messages); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_MSGS_Not_deleted); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_MSGS_Deleted); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Total); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Messages); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_MSGS_Not_deleted); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_MSGS_Deleted); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Total); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_notifications); Tbl_TR_End (); @@ -4830,25 +4609,11 @@ static void Fig_GetAndShowSurveysStats (void) /***** Write table heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_surveys); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_surveys); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_surveys_BR_per_course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_questions_BR_per_survey); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_surveys); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_courses_with_BR_surveys); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_BR_of_surveys_BR_per_course); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Average_number_BR_of_questions_BR_per_survey); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Number_of_BR_notifications); Tbl_TR_End (); @@ -4934,17 +4699,9 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject, /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",TxtObject); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",TxtObject); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5031,17 +4788,9 @@ static void Fig_GetAndShowNumUsrsPerCookies (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Cookies); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Cookies); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5115,17 +4864,9 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Language); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Language); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5200,17 +4941,9 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Calendar); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Calendar); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5289,17 +5022,9 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Format); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Format); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5374,17 +5099,9 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Icons); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Icons); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5464,17 +5181,9 @@ static void Fig_GetAndShowNumUsrsPerMenu (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Menu); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Menu); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5553,17 +5262,9 @@ static void Fig_GetAndShowNumUsrsPerTheme (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Theme_SKIN); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Theme_SKIN); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); @@ -5641,17 +5342,9 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void) /***** Heading row *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Columns); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Columns); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_of_users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_PERCENT_of_users); Tbl_TR_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 2ab17a6cd..664f9a5d5 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -11807,32 +11807,13 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs, /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Centre); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_File_zone); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Document); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Institution); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Centre); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Degree); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Course); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_File_zone); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Document); Tbl_TR_End (); diff --git a/swad_forum.c b/swad_forum.c index 82a45bcdb..0d19a943d 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2561,21 +2561,16 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BT"); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CONTEXT_COL"); // Column for contextual icons - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_MSG_Subject); - Tbl_TH_End (); + Tbl_TH (1,1,"BT",NULL); + Tbl_TH (1,1,"CONTEXT_COL",NULL); // Column for contextual icons + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_MSG_Subject); for (Order = For_FIRST_MSG; Order <= For_LAST_MSG; Order++) { Tbl_TH_Begin (1,2,"CENTER_MIDDLE"); + Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current @@ -2593,24 +2588,14 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Frm_EndForm (); + Tbl_TH_End (); } - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_BR_msgs); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Unread_BR_msgs); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_WriBRters); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ReaBRders); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_No_BR_msgs); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Unread_BR_msgs); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_WriBRters); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ReaBRders); Tbl_TR_End (); diff --git a/swad_game.c b/swad_game.c index 14b3c3180..981238ffa 100644 --- a/swad_game.c +++ b/swad_game.c @@ -212,10 +212,7 @@ static void Gam_ListAllGames (void) Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); if (Gam_CheckIfICanEditGames ()) - { - Tbl_TH_Begin (1,1,"CONTEXT_COL"); // Column for contextual icons - Tbl_TH_End (); - } + Tbl_TH (1,1,"CONTEXT_COL",NULL); // Column for contextual icons for (Order = (Gam_Order_t) 0; Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); @@ -239,9 +236,7 @@ static void Gam_ListAllGames (void) Tbl_TH_End (); } - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Matches); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Matches); Tbl_TR_End (); @@ -1653,21 +1648,10 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, Tbl_TH_Empty (1); - Tbl_TH_Begin (1,1,"CENTER_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Tags); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_TOP"); - fprintf (Gbl.F.Out,"%s",Txt_Question); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_TOP",Txt_No_INDEX); + Tbl_TH (1,1,"CENTER_TOP",Txt_Code); + Tbl_TH (1,1,"CENTER_TOP",Txt_Tags); + Tbl_TH (1,1,"CENTER_TOP",Txt_Question); Tbl_TR_End (); diff --git a/swad_group.c b/swad_group.c index 246bb5820..90c7bb0f4 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1453,28 +1453,14 @@ static void Grp_WriteHeadingGroupTypes (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - + Tbl_TH (1,1,"BM",NULL); Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); fprintf (Gbl.F.Out,"%s
(%s)",Txt_Type_of_group,Txt_eg_Lectures_Practicals); Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Mandatory_enrolment); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Multiple_enrolment); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Opening_of_groups); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_BR_groups); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Mandatory_enrolment); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Multiple_enrolment); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Opening_of_groups); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_No_of_BR_groups); Tbl_TR_End (); } @@ -1682,39 +1668,19 @@ static void Grp_WriteHeadingGroups (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type_BR_of_group); - Tbl_TH_End (); - + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Type_BR_of_group); Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); fprintf (Gbl.F.Out,"%s
(%s)",Txt_Group_name,Txt_eg_A_B); Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Classroom); - Tbl_TH_End (); - + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Classroom); for (Role = Rol_TCH; Role >= Rol_STD; Role--) - { - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); - Tbl_TH_End (); - } - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Max_BR_students); Tbl_TR_End (); } @@ -2393,33 +2359,15 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) /***** Head row with title of each column *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,2,NULL); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Group); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Classroom); - Tbl_TH_End (); - + Tbl_TH_Empty (2); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Group); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Classroom); for (Role = Rol_TCH; Role >= Rol_STD; Role--) - { - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); - Tbl_TH_End (); - } - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Vacants); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_ROLES_PLURAL_BRIEF_Abc[Role]); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Max_BR_students); + Tbl_TH (1,1,"CENTER_MIDDLE",Txt_Vacants); Tbl_TR_End (); } diff --git a/swad_holiday.c b/swad_holiday.c index 3a104bae4..721aa30d6 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -116,11 +116,13 @@ void Hld_SeeHolidays (void) { Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TR_Begin (NULL); + for (Order = Hld_ORDER_BY_PLACE; Order <= Hld_ORDER_BY_START_DATE; Order++) { Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); + Frm_StartForm (ActSeeHld); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL); @@ -131,6 +133,7 @@ void Hld_SeeHolidays (void) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); Frm_EndForm (); + Tbl_TH_End (); } @@ -138,9 +141,7 @@ void Hld_SeeHolidays (void) fprintf (Gbl.F.Out," %s ",Txt_End_date); Tbl_TH_End (); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Holiday); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Holiday); Tbl_TR_End (); @@ -975,25 +976,11 @@ static void Hld_PutFormToCreateHoliday (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Place); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Holiday); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Place); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_START_END_TIME[Dat_START_TIME]); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_START_END_TIME[Dat_END_TIME]); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Holiday); Tbl_TR_End (); @@ -1082,32 +1069,13 @@ static void Hld_PutHeadHolidays (void) Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"BM");; - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Place); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Type); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Holiday); - Tbl_TH_End (); + Tbl_TH (1,1,"BM",NULL); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Place); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Type); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_START_END_TIME[Dat_START_TIME]); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_START_END_TIME[Dat_END_TIME]); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Holiday); Tbl_TR_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index fbb697059..3a0c7715d 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -647,14 +647,8 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 if (PutForm) Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Indicators); - Tbl_TH_End (); - - Tbl_TH_Begin (1,2,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses); - Tbl_TH_End (); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Indicators); + Tbl_TH (1,2,"RIGHT_MIDDLE",Txt_Courses); Tbl_TR_End (); @@ -770,50 +764,29 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat case Ind_INDICATORS_BRIEF: Tbl_TR_Begin (NULL); - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course); - Tbl_TH_End (); - - Tbl_TH_Begin (11,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Indicators); - Tbl_TH_End (); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Degree); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Course); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Institutional_BR_code); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Web_page_of_the_course); + Tbl_TH (11,1,"CENTER_MIDDLE COLOR0",Txt_Indicators); Tbl_TR_End (); Tbl_TR_Begin (NULL); - Tbl_TH_Begin (2,1,"CENTER_TOP COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); - Tbl_TH_End (); - + Tbl_TH (2,1,"CENTER_TOP COLOR0",Txt_No_INDEX); Tbl_TH_Begin (1,2,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course); Tbl_TH_End (); - Tbl_TH_Begin (1,2,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments); Tbl_TH_End (); - Tbl_TH_Begin (1,2,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring); Tbl_TH_End (); - Tbl_TH_Begin (1,2,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(D) %s",Txt_Materials); Tbl_TH_End (); - Tbl_TH_Begin (1,2,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria); Tbl_TH_End (); @@ -822,103 +795,47 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); Tbl_TR_End (); break; case Ind_INDICATORS_FULL: Tbl_TR_Begin (NULL); - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Degree); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Course); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - Tbl_TH_End (); - - Tbl_TH_Begin (3,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,24,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Indicators); - Tbl_TH_End (); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Degree); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Course); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Institutional_BR_code); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_Web_page_of_the_course); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH (3,1,"LEFT_MIDDLE COLOR0",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH (1,24,"CENTER_MIDDLE COLOR0",Txt_Indicators); Tbl_TR_End (); Tbl_TR_Begin (NULL); - Tbl_TH_Begin (2,1,"CENTER_TOP COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_No_INDEX); - Tbl_TH_End (); - + Tbl_TH (2,1,"CENTER_TOP COLOR0",Txt_No_INDEX); Tbl_TH_Begin (1,5,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course); Tbl_TH_End (); - Tbl_TH_Begin (1,5,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments); Tbl_TH_End (); - Tbl_TH_Begin (1,5,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring); Tbl_TH_End (); - Tbl_TH_Begin (1,4,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(D) %s",Txt_Materials); Tbl_TH_End (); - Tbl_TH_Begin (1,4,"CENTER_TOP COLOR0"); fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria); Tbl_TH_End (); @@ -927,97 +844,29 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_LECTURES]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_PRACTICALS]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Assignments); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Files_assignments); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Files_works); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"class=\"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Forum_threads); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Forum_posts); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_Messages_sent_by_teachers); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_DOCUM_zones); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_SHARE_zones); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_YES); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"CENTER_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_NO); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_ASSESSMENT]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE COLOR0"); - fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); - Tbl_TH_End (); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"LEFT_MIDDLE COLOR0",Txt_INFO_TITLE[Inf_LECTURES]); + Tbl_TH (1,1,"LEFT_MIDDLE COLOR0",Txt_INFO_TITLE[Inf_PRACTICALS]); + Tbl_TH (1,1,"LEFT_MIDDLE COLOR0",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Assignments); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Files_assignments); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Files_works); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Forum_threads); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Forum_posts); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_Messages_sent_by_teachers); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_No_of_files_in_DOCUM_zones); + Tbl_TH (1,1,"RIGHT_MIDDLE COLOR0",Txt_No_of_files_in_SHARE_zones); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_YES); + Tbl_TH (1,1,"CENTER_MIDDLE COLOR0",Txt_NO); + Tbl_TH (1,1,"LEFT_MIDDLE COLOR0",Txt_INFO_TITLE[Inf_ASSESSMENT]); + Tbl_TH (1,1,"LEFT_MIDDLE COLOR0",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]); Tbl_TR_End (); break; diff --git a/swad_institution.c b/swad_institution.c index 4f11e8385..3daa0690a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -175,13 +175,8 @@ void Ins_SeeInsWithPendingCtrs (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); - Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Institution); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Centres_ABBREVIATION); Tbl_TR_End (); @@ -878,7 +873,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) Order++) { Tbl_TH_Begin (1,1,Order == Ins_ORDER_BY_INSTITUTION ? "LEFT_MIDDLE" : - "RIGHT_MIDDLE"); + "RIGHT_MIDDLE"); if (OrderSelectable) { Frm_StartForm (ActSeeIns); @@ -898,30 +893,15 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) Tbl_TH_End (); } + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Centres_ABBREVIATION); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees_ABBREVIATION); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Departments_ABBREVIATION); Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Departments_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s+
%s", - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); + fprintf (Gbl.F.Out,"%s+
%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TH_End (); + Tbl_TH_Empty (1); Tbl_TR_End (); } @@ -2334,45 +2314,19 @@ static void Ins_PutHeadInstitutionsForEdition (void) Tbl_TR_Begin (NULL); Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Code); - Tbl_TH_End (); - + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code); Tbl_TH_Empty (1); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_institution); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_WWW); - Tbl_TH_End (); - + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name_of_the_institution); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name_of_the_institution); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Users); + Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Centres_ABBREVIATION); Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Users); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"RIGHT_MIDDLE"); - fprintf (Gbl.F.Out,"%s+
%s", - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); - fprintf (Gbl.F.Out,"%s",Txt_Requester); - Tbl_TH_End (); - - Tbl_TH_Begin (1,1,"LEFT_MIDDLE"); + fprintf (Gbl.F.Out,"%s+
%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); Tbl_TH_End (); + Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Requester); + Tbl_TH_Empty (1); Tbl_TR_End (); }