mirror of https://github.com/acanas/swad-core.git
Version 21.33.2: Oct 15, 2021 Fixed bug getting name of degree.
This commit is contained in:
parent
1e8a0e5d97
commit
b0f3d80101
|
@ -602,13 +602,14 @@ TODO: FIX BUG, URGENT! En las fechas como par
|
||||||
|
|
||||||
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
|
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 21.33.1 (2021-10-15)"
|
#define Log_PLATFORM_VERSION "SWAD 21.33.2 (2021-10-15)"
|
||||||
#define CSS_FILE "swad20.45.css"
|
#define CSS_FILE "swad20.45.css"
|
||||||
#define JS_FILE "swad20.69.1.js"
|
#define JS_FILE "swad20.69.1.js"
|
||||||
/*
|
/*
|
||||||
TODO: Rename CENTRE to CENTER in help wiki.
|
TODO: Rename CENTRE to CENTER in help wiki.
|
||||||
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
|
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
|
||||||
|
|
||||||
|
Version 21.33.2: Oct 15, 2021 Fixed bug getting name of degree. (319950 lines)
|
||||||
Version 21.33.1: Oct 15, 2021 Number of users/courses to show big-list warning increased from 500 to 1000. (319944 lines)
|
Version 21.33.1: Oct 15, 2021 Number of users/courses to show big-list warning increased from 500 to 1000. (319944 lines)
|
||||||
Version 21.33: Oct 15, 2021 Queries moved from search to other modules. (319942 lines)
|
Version 21.33: Oct 15, 2021 Queries moved from search to other modules. (319942 lines)
|
||||||
Version 21.32.3: Oct 14, 2021 Fixed bug in institutional links. (319792 lines)
|
Version 21.32.3: Oct 14, 2021 Fixed bug in institutional links. (319792 lines)
|
||||||
|
|
|
@ -284,7 +284,7 @@ long Deg_DB_GetCtrCodOfDegreeByCod (long DegCod)
|
||||||
void Deg_DB_GetShortNameOfDegreeByCod (long DegCod,char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1])
|
void Deg_DB_GetShortNameOfDegreeByCod (long DegCod,char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1])
|
||||||
{
|
{
|
||||||
/***** Trivial check: degree code should be > 0 *****/
|
/***** Trivial check: degree code should be > 0 *****/
|
||||||
if (DegCod > 0)
|
if (DegCod <= 0)
|
||||||
{
|
{
|
||||||
ShrtName[0] = '\0';
|
ShrtName[0] = '\0';
|
||||||
return;
|
return;
|
||||||
|
|
21
swad_log.c
21
swad_log.c
|
@ -203,17 +203,17 @@ void Log_GetAndShowLastClicks (void)
|
||||||
|
|
||||||
/***** Write list of connected users *****/
|
/***** Write list of connected users *****/
|
||||||
HTM_TABLE_BeginCenterPadding (1);
|
HTM_TABLE_BeginCenterPadding (1);
|
||||||
HTM_TR_Begin (NULL);
|
|
||||||
|
|
||||||
|
/* Heading row */
|
||||||
|
HTM_TR_Begin (NULL);
|
||||||
HTM_TH (1,1,"LC_CLK",Txt_Click); // Click
|
HTM_TH (1,1,"LC_CLK",Txt_Click); // Click
|
||||||
HTM_TH (1,1,"LC_TIM",Txt_ELAPSED_TIME); // Elapsed time
|
HTM_TH (1,1,"LC_TIM",Txt_ELAPSED_TIME); // Elapsed time
|
||||||
HTM_TH (1,1,"LC_ROL",Txt_Role); // Role
|
HTM_TH (1,1,"LC_ROL",Txt_Role); // Role
|
||||||
HTM_TH (1,1,"LC_CTY",Txt_Country); // Country
|
HTM_TH (1,1,"LC_CTY",Txt_Country); // Country
|
||||||
HTM_TH (1,1,"LC_INS",Txt_Institution); // Institution
|
HTM_TH (1,1,"LC_INS",Txt_Institution); // Institution
|
||||||
HTM_TH (1,1,"LC_CTR",Txt_Center); // Center
|
HTM_TH (1,1,"LC_CTR",Txt_Center); // Center
|
||||||
HTM_TH (1,1,"LC_DEG",Txt_Degree); // Degree
|
HTM_TH (1,1,"LC_DEG",Txt_Degree); // Degree
|
||||||
HTM_TH (1,1,"LC_ACT",Txt_Action); // Action
|
HTM_TH (1,1,"LC_ACT",Txt_Action); // Action
|
||||||
|
|
||||||
HTM_TR_End ();
|
HTM_TR_End ();
|
||||||
|
|
||||||
for (NumClick = 0;
|
for (NumClick = 0;
|
||||||
|
@ -243,16 +243,14 @@ void Log_GetAndShowLastClicks (void)
|
||||||
Cty_GetCountryName (Hie.Cty.CtyCod,Gbl.Prefs.Language,
|
Cty_GetCountryName (Hie.Cty.CtyCod,Gbl.Prefs.Language,
|
||||||
Hie.Cty.Name[Gbl.Prefs.Language]);
|
Hie.Cty.Name[Gbl.Prefs.Language]);
|
||||||
|
|
||||||
/* Get institution code (row[5]) */
|
/* Get institution code (row[5]),
|
||||||
|
center code (row[6])
|
||||||
|
and degree code (row[7]) */
|
||||||
Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[5]);
|
Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[5]);
|
||||||
Ins_DB_GetShortNameOfInstitution (Hie.Ins.InsCod,Hie.Ins.ShrtName);
|
|
||||||
|
|
||||||
/* Get center code (row[6]) */
|
|
||||||
Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[6]);
|
Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[6]);
|
||||||
Ctr_DB_GetShortNameOfCenterByCod (Hie.Ctr.CtrCod,Hie.Ctr.ShrtName);
|
|
||||||
|
|
||||||
/* Get degree code (row[7]) */
|
|
||||||
Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[7]);
|
Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[7]);
|
||||||
|
Ins_DB_GetShortNameOfInstitution (Hie.Ins.InsCod,Hie.Ins.ShrtName);
|
||||||
|
Ctr_DB_GetShortNameOfCenterByCod (Hie.Ctr.CtrCod,Hie.Ctr.ShrtName);
|
||||||
Deg_DB_GetShortNameOfDegreeByCod (Hie.Deg.DegCod,Hie.Deg.ShrtName);
|
Deg_DB_GetShortNameOfDegreeByCod (Hie.Deg.DegCod,Hie.Deg.ShrtName);
|
||||||
|
|
||||||
/* Print table row */
|
/* Print table row */
|
||||||
|
@ -283,7 +281,7 @@ void Log_GetAndShowLastClicks (void)
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
HTM_TD_Begin ("class=\"LC_DEG %s\"",ClassRow);
|
HTM_TD_Begin ("class=\"LC_DEG %s\"",ClassRow);
|
||||||
HTM_Txt (Hie.Deg.ShrtName); // Degree
|
HTM_Txt (Hie.Deg.ShrtName); // Degree
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
HTM_TD_Begin ("class=\"LC_ACT %s\"",ClassRow);
|
HTM_TD_Begin ("class=\"LC_ACT %s\"",ClassRow);
|
||||||
|
@ -292,6 +290,7 @@ void Log_GetAndShowLastClicks (void)
|
||||||
|
|
||||||
HTM_TR_End ();
|
HTM_TR_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
HTM_TABLE_End ();
|
HTM_TABLE_End ();
|
||||||
|
|
||||||
/***** Free structure that stores the query result *****/
|
/***** Free structure that stores the query result *****/
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#define _GNU_SOURCE // For asprintf
|
#define _GNU_SOURCE // For asprintf
|
||||||
#include <stdio.h> // For asprintf
|
#include <stdio.h> // For asprintf
|
||||||
|
#include <stdlib.h> // For free
|
||||||
#include <string.h> // For string functions
|
#include <string.h> // For string functions
|
||||||
|
|
||||||
#include "swad_database.h"
|
#include "swad_database.h"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#define _GNU_SOURCE // For asprintf
|
#define _GNU_SOURCE // For asprintf
|
||||||
#include <stdio.h> // For asprintf
|
#include <stdio.h> // For asprintf
|
||||||
|
#include <stdlib.h> // For free
|
||||||
#include <string.h> // For string functions
|
#include <string.h> // For string functions
|
||||||
|
|
||||||
#include "swad_database.h"
|
#include "swad_database.h"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#define _GNU_SOURCE // For asprintf
|
#define _GNU_SOURCE // For asprintf
|
||||||
#include <stdio.h> // For asprintf
|
#include <stdio.h> // For asprintf
|
||||||
|
#include <stdlib.h> // For free
|
||||||
|
|
||||||
#include "swad_config.h"
|
#include "swad_config.h"
|
||||||
#include "swad_database.h"
|
#include "swad_database.h"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#define _GNU_SOURCE // For asprintf
|
#define _GNU_SOURCE // For asprintf
|
||||||
#include <stdio.h> // For asprintf
|
#include <stdio.h> // For asprintf
|
||||||
|
#include <stdlib.h> // For free
|
||||||
|
|
||||||
#include "swad_database.h"
|
#include "swad_database.h"
|
||||||
#include "swad_error.h"
|
#include "swad_error.h"
|
||||||
|
|
Loading…
Reference in New Issue