mirror of https://github.com/acanas/swad-core.git
Version19.33.1
This commit is contained in:
parent
4b39588f79
commit
c9c0a5872d
|
@ -599,13 +599,8 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType)
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Event);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Event);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Location);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Location);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,9 +204,7 @@ static void Asg_PutHeadForSeeing (bool PrintView)
|
||||||
|
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"CONTEXT_COL");
|
Tbl_TH (1,1,"CONTEXT_COL",NULL); // Column for contextual icons
|
||||||
Tbl_TH_End (); // Column for contextual icons
|
|
||||||
|
|
||||||
for (Order = Dat_START_TIME;
|
for (Order = Dat_START_TIME;
|
||||||
Order <= Dat_END_TIME;
|
Order <= Dat_END_TIME;
|
||||||
Order++)
|
Order++)
|
||||||
|
@ -234,13 +232,8 @@ static void Asg_PutHeadForSeeing (bool PrintView)
|
||||||
|
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Assignment);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Assignment);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Folder);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Folder);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,14 +240,13 @@ static void Att_ShowAllAttEvents (void)
|
||||||
Tbl_TABLE_BeginWideMarginPadding (2);
|
Tbl_TABLE_BeginWideMarginPadding (2);
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"CONTEXT_COL"); // Column for contextual icons
|
Tbl_TH (1,1,"CONTEXT_COL",NULL); // Column for contextual icons
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
for (Order = Dat_START_TIME;
|
for (Order = Dat_START_TIME;
|
||||||
Order <= Dat_END_TIME;
|
Order <= Dat_END_TIME;
|
||||||
Order++)
|
Order++)
|
||||||
{
|
{
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
||||||
|
|
||||||
Frm_StartForm (ActSeeAtt);
|
Frm_StartForm (ActSeeAtt);
|
||||||
Grp_PutParamWhichGrps ();
|
Grp_PutParamWhichGrps ();
|
||||||
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage);
|
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage);
|
||||||
|
@ -260,16 +259,11 @@ static void Att_ShowAllAttEvents (void)
|
||||||
fprintf (Gbl.F.Out,"</u>");
|
fprintf (Gbl.F.Out,"</u>");
|
||||||
fprintf (Gbl.F.Out,"</a>");
|
fprintf (Gbl.F.Out,"</a>");
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
|
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Event);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Event);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -1903,21 +1897,11 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Empty (3);
|
Tbl_TH_Empty (3);
|
||||||
|
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
Tbl_TH_Empty (1);
|
Tbl_TH_Empty (1);
|
||||||
|
Tbl_TH (1,2,"TIT_TBL LEFT_MIDDLE",Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
||||||
Tbl_TH_Begin (1,2,"TIT_TBL LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Student_comment);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Teachers_comment);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Student_comment);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Teachers_comment);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -1991,21 +1975,11 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Empty (3);
|
Tbl_TH_Empty (3);
|
||||||
|
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
Tbl_TH_Empty (1);
|
Tbl_TH_Empty (1);
|
||||||
|
Tbl_TH (1,2,"LEFT_MIDDLE",Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
||||||
Tbl_TH_Begin (1,2,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Student_comment);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Teachers_comment);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Student_comment);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Teachers_comment);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -3125,13 +3099,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
|
||||||
/***** Heading row *****/
|
/***** Heading row *****/
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,4,"LEFT_MIDDLE");
|
Tbl_TH (1,4,"LEFT_MIDDLE",Txt_Event);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Event);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -3330,11 +3299,9 @@ static void Att_WriteTableHeadSeveralAttEvents (void)
|
||||||
|
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,Gbl.Usrs.Listing.WithPhotos ? 4 :
|
Tbl_TH (1,Gbl.Usrs.Listing.WithPhotos ? 4 :
|
||||||
3,
|
3,
|
||||||
"LEFT_MIDDLE");
|
"LEFT_MIDDLE",Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN]);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN]);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
for (NumAttEvent = 0;
|
for (NumAttEvent = 0;
|
||||||
NumAttEvent < Gbl.AttEvents.Num;
|
NumAttEvent < Gbl.AttEvents.Num;
|
||||||
|
@ -3356,9 +3323,7 @@ static void Att_WriteTableHeadSeveralAttEvents (void)
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Attendance);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Attendance);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -934,31 +934,13 @@ static void Ban_PutHeadBanners (void)
|
||||||
|
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"BM");;
|
Tbl_TH (1,1,"BM",NULL);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"BM",NULL);
|
||||||
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code);
|
||||||
Tbl_TH_Begin (1,1,"BM");;
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name);
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Image);
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Code);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Short_name);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Full_name);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Image);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_WWW);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -182,13 +182,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
|
||||||
/***** Wrtie heading *****/
|
/***** Wrtie heading *****/
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Centre);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Centre);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees_ABBREVIATION);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -2633,7 +2628,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
|
||||||
Order++)
|
Order++)
|
||||||
{
|
{
|
||||||
Tbl_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTRE ? "LEFT_MIDDLE" :
|
Tbl_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTRE ? "LEFT_MIDDLE" :
|
||||||
"RIGHT_MIDDLE");
|
"RIGHT_MIDDLE");
|
||||||
if (OrderSelectable)
|
if (OrderSelectable)
|
||||||
{
|
{
|
||||||
Frm_StartForm (ActSeeCtr);
|
Frm_StartForm (ActSeeCtr);
|
||||||
|
@ -2653,26 +2648,15 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Place);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Place);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees_ABBREVIATION);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
||||||
fprintf (Gbl.F.Out,"%s+<br />%s",
|
fprintf (Gbl.F.Out,"%s+<br />%s",
|
||||||
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
||||||
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
|
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
|
Tbl_TH_Empty (1);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
@ -2696,49 +2680,21 @@ static void Ctr_PutHeadCentresForEdition (void)
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Empty (1);
|
Tbl_TH_Empty (1);
|
||||||
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code);
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Code);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Empty (1);
|
Tbl_TH_Empty (1);
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Place);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name_of_the_centre);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Place);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name_of_the_centre);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW);
|
||||||
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Users);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees_ABBREVIATION);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_centre);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_centre);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_WWW);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Users);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
||||||
fprintf (Gbl.F.Out,"%s+<br />%s",
|
fprintf (Gbl.F.Out,"%s+<br />%s",
|
||||||
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
||||||
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
|
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Requester);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH_Empty (1);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Requester);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.33 (2019-10-12)"
|
#define Log_PLATFORM_VERSION "SWAD 19.33.1 (2019-10-12)"
|
||||||
#define CSS_FILE "swad19.33.css"
|
#define CSS_FILE "swad19.33.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.33.1: Oct 12, 2019 Code refactoring in HTML table headings. (246205 lines)
|
||||||
Version 19.33: Oct 12, 2019 Code refactoring in HTML table headings.
|
Version 19.33: Oct 12, 2019 Code refactoring in HTML table headings.
|
||||||
Changes in layout of last clicks. (246309 lines)
|
Changes in layout of last clicks. (246309 lines)
|
||||||
Version 19.32.6: Oct 12, 2019 Code refactoring in HTML table headings. (246305 lines)
|
Version 19.32.6: Oct 12, 2019 Code refactoring in HTML table headings. (246305 lines)
|
||||||
|
|
|
@ -285,13 +285,8 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
|
||||||
/***** Write heading *****/
|
/***** Write heading *****/
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"CENTER_MIDDLE LIGHT_BLUE");
|
Tbl_TH (1,1,"CENTER_MIDDLE LIGHT_BLUE",Txt_CHAT_Room_code);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_CHAT_Room_code);
|
Tbl_TH (1,1,"LEFT_MIDDLE LIGHT_BLUE",Txt_No_of_users);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE LIGHT_BLUE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_No_of_users);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
|
|
@ -963,28 +963,12 @@ static void Cla_PutHeadClassrooms (void)
|
||||||
|
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"BM");;
|
Tbl_TH (1,1,"BM",NULL);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Code);
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Short_name);
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Full_name);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Code);
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Capacity_OF_A_CLASSROOM);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Location);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Short_name);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Full_name);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Capacity_OF_A_CLASSROOM);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Location);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -157,13 +157,8 @@ void Cty_SeeCtyWithPendingInss (void)
|
||||||
/***** Write heading *****/
|
/***** Write heading *****/
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Country);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Country);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Institutions_ABBREVIATION);
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
|
|
||||||
|
@ -668,7 +663,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
|
||||||
Order++)
|
Order++)
|
||||||
{
|
{
|
||||||
Tbl_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" :
|
Tbl_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" :
|
||||||
"RIGHT_MIDDLE");
|
"RIGHT_MIDDLE");
|
||||||
if (OrderSelectable)
|
if (OrderSelectable)
|
||||||
{
|
{
|
||||||
Frm_StartForm (ActSeeCty);
|
Frm_StartForm (ActSeeCty);
|
||||||
|
@ -688,22 +683,10 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
|
||||||
Tbl_TH_End ();
|
Tbl_TH_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Institutions_ABBREVIATION);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Centres_ABBREVIATION);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Degrees_ABBREVIATION);
|
||||||
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Courses_ABBREVIATION);
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
||||||
fprintf (Gbl.F.Out,"%s+<br />%s",
|
fprintf (Gbl.F.Out,"%s+<br />%s",
|
||||||
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
|
||||||
|
@ -2150,34 +2133,14 @@ static void Cty_PutHeadCountriesForEdition (void)
|
||||||
|
|
||||||
Tbl_TR_Begin (NULL);
|
Tbl_TR_Begin (NULL);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"BM");;
|
Tbl_TH (1,1,"BM",NULL);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Numeric_BR_code_BR_ISO_3166_1);
|
||||||
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Alphabetic_BR_code_BR_ISO_3166_1);
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Numeric_BR_code_BR_ISO_3166_1);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Alphabetic_BR_code_BR_ISO_3166_1);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Empty (1);
|
Tbl_TH_Empty (1);
|
||||||
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_Name);
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
Tbl_TH (1,1,"LEFT_MIDDLE",Txt_WWW);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Name);
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Users);
|
||||||
Tbl_TH_End ();
|
Tbl_TH (1,1,"RIGHT_MIDDLE",Txt_Institutions_ABBREVIATION);
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"LEFT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_WWW);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Users);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TH_Begin (1,1,"RIGHT_MIDDLE");
|
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION);
|
|
||||||
Tbl_TH_End ();
|
|
||||||
|
|
||||||
Tbl_TR_End ();
|
Tbl_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
11
swad_table.c
11
swad_table.c
|
@ -206,6 +206,15 @@ void Tbl_TR_End (void)
|
||||||
/***************************** Table heading cells ***************************/
|
/***************************** Table heading cells ***************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Tbl_TH (unsigned RowSpan,unsigned ColSpan,const char *Class,const char *Txt)
|
||||||
|
{
|
||||||
|
Tbl_TH_Begin (RowSpan,ColSpan,Class);
|
||||||
|
if (Txt)
|
||||||
|
if (Txt[0])
|
||||||
|
fprintf (Gbl.F.Out,"%s",Txt);
|
||||||
|
Tbl_TH_End ();
|
||||||
|
}
|
||||||
|
|
||||||
void Tbl_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *Class)
|
void Tbl_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *Class)
|
||||||
{
|
{
|
||||||
if (RowSpan > 1 && ColSpan > 1)
|
if (RowSpan > 1 && ColSpan > 1)
|
||||||
|
@ -245,7 +254,7 @@ void Tbl_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *Class)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Tbl_TH_BeginAttr (const char *fmt,...)
|
static void Tbl_TH_BeginAttr (const char *fmt,...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
int NumBytesPrinted;
|
int NumBytesPrinted;
|
||||||
|
|
|
@ -53,6 +53,7 @@ void Tbl_TABLE_End (void);
|
||||||
void Tbl_TR_Begin (const char *fmt,...);
|
void Tbl_TR_Begin (const char *fmt,...);
|
||||||
void Tbl_TR_End (void);
|
void Tbl_TR_End (void);
|
||||||
|
|
||||||
|
void Tbl_TH (unsigned RowSpan,unsigned ColSpan,const char *Class,const char *Txt);
|
||||||
void Tbl_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *Class);
|
void Tbl_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *Class);
|
||||||
void Tbl_TH_End (void);
|
void Tbl_TH_End (void);
|
||||||
void Tbl_TH_Empty (unsigned NumColumns);
|
void Tbl_TH_Empty (unsigned NumColumns);
|
||||||
|
|
Loading…
Reference in New Issue