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 20.51.40: Mar 24, 2021 Course requests database table renamed.

This commit is contained in:
acanas 2021-03-24 13:03:09 +01:00
parent 5cd0023fdb
commit 6dddb7b0f1
7 changed files with 225 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/swad.sql
View File

@ -384,9 +384,9 @@ CREATE TABLE IF NOT EXISTS crs_usr_last (
ListWithPhotos ENUM('N','Y') NOT NULL DEFAULT 'Y', ListWithPhotos ENUM('N','Y') NOT NULL DEFAULT 'Y',
UNIQUE INDEX(UsrCod,CrsCod)); UNIQUE INDEX(UsrCod,CrsCod));
-- --
-- Table crs_usr_requests: stores requests for enrollment in courses -- Table crs_requests: stores requests for enrollment in courses
-- --
CREATE TABLE IF NOT EXISTS crs_usr_requests ( CREATE TABLE IF NOT EXISTS crs_requests (
ReqCod INT NOT NULL AUTO_INCREMENT, ReqCod INT NOT NULL AUTO_INCREMENT,
CrsCod INT NOT NULL DEFAULT -1, CrsCod INT NOT NULL DEFAULT -1,
UsrCod INT NOT NULL, UsrCod INT NOT NULL,

3
swad_account.c
View File

@ -1040,7 +1040,8 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat,
/***** Remove user's requests for inscription *****/ /***** Remove user's requests for inscription *****/
DB_QueryDELETE ("can not remove user's requests for inscription", DB_QueryDELETE ("can not remove user's requests for inscription",
"DELETE FROM crs_usr_requests WHERE UsrCod=%ld", "DELETE FROM crs_requests"
" WHERE UsrCod=%ld",
UsrDat->UsrCod); UsrDat->UsrCod);
/***** Remove user from possible duplicate users *****/ /***** Remove user from possible duplicate users *****/

6
swad_changelog.h
View File

@ -600,13 +600,17 @@ TODO: Salvador Romero Cort
TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria.
*/ */
#define Log_PLATFORM_VERSION "SWAD 20.51.39 (2021-03-24)" #define Log_PLATFORM_VERSION "SWAD 20.51.40 (2021-03-24)"
#define CSS_FILE "swad20.45.css" #define CSS_FILE "swad20.45.css"
#define JS_FILE "swad20.6.2.js" #define JS_FILE "swad20.6.2.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 20.51.40: Mar 24, 2021 Course requests database table renamed. (308671 lines)
1 change necessary in database:
RENAME TABLE crs_usr_requests TO crs_requests;
Version 20.51.39: Mar 24, 2021 Calls for exams database table renamed. (308655 lines) Version 20.51.39: Mar 24, 2021 Calls for exams database table renamed. (308655 lines)
1 change necessary in database: 1 change necessary in database:
RENAME TABLE cfe_calls_for_exams TO cfe_exams; RENAME TABLE cfe_calls_for_exams TO cfe_exams;

2
swad_course.c
View File

@ -2052,7 +2052,7 @@ static void Crs_EmptyCourseCompletely (long CrsCod)
/***** Remove users' requests for inscription in the course *****/ /***** Remove users' requests for inscription in the course *****/
DB_QueryDELETE ("can not remove requests for inscription to a course", DB_QueryDELETE ("can not remove requests for inscription to a course",
"DELETE FROM crs_usr_requests" "DELETE FROM crs_requests"
" WHERE CrsCod=%ld", " WHERE CrsCod=%ld",
CrsCod); CrsCod);

6
swad_database.c
View File

@ -891,9 +891,9 @@ mysql> DESCRIBE crs_usr_last;
"ListWithPhotos ENUM('N','Y') NOT NULL DEFAULT 'Y'," "ListWithPhotos ENUM('N','Y') NOT NULL DEFAULT 'Y',"
"UNIQUE INDEX(UsrCod,CrsCod))"); "UNIQUE INDEX(UsrCod,CrsCod))");
/***** Table crs_usr_requests *****/ /***** Table crs_requests *****/
/* /*
mysql> DESCRIBE crs_usr_requests; mysql> DESCRIBE crs_requests;
+-------------+------------+------+-----+---------+----------------+ +-------------+------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra | | Field | Type | Null | Key | Default | Extra |
+-------------+------------+------+-----+---------+----------------+ +-------------+------------+------+-----+---------+----------------+
@ -905,7 +905,7 @@ mysql> DESCRIBE crs_usr_requests;
+-------------+------------+------+-----+---------+----------------+ +-------------+------------+------+-----+---------+----------------+
5 rows in set (0.01 sec) 5 rows in set (0.01 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS crs_usr_requests (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS crs_requests ("
"ReqCod INT NOT NULL AUTO_INCREMENT," "ReqCod INT NOT NULL AUTO_INCREMENT,"
"CrsCod INT NOT NULL DEFAULT -1," "CrsCod INT NOT NULL DEFAULT -1,"
"UsrCod INT NOT NULL," "UsrCod INT NOT NULL,"

406
swad_enrolment.c
View File

@ -2001,8 +2001,10 @@ void Enr_SignUpInCrs (void)
/***** Try to get and old request of the same user in the same course from database *****/ /***** Try to get and old request of the same user in the same course from database *****/
if (DB_QuerySELECT (&mysql_res,"can not get enrolment request", if (DB_QuerySELECT (&mysql_res,"can not get enrolment request",
"SELECT ReqCod FROM crs_usr_requests" "SELECT ReqCod"
" WHERE CrsCod=%ld AND UsrCod=%ld", " FROM crs_requests"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld",
Gbl.Hierarchy.Crs.CrsCod, Gbl.Hierarchy.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod)) Gbl.Usrs.Me.UsrDat.UsrCod))
{ {
@ -2016,8 +2018,12 @@ void Enr_SignUpInCrs (void)
/***** Request user in current course in database *****/ /***** Request user in current course in database *****/
if (ReqCod > 0) // Old request exists in database if (ReqCod > 0) // Old request exists in database
DB_QueryUPDATE ("can not update enrolment request", DB_QueryUPDATE ("can not update enrolment request",
"UPDATE crs_usr_requests SET Role=%u,RequestTime=NOW()" "UPDATE crs_requests"
" WHERE ReqCod=%ld AND CrsCod=%ld AND UsrCod=%ld", " SET Role=%u,"
"RequestTime=NOW()"
" WHERE ReqCod=%ld"
" AND CrsCod=%ld"
" AND UsrCod=%ld",
(unsigned) RoleFromForm, (unsigned) RoleFromForm,
ReqCod, ReqCod,
Gbl.Hierarchy.Crs.CrsCod, Gbl.Hierarchy.Crs.CrsCod,
@ -2025,7 +2031,7 @@ void Enr_SignUpInCrs (void)
else // No request in database for this user in this course else // No request in database for this user in this course
ReqCod = ReqCod =
DB_QueryINSERTandReturnCode ("can not save enrolment request", DB_QueryINSERTandReturnCode ("can not save enrolment request",
"INSERT INTO crs_usr_requests" "INSERT INTO crs_requests"
" (CrsCod,UsrCod,Role,RequestTime)" " (CrsCod,UsrCod,Role,RequestTime)"
" VALUES" " VALUES"
" (%ld,%ld,%u,NOW())", " (%ld,%ld,%u,NOW())",
@ -2069,8 +2075,9 @@ void Enr_GetNotifEnrolmentRequest (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1],
/***** Get user and requested role from database *****/ /***** Get user and requested role from database *****/
if (DB_QuerySELECT (&mysql_res,"can not get enrolment request", if (DB_QuerySELECT (&mysql_res,"can not get enrolment request",
"SELECT UsrCod,Role" "SELECT UsrCod," // row[0]
" FROM crs_usr_requests" "Role" // row[1]
" FROM crs_requests"
" WHERE ReqCod=%ld", " WHERE ReqCod=%ld",
ReqCod) == 1) // Result should have a unique row ReqCod) == 1) // Result should have a unique row
{ {
@ -2338,18 +2345,18 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in all courses in which I am teacher // Requests in all courses in which I am teacher
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM crs_users," " FROM crs_users,"
"crs_usr_requests" "crs_requests"
" WHERE crs_users.UsrCod=%ld" " WHERE crs_users.UsrCod=%ld"
" AND crs_users.Role=%u" " AND crs_users.Role=%u"
" AND crs_users.CrsCod=crs_usr_requests.CrsCod" " AND crs_users.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_TCH, (unsigned) Rol_TCH,
RolesSelected); RolesSelected);
@ -2358,20 +2365,20 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in all degrees administrated by me // Requests in all degrees administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=crs_courses.DegCod" " AND usr_admins.Cod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_DEG), Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_DEG),
RolesSelected); RolesSelected);
break; break;
@ -2379,22 +2386,22 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in all centers administrated by me // Requests in all centers administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=deg_degrees.CtrCod" " AND usr_admins.Cod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_CTR), Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_CTR),
RolesSelected); RolesSelected);
break; break;
@ -2402,24 +2409,24 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in all institutions administrated by me // Requests in all institutions administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=ctr_centers.InsCod" " AND usr_admins.Cod=ctr_centers.InsCod"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_INS), Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_INS),
RolesSelected); RolesSelected);
break; break;
@ -2432,7 +2439,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
"UsrCod," // row[2] "UsrCod," // row[2]
"Role," // row[3] "Role," // row[3]
"UNIX_TIMESTAMP(RequestTime)" // row[4] "UNIX_TIMESTAMP(RequestTime)" // row[4]
" FROM crs_usr_requests" " FROM crs_requests"
" WHERE ((1<<Role)&%u)<>0" " WHERE ((1<<Role)&%u)<>0"
" ORDER BY RequestTime DESC", " ORDER BY RequestTime DESC",
RolesSelected); RolesSelected);
@ -2449,17 +2456,17 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in courses of this country in which I am teacher // Requests in courses of this country in which I am teacher
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // roe[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // roe[4]
" FROM crs_users," " FROM crs_users,"
"ins_instits," "ins_instits,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE crs_users.UsrCod=%ld" " WHERE crs_users.UsrCod=%ld"
" AND crs_users.Role=%u" " AND crs_users.Role=%u"
" AND crs_users.CrsCod=crs_courses.CrsCod" " AND crs_users.CrsCod=crs_courses.CrsCod"
@ -2467,9 +2474,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND deg_degrees.CtrCod=ctr_centers.CtrCod" " AND deg_degrees.CtrCod=ctr_centers.CtrCod"
" AND ctr_centers.InsCod=ins_instits.InsCod" " AND ctr_centers.InsCod=ins_instits.InsCod"
" AND ins_instits.CtyCod=%ld" " AND ins_instits.CtyCod=%ld"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_TCH, (unsigned) Rol_TCH,
Gbl.Hierarchy.Cty.CtyCod, Gbl.Hierarchy.Cty.CtyCod,
@ -2479,17 +2486,17 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in degrees of this country administrated by me // Requests in degrees of this country administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ins_instits," "ins_instits,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=deg_degrees.DegCod" " AND usr_admins.Cod=deg_degrees.DegCod"
@ -2497,9 +2504,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ctr_centers.InsCod=ins_instits.InsCod" " AND ctr_centers.InsCod=ins_instits.InsCod"
" AND ins_instits.CtyCod=%ld" " AND ins_instits.CtyCod=%ld"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
Sco_GetDBStrFromScope (Hie_Lvl_DEG), Sco_GetDBStrFromScope (Hie_Lvl_DEG),
Gbl.Hierarchy.Cty.CtyCod, Gbl.Hierarchy.Cty.CtyCod,
@ -2509,17 +2516,17 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in centers of this country administrated by me // Requests in centers of this country administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ins_instits," "ins_instits,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=ctr_centers.CtrCod" " AND usr_admins.Cod=ctr_centers.CtrCod"
@ -2527,9 +2534,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ins_instits.CtyCod=%ld" " AND ins_instits.CtyCod=%ld"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
Sco_GetDBStrFromScope (Hie_Lvl_CTR), Sco_GetDBStrFromScope (Hie_Lvl_CTR),
Gbl.Hierarchy.Cty.CtyCod, Gbl.Hierarchy.Cty.CtyCod,
@ -2539,17 +2546,17 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in institutions of this country administrated by me // Requests in institutions of this country administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ins_instits," "ins_instits,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=ins_instits.InsCod" " AND usr_admins.Cod=ins_instits.InsCod"
@ -2557,9 +2564,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ins_instits.InsCod=ctr_centers.InsCod" " AND ins_instits.InsCod=ctr_centers.InsCod"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
Sco_GetDBStrFromScope (Hie_Lvl_INS), Sco_GetDBStrFromScope (Hie_Lvl_INS),
Gbl.Hierarchy.Cty.CtyCod, Gbl.Hierarchy.Cty.CtyCod,
@ -2569,23 +2576,23 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in any course of this country // Requests in any course of this country
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM ins_instits," " FROM ins_instits,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE ins_instits.CtyCod=%ld" " WHERE ins_instits.CtyCod=%ld"
" AND ins_instits.InsCod=ctr_centers.InsCod" " AND ins_instits.InsCod=ctr_centers.InsCod"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Hierarchy.Cty.CtyCod, Gbl.Hierarchy.Cty.CtyCod,
RolesSelected); RolesSelected);
break; break;
@ -2601,25 +2608,25 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in courses of this institution in which I am teacher // Requests in courses of this institution in which I am teacher
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM crs_users," " FROM crs_users,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE crs_users.UsrCod=%ld" " WHERE crs_users.UsrCod=%ld"
" AND crs_users.Role=%u" " AND crs_users.Role=%u"
" AND crs_users.CrsCod=crs_courses.CrsCod" " AND crs_users.CrsCod=crs_courses.CrsCod"
" AND crs_courses.DegCod=deg_degrees.DegCod" " AND crs_courses.DegCod=deg_degrees.DegCod"
" AND deg_degrees.CtrCod=ctr_centers.CtrCod" " AND deg_degrees.CtrCod=ctr_centers.CtrCod"
" AND ctr_centers.InsCod=%ld" " AND ctr_centers.InsCod=%ld"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_TCH, (unsigned) Rol_TCH,
Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod,
@ -2629,25 +2636,25 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in degrees of this institution administrated by me // Requests in degrees of this institution administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=deg_degrees.DegCod" " AND usr_admins.Cod=deg_degrees.DegCod"
" AND deg_degrees.CtrCod=ctr_centers.CtrCod" " AND deg_degrees.CtrCod=ctr_centers.CtrCod"
" AND ctr_centers.InsCod=%ld" " AND ctr_centers.InsCod=%ld"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
Sco_GetDBStrFromScope (Hie_Lvl_DEG), Sco_GetDBStrFromScope (Hie_Lvl_DEG),
Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod,
@ -2657,25 +2664,25 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in centers of this institution administrated by me // Requests in centers of this institution administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"ctr_centers," "ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=ctr_centers.CtrCod" " AND usr_admins.Cod=ctr_centers.CtrCod"
" AND ctr_centers.InsCod=%ld" " AND ctr_centers.InsCod=%ld"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_CTR), Gbl.Usrs.Me.UsrDat.UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_CTR),
Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod,
RolesSelected); RolesSelected);
@ -2685,21 +2692,21 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in any course of this institution // Requests in any course of this institution
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM ctr_centers," " FROM ctr_centers,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE ctr_centers.InsCod=%ld" " WHERE ctr_centers.InsCod=%ld"
" AND ctr_centers.CtrCod=deg_degrees.CtrCod" " AND ctr_centers.CtrCod=deg_degrees.CtrCod"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod,
RolesSelected); RolesSelected);
break; break;
@ -2715,23 +2722,23 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in courses of this center in which I am teacher // Requests in courses of this center in which I am teacher
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM crs_users," " FROM crs_users,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE crs_users.UsrCod=%ld" " WHERE crs_users.UsrCod=%ld"
" AND crs_users.Role=%u" " AND crs_users.Role=%u"
" AND crs_users.CrsCod=crs_courses.CrsCod" " AND crs_users.CrsCod=crs_courses.CrsCod"
" AND crs_courses.DegCod=deg_degrees.DegCod" " AND crs_courses.DegCod=deg_degrees.DegCod"
" AND deg_degrees.CtrCod=%ld" " AND deg_degrees.CtrCod=%ld"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_TCH, (unsigned) Rol_TCH,
Gbl.Hierarchy.Ctr.CtrCod, Gbl.Hierarchy.Ctr.CtrCod,
@ -2741,23 +2748,23 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in degrees of this center administrated by me // Requests in degrees of this center administrated by me
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM usr_admins," " FROM usr_admins,"
"deg_degrees," "deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE usr_admins.UsrCod=%ld" " WHERE usr_admins.UsrCod=%ld"
" AND usr_admins.Scope='%s'" " AND usr_admins.Scope='%s'"
" AND usr_admins.Cod=deg_degrees.DegCod" " AND usr_admins.Cod=deg_degrees.DegCod"
" AND deg_degrees.CtrCod=%ld" " AND deg_degrees.CtrCod=%ld"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
Sco_GetDBStrFromScope (Hie_Lvl_DEG), Sco_GetDBStrFromScope (Hie_Lvl_DEG),
Gbl.Hierarchy.Ctr.CtrCod, Gbl.Hierarchy.Ctr.CtrCod,
@ -2769,19 +2776,19 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Request in any course of this center // Request in any course of this center
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM deg_degrees," " FROM deg_degrees,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE deg_degrees.CtrCod=%ld" " WHERE deg_degrees.CtrCod=%ld"
" AND deg_degrees.DegCod=crs_courses.DegCod" " AND deg_degrees.DegCod=crs_courses.DegCod"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Hierarchy.Ctr.CtrCod, Gbl.Hierarchy.Ctr.CtrCod,
RolesSelected); RolesSelected);
break; break;
@ -2797,21 +2804,21 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in courses of this degree in which I am teacher // Requests in courses of this degree in which I am teacher
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM crs_users," " FROM crs_users,"
"crs_courses," "crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE crs_users.UsrCod=%ld" " WHERE crs_users.UsrCod=%ld"
" AND crs_users.Role=%u" " AND crs_users.Role=%u"
" AND crs_users.CrsCod=crs_courses.CrsCod" " AND crs_users.CrsCod=crs_courses.CrsCod"
" AND crs_courses.DegCod=%ld" " AND crs_courses.DegCod=%ld"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Rol_TCH, (unsigned) Rol_TCH,
Gbl.Hierarchy.Deg.DegCod, Gbl.Hierarchy.Deg.DegCod,
@ -2824,17 +2831,17 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
// Requests in any course of this degree // Requests in any course of this degree
NumReqs = NumReqs =
DB_QuerySELECT (&mysql_res,"can not get requests for enrolment", DB_QuerySELECT (&mysql_res,"can not get requests for enrolment",
"SELECT crs_usr_requests.ReqCod," // row[0] "SELECT crs_requests.ReqCod," // row[0]
"crs_usr_requests.CrsCod," // row[1] "crs_requests.CrsCod," // row[1]
"crs_usr_requests.UsrCod," // row[2] "crs_requests.UsrCod," // row[2]
"crs_usr_requests.Role," // row[3] "crs_requests.Role," // row[3]
"UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" // row[4] "UNIX_TIMESTAMP(crs_requests.RequestTime)" // row[4]
" FROM crs_courses," " FROM crs_courses,"
"crs_usr_requests" "crs_requests"
" WHERE crs_courses.DegCod=%ld" " WHERE crs_courses.DegCod=%ld"
" AND crs_courses.CrsCod=crs_usr_requests.CrsCod" " AND crs_courses.CrsCod=crs_requests.CrsCod"
" AND ((1<<crs_usr_requests.Role)&%u)<>0" " AND ((1<<crs_requests.Role)&%u)<>0"
" ORDER BY crs_usr_requests.RequestTime DESC", " ORDER BY crs_requests.RequestTime DESC",
Gbl.Hierarchy.Deg.DegCod, Gbl.Hierarchy.Deg.DegCod,
RolesSelected); RolesSelected);
break; break;
@ -2859,7 +2866,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
"UsrCod," // row[2] "UsrCod," // row[2]
"Role," // row[3] "Role," // row[3]
"UNIX_TIMESTAMP(RequestTime)" // row[4] "UNIX_TIMESTAMP(RequestTime)" // row[4]
" FROM crs_usr_requests" " FROM crs_requests"
" WHERE CrsCod=%ld" " WHERE CrsCod=%ld"
" AND ((1<<Role)&%u)<>0" " AND ((1<<Role)&%u)<>0"
" ORDER BY RequestTime DESC", " ORDER BY RequestTime DESC",
@ -3019,7 +3026,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
ReqCod,Gbl.Hierarchy.Crs.CrsCod, ReqCod,Gbl.Hierarchy.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod); Gbl.Usrs.Me.UsrDat.UsrCod);
} }
else // User does not exists or user already belongs to course ==> remove pair from crs_usr_requests table else // User does not exists or user already belongs to course ==> remove pair from crs_requests table
Enr_RemoveEnrolmentRequest (Crs.CrsCod,UsrDat.UsrCod); Enr_RemoveEnrolmentRequest (Crs.CrsCod,UsrDat.UsrCod);
} }
@ -3050,8 +3057,10 @@ static void Enr_RemoveEnrolmentRequest (long CrsCod,long UsrCod)
Important: do this before removing the request *****/ Important: do this before removing the request *****/
/* Request request code (returns 0 or 1 rows) */ /* Request request code (returns 0 or 1 rows) */
if (DB_QuerySELECT (&mysql_res,"can not get request code", if (DB_QuerySELECT (&mysql_res,"can not get request code",
"SELECT ReqCod FROM crs_usr_requests" "SELECT ReqCod"
" WHERE CrsCod=%ld AND UsrCod=%ld", " FROM crs_requests"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld",
CrsCod,UsrCod)) // Request exists CrsCod,UsrCod)) // Request exists
{ {
/* Get request code */ /* Get request code */
@ -3066,8 +3075,9 @@ static void Enr_RemoveEnrolmentRequest (long CrsCod,long UsrCod)
/***** Remove enrolment request *****/ /***** Remove enrolment request *****/
DB_QueryDELETE ("can not remove a request for enrolment", DB_QueryDELETE ("can not remove a request for enrolment",
"DELETE FROM crs_usr_requests" "DELETE FROM crs_requests"
" WHERE CrsCod=%ld AND UsrCod=%ld", " WHERE CrsCod=%ld"
" AND UsrCod=%ld",
CrsCod,UsrCod); CrsCod,UsrCod);
} }
@ -3081,18 +3091,18 @@ static void Enr_RemoveExpiredEnrolmentRequests (void)
Important: do this before removing the request *****/ Important: do this before removing the request *****/
DB_QueryUPDATE ("can not set notification(s) as removed", DB_QueryUPDATE ("can not set notification(s) as removed",
"UPDATE ntf_notifications," "UPDATE ntf_notifications,"
"crs_usr_requests" "crs_requests"
" SET ntf_notifications.Status=(ntf_notifications.Status | %u)" " SET ntf_notifications.Status=(ntf_notifications.Status | %u)"
" WHERE ntf_notifications.NotifyEvent=%u" " WHERE ntf_notifications.NotifyEvent=%u"
" AND ntf_notifications.Cod=crs_usr_requests.ReqCod" " AND ntf_notifications.Cod=crs_requests.ReqCod"
" AND crs_usr_requests.RequestTime<FROM_UNIXTIME(UNIX_TIMESTAMP()-%lu)", " AND crs_requests.RequestTime<FROM_UNIXTIME(UNIX_TIMESTAMP()-%lu)",
(unsigned) Ntf_STATUS_BIT_REMOVED, (unsigned) Ntf_STATUS_BIT_REMOVED,
(unsigned) Ntf_EVENT_ENROLMENT_REQUEST, (unsigned) Ntf_EVENT_ENROLMENT_REQUEST,
Cfg_TIME_TO_DELETE_ENROLMENT_REQUESTS); Cfg_TIME_TO_DELETE_ENROLMENT_REQUESTS);
/***** Remove expired requests for enrolment *****/ /***** Remove expired requests for enrolment *****/
DB_QueryDELETE ("can not remove expired requests for enrolment", DB_QueryDELETE ("can not remove expired requests for enrolment",
"DELETE LOW_PRIORITY FROM crs_usr_requests" "DELETE LOW_PRIORITY FROM crs_requests"
" WHERE RequestTime<FROM_UNIXTIME(UNIX_TIMESTAMP()-%lu)", " WHERE RequestTime<FROM_UNIXTIME(UNIX_TIMESTAMP()-%lu)",
Cfg_TIME_TO_DELETE_ENROLMENT_REQUESTS); Cfg_TIME_TO_DELETE_ENROLMENT_REQUESTS);
} }

6
swad_role.c
View File

@ -622,8 +622,10 @@ Rol_Role_t Rol_GetRequestedRole (long UsrCod)
/***** Get requested role from database *****/ /***** Get requested role from database *****/
if (DB_QuerySELECT (&mysql_res,"can not get requested role", if (DB_QuerySELECT (&mysql_res,"can not get requested role",
"SELECT Role FROM crs_usr_requests" "SELECT Role"
" WHERE CrsCod=%ld AND UsrCod=%ld", " FROM crs_requests"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld",
Gbl.Hierarchy.Crs.CrsCod,UsrCod)) Gbl.Hierarchy.Crs.CrsCod,UsrCod))
{ {
/***** Get role *****/ /***** Get role *****/