From e513505d3b9976fb1a4118787b815389df34e36c Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Mon, 02 Jun 2025 15:49:02 +0000
Subject: [PATCH] adding new routes
---
lib/db.js | 58 +++++++++++++++++++++++++---
bin/getKurse.js | 22 +++++++++++
tst.js | 21 ++++++++--
3 files changed, 90 insertions(+), 11 deletions(-)
diff --git a/bin/getKurse.js b/bin/getKurse.js
new file mode 100644
index 0000000..6ce2f56
--- /dev/null
+++ b/bin/getKurse.js
@@ -0,0 +1,22 @@
+const db = require("../lib/db")
+const yargs = require("yargs")
+
+/////////////////////////////////////////////////////////////////////////
+
+const argv = yargs
+ .usage("$0", "get Kurse",)
+ .strict()
+ .parse()
+
+run(argv)
+ .then(function (kurse) {
+ console.log(JSON.stringify(kurse, null, " "))
+ console.log("#Kurse",kurse.length)
+ })
+ .catch(console.error)
+ .finally(process.exit)
+
+async function run() {
+ return await db.getKurse()
+}
+
diff --git a/lib/db.js b/lib/db.js
index e849ebd..d13bd08 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -28,6 +28,10 @@
getObjIdFromRefId,
getRefIdFromObjId,
+
+ getKurse,
+ getKurs,
+ getTeilnehmer,
}
/////////////////////////////////////////////////////////////////////////
@@ -98,8 +102,8 @@
const pool = await poolP
const [results] = await pool.query(
`SELECT ut.usr_id, ud.field_name, ut.value
- FROM ${database}.udf_definition ud
- JOIN ${database}.udf_text ut ON ut.field_id = ud.field_id`
+ FROM ${database}.udf_definition ud
+ JOIN ${database}.udf_text ut ON ut.field_id = ud.field_id`
)
return results
}
@@ -108,10 +112,10 @@
const pool = await poolP
const [results] = await pool.query(
`SELECT ut.usr_id, ud.field_name, ut.value
- FROM ${database}.udf_definition ud
- JOIN ${database}.udf_text ut ON ut.field_id = ud.field_id
- WHERE ut.usr_id = '${usr_id}'
- `
+ FROM ${database}.udf_definition ud
+ JOIN ${database}.udf_text ut ON ut.field_id = ud.field_id
+ WHERE ut.usr_id = '${usr_id}'
+ `
)
return results
}
@@ -148,8 +152,48 @@
async function joinUDF (user) {
const fields = await getUserDefinedField(user.usr_id)
- for(const field of fields) {
+ for (const field of fields) {
user[field.field_name] = field.value
}
return user
}
+
+/////// Kurs ////////////////////////////////////////////////////////////////
+
+async function getKurse () {
+ 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 od.type = 'crs' AND or2.deleted IS NULL
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKurs (obj_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}'
+ `
+ const [results] = await pool.query(q)
+ return results.length ? results[0] : undefined
+}
+
+async function getTeilnehmer (obj_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
+ 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 -
+ `
+ const [results] = await pool.query(q)
+ return results
+}
diff --git a/tst.js b/tst.js
index c0ec1bc..edf2cc0 100644
--- a/tst.js
+++ b/tst.js
@@ -17,11 +17,24 @@
const settings = require("./settings")
console.log(settings)
- const dat = await db.getObjIdFromRefId(149)
- console.log(dat)
+ // console.log(await db.getKurse())
+ // console.log(await db.getKurs(9911))
- const dat2 = await db.getRefIdFromObjId(9911)
- console.log(dat2)
+ // const k = await db.getKurse()
+ const k = await db.getKurs(9911)
+ console.log(k)
+ console.log(k.length)
+
+ //
+ // console.log(2222222222222222)
+ // const data = await db.getTeilnehmer(9911)
+ // console.log(data)
+
+ // const dat = await db.getObjIdFromRefId(149)
+ // console.log(dat)
+ //
+ // const dat2 = await db.getRefIdFromObjId(9911)
+ // console.log(dat2)
// const user = await db.getUserByLogin("242424")
// console.log("user", user)
--
Gitblit v1.8.0