Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.32.4

This commit is contained in:
Antonio Cañas Vargas 2019-10-12 00:07:52 +02:00
parent 2df685207a
commit a9041f711d
26 changed files with 1447 additions and 1288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf 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 CSS_FILE "swad19.29.css"
#define JS_FILE "swad19.30.js" #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: 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.) // 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.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.2: Oct 11, 2019 Code refactoring in HTML. (246626 lines)
Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines) Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines)

266
swad_figure.c
View File

@ -4829,26 +4829,27 @@ static void Fig_GetAndShowSurveysStats (void)
/***** Write table heading *****/ /***** Write table heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_surveys);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_courses_with_BR_surveys);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_surveys_BR_per_course);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Average_number_BR_of_questions_BR_per_survey);
Txt_Number_of_BR_surveys, fprintf (Gbl.F.Out,"</th>");
Txt_Number_of_BR_courses_with_BR_surveys,
Txt_Average_number_BR_of_surveys_BR_per_course, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_Average_number_BR_of_questions_BR_per_survey, fprintf (Gbl.F.Out,"%s",Txt_Number_of_BR_notifications);
Txt_Number_of_BR_notifications); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write number of surveys *****/ /***** Write number of surveys *****/
@ -4932,18 +4933,19 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject,
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",TxtObject);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
TxtObject, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each privacy option... *****/ /***** For each privacy option... *****/
@ -5028,18 +5030,19 @@ static void Fig_GetAndShowNumUsrsPerCookies (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Cookies);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Cookies, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each option... *****/ /***** For each option... *****/
@ -5111,18 +5114,19 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Language);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Language, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each language... *****/ /***** For each language... *****/
@ -5195,18 +5199,19 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Calendar);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Calendar, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each day... *****/ /***** For each day... *****/
@ -5283,18 +5288,19 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Format);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Format, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each format... *****/ /***** For each format... *****/
@ -5367,18 +5373,19 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Icons);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Icons, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each icon set... *****/ /***** For each icon set... *****/
@ -5456,18 +5463,19 @@ static void Fig_GetAndShowNumUsrsPerMenu (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Menu);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Menu, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each menu... *****/ /***** For each menu... *****/
@ -5544,18 +5552,19 @@ static void Fig_GetAndShowNumUsrsPerTheme (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Theme_SKIN);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Theme_SKIN, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each theme... *****/ /***** For each theme... *****/
@ -5631,18 +5640,19 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void)
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Columns);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Columns, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each language... *****/ /***** For each language... *****/

65
swad_file_browser.c
View File

@ -11806,31 +11806,34 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Institution);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Centre);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Course);
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_Institution,
Txt_Centre, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Degree, fprintf (Gbl.F.Out,"%s",Txt_File_zone);
Txt_Course, fprintf (Gbl.F.Out,"</th>");
Txt_File_zone,
Txt_Document); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Document);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** List documents found *****/ /***** List documents found *****/
@ -11846,17 +11849,19 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs,
} }
/***** Write footer *****/ /***** Write footer *****/
/* Number of documents not hidden found */
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"7\" class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<th colspan=\"7\" class=\"CENTER_MIDDLE\">");
"(");
/* Number of documents not hidden found */
fprintf (Gbl.F.Out,"(");
NumDocsHidden = NumDocs - NumDocsNotHidden; NumDocsHidden = NumDocs - NumDocsNotHidden;
if (NumDocsHidden == 1) if (NumDocsHidden == 1)
fprintf (Gbl.F.Out,"1 %s",Txt_hidden_document); fprintf (Gbl.F.Out,"1 %s",Txt_hidden_document);
else else
fprintf (Gbl.F.Out,"%lu %s",NumDocsHidden,Txt_hidden_documents); fprintf (Gbl.F.Out,"%lu %s",NumDocsHidden,Txt_hidden_documents);
fprintf (Gbl.F.Out,")" fprintf (Gbl.F.Out,")");
"</th>");
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** End table and box *****/ /***** End table and box *****/

48
swad_forum.c
View File

@ -2560,10 +2560,17 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
/***** Heading row *****/ /***** Heading row *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th style=\"width:20px;\"></th>"
"<th class=\"CONTEXT_COL\"></th>" // Column for contextual icons fprintf (Gbl.F.Out,"<th style=\"width:20px;\">");
"<th class=\"LEFT_MIDDLE\">%s</th>", fprintf (Gbl.F.Out,"</th>");
Txt_MSG_Subject);
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\">"); // Column for contextual icons
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_MSG_Subject);
fprintf (Gbl.F.Out,"</th>");
for (Order = For_FIRST_MSG; for (Order = For_FIRST_MSG;
Order <= For_LAST_MSG; Order <= For_LAST_MSG;
Order++) Order++)
@ -2588,22 +2595,23 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
Frm_EndForm (); Frm_EndForm ();
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_BR_msgs);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Unread_BR_msgs);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_WriBRters);
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_No_BR_msgs,
Txt_Unread_BR_msgs, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_WriBRters, fprintf (Gbl.F.Out,"%s",Txt_ReaBRders);
Txt_ReaBRders); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** List the threads *****/ /***** List the threads *****/

43
swad_game.c
View File

@ -212,7 +212,10 @@ static void Gam_ListAllGames (void)
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
if (Gam_CheckIfICanEditGames ()) if (Gam_CheckIfICanEditGames ())
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\"></th>"); // Column for contextual icons {
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\">"); // Column for contextual icons
fprintf (Gbl.F.Out,"</th>");
}
for (Order = (Gam_Order_t) 0; for (Order = (Gam_Order_t) 0;
Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1);
@ -236,7 +239,9 @@ static void Gam_ListAllGames (void)
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">%s</th>",Txt_Matches); fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Matches);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
@ -1645,23 +1650,25 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts,
/***** Write the heading *****/ /***** Write the heading *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Code);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Tags);
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_No_INDEX,
Txt_Code, fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_Tags, fprintf (Gbl.F.Out,"%s",Txt_Question);
Txt_Question); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write rows *****/ /***** Write rows *****/

147
swad_group.c
View File

@ -1452,27 +1452,30 @@ static void Grp_WriteHeadingGroupTypes (void)
extern const char *Txt_No_of_BR_groups; extern const char *Txt_No_of_BR_groups;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s<br />(%s)" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s<br />(%s)",Txt_Type_of_group,Txt_eg_Lectures_Practicals);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Mandatory_enrolment);
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Multiple_enrolment);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Type_of_group,Txt_eg_Lectures_Practicals, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_Mandatory_enrolment, fprintf (Gbl.F.Out,"%s",Txt_Opening_of_groups);
Txt_Multiple_enrolment, fprintf (Gbl.F.Out,"</th>");
Txt_Opening_of_groups,
Txt_No_of_BR_groups); fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_No_of_BR_groups);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -1678,32 +1681,41 @@ static void Grp_WriteHeadingGroups (void)
Rol_Role_t Role; Rol_Role_t Role;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"BM\"></th>" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"<th class=\"BM\"></th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_MIDDLE\">"
"%s<br />(%s)" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Type_BR_of_group);
Txt_Type_BR_of_group, fprintf (Gbl.F.Out,"</th>");
Txt_Group_name,Txt_eg_A_B,
Txt_Classroom); fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"%s<br />(%s)",Txt_Group_name,Txt_eg_A_B);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Classroom);
fprintf (Gbl.F.Out,"</th>");
for (Role = Rol_TCH; for (Role = Rol_TCH;
Role >= Rol_STD; Role >= Rol_STD;
Role--) Role--)
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">" {
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]);
Txt_ROLES_PLURAL_BRIEF_Abc[Role]); fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">" }
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_Max_BR_students); fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -2380,30 +2392,35 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
/***** Head row with title of each column *****/ /***** Head row with title of each column *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"2\"></th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th colspan=\"2\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Group);
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_Group,
Txt_Classroom); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Classroom);
fprintf (Gbl.F.Out,"</th>");
for (Role = Rol_TCH; for (Role = Rol_TCH;
Role >= Rol_STD; Role >= Rol_STD;
Role--) Role--)
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">" {
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Role]);
Txt_ROLES_PLURAL_BRIEF_Abc[Role]); fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">" }
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Max_BR_students);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Max_BR_students, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_Vacants); fprintf (Gbl.F.Out,"%s",Txt_Vacants);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

111
swad_holiday.c
View File

@ -133,14 +133,15 @@ void Hld_SeeHolidays (void)
Frm_EndForm (); Frm_EndForm ();
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"&nbsp;%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",Txt_End_date);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_End_date, fprintf (Gbl.F.Out,"%s",Txt_Holiday);
Txt_Holiday); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write all the holidays *****/ /***** Write all the holidays *****/
@ -973,26 +974,27 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Place);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Type);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]);
Txt_Place, fprintf (Gbl.F.Out,"</th>");
Txt_Type,
Txt_START_END_TIME[Dat_START_TIME], fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_START_END_TIME[Dat_END_TIME], fprintf (Gbl.F.Out,"%s",Txt_Holiday);
Txt_Holiday); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
@ -1079,31 +1081,34 @@ static void Hld_PutHeadHolidays (void)
extern const char *Txt_Holiday; extern const char *Txt_Holiday;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Place);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Type);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]);
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_Code,
Txt_Place, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Type, fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]);
Txt_START_END_TIME[Dat_START_TIME], fprintf (Gbl.F.Out,"</th>");
Txt_START_END_TIME[Dat_END_TIME],
Txt_Holiday); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Holiday);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

473
swad_indicator.c
View File

@ -644,17 +644,20 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
Tbl_TABLE_BeginPadding (2); Tbl_TABLE_BeginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
if (PutForm) if (PutForm)
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Indicators);
"<th colspan=\"2\" class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"RIGHT_MIDDLE\">");
Txt_Indicators, fprintf (Gbl.F.Out,"%s",Txt_Courses);
Txt_Courses); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
for (Ind = 0; for (Ind = 0;
Ind <= Ind_NUM_INDICATORS; Ind <= Ind_NUM_INDICATORS;
Ind++) Ind++)
@ -766,258 +769,256 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
{ {
case Ind_INDICATORS_BRIEF: case Ind_INDICATORS_BRIEF:
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"%s",Txt_Course);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th colspan=\"11\" class=\"CENTER_MIDDLE COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course);
Txt_Degree, fprintf (Gbl.F.Out,"</th>");
Txt_Course,
Txt_Institutional_BR_code, fprintf (Gbl.F.Out,"<th colspan=\"11\" class=\"CENTER_MIDDLE COLOR0\">");
Txt_Web_page_of_the_course, fprintf (Gbl.F.Out,"%s",Txt_Indicators);
Txt_Indicators); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th rowspan=\"2\" class=\"CENTER_TOP COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"2\" class=\"CENTER_TOP COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"(A) %s"
"</th>" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">");
"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course);
"(B) %s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">");
"(C) %s" fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">"
"(D) %s" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring);
"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"(E) %s"
"</th>", fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">");
Txt_No_INDEX, fprintf (Gbl.F.Out,"(D) %s",Txt_Materials);
Txt_Syllabus_of_the_course, fprintf (Gbl.F.Out,"</th>");
Txt_Guided_academic_assignments,
Txt_Online_tutoring, fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP COLOR0\">");
Txt_Materials, fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria);
Txt_Assessment_criteria); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>",
Txt_YES,
Txt_NO,
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
Txt_YES,
Txt_NO);
Tbl_TR_End (); Tbl_TR_End ();
break; break;
case Ind_INDICATORS_FULL: case Ind_INDICATORS_FULL:
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"%s",Txt_Course);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Web_page_of_the_course);
"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
"<th colspan=\"24\" class=\"CENTER_MIDDLE COLOR0\">" fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Degree, fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_MIDDLE COLOR0\">");
Txt_Course, fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Txt_Institutional_BR_code, fprintf (Gbl.F.Out,"</th>");
Txt_Web_page_of_the_course,
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], fprintf (Gbl.F.Out,"<th colspan=\"24\" class=\"CENTER_MIDDLE COLOR0\">");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], fprintf (Gbl.F.Out,"%s",Txt_Indicators);
Txt_Indicators); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th rowspan=\"2\" class=\"CENTER_TOP COLOR0\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"2\" class=\"CENTER_TOP COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"(A) %s"
"</th>" fprintf (Gbl.F.Out,"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">");
"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"(A) %s",Txt_Syllabus_of_the_course);
"(B) %s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">");
"(C) %s" fprintf (Gbl.F.Out,"(B) %s",Txt_Guided_academic_assignments);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th colspan=\"4\" class=\"CENTER_TOP COLOR0\">"
"(D) %s" fprintf (Gbl.F.Out,"<th colspan=\"5\" class=\"CENTER_TOP COLOR0\">");
"</th>" fprintf (Gbl.F.Out,"(C) %s",Txt_Online_tutoring);
"<th colspan=\"4\" class=\"CENTER_TOP COLOR0\">" fprintf (Gbl.F.Out,"</th>");
"(E) %s"
"</th>", fprintf (Gbl.F.Out,"<th colspan=\"4\" class=\"CENTER_TOP COLOR0\">");
Txt_No_INDEX, fprintf (Gbl.F.Out,"(D) %s",Txt_Materials);
Txt_Syllabus_of_the_course, fprintf (Gbl.F.Out,"</th>");
Txt_Guided_academic_assignments,
Txt_Online_tutoring, fprintf (Gbl.F.Out,"<th colspan=\"4\" class=\"CENTER_TOP COLOR0\">");
Txt_Materials, fprintf (Gbl.F.Out,"(E) %s",Txt_Assessment_criteria);
Txt_Assessment_criteria); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"LEFT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"LEFT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"LEFT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"CENTER_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"LEFT_MIDDLE COLOR0\">"
"%s"
"</th>"
"<th class=\"LEFT_MIDDLE COLOR0\">"
"%s"
"</th>",
Txt_YES,
Txt_NO,
Txt_INFO_TITLE[Inf_LECTURES],
Txt_INFO_TITLE[Inf_PRACTICALS],
Txt_INFO_TITLE[Inf_TEACHING_GUIDE],
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_YES);
Txt_Assignments, fprintf (Gbl.F.Out,"</th>");
Txt_Files_assignments,
Txt_Files_works,
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_NO);
Txt_Forum_threads, fprintf (Gbl.F.Out,"</th>");
Txt_Forum_posts,
Txt_Messages_sent_by_teachers,
Txt_YES, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE COLOR0\">");
Txt_NO, fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_LECTURES]);
Txt_No_of_files_in_DOCUM_zones, fprintf (Gbl.F.Out,"</th>");
Txt_No_of_files_in_SHARE_zones,
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_PRACTICALS]);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Assignments);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Files_assignments);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Files_works);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Forum_threads);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Forum_posts);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_Messages_sent_by_teachers);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_DOCUM_zones);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_No_of_files_in_SHARE_zones);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_YES);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_NO);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_ASSESSMENT]);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE COLOR0\">");
fprintf (Gbl.F.Out,"%s",Txt_INFO_TITLE[Inf_TEACHING_GUIDE]);
fprintf (Gbl.F.Out,"</th>");
Txt_YES,
Txt_NO,
Txt_INFO_TITLE[Inf_ASSESSMENT],
Txt_INFO_TITLE[Inf_TEACHING_GUIDE]);
Tbl_TR_End (); Tbl_TR_End ();
break; break;
} }

134
swad_institution.c
View File

@ -174,14 +174,15 @@ void Ins_SeeInsWithPendingCtrs (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Institution);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_Institution, fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION);
Txt_Centres_ABBREVIATION); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** List the institutions *****/ /***** List the institutions *****/
@ -897,29 +898,32 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
} }
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_MIDDLE\">"
"%s+<br />%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Departments_ABBREVIATION);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Centres_ABBREVIATION, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_Degrees_ABBREVIATION, fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_Courses_ABBREVIATION, Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_Departments_ABBREVIATION, Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], fprintf (Gbl.F.Out,"</th>");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -2329,43 +2333,49 @@ static void Ins_PutHeadInstitutionsForEdition (void)
extern const char *Txt_Requester; extern const char *Txt_Requester;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" "%s"
"</th>", "</th>",
Txt_Code); Txt_Code);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_institution);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_institution);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_WWW);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Users);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s+<br />%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_Short_name_of_the_institution, Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_Full_name_of_the_institution, Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
Txt_WWW, fprintf (Gbl.F.Out,"</th>");
Txt_Users,
Txt_Centres_ABBREVIATION, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], fprintf (Gbl.F.Out,"%s",Txt_Requester);
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], fprintf (Gbl.F.Out,"</th>");
Txt_Requester);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

37
swad_link.c
View File

@ -802,23 +802,26 @@ static void Lnk_PutHeadLinks (void)
extern const char *Txt_WWW; extern const char *Txt_WWW;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Short_name);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Code, fprintf (Gbl.F.Out,"%s",Txt_Full_name);
Txt_Short_name, fprintf (Gbl.F.Out,"</th>");
Txt_Full_name,
Txt_WWW); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_WWW);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

54
swad_mail.c
View File

@ -753,14 +753,15 @@ static void Mai_PutFormToCreateMailDomain (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN]);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO]);
Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
@ -802,23 +803,26 @@ static void Mai_PutHeadMailDomains (void)
extern const char *Txt_EMAIL_DOMAIN_ORDER[3]; extern const char *Txt_EMAIL_DOMAIN_ORDER[3];
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN]);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Code, fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ]);
Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN], fprintf (Gbl.F.Out,"</th>");
Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ],
Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ]); fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ]);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

55
swad_match.c
View File

@ -437,34 +437,33 @@ static void Mch_ListOneOrMoreMatchesHeading (bool ICanEditMatches)
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
/***** The rest of columns *****/ /***** The rest of columns *****/
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN]);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Gam_ORDER_BY_START_DATE]);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Gam_ORDER_BY_END_DATE]);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Match);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Players);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN], fprintf (Gbl.F.Out,"%s",Txt_Status);
Txt_START_END_TIME[Gam_ORDER_BY_START_DATE], fprintf (Gbl.F.Out,"</th>");
Txt_START_END_TIME[Gam_ORDER_BY_END_DATE],
Txt_Match, fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_Players, fprintf (Gbl.F.Out,"%s",Txt_Result);
Txt_Status, fprintf (Gbl.F.Out,"</th>");
Txt_Result);
/***** End row *****/ /***** End row *****/
Tbl_TR_End (); Tbl_TR_End ();

76
swad_match_result.c
View File

@ -327,44 +327,46 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
extern const char *Txt_out_of_PART_OF_A_SCORE; extern const char *Txt_out_of_PART_OF_A_SCORE;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex :
"<th class=\"LEFT_TOP\">" Usr_SEX_UNKNOWN]);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_START_TIME]);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Dat_END_TIME]);
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Match);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Questions);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Non_blank_BR_questions);
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s<br />%s<br />%u"
"</th>", fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : fprintf (Gbl.F.Out,"%s",Txt_Total_BR_score);
Usr_SEX_UNKNOWN], fprintf (Gbl.F.Out,"</th>");
Txt_START_END_TIME[Dat_START_TIME],
Txt_START_END_TIME[Dat_END_TIME], fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
Txt_Match, fprintf (Gbl.F.Out,"%s",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
Txt_Questions, fprintf (Gbl.F.Out,"</th>");
Txt_Non_blank_BR_questions,
Txt_Total_BR_score, fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
Txt_Average_BR_score_BR_per_question_BR_from_0_to_1, fprintf (Gbl.F.Out,"%s<br />%s<br />%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX);
Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); fprintf (Gbl.F.Out,"</th>");
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
Tbl_TR_End (); Tbl_TR_End ();
} }

16
swad_message.c
View File

@ -481,14 +481,16 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
/***** Title *****/ /***** Title *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th");
if (Colspan > 1) if (Colspan > 1)
fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan); fprintf (Gbl.F.Out,"<th colspan=\"%u\" class=\"LEFT_MIDDLE LIGHT_BLUE\">",Colspan);
fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE LIGHT_BLUE\">" else
"<label for=\"OtherRecipients\">%s:</label>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"<label for=\"OtherRecipients\">%s:</label>",
StdsAndTchsWritten ? Txt_Other_recipients : StdsAndTchsWritten ? Txt_Other_recipients :
Txt_Recipients); Txt_Recipients);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Textarea with users' @nicknames, emails or IDs *****/ /***** Textarea with users' @nicknames, emails or IDs *****/

25
swad_network.c
View File

@ -556,18 +556,19 @@ void Net_ShowWebAndSocialNetworksStats (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Web_social_network);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Web_social_network, fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
Txt_No_of_users, fprintf (Gbl.F.Out,"%s",Txt_PERCENT_of_users);
Txt_PERCENT_of_users); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** For each web / social network... *****/ /***** For each web / social network... *****/

59
swad_notification.c
View File

@ -395,26 +395,27 @@ void Ntf_ShowMyNotifications (void)
/***** Start table *****/ /***** Start table *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Event);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_MSG_From);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Location);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Date);
Txt_Event, fprintf (Gbl.F.Out,"</th>");
Txt_MSG_From,
Txt_Location, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Date, fprintf (Gbl.F.Out,"%s",Txt_Email);
Txt_Email); // Date and time, in YYYY-MM-DD HH:MM:SS format fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** List notifications one by one *****/ /***** List notifications one by one *****/
@ -1942,15 +1943,17 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
/***** List of notifications *****/ /***** List of notifications *****/
Tbl_TABLE_BeginCenterPadding (2); Tbl_TABLE_BeginCenterPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Create_BR_notification);
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_Create_BR_notification, fprintf (Gbl.F.Out,"%s",Txt_Notify_me_BR_by_email);
Txt_Notify_me_BR_by_email); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Checkbox to activate internal notifications and email notifications /***** Checkbox to activate internal notifications and email notifications

27
swad_photo.c
View File

@ -2217,21 +2217,24 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TABLE_BeginCenterPadding (2); Tbl_TABLE_BeginCenterPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_No_INDEX, fprintf (Gbl.F.Out,"%s",Txt_Degree);
Txt_Degree); fprintf (Gbl.F.Out,"</th>");
for (Sex = (Usr_Sex_t) 0; for (Sex = (Usr_Sex_t) 0;
Sex < Usr_NUM_SEXS; Sex < Usr_NUM_SEXS;
Sex++) Sex++)
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">" {
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_SEX_PLURAL_Abc[Sex]);
Txt_SEX_PLURAL_Abc[Sex]); fprintf (Gbl.F.Out,"</th>");
}
Tbl_TR_End (); Tbl_TR_End ();
/***** Get degrees *****/ /***** Get degrees *****/

37
swad_place.c
View File

@ -862,23 +862,26 @@ static void Plc_PutHeadPlaces (void)
extern const char *Txt_Centres; extern const char *Txt_Centres;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"BM\"></th>"
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"BM\">");
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Code);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Short_name);
"<th class=\"RIGHT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Code, fprintf (Gbl.F.Out,"%s",Txt_Full_name);
Txt_Short_name, fprintf (Gbl.F.Out,"</th>");
Txt_Full_name,
Txt_Centres); fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_Centres);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

125
swad_plugin.c
View File

@ -115,12 +115,14 @@ void Plg_ListPlugins (void)
/***** Write table heading *****/ /***** Write table heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th style=\"width:40px;\">"
"</th>" fprintf (Gbl.F.Out,"<th style=\"width:40px;\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Plugin); fprintf (Gbl.F.Out,"%s",Txt_Plugin);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write all the plugins *****/ /***** Write all the plugins *****/
@ -893,30 +895,31 @@ static void Plg_PutFormToCreatePlugin (void)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Name);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Description);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Logo);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Application_key);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Name, fprintf (Gbl.F.Out,"%s",Txt_URL);
Txt_Description, fprintf (Gbl.F.Out,"</th>");
Txt_Logo,
Txt_Application_key, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_URL, fprintf (Gbl.F.Out,"%s",Txt_IP);
Txt_IP); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Plugin name *****/ /***** Plugin name *****/
@ -991,36 +994,40 @@ static void Plg_PutHeadPlugins (void)
extern const char *Txt_IP; extern const char *Txt_IP;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Code);
"<th style=\"width:35px;\"></th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th style=\"width:35px;\">");
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Name);
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_Description);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Logo);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Application_key);
Txt_Code, fprintf (Gbl.F.Out,"</th>");
Txt_Name,
Txt_Description, fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
Txt_Logo, fprintf (Gbl.F.Out,"%s",Txt_URL);
Txt_Application_key, fprintf (Gbl.F.Out,"</th>");
Txt_URL,
Txt_IP); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_IP);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

61
swad_project.c
View File

@ -691,7 +691,9 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView)
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">%s</th>",Txt_No_INDEX); fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
fprintf (Gbl.F.Out,"</th>");
break; break;
default: default:
break; break;
@ -702,7 +704,8 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\"></th>"); fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\">");
fprintf (Gbl.F.Out,"</th>");
break; break;
default: default:
break; break;
@ -761,30 +764,48 @@ static void Prj_ShowTableAllProjectsHead (void)
for (Order = (Prj_Order_t) 0; for (Order = (Prj_Order_t) 0;
Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1); Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1);
Order++) Order++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">%s</th>", {
Txt_PROJECT_ORDER[Order]); fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
fprintf (Gbl.F.Out,"%s",Txt_PROJECT_ORDER[Order]);
fprintf (Gbl.F.Out,"</th>");
}
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">%s</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
"<th class=\"LEFT_TOP DAT_N\">%s</th>", fprintf (Gbl.F.Out,"%s",Txt_Preassigned_QUESTION);
Txt_Preassigned_QUESTION, fprintf (Gbl.F.Out,"</th>");
Txt_Number_of_students);
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
fprintf (Gbl.F.Out,"%s",Txt_Number_of_students);
fprintf (Gbl.F.Out,"</th>");
for (NumRoleToShow = 0; for (NumRoleToShow = 0;
NumRoleToShow < Brw_NUM_ROLES_TO_SHOW; NumRoleToShow < Brw_NUM_ROLES_TO_SHOW;
NumRoleToShow++) NumRoleToShow++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">%s</th>", {
Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]]); fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
fprintf (Gbl.F.Out,"%s",Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]]);
fprintf (Gbl.F.Out,"</th>");
}
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">%s</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
"<th class=\"LEFT_TOP DAT_N\">%s</th>" fprintf (Gbl.F.Out,"%s",Txt_Proposal);
"<th class=\"LEFT_TOP DAT_N\">%s</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_TOP DAT_N\">%s</th>"
"<th class=\"LEFT_TOP DAT_N\">%s</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
Txt_Proposal, fprintf (Gbl.F.Out,"%s",Txt_Description);
Txt_Description, fprintf (Gbl.F.Out,"</th>");
Txt_Required_knowledge,
Txt_Required_materials, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
Txt_URL); fprintf (Gbl.F.Out,"%s",Txt_Required_knowledge);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
fprintf (Gbl.F.Out,"%s",Txt_Required_materials);
fprintf (Gbl.F.Out,"</th>");
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP DAT_N\">");
fprintf (Gbl.F.Out,"%s",Txt_URL);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

26
swad_record.c
View File

@ -435,19 +435,21 @@ static void Rec_WriteHeadingRecordFields (void)
extern const char *Txt_Visible_by_BR_the_student; extern const char *Txt_Visible_by_BR_the_student;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Field_BR_name);
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"%s",Txt_No_of_BR_lines);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Field_BR_name, fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_No_of_BR_lines, fprintf (Gbl.F.Out,"%s",Txt_Visible_by_BR_the_student);
Txt_Visible_by_BR_the_student); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

492
swad_statistic.c
View File

@ -1669,34 +1669,35 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_User_ID);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Name);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Role);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\" style=\"width:10%%;\">" fprintf (Gbl.F.Out,"%s",Txt_Date);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_User_ID, fprintf (Gbl.F.Out,"%s",Txt_Action);
Txt_Name, fprintf (Gbl.F.Out,"</th>");
Txt_Role,
Txt_Date, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\" style=\"width:10%%;\">");
Txt_Action, fprintf (Gbl.F.Out,"%s",Txt_LOG_More_info);
Txt_LOG_More_info); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write rows back *****/ /***** Write rows back *****/
@ -1830,30 +1831,31 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Photo);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_ID);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Name);
"<th colspan=\"2\" class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_No_INDEX, fprintf (Gbl.F.Out,"%s",Txt_Role);
Txt_Photo, fprintf (Gbl.F.Out,"</th>");
Txt_ID,
Txt_Name, fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"LEFT_TOP\">");
Txt_Role, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write rows *****/ /***** Write rows *****/
@ -1960,18 +1962,19 @@ static void Sta_ShowNumHitsPerDay (unsigned long NumRows,MYSQL_RES *mysql_res)
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Date);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Day);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_Date, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Day, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per day *****/ /***** Compute maximum number of pages generated per day *****/
@ -2158,20 +2161,20 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Date);
"<th rowspan=\"3\" class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th rowspan=\"3\" class=\"LEFT_TOP\">");
"<th colspan=\"24\" class=\"LEFT_TOP\"" fprintf (Gbl.F.Out,"%s",Txt_Day);
" style=\"width:%upx;\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th colspan=\"24\" class=\"LEFT_TOP\" style=\"width:%upx;\">",
Txt_Date, GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH);
Txt_Day, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH, fprintf (Gbl.F.Out,"</th>");
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Tbl_TR_End (); Tbl_TR_End ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
@ -2555,14 +2558,15 @@ static void Sta_ShowNumHitsPerWeek (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Week);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Week, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per week *****/ /***** Compute maximum number of pages generated per week *****/
@ -2659,14 +2663,15 @@ static void Sta_ShowNumHitsPerMonth (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Month);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Month, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per month *****/ /***** Compute maximum number of pages generated per month *****/
@ -2763,14 +2768,15 @@ static void Sta_ShowNumHitsPerYear (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Year);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Year, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per year *****/ /***** Compute maximum number of pages generated per year *****/
@ -3192,14 +3198,15 @@ static void Sta_ShowNumHitsPerAction (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Action);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Action, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per day *****/ /***** Compute maximum number of pages generated per day *****/
@ -3250,14 +3257,15 @@ static void Sta_ShowNumHitsPerPlugin (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Plugin);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Plugin, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per plugin *****/ /***** Compute maximum number of pages generated per plugin *****/
@ -3309,14 +3317,15 @@ static void Sta_ShowNumHitsPerWSFunction (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Function);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Function, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per function *****/ /***** Compute maximum number of pages generated per function *****/
@ -3367,14 +3376,15 @@ static void Sta_ShowNumHitsPerBanner (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Banner);
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Banner, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of clicks per banner *****/ /***** Compute maximum number of clicks per banner *****/
@ -3446,18 +3456,19 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Country);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Country, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of hits per country *****/ /***** Compute maximum number of hits per country *****/
@ -3543,18 +3554,19 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Institution);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Institution, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of hits per institution *****/ /***** Compute maximum number of hits per institution *****/
@ -3642,18 +3654,19 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Centre);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Centre, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of hits per centre *****/ /***** Compute maximum number of hits per centre *****/
@ -3741,18 +3754,19 @@ static void Sta_ShowNumHitsPerDegree (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Degree, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of hits per degree *****/ /***** Compute maximum number of hits per degree *****/
@ -3845,26 +3859,27 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
/***** Write heading *****/ /***** Write heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Degree);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Course);
Txt_No_INDEX, fprintf (Gbl.F.Out,"</th>");
Txt_Degree,
Txt_Year_OF_A_DEGREE, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Course, fprintf (Gbl.F.Out,"%s",Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Compute maximum number of pages generated per course *****/ /***** Compute maximum number of pages generated per course *****/
@ -4190,46 +4205,39 @@ void Sta_GetAndShowLastClicks (void)
/***** Write list of connected users *****/ /***** Write list of connected users *****/
Tbl_TABLE_BeginCenterPadding (1); Tbl_TABLE_BeginCenterPadding (1);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\""
" style=\"width:85px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:85px;\">");
"%s" // Click fprintf (Gbl.F.Out,"%s",Txt_Click); // Click
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_MIDDLE\""
" style=\"width:50px;\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_MIDDLE\" style=\"width:50px;\">");
"%s" // Elapsed time fprintf (Gbl.F.Out,"%s",Txt_ELAPSED_TIME); // Elapsed time
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:100px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:100px;\">");
"%s" // Role fprintf (Gbl.F.Out,"%s",Txt_Role); // Role
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:100px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:100px;\">");
"%s" // Country fprintf (Gbl.F.Out,"%s",Txt_Country); // Country
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:150px;\">");
"%s" // Institution fprintf (Gbl.F.Out,"%s",Txt_Institution); // Institution
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:150px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:150px;\">");
"%s" // Centre fprintf (Gbl.F.Out,"%s",Txt_Centre); // Centre
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:200px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:200px;\">");
"%s" // Degree fprintf (Gbl.F.Out,"%s",Txt_Degree); // Degree
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_MIDDLE\""
" style=\"width:275px;\">" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\" style=\"width:275px;\">");
"%s" // Action fprintf (Gbl.F.Out,"%s",Txt_Action); // Action
"</th>", fprintf (Gbl.F.Out,"</th>");
Txt_Click,
Txt_ELAPSED_TIME,
Txt_Role,
Txt_Country,
Txt_Institution,
Txt_Centre,
Txt_Degree,
Txt_Action);
Tbl_TR_End (); Tbl_TR_End ();
for (NumRow = 0; for (NumRow = 0;

48
swad_survey.c
View File

@ -246,7 +246,10 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
/***** Table head *****/ /***** Table head *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\"></th>"); // Column for contextual icons
fprintf (Gbl.F.Out,"<th class=\"CONTEXT_COL\">"); // Column for contextual icons
fprintf (Gbl.F.Out,"</th>");
for (Order = Svy_ORDER_BY_START_DATE; for (Order = Svy_ORDER_BY_START_DATE;
Order <= Svy_ORDER_BY_END_DATE; Order <= Svy_ORDER_BY_END_DATE;
Order++) Order++)
@ -269,14 +272,15 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Tbl_TH_End (); Tbl_TH_End ();
} }
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Survey);
"<th class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>", fprintf (Gbl.F.Out,"<th class=\"CENTER_MIDDLE\">");
Txt_Survey, fprintf (Gbl.F.Out,"%s",Txt_Status);
Txt_Status); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write all the surveys *****/ /***** Write all the surveys *****/
@ -3219,20 +3223,22 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,
/***** Write the heading *****/ /***** Write the heading *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
if (Svy->Status.ICanEdit) if (Svy->Status.ICanEdit)
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Type);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Type, fprintf (Gbl.F.Out,"%s",Txt_Question);
Txt_Question); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write questions one by one *****/ /***** Write questions one by one *****/

157
swad_test.c
View File

@ -2828,27 +2828,28 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
/***** Write the heading *****/ /***** Write the heading *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Code);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Date);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Tags);
Txt_No_INDEX, fprintf (Gbl.F.Out,"</th>");
Txt_Code,
Txt_Date, fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_Tags, fprintf (Gbl.F.Out,"%s",Txt_Shuffle);
Txt_Shuffle); fprintf (Gbl.F.Out,"</th>");
/* Stem and answers of question */ /* Stem and answers of question */
/* Number of times that the question has been answered */ /* Number of times that the question has been answered */
@ -3094,35 +3095,37 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
/***** Write the heading *****/ /***** Write the heading *****/
Tbl_TABLE_BeginWideMarginPadding (2); Tbl_TABLE_BeginWideMarginPadding (2);
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Code);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Date);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Tags);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Type);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_No_INDEX, fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_Code, fprintf (Gbl.F.Out,"%s",Txt_Shuffle);
Txt_Date, fprintf (Gbl.F.Out,"</th>");
Txt_Tags,
Txt_Type, fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
Txt_Shuffle, fprintf (Gbl.F.Out,"%s",Txt_Question);
Txt_Question); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
/***** Write rows *****/ /***** Write rows *****/
@ -7706,35 +7709,37 @@ static void Tst_ShowHeaderTestResults (void)
extern const char *Txt_out_of_PART_OF_A_SCORE; extern const char *Txt_out_of_PART_OF_A_SCORE;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th colspan=\"2\" class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_User[Usr_SEX_UNKNOWN]);
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Date);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Questions);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"RIGHT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_Non_blank_BR_questions);
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
"<th class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Total_BR_score);
"%s<br />%s<br />%u" fprintf (Gbl.F.Out,"</th>");
"</th>",
Txt_User[Usr_SEX_UNKNOWN], fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
Txt_Date, fprintf (Gbl.F.Out,"%s",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
Txt_Questions, fprintf (Gbl.F.Out,"</th>");
Txt_Non_blank_BR_questions,
Txt_Total_BR_score, fprintf (Gbl.F.Out,"<th class=\"RIGHT_TOP\">");
Txt_Average_BR_score_BR_per_question_BR_from_0_to_1, fprintf (Gbl.F.Out,"%s<br />%s<br />%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX);
Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX); fprintf (Gbl.F.Out,"</th>");
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
Tbl_TR_End (); Tbl_TR_End ();
} }

42
swad_test_import.c
View File

@ -959,27 +959,29 @@ static void TsI_WriteHeadingListImportedQst (void)
/***** Write the heading *****/ /***** Write the heading *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
Tbl_TH_Empty (1); Tbl_TH_Empty (1);
fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>" fprintf (Gbl.F.Out,"%s",Txt_No_INDEX);
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"</th>");
"%s"
"</th>" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"%s",Txt_Tags);
"%s" fprintf (Gbl.F.Out,"</th>");
"</th>"
"<th class=\"CENTER_TOP\">" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"%s" fprintf (Gbl.F.Out,"%s",Txt_Type);
"</th>" fprintf (Gbl.F.Out,"</th>");
"<th class=\"LEFT_TOP\">"
"%s" fprintf (Gbl.F.Out,"<th class=\"CENTER_TOP\">");
"</th>", fprintf (Gbl.F.Out,"%s",Txt_Shuffle);
Txt_No_INDEX, fprintf (Gbl.F.Out,"</th>");
Txt_Tags,
Txt_Type, fprintf (Gbl.F.Out,"<th class=\"LEFT_TOP\">");
Txt_Shuffle, fprintf (Gbl.F.Out,"%s",Txt_Question);
Txt_Question); fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }

108
swad_user.c
View File

@ -6312,9 +6312,11 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
Usr_Sex_t Sex; Usr_Sex_t Sex;
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
fprintf (Gbl.F.Out,"<th colspan=\"%u\" class=\"LEFT_MIDDLE LIGHT_BLUE\">"
"<label>", fprintf (Gbl.F.Out,"<th colspan=\"%u\" class=\"LEFT_MIDDLE LIGHT_BLUE\">",
Usr_GetColumnsForSelectUsrs ()); Usr_GetColumnsForSelectUsrs ());
fprintf (Gbl.F.Out,"<label>");
if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role]) if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role])
fprintf (Gbl.F.Out,"<input type=\"checkbox\"" fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" name=\"%s\" value=\"\"" " name=\"%s\" value=\"\""
@ -6325,10 +6327,12 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
Rol_WrongRoleExit (); Rol_WrongRoleExit ();
Sex = Usr_GetSexOfUsrsLst (Role); Sex = Usr_GetSexOfUsrsLst (Role);
fprintf (Gbl.F.Out,"%s:" fprintf (Gbl.F.Out,"%s:"
"</label>" "</label>",
"</th>",
Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] :
Txt_ROLES_PLURAL_Abc[Role][Sex]); Txt_ROLES_PLURAL_Abc[Role][Sex]);
fprintf (Gbl.F.Out,"</th>");
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -6463,18 +6467,21 @@ void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr)
/***** First column used for selection *****/ /***** First column used for selection *****/
if (PutCheckBoxToSelectUsr) if (PutCheckBoxToSelectUsr)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"</th>"); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
fprintf (Gbl.F.Out,"</th>");
}
/***** Columns for user's data fields *****/ /***** Columns for user's data fields *****/
for (NumCol = 0; for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR;
NumCol++) NumCol++)
if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",Usr_UsrDatMainFieldNames[NumCol]);
Usr_UsrDatMainFieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
Tbl_TR_End (); Tbl_TR_End ();
} }
@ -6627,19 +6634,22 @@ static void Usr_ListMainDataTchs (Rol_Role_t Role,bool PutCheckBoxToSelectUsr)
/* First column used for selection */ /* First column used for selection */
if (PutCheckBoxToSelectUsr) if (PutCheckBoxToSelectUsr)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>"); fprintf (Gbl.F.Out,"&nbsp;");
fprintf (Gbl.F.Out,"</th>");
}
/* Columns for the data */ /* Columns for the data */
for (NumCol = 0; for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR;
NumCol++) NumCol++)
if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",Usr_UsrDatMainFieldNames[NumCol]);
Usr_UsrDatMainFieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
/* End row */ /* End row */
Tbl_TR_End (); Tbl_TR_End ();
@ -6742,10 +6752,11 @@ void Usr_ListAllDataGsts (void)
1); 1);
NumCol < NumColumnsCommonCard; NumCol < NumColumnsCommonCard;
NumCol++) NumCol++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",FieldNames[NumCol]);
FieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
/* End row */ /* End row */
Tbl_TR_End (); Tbl_TR_End ();
@ -6899,10 +6910,11 @@ void Usr_ListAllDataStds (void)
1); 1);
NumCol < NumColumnsCommonCard; NumCol < NumColumnsCommonCard;
NumCol++) NumCol++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",FieldNames[NumCol]);
FieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
/* 2. Columns for the groups */ /* 2. Columns for the groups */
if (Gbl.Scope.Current == Hie_CRS) if (Gbl.Scope.Current == Hie_CRS)
@ -6912,11 +6924,13 @@ void Usr_ListAllDataStds (void)
NumGrpTyp < Gbl.Crs.Grps.GrpTypes.Num; NumGrpTyp < Gbl.Crs.Grps.GrpTypes.Num;
NumGrpTyp++) NumGrpTyp++)
if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s %s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s %s&nbsp;",
Txt_Group, Txt_Group,
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName); Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName);
fprintf (Gbl.F.Out,"</th>");
}
if (Gbl.Crs.Records.LstFields.Num) if (Gbl.Crs.Records.LstFields.Num)
{ {
@ -6924,10 +6938,12 @@ void Usr_ListAllDataStds (void)
for (NumField = 0; for (NumField = 0;
NumField < Gbl.Crs.Records.LstFields.Num; NumField < Gbl.Crs.Records.LstFields.Num;
NumField++) NumField++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",
Gbl.Crs.Records.LstFields.Lst[NumField].Name); Gbl.Crs.Records.LstFields.Lst[NumField].Name);
fprintf (Gbl.F.Out,"</th>");
}
/* 4. Visibility type for the record fields that depend on the course, in other row */ /* 4. Visibility type for the record fields that depend on the course, in other row */
Tbl_TR_End (); Tbl_TR_End ();
@ -6943,10 +6959,12 @@ void Usr_ListAllDataStds (void)
for (NumField = 0; for (NumField = 0;
NumField < Gbl.Crs.Records.LstFields.Num; NumField < Gbl.Crs.Records.LstFields.Num;
NumField++) NumField++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE VERY_LIGHT_BLUE\">" {
"(%s)&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE VERY_LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"(%s)&nbsp;",
Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]);
fprintf (Gbl.F.Out,"</th>");
}
} }
} }
@ -7136,14 +7154,17 @@ static void Usr_ListRowsAllDataTchs (Rol_Role_t Role,
/***** Heading row *****/ /***** Heading row *****/
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 : for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 :
1); 1);
NumCol < NumColumns; NumCol < NumColumns;
NumCol++) NumCol++)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",FieldNames[NumCol]);
FieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
Tbl_TR_End (); Tbl_TR_End ();
/***** Initialize structure with user's data *****/ /***** Initialize structure with user's data *****/
@ -7388,14 +7409,17 @@ void Usr_ListDataAdms (void)
/***** Heading row with column names *****/ /***** Heading row with column names *****/
Tbl_TABLE_BeginWithoutAttr (); Tbl_TABLE_BeginWithoutAttr ();
Tbl_TR_Begin (NULL); Tbl_TR_Begin (NULL);
for (NumCol = 0; for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_ADM; NumCol < Usr_NUM_MAIN_FIELDS_DATA_ADM;
NumCol++) NumCol++)
if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">" {
"%s&nbsp;" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE LIGHT_BLUE\">");
"</th>", fprintf (Gbl.F.Out,"%s&nbsp;",FieldNames[NumCol]);
FieldNames[NumCol]); fprintf (Gbl.F.Out,"</th>");
}
Tbl_TR_End (); Tbl_TR_End ();
/***** Initialize structure with user's data *****/ /***** Initialize structure with user's data *****/