From 7aa80f1c68df586c1bc637c668666d29e84c3de7 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 04 Jun 2025 08:45:42 +0000
Subject: [PATCH] use offset in url query
---
lib/db.js | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index d492507..1b4d92d 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -30,14 +30,19 @@
getRefIdFromObjId,
getKurse,
- getKursByObjId,
- getKursByRefId,
- getTeilnehmer,
+ getKurs,
+ getKursItems,
+ // getKursByObjId,
+ // getKursByRefId,
+ getKursTeilnehmer,
+ getKursTeilnehmerCount,
}
/////////////////////////////////////////////////////////////////////////
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
@@ -152,6 +157,7 @@
}
async function joinUDF (user) {
+ if(!user) return user
const fields = await getUserDefinedField(user.usr_id)
for (const field of fields) {
user[field.field_name] = field.value
@@ -172,34 +178,66 @@
return results
}
-async function getKursByRefId (refId) {
- const {ref_id, obj_id} = await getObjIdFromRefId(refId)
- return getKursByObjId(obj_id)
-}
+// async function getKursByRefId (refId) {
+// const {ref_id, obj_id} = await getObjIdFromRefId(refId)
+// return getKursByObjId(obj_id)
+// }
-async function getKursByObjId (obj_id) {
+async function getKurs (ref_id) {
const pool = await poolP
const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
FROM ${database}.object_reference or2
- INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
- WHERE or2.obj_id = '${obj_id}'
+ 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)
- return results.length ? results[0] : undefined
+ let [results] = await pool.query(q)
+ results = results.length? results[0] : undefined
+ return results
}
-
-async function getTeilnehmer (obj_id) {
+async function getKursItems (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, ulm.status
+ // const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
+ // FROM ${database}.object_reference or2
+ // INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ // WHERE or2.obj_id = '${obj_id}'
+ // `
+ const q = `SELECT ci.parent_id, or2.ref_id, or2.obj_id, od.title, od.type
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}.ut_lp_marks ulm
- ON ulm.obj_id = or2.obj_id AND ulm.usr_id = om.usr_id
- WHERE (or2.ref_id = ${obj_id}
- OR parent_id = ${obj_id}) # Fliesenratgeber #AND om.usr_id = 6573 # Holger Börner / nicht-bestanden -
+ WHERE or2.ref_id = ${ref_id}
+ OR parent_id = ${ref_id}
+ AND or2.deleted is NULL
`
const [results] = await pool.query(q)
return results
}
+
+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
+ 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})
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKursTeilnehmerCount (ref_id) {
+ const pool = await poolP
+ const q = `SELECT COUNT(*) as count
+ 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})
+ `
+ let [results] = await pool.query(q)
+ results = results.length? results[0] : undefined
+ return { ref_id, count: results.count }
+}
--
Gitblit v1.8.0