From 9348470eccb003d941f75c915a0941714378986a Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Tue, 03 Jun 2025 20:04:39 +0000
Subject: [PATCH] using .env for base urls
---
lib/db.js | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index 6aa9575..1b4d92d 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -30,6 +30,7 @@
getRefIdFromObjId,
getKurse,
+ getKurs,
getKursItems,
// getKursByObjId,
// getKursByRefId,
@@ -40,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
@@ -154,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
@@ -179,6 +183,17 @@
// return 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.ref_id = '${ref_id}'
+ `
+ let [results] = await pool.query(q)
+ results = results.length? results[0] : undefined
+ return results
+}
async function getKursItems (ref_id) {
const pool = await poolP
// const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
@@ -188,13 +203,14 @@
// `
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
- WHERE or2.ref_id = ${ref_id} OR parent_id = ${ref_id}
- `
+ 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
+ WHERE or2.ref_id = ${ref_id}
+ OR parent_id = ${ref_id}
+ AND or2.deleted is NULL
+ `
const [results] = await pool.query(q)
return results
- // return results.length ? results[0] : undefined
}
async function getKursTeilnehmer (ref_id) {
--
Gitblit v1.8.0