From c3661c26aa22ba5e9d9213356d101ee096ebe866 Mon Sep 17 00:00:00 2001
From: Thomas Mack <email@bielefeldts.de>
Date: Sat, 28 Sep 2019 13:40:27 +0200
Subject: [PATCH] items auch bei schueler und schuljahr

---
 routes/v1/person.js    | 4 ++++
 routes/v1/schueler.js  | 2 +-
 routes/v1/schuljahr.js | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/routes/v1/person.js b/routes/v1/person.js
index 313d009..521b7a7 100644
--- a/routes/v1/person.js
+++ b/routes/v1/person.js
@@ -34,7 +34,11 @@ router.get('/', function(req, res, next) {
       next(err);
     } else {
       let result  = {};
+<<<<<<< HEAD
       result['items'] = rs.rows;
+=======
+      result['person'] = rs.rows;
+>>>>>>> 0db45ce44687f68654bfe595345fd32498cbe665
       console.log(result);
       res.status(200).json(result);
     }
diff --git a/routes/v1/schueler.js b/routes/v1/schueler.js
index d84cfc5..f63c7ec 100644
--- a/routes/v1/schueler.js
+++ b/routes/v1/schueler.js
@@ -34,7 +34,7 @@ router.get('/', function(req, res, next) {
       next(err);
     } else {
       let result  = {};
-      result['schueler'] = rs.rows;
+      result['items'] = rs.rows;
       console.log(result);
       res.status(200).json(result);
     }
diff --git a/routes/v1/schuljahr.js b/routes/v1/schuljahr.js
index c7e1db6..0c09ed8 100644
--- a/routes/v1/schuljahr.js
+++ b/routes/v1/schuljahr.js
@@ -36,7 +36,7 @@ router.get('/', function(req, res, next) {
       next(err);
     } else {
       let result  = {};
-      result['schuljahr'] = rs.rows;
+      result['items'] = rs.rows;
       console.log(result);
       res.status(200).json(result);
     }