From 95763390ca49fe3bce0fc6f0c29155c2696d9509 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 04 Jun 2025 13:28:40 +0000
Subject: [PATCH] adding passed and status
---
lib/db.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index aeb5b6b..80577fa 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -41,6 +41,8 @@
/////////////////////////////////////////////////////////////////////////
async function getUsers (offset = 0, limit = 10) {
+ limit = Number(limit) || 10
+ offset = Number(offset) || 0
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
// TODO user defined fields
// TODO check args for SQL Injection
@@ -188,7 +190,8 @@
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE or2.ref_id = '${ref_id}'
`
- const [results] = await pool.query(q)
+ let [results] = await pool.query(q)
+ results = results.length? results[0] : undefined
return results
}
async function getKursItems (ref_id) {
@@ -212,13 +215,15 @@
async function getKursTeilnehmer (ref_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#, ulm.status
+ 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
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
INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
- WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_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})
+ ORDER BY usr_id
`
const [results] = await pool.query(q)
return results
--
Gitblit v1.8.0