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

Version 23.53.3: Dec 18, 2023 Responsive design in assignments.

This commit is contained in:
acanas 2023-12-18 14:27:33 +01:00
parent 68d9e1c4fe
commit c40e88baf8
11 changed files with 85 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad23.53.1.css
View File

@ -5242,10 +5242,12 @@ button.PAG_DARK:hover, .PAG_CUR_DARK {background-color:#707070;}
} }
} }
.TBL_SCROLL tbody { .TBL_SCROLL tbody
{
display: table; display: table;
width: 100%; width: 100%;
} }
.TBL_SCROLL th,.TBL_SCROLL td {padding: 2px;}
.Ind_TBL td,.Ind_TBL th .Ind_TBL td,.Ind_TBL th
{ {

8
js/swad23.52.js → js/swad23.53.3.js
View File

@ -145,13 +145,13 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
StrDat = Yea.toString () + '-' + StrMon + '-' + StrDay; StrDat = Yea.toString () + '-' + StrMon + '-' + StrDay;
break; break;
case 1: // Dat_FORMAT_DD_MONTH_YYYY case 1: // Dat_FORMAT_DD_MONTH_YYYY
StrDat = Day.toString () + ' ' + StrDat = Day.toString () + ' ' +
MonthsShort[Mon - 1] + ' ' + MonthsShort[Mon - 1] + ' ' +
Yea.toString (); Yea.toString ();
break; break;
case 2: // Dat_FORMAT_MONTH_DD_YYYY case 2: // Dat_FORMAT_MONTH_DD_YYYY
StrDat = MonthsShort[Mon - 1] + ' ' + StrDat = MonthsShort[Mon - 1] + ' ' +
Day.toString() + ', ' + Day.toString() + ', ' +
Yea.toString (); Yea.toString ();
break; break;
default: default:

38
swad_assignment.c
View File

@ -174,7 +174,7 @@ void Asg_ShowAllAssignments (struct Asg_Assignments *Assignments)
if (Assignments->Num) if (Assignments->Num)
{ {
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_Begin ("TBL_SCROLL");
/***** Table head *****/ /***** Table head *****/
Asg_PutHead (Assignments, Asg_PutHead (Assignments,
@ -415,24 +415,30 @@ void Asg_ShowOneAssignmentInBox (struct Asg_Assignments *Assignments)
extern const char *Hlp_ASSESSMENT_Assignments; extern const char *Hlp_ASSESSMENT_Assignments;
extern const char *Txt_Assignment; extern const char *Txt_Assignment;
/***** Begin box and table *****/ /***** Begin box *****/
Box_BoxTableBegin (NULL,Assignments->Asg.Title[0] ? Assignments->Asg.Title : Box_BoxBegin (NULL,Assignments->Asg.Title[0] ? Assignments->Asg.Title :
Txt_Assignment, Txt_Assignment,
Asg_PutIconsOneAsg,Assignments, Asg_PutIconsOneAsg,Assignments,
Hlp_ASSESSMENT_Assignments,Box_NOT_CLOSABLE,2); Hlp_ASSESSMENT_Assignments,Box_NOT_CLOSABLE);
/***** Table head *****/ /***** Begin table *****/
Asg_PutHead (Assignments, HTM_TABLE_Begin ("TBL_SCROLL");
true, // Only this assignment in table
Vie_VIEW); // Not print view
/***** Write assignment *****/ /***** Table head *****/
Asg_ShowAssignmentRow (Assignments, Asg_PutHead (Assignments,
true, // Only this assignment in table true, // Only this assignment in table
Vie_VIEW); // Not print view Vie_VIEW); // Not print view
/***** End table and end box *****/ /***** Write assignment *****/
Box_BoxTableEnd (); Asg_ShowAssignmentRow (Assignments,
true, // Only this assignment in table
Vie_VIEW); // Not print view
/***** End table *****/
HTM_TABLE_End ();
/***** End box *****/
Box_BoxEnd ();
} }
/*****************************************************************************/ /*****************************************************************************/

29
swad_center.c
View File

@ -261,9 +261,9 @@ static void Ctr_ListCenters (void)
if (Gbl.Hierarchy.List[Hie_INS].Num) // There are centers in the current institution if (Gbl.Hierarchy.List[Hie_INS].Num) // There are centers in the current institution
{ {
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_Begin ("TBL_SCROLL");
/***** Write heading *****/ /***** Heading *****/
Ctr_PutHeadCentersForSeeing (true); // Order selectable Ctr_PutHeadCentersForSeeing (true); // Order selectable
/***** Write all centers and their nuber of teachers *****/ /***** Write all centers and their nuber of teachers *****/
@ -330,31 +330,30 @@ static void Ctr_ListOneCenterForSeeing (struct Hie_Node *Ctr,unsigned NumCtr)
TxtClassStrong = "DAT_STRONG"; TxtClassStrong = "DAT_STRONG";
} }
BgColor = (Ctr->HieCod == Gbl.Hierarchy.Node[Hie_CTR].HieCod) ? "BG_HIGHLIGHT" : BgColor = (Ctr->HieCod == Gbl.Hierarchy.Node[Hie_CTR].HieCod) ? "BG_HIGHLIGHT" :
The_GetColorRows (); The_GetColorRows ();
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Number of center in this list *****/ /***** Number of center in this list *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumCtr); HTM_Unsigned (NumCtr);
HTM_TD_End (); HTM_TD_End ();
/***** Center logo and name *****/ /***** Center logo and name *****/
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassStrong,The_GetSuffix (),BgColor); TxtClassStrong,The_GetSuffix (),BgColor);
Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CM ICO16x16"); Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CT ICO16x16");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this center *****/ /***** Number of users who claim to belong to this center *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTR, HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTR,Ctr));
Ctr));
HTM_TD_End (); HTM_TD_End ();
/***** Place *****/ /***** Place *****/
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
Plc.PlcCod = Ctr->Specific.PlcCod; Plc.PlcCod = Ctr->Specific.PlcCod;
Plc_GetPlaceDataByCod (&Plc); Plc_GetPlaceDataByCod (&Plc);
@ -362,7 +361,7 @@ static void Ctr_ListOneCenterForSeeing (struct Hie_Node *Ctr,unsigned NumCtr)
HTM_TD_End (); HTM_TD_End ();
/***** Number of degrees *****/ /***** Number of degrees *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees...
Hie_CTR, // ...in center Hie_CTR, // ...in center
@ -370,7 +369,7 @@ static void Ctr_ListOneCenterForSeeing (struct Hie_Node *Ctr,unsigned NumCtr)
HTM_TD_End (); HTM_TD_End ();
/***** Number of courses *****/ /***** Number of courses *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_CTR, // ...in center Hie_CTR, // ...in center
@ -378,7 +377,7 @@ static void Ctr_ListOneCenterForSeeing (struct Hie_Node *Ctr,unsigned NumCtr)
HTM_TD_End (); HTM_TD_End ();
/***** Number of users in courses of this center *****/ /***** Number of users in courses of this center *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_CTR,Ctr->HieCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_CTR,Ctr->HieCod,
1 << Rol_STD | 1 << Rol_STD |
@ -1336,7 +1335,7 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
Hie_Order_t Order; Hie_Order_t Order;
static HTM_HeadAlign Align[Hie_NUM_ORDERS] = static HTM_HeadAlign Align[Hie_NUM_ORDERS] =
{ {
[Hie_ORDER_BY_NAME ] = HTM_HEAD_LEFT, [Hie_ORDER_BY_NAME ] = HTM_HEAD_LEFT,
[Hie_ORDER_BY_NUM_USRS] = HTM_HEAD_RIGHT [Hie_ORDER_BY_NUM_USRS] = HTM_HEAD_RIGHT
}; };
@ -1354,7 +1353,7 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
Frm_BeginForm (ActSeeCtr); Frm_BeginForm (ActSeeCtr);
Par_PutParUnsigned (NULL,"Order",(unsigned) Order); Par_PutParUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_Submit_Begin (Txt_CENTERS_HELP_ORDER[Order], HTM_BUTTON_Submit_Begin (Txt_CENTERS_HELP_ORDER[Order],
"class=\"BT_LINK\""); "class=\"BT_LINK RT\"");
if (Order == Gbl.Hierarchy.List[Hie_INS].SelectedOrder) if (Order == Gbl.Hierarchy.List[Hie_INS].SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
} }

6
swad_changelog.h
View File

@ -633,10 +633,12 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod') "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/ */
#define Log_PLATFORM_VERSION "SWAD 23.53.1 (2023-12-14)" #define Log_PLATFORM_VERSION "SWAD 23.53.3 (2023-12-18)"
#define CSS_FILE "swad23.53.1.css" #define CSS_FILE "swad23.53.1.css"
#define JS_FILE "swad23.52.js" #define JS_FILE "swad23.53.3.js"
/* /*
Version 23.53.3: Dec 18, 2023 Responsive design in assignments. (335868 lines)
Version 23.53.2: Dec 15, 2023 Responsive design in lists of institutions, centers, degrees and courses. (335863 lines)
Version 23.53.1: Dec 15, 2023 Responsive design in list of countries. (335860 lines) Version 23.53.1: Dec 15, 2023 Responsive design in list of countries. (335860 lines)
Version 23.53: Dec 15, 2023 Code refactoring and responsive design in timetable. (335858 lines) Version 23.53: Dec 15, 2023 Code refactoring and responsive design in timetable. (335858 lines)
Version 23.52.7: Dec 14, 2023 Responsive design in indicators. (335817 lines) Version 23.52.7: Dec 14, 2023 Responsive design in indicators. (335817 lines)

2
swad_country.c
View File

@ -230,7 +230,7 @@ void Cty_ListCountries2 (void)
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE); Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE);
HTM_TABLE_Begin ("TBL_SCROLL"); HTM_TABLE_Begin ("TBL_SCROLL");
/***** Write heading *****/ /***** Heading *****/
Cty_PutHeadCountriesForSeeing (true); // Order selectable Cty_PutHeadCountriesForSeeing (true); // Order selectable
/***** Write all countries and their number of users and institutions *****/ /***** Write all countries and their number of users and institutions *****/

22
swad_course.c
View File

@ -532,13 +532,13 @@ static void Crs_ListCourses (void)
if (Gbl.Hierarchy.List[Hie_DEG].Num) // There are courses in the current degree if (Gbl.Hierarchy.List[Hie_DEG].Num) // There are courses in the current degree
{ {
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_Begin ("TBL_SCROLL");
/* Heading */ /***** Heading *****/
Crs_PutHeadCoursesForSeeing (); Crs_PutHeadCoursesForSeeing ();
/* List the courses */ /***** List the courses *****/
for (Year = 1; for (Year = 1;
Year <= Deg_MAX_YEARS_PER_DEGREE; Year <= Deg_MAX_YEARS_PER_DEGREE;
Year++) Year++)
if (Crs_ListCoursesOfAYearForSeeing (Year)) // If this year has courses ==> if (Crs_ListCoursesOfAYearForSeeing (Year)) // If this year has courses ==>
@ -633,7 +633,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
NumUsrs[Rol_TCH]; NumUsrs[Rol_TCH];
/* Put green tip if course has users */ /* Put green tip if course has users */
HTM_TD_Begin ("class=\"CM %s_%s %s\" title=\"%s\"", HTM_TD_Begin ("class=\"CT %s_%s %s\" title=\"%s\"",
TxtClassNormal,The_GetSuffix (),BgColor, TxtClassNormal,The_GetSuffix (),BgColor,
NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : NumUsrs[Rol_UNK] ? Txt_COURSE_With_users :
Txt_COURSE_Without_users); Txt_COURSE_Without_users);
@ -642,24 +642,24 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
HTM_TD_End (); HTM_TD_End ();
/* Course year */ /* Course year */
HTM_TD_Begin ("class=\"CM %s_%s %s\"", HTM_TD_Begin ("class=\"CT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Specific.Year]); HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Specific.Year]);
HTM_TD_End (); HTM_TD_End ();
/* Institutional code of the course */ /* Institutional code of the course */
HTM_TD_Begin ("class=\"CM %s_%s %s\"", HTM_TD_Begin ("class=\"CT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (Crs->InstitutionalCod); HTM_Txt (Crs->InstitutionalCod);
HTM_TD_End (); HTM_TD_End ();
/* Course full name */ /* Course full name */
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassStrong,The_GetSuffix (),BgColor); TxtClassStrong,The_GetSuffix (),BgColor);
Frm_BeginFormGoTo (ActSeeCrsInf); Frm_BeginFormGoTo (ActSeeCrsInf);
ParCod_PutPar (ParCod_Crs,Crs->HieCod); ParCod_PutPar (ParCod_Crs,Crs->HieCod);
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs->FullName), HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs->FullName),
"class=\"LM BT_LINK\""); "class=\"BT_LINK LT\"");
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
HTM_Txt (Crs->FullName); HTM_Txt (Crs->FullName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -667,14 +667,14 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
HTM_TD_End (); HTM_TD_End ();
/* Number of teachers in this course */ /* Number of teachers in this course */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumUsrs[Rol_TCH] + HTM_Unsigned (NumUsrs[Rol_TCH] +
NumUsrs[Rol_NET]); NumUsrs[Rol_NET]);
HTM_TD_End (); HTM_TD_End ();
/* Number of students in this course */ /* Number of students in this course */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumUsrs[Rol_STD]); HTM_Unsigned (NumUsrs[Rol_STD]);
HTM_TD_End (); HTM_TD_End ();

16
swad_degree.c
View File

@ -691,9 +691,9 @@ static void Deg_ListDegrees (void)
if (Gbl.Hierarchy.List[Hie_CTR].Num) // There are degrees in the current center if (Gbl.Hierarchy.List[Hie_CTR].Num) // There are degrees in the current center
{ {
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_Begin ("TBL_SCROLL");
/***** Write heading *****/ /***** Heading *****/
Deg_PutHeadDegreesForSeeing (); Deg_PutHeadDegreesForSeeing ();
/***** List the degrees *****/ /***** List the degrees *****/
@ -779,7 +779,7 @@ static void Deg_ListOneDegreeForSeeing (struct Hie_Node *Deg,unsigned NumDeg)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Put tip if degree has courses *****/ /***** Put tip if degree has courses *****/
HTM_TD_Begin ("class=\"CM %s_%s %s\" title=\"%s\"", HTM_TD_Begin ("class=\"CT %s_%s %s\" title=\"%s\"",
TxtClassNormal,The_GetSuffix (),BgColor, TxtClassNormal,The_GetSuffix (),BgColor,
NumCrss ? Txt_DEGREE_With_courses : NumCrss ? Txt_DEGREE_With_courses :
Txt_DEGREE_Without_courses); Txt_DEGREE_Without_courses);
@ -788,31 +788,31 @@ static void Deg_ListOneDegreeForSeeing (struct Hie_Node *Deg,unsigned NumDeg)
HTM_TD_End (); HTM_TD_End ();
/***** Number of degree in this list *****/ /***** Number of degree in this list *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumDeg); HTM_Unsigned (NumDeg);
HTM_TD_End (); HTM_TD_End ();
/***** Degree logo and name *****/ /***** Degree logo and name *****/
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassStrong,The_GetSuffix (),BgColor); TxtClassStrong,The_GetSuffix (),BgColor);
Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM ICO20x20"); Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM ICO20x20");
HTM_TD_End (); HTM_TD_End ();
/***** Type of degree *****/ /***** Type of degree *****/
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (DegTyp.DegTypName); HTM_Txt (DegTyp.DegTypName);
HTM_TD_End (); HTM_TD_End ();
/***** Current number of courses in this degree *****/ /***** Current number of courses in this degree *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumCrss); HTM_Unsigned (NumCrss);
HTM_TD_End (); HTM_TD_End ();
/***** Number of users in courses of this degree *****/ /***** Number of users in courses of this degree *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_DEG,Deg->HieCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_DEG,Deg->HieCod,
1 << Rol_STD | 1 << Rol_STD |

2
swad_hierarchy.c
View File

@ -727,7 +727,7 @@ void Hie_WriteStatusCell (Hie_Status_t Status,
{ {
Hie_StatusTxt_t StatusTxt = Hie_GetStatusTxtFromStatusBits (Status); Hie_StatusTxt_t StatusTxt = Hie_GetStatusTxtFromStatusBits (Status);
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
Class,The_GetSuffix (),BgColor); Class,The_GetSuffix (),BgColor);
if (StatusTxt != Hie_STATUS_ACTIVE) // If active ==> do not show anything if (StatusTxt != Hie_STATUS_ACTIVE) // If active ==> do not show anything
HTM_Txt (Txt[StatusTxt]); HTM_Txt (Txt[StatusTxt]);

26
swad_institution.c
View File

@ -304,8 +304,10 @@ static void Ins_ListInstitutions (void)
if (Gbl.Hierarchy.List[Hie_CTY].Num) // There are institutions in the current country if (Gbl.Hierarchy.List[Hie_CTY].Num) // There are institutions in the current country
{ {
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (2); HTM_TABLE_Begin ("TBL_SCROLL");
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
/***** Heading *****/
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
/***** Write all institutions and their nuber of users *****/ /***** Write all institutions and their nuber of users *****/
for (NumIns = 0, The_ResetRowColor (); for (NumIns = 0, The_ResetRowColor ();
@ -374,26 +376,26 @@ static void Ins_ListOneInstitutionForSeeing (struct Hie_Node *Ins,unsigned NumIn
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Number of institution in this list *****/ /***** Number of institution in this list *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (NumIns); HTM_Unsigned (NumIns);
HTM_TD_End (); HTM_TD_End ();
/***** Institution logo and name *****/ /***** Institution logo and name *****/
HTM_TD_Begin ("class=\"LM %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
TxtClassStrong,The_GetSuffix (),BgColor); TxtClassStrong,The_GetSuffix (),BgColor);
Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CM ICO16x16"); Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CT ICO16x16");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this institution *****/ /***** Number of users who claim to belong to this institution *****/
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_INS,Ins)); HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_INS,Ins));
HTM_TD_End (); HTM_TD_End ();
/***** Other stats *****/ /***** Other stats *****/
/* Number of centers in this institution */ /* Number of centers in this institution */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CTR, // Number of centers... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CTR, // Number of centers...
Hie_INS, // ...in institution Hie_INS, // ...in institution
@ -401,7 +403,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Hie_Node *Ins,unsigned NumIn
HTM_TD_End (); HTM_TD_End ();
/* Number of degrees in this institution */ /* Number of degrees in this institution */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees...
Hie_INS, // ...in institution Hie_INS, // ...in institution
@ -409,7 +411,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Hie_Node *Ins,unsigned NumIn
HTM_TD_End (); HTM_TD_End ();
/* Number of courses in this institution */ /* Number of courses in this institution */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_INS, // ...in institution Hie_INS, // ...in institution
@ -417,13 +419,13 @@ static void Ins_ListOneInstitutionForSeeing (struct Hie_Node *Ins,unsigned NumIn
HTM_TD_End (); HTM_TD_End ();
/* Number of departments in this institution */ /* Number of departments in this institution */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Dpt_GetNumDptsInIns (Ins->HieCod)); HTM_Unsigned (Dpt_GetNumDptsInIns (Ins->HieCod));
HTM_TD_End (); HTM_TD_End ();
/* Number of users in courses of this institution */ /* Number of users in courses of this institution */
HTM_TD_Begin ("class=\"RM %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor); TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_INS,Ins->HieCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Hie_INS,Ins->HieCod,
1 << Rol_STD | 1 << Rol_STD |
@ -470,7 +472,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
Frm_BeginForm (ActSeeIns); Frm_BeginForm (ActSeeIns);
Par_PutParUnsigned (NULL,"Order",(unsigned) Order); Par_PutParUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_Submit_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order], HTM_BUTTON_Submit_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],
"class=\"BT_LINK\""); "class=\"BT_LINK RT\"");
if (Order == Gbl.Hierarchy.List[Hie_CTY].SelectedOrder) if (Order == Gbl.Hierarchy.List[Hie_CTY].SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
} }

4
swad_text.c
View File

@ -18288,7 +18288,7 @@ const char *Txt_Institutions_of_COUNTRY_X = // Warning: it is very important to
#elif L==5 // fr #elif L==5 // fr
"&Eacute;tablissements de %s"; "&Eacute;tablissements de %s";
#elif L==6 // gn #elif L==6 // gn
"Instituciones de %s"; // Okoteve traducción "Instituciones %s-pegua";
#elif L==7 // it #elif L==7 // it
"Istituzioni di %s"; "Istituzioni di %s";
#elif L==8 // pl #elif L==8 // pl
@ -18296,7 +18296,7 @@ const char *Txt_Institutions_of_COUNTRY_X = // Warning: it is very important to
#elif L==9 // pt #elif L==9 // pt
"Institu&ccedil;&otilde;es de %s"; "Institu&ccedil;&otilde;es de %s";
#elif L==10 // tr #elif L==10 // tr
"Institutions of %s"; // Çeviri lazim! "%s Kurumlar&inodot;";
#endif #endif
const char *Txt_INSTITUTIONS_ORDER[Hie_NUM_ORDERS] = const char *Txt_INSTITUTIONS_ORDER[Hie_NUM_ORDERS] =