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.101.4

This commit is contained in:
Antonio Cañas Vargas 2019-12-28 18:21:09 +01:00
parent 4e9475604b
commit b9a4251d77
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -492,7 +492,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.101.3 (2019-12-28)"
#define Log_PLATFORM_VERSION "SWAD 19.101.4 (2019-12-28)"
#define CSS_FILE "swad19.101.1.css"
#define JS_FILE "swad19.91.1.js"
/*
@ -502,6 +502,7 @@ ps2pdf source.ps destination.pdf
Version 19.103: Dec 28, 2019 Map in country information. (? lines)
Version 19.102: Dec 28, 2019 Map in institution information. (? lines)
Version 19.101.4: Dec 28, 2019 Insti. information is splitted into two columns. (249324 lines)
Version 19.101.3: Dec 28, 2019 Course information is splitted into two columns. (249308 lines)
Version 19.101.2: Dec 28, 2019 Degree information is splitted into two columns. (249303 lines)
Version 19.101.1: Dec 28, 2019 Centre information is splitted into two columns. (249297 lines)

55
swad_institution.c
View File

@ -321,6 +321,7 @@ static void Ins_Configuration (bool PrintView)
bool PutFormCty;
bool PutFormName;
bool PutFormWWW;
bool MapIsAvailable;
/***** Trivial check *****/
if (Gbl.Hierarchy.Ins.InsCod <= 0) // No institution selected
@ -344,9 +345,8 @@ static void Ins_Configuration (bool PrintView)
/***** Title *****/
Ins_ConfigTitle (PutLink);
/***** Institution map *****/
if (Ins_GetIfMapIsAvailable ())
Ins_ConfigMap ();
/**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
@ -390,6 +390,23 @@ static void Ins_Configuration (bool PrintView)
/***** End table *****/
HTM_TABLE_End ();
/***** End of left part *****/
HTM_DIV_End ();
/**************************** Right part **********************************/
/***** Check map *****/
MapIsAvailable = Ins_GetIfMapIsAvailable ();
if (MapIsAvailable)
{
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/***** Institution map *****/
Ins_ConfigMap ();
HTM_DIV_End ();
}
/***** End box *****/
Box_BoxEnd ();
}
@ -434,9 +451,13 @@ static void Ins_ConfigTitle (bool PutLink)
static bool Ins_GetIfMapIsAvailable (void)
{
return true;
/***** Coordinates 0, 0 means not set ==> don't show map *****/
/*
return (bool) (Gbl.Hierarchy.Ctr.Coord.Latitude ||
Gbl.Hierarchy.Ctr.Coord.Longitude);
*/
}
/*****************************************************************************/
@ -517,12 +538,12 @@ static void Ins_ConfigCountry (bool PrintView,bool PutForm)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",PutForm ? "OthCtyCod" :
Frm_LabelColumn ("RT",PutForm ? "OthCtyCod" :
NULL,
Txt_Country);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
if (PutForm)
{
/* Get list of countries */
@ -630,10 +651,10 @@ static void Ins_ConfigNumUsrs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Users_of_the_institution);
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_institution);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -653,10 +674,10 @@ static void Ins_ConfigNumCtrs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Centres);
Frm_LabelColumn ("RT",NULL,Txt_Centres);
/* Data */
HTM_TD_Begin ("class=\"LM\"");
HTM_TD_Begin ("class=\"LB\"");
Frm_StartFormGoTo (ActSeeCtr);
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -683,10 +704,10 @@ static void Ins_ConfigNumDegs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -705,10 +726,10 @@ static void Ins_ConfigNumCrss (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -727,10 +748,10 @@ static void Ins_ConfigNumDpts (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Departments);
Frm_LabelColumn ("RT",NULL,Txt_Departments);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -750,12 +771,12 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,
Frm_LabelColumn ("RT",NULL,
Role == Rol_UNK ? Txt_Users_in_courses :
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();