mirror of https://github.com/acanas/swad-core.git
Version 22.66.2: Mar 03, 2023 Fixed bugs in figures.
This commit is contained in:
parent
4952598ea7
commit
6439db55e4
|
@ -629,11 +629,12 @@ TODO: Emilce Barrera Mesa: Podr
|
|||
TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
|
||||
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 22.66 (2023-03-02)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 22.66.2 (2023-03-03)"
|
||||
#define CSS_FILE "swad22.57.1.css"
|
||||
#define JS_FILE "swad22.49.js"
|
||||
/*
|
||||
Version 22.66.1: Mar 02, 2023 Rubric removal. (337125 lines)
|
||||
Version 22.66.2: Mar 03, 2023 Fixed bugs in figures. (337128 lines)
|
||||
Version 22.66.1: Mar 02, 2023 Rubric removal. (337126 lines)
|
||||
Version 22.66: Mar 02, 2023 New module swad_rubric_criteria for rubric criteria. (337125 lines)
|
||||
Version 22.65.1: Mar 02, 2023 Changes in rubrics. Not finished. (337012 lines)
|
||||
Version 22.65: Mar 01, 2023 New module swad_rubric for rubrics. Not finished. (336989 lines)
|
||||
|
|
|
@ -686,7 +686,8 @@ double Enr_DB_GetAverageNumUsrsPerCrs (HieLvl_Level_t Scope,long Cod,Rol_Role_t
|
|||
"SELECT AVG(NumUsrs)"
|
||||
" FROM (SELECT COUNT(UsrCod) AS NumUsrs"
|
||||
" FROM crs_users"
|
||||
" WHERE Role=%u GROUP BY CrsCod) AS NumUsrsTable",
|
||||
" WHERE Role=%u"
|
||||
" GROUP BY CrsCod) AS NumUsrsTable",
|
||||
(unsigned) Role);
|
||||
case HieLvl_CTY:
|
||||
if (Role == Rol_UNK) // Any user
|
||||
|
|
|
@ -290,7 +290,7 @@ unsigned Exa_DB_GetNumCoursesWithExams (HieLvl_Level_t Scope)
|
|||
" AND ctr_centers.CtrCod=deg_degrees.CtrCod"
|
||||
" AND deg_degrees.DegCod=crs_courses.DegCod"
|
||||
" AND crs_courses.CrsCod=exa_exams.CrsCod",
|
||||
Gbl.Hierarchy.Ins.InsCod);
|
||||
Gbl.Hierarchy.Cty.CtyCod);
|
||||
case HieLvl_INS:
|
||||
return DB_QueryCOUNT ("can not get number of courses with exams",
|
||||
"SELECT COUNT(DISTINCT exa_exams.CrsCod)"
|
||||
|
|
|
@ -298,7 +298,7 @@ unsigned Gam_DB_GetNumCoursesWithGames (HieLvl_Level_t Scope)
|
|||
" AND ctr_centers.CtrCod=deg_degrees.CtrCod"
|
||||
" AND deg_degrees.DegCod=crs_courses.DegCod"
|
||||
" AND crs_courses.CrsCod=gam_games.CrsCod",
|
||||
Gbl.Hierarchy.Ins.InsCod);
|
||||
Gbl.Hierarchy.Cty.CtyCod);
|
||||
case HieLvl_INS:
|
||||
return (unsigned)
|
||||
DB_QueryCOUNT ("can not get number of courses with games",
|
||||
|
|
|
@ -299,6 +299,7 @@ unsigned Log_DB_GetMyCrssAndHitsPerCrs (MYSQL_RES **mysql_res,Rol_Role_t Role)
|
|||
Gbl.Usrs.Me.UsrDat.UsrCod,(unsigned) Role,
|
||||
Gbl.Usrs.Me.UsrDat.UsrCod,(unsigned) Role);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************** Get my historic courses **************************/
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -187,7 +187,7 @@ unsigned Rub_DB_GetNumCoursesWithRubrics (HieLvl_Level_t Scope)
|
|||
" AND ctr_centers.CtrCod=deg_degrees.CtrCod"
|
||||
" AND deg_degrees.DegCod=crs_courses.DegCod"
|
||||
" AND crs_courses.CrsCod=rub_rubrics.CrsCod",
|
||||
Gbl.Hierarchy.Ins.InsCod);
|
||||
Gbl.Hierarchy.Cty.CtyCod);
|
||||
case HieLvl_INS:
|
||||
return (unsigned)
|
||||
DB_QueryCOUNT ("can not get number of courses with rubrics",
|
||||
|
@ -525,7 +525,7 @@ unsigned Rub_DB_GetCriterionData (MYSQL_RES **mysql_res,long CriCod)
|
|||
DB_QuerySELECT (mysql_res,"can not get a criterion",
|
||||
"SELECT Title" // row[0]
|
||||
" FROM rub_criteria"
|
||||
" WHERE QstCod=%ld"
|
||||
" WHERE CriCod=%ld"
|
||||
" AND CrsCod=%ld", // Extra check
|
||||
CriCod,
|
||||
Gbl.Hierarchy.Crs.CrsCod);
|
||||
|
@ -544,7 +544,7 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM rub_rubrics,"
|
||||
"rub_criteria"
|
||||
" WHERE rub_rubrics.RubCod=rub_criteria.RubCod"
|
||||
|
@ -553,7 +553,7 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM ins_instits,"
|
||||
"ctr_centers,"
|
||||
"deg_degrees,"
|
||||
|
@ -572,7 +572,7 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM ctr_centers,"
|
||||
"deg_degrees,"
|
||||
"crs_courses,"
|
||||
|
@ -589,7 +589,7 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM deg_degrees,"
|
||||
"crs_courses,"
|
||||
"rub_rubrics,"
|
||||
|
@ -604,7 +604,7 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM crs_courses,"
|
||||
"rub_rubrics,"
|
||||
"rub_criteria"
|
||||
|
@ -617,10 +617,10 @@ double Rub_DB_GetNumCriteriaPerRubric (HieLvl_Level_t Scope)
|
|||
return
|
||||
DB_QuerySELECTDouble ("can not get number of criteria per rubric",
|
||||
"SELECT AVG(NumCriteria)"
|
||||
" FROM (SELECT COUNT(rub_criteria.QstCod) AS NumCriteria"
|
||||
" FROM (SELECT COUNT(rub_criteria.CriCod) AS NumCriteria"
|
||||
" FROM rub_rubrics,"
|
||||
"rub_criteria"
|
||||
" WHERE rub_rubrics.Cod=%ld"
|
||||
" WHERE rub_rubrics.CrsCod=%ld"
|
||||
" AND rub_rubrics.RubCod=rub_criteria.RubCod"
|
||||
" GROUP BY rub_criteria.RubCod) AS NumCriteriaTable",
|
||||
Gbl.Hierarchy.Crs.CrsCod);
|
||||
|
|
|
@ -381,7 +381,7 @@ unsigned Svy_DB_GetNumCrssWithCrsSurveys (HieLvl_Level_t Scope)
|
|||
" AND deg_degrees.DegCod=crs_courses.DegCod"
|
||||
" AND crs_courses.CrsCod=svy_surveys.Cod"
|
||||
" AND svy_surveys.Scope='%s'",
|
||||
Gbl.Hierarchy.Ins.InsCod,
|
||||
Gbl.Hierarchy.Cty.CtyCod,
|
||||
Sco_GetDBStrFromScope (HieLvl_CRS));
|
||||
case HieLvl_INS:
|
||||
return (unsigned)
|
||||
|
|
Loading…
Reference in New Issue