From 846df9e0f36145aae237818362dadff78453a7b9 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 17 Sep 2025 17:15:34 +0000
Subject: [PATCH] GS-2308
---
lib/db.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index af6fa94..0cc8cc2 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -92,6 +92,7 @@
let userSearchQuery = await getUserSearchQuery(offset, limit, search)
// log.info(userSearchQuery)
const [results, fields] = await pool.query(userSearchQuery)
+ // console.log(results, fields)
const count = await getUserCount(offset, limit, search)
return {
total: count,
@@ -220,7 +221,7 @@
async function getKurse () {
const pool = await poolP
- const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
+ const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.offline
FROM ${database}.object_reference or2
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE od.type = 'crs'
@@ -237,10 +238,11 @@
async function getKurs (ref_id) {
const pool = await poolP
- const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.create_date
+ const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.create_date, od.offline
FROM ${database}.object_reference or2
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE or2.ref_id = '${ref_id}'
+ AND or2.deleted IS NULL
`
let [results] = await pool.query(q)
results = results.length ? results[0] : undefined
@@ -323,6 +325,7 @@
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 or2.deleted IS NULL
ORDER BY usr_id
`
// log.info(q)
@@ -478,6 +481,9 @@
*/
async function setStatus (courseId, userId, passed = null, status = null) {
const pool = await poolP
+ log.info(`------------setStatus----- courseId=${courseId} userId=${userId} passed=${passed} status=${status}`)
+ passed = isNaN(Number(passed)) ? passed : Number(passed)
+ status = isNaN(Number(status)) ? status : Number(status)
// ACHTUNG Transactions funktioneren so nicht, erst mal ohne machen...
const q = `
--
Gitblit v1.8.0