summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorUdo Walter2018-07-31 04:20:37 +0200
committerUdo Walter2018-07-31 04:20:37 +0200
commitcb7711cc9f76fe4211538bad74de68c57cd07e83 (patch)
tree633568bcbc8737e97eb0e99eaefbf846422e6147 /server
parent[webapp/external-backends] Dialog polishing. Thx Udo for fixing the scroll co... (diff)
downloadbas-cb7711cc9f76fe4211538bad74de68c57cd07e83.tar.gz
bas-cb7711cc9f76fe4211538bad74de68c57cd07e83.tar.xz
bas-cb7711cc9f76fe4211538bad74de68c57cd07e83.zip
[groups] add edit form for groups; add description to groups and clients
Diffstat (limited to 'server')
-rw-r--r--server/api/clients.js22
-rw-r--r--server/api/groups.js63
-rw-r--r--server/migrations/20180717132233-create-group.js3
-rw-r--r--server/migrations/20180717132333-create-client.js3
-rw-r--r--server/models/client.js1
-rw-r--r--server/models/group.js3
6 files changed, 54 insertions, 41 deletions
diff --git a/server/api/clients.js b/server/api/clients.js
index 37e207b..d494fd0 100644
--- a/server/api/clients.js
+++ b/server/api/clients.js
@@ -2,17 +2,19 @@
var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
-module.exports = {
- get: {
-
- getInfo: function (req, res) {
- db.client.findOne({ where: { id: req.query.id } }).then(client => {
- res.send(client)
- })
- }
-
+// GET Requests
+module.exports.get = {
+ getList: function (req, res) {
+ db.client.findAll({ attributes: ['id', 'name'] }).then(list => {
+ res.send(list)
+ })
},
- post: {
+ getGroups: function (req, res) {
+ db.client.findOne({ where: { id: req.query.id } }).then(client => {
+ client.getGroups().then(groups => {
+ res.send(groups)
+ })
+ })
}
}
diff --git a/server/api/groups.js b/server/api/groups.js
index ff29799..fa2c1ca 100644
--- a/server/api/groups.js
+++ b/server/api/groups.js
@@ -2,41 +2,44 @@
var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
-module.exports = {
- get: {
-
- getParents: function (req, res) {
- const id = req.query.id > 0 ? req.query.id : null
- db.group.findOne({ where: { id: id }, include: ['parents'] }).then(group => {
- group.getParents().then(parents => {
- res.send(parents.map(x => ({ id: x.id, name: x.name })))
- })
- })
- },
-
- getSubGroups: function (req, res) {
- const id = req.query.id > 0 ? req.query.id : null
- db.group.findAll({ where: { '$parents.id$': id }, include: ['parents'] }).then(result => {
- res.send(result)
- })
- },
+// GET Requests
+module.exports.get = {
+ getList: function (req, res) {
+ db.group.findAll({ attributes: ['id', 'name'] }).then(list => {
+ res.send(list)
+ })
+ },
- getClients: function (req, res) {
- const id = req.query.id > 0 ? req.query.id : null
- db.client.findAll({ where: { '$groups.id$': id }, include: ['groups'] }).then(result => {
- res.send(result)
+ getParents: function (req, res) {
+ const id = req.query.id > 0 ? req.query.id : null
+ db.group.findOne({ where: { id: id }, include: ['parents'] }).then(group => {
+ group.getParents().then(parents => {
+ res.send(parents)
})
- }
+ })
+ },
+ getSubGroups: function (req, res) {
+ const id = req.query.id > 0 ? req.query.id : null
+ db.group.findAll({ where: { '$parents.id$': id }, include: ['parents'] }).then(subgroups => {
+ res.send(subgroups)
+ })
},
- post: {
- update: function (req, res) {
- const id = req.body.id > 0 ? req.body.id : null
- if (!id) res.end()
- db.group.update({ name: req.body.name }, { where: { id: id } })
- res.end()
- }
+ getClients: function (req, res) {
+ const id = req.query.id > 0 ? req.query.id : null
+ db.client.findAll({ where: { '$groups.id$': id }, include: ['groups'] }).then(clients => {
+ res.send(clients)
+ })
+ }
+}
+// POST Requests
+module.exports.post = {
+ update: function (req, res) {
+ const id = req.body.id > 0 ? req.body.id : null
+ if (!id) res.end()
+ db.group.update({ name: req.body.name }, { where: { id: id } })
+ res.end()
}
}
diff --git a/server/migrations/20180717132233-create-group.js b/server/migrations/20180717132233-create-group.js
index 720a1e7..71258dd 100644
--- a/server/migrations/20180717132233-create-group.js
+++ b/server/migrations/20180717132233-create-group.js
@@ -10,6 +10,9 @@ module.exports = {
},
name: {
type: Sequelize.STRING
+ },
+ description: {
+ type: Sequelize.STRING
}
})
},
diff --git a/server/migrations/20180717132333-create-client.js b/server/migrations/20180717132333-create-client.js
index 79552c4..955f2f9 100644
--- a/server/migrations/20180717132333-create-client.js
+++ b/server/migrations/20180717132333-create-client.js
@@ -11,6 +11,9 @@ module.exports = {
name: {
type: Sequelize.STRING
},
+ description: {
+ type: Sequelize.STRING
+ },
ip: {
type: Sequelize.STRING
},
diff --git a/server/models/client.js b/server/models/client.js
index 1086023..483d1e6 100644
--- a/server/models/client.js
+++ b/server/models/client.js
@@ -8,6 +8,7 @@ module.exports = (sequelize, DataTypes) => {
type: DataTypes.INTEGER
},
name: DataTypes.STRING,
+ description: DataTypes.STRING,
ip: DataTypes.STRING,
mac: DataTypes.STRING,
uuid: DataTypes.STRING
diff --git a/server/models/group.js b/server/models/group.js
index 223df07..e988497 100644
--- a/server/models/group.js
+++ b/server/models/group.js
@@ -7,7 +7,8 @@ module.exports = (sequelize, DataTypes) => {
primaryKey: true,
type: DataTypes.INTEGER
},
- name: DataTypes.STRING
+ name: DataTypes.STRING,
+ description: DataTypes.STRING
}, {
timestamps: false
})