From a5dcd68d7f47302abdc6c479269c79edf6d21686 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Fri, 11 Jul 2025 14:33:28 +0000
Subject: [PATCH] GS-2174
---
lib/db.js | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index df6ea22..3bc907c 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -39,11 +39,14 @@
// getKursByObjId,
// getKursByRefId,
getKursTeilnehmer,
+ getSingleKursTeilnehmer,
getKursTeilnehmerCount,
getUdf,
- getMemberRoleForCourse,
+ getKursTeilnehmerRolle,
+ getKursTeilnehmerByRole,
+ getKursRoles,
setStatus,
}
@@ -171,6 +174,10 @@
/////// obj_id / ref_id ////////////////////////////////////////////////////////////////
+/**
+ * @param refId
+ * @returns {Promise<{ref_id,obj_id}|undefined>}
+ */
async function getObjIdFromRefId (refId) {
const pool = await poolP
const [results] = await pool.query(
@@ -317,9 +324,40 @@
WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_id})
ORDER BY usr_id
`
- console.log(q)
+ // console.log(q)
const [results] = await pool.query(q)
return results
+}
+
+async function getSingleKursTeilnehmer (ref_id, usr_id) {
+ const pool = await poolP
+ const q = `SELECT ci.parent_id,
+ or2.ref_id,
+ or2.obj_id,
+ od.title,
+ od.type,
+ om.usr_id,
+ ud.login,
+ ud.firstname,
+ ud.lastname,
+ ud.active,
+ om.passed,
+ ulm.status,
+ ulm.status_changed
+ FROM ${database}.crs_items ci
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = ci.obj_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ INNER JOIN ${database}.obj_members om ON om.obj_id = or2.obj_id AND om.member = 1
+ INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
+ LEFT JOIN ${database}.ut_lp_marks ulm ON ulm.obj_id = or2.obj_id AND ud.usr_id = ulm.usr_id
+ WHERE (or2.ref_id = ${ref_id}
+ OR parent_id = ${ref_id})
+ AND om.usr_id = ${usr_id}
+ ORDER BY usr_id
+ `
+ // console.log(q)
+ const [results] = await pool.query(q)
+ return results[0]
}
async function getKursTeilnehmerCount (ref_id) {
@@ -370,7 +408,7 @@
/////// ROLLEN ////////////////////////////////////////////////////////////////
-async function getMemberRoleForCourse (obj_id) {
+async function getKursTeilnehmerRolle (obj_id) {
const pool = await poolP
const q = `SELECT obj_id, title, description
from object_data od
@@ -387,6 +425,36 @@
return null
}
}
+
+async function getKursTeilnehmerByRole (obj_id) {
+ const pool = await poolP
+ const q = `
+ SELECT obj_id as role_id, ru.usr_id, ud.firstname, ud.lastname
+ FROM ${database}.object_data od
+ INNER JOIN ${database}.rbac_ua ru ON ru.rol_id = od.obj_id
+ INNER JOIN ${database}.usr_data ud ON ud.usr_id = ru.usr_id
+ WHERE type = "role" #AND title LIKE 'il_crs_member_157'
+ AND od.description LIKE 'Member%${obj_id}'
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKursRoles (ref_id) {
+ const pool = await poolP
+ const q = `
+ SELECT pa.rol_id, or2.ref_id, or2.obj_id, od2.type, od2.title, od2.description
+ FROM ${database}.rbac_pa pa
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = pa.ref_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ INNER JOIN ${database}.object_data od2 ON od2.obj_id = pa.rol_id
+ WHERE pa.ref_id = ${ref_id}
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+
/////// STATUS ////////////////////////////////////////////////////////////////
@@ -430,8 +498,8 @@
UPDATE ${database}.ut_lp_marks ulm
SET status = ${status},
status_changed = "${date}"
- WHERE ulm.usr_id = 31793
- AND ulm.obj_id = 32212;
+ WHERE ulm.usr_id = ${userId}
+ AND ulm.obj_id = ${courseId};
`
const q2 = `
UPDATE ${database}.obj_members om
@@ -439,10 +507,12 @@
WHERE om.usr_id = ${userId}
AND om.obj_id = ${courseId};
`
+
const [results1] = await pool.query(q1)
const [results2] = await pool.query(q2)
const {affectedRows: affectedRows1} = results1
const {affectedRows: affectedRows2} = results2
+
if (affectedRows1 && affectedRows2) {
return {status: "ok"}
}
--
Gitblit v1.8.0