admin/sensorapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct typo, remove 'whatTable'

Browse Source
This commit is contained in:
rxf
2023-06-28 11:27:14 +02:00
parent 6857d75e9d
commit 6485ef63f6
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/getsensorData.js
+4 -4
View File
@@ -40,7 +40,7 @@ const geigerParams = [
{name: 'sort', type: 'int', default: 1}, {name: 'sort', type: 'int', default: 1},
{name: 'last_seen', type: 'date', default: '1900-01-01T00:00:00Z'}, {name: 'last_seen', type: 'date', default: '1900-01-01T00:00:00Z'},
{name: 'datetime', type: 'date', default: null}, {name: 'datetime', type: 'date', default: null},
{name: 'mooving', type: 'bool', default: false}, {name: 'moving', type: 'bool', default: false},
] ]
// >>>>>>>>>>>>>>>>>>>>> DUMMIES // >>>>>>>>>>>>>>>>>>>>> DUMMIES
@@ -98,9 +98,9 @@ export const calcRange = (opts) => {
} }
start = start.toUTC() start = start.toUTC()
end = end.toUTC() end = end.toUTC()
if(opts.avg !== undefined) { // if(opts.avg !== undefined) {
start = start.minus({minutes: opts.avg}) // start = start.minus({minutes: opts.avg})
} // }
ret.start = `start: ${start.toISO()}` ret.start = `start: ${start.toISO()}`
ret.stop = `stop: ${end.toISO()}` ret.stop = `stop: ${end.toISO()}`
return ret return ret
databases/mongo.js
+10 -4
View File
@@ -187,7 +187,7 @@ export const fetchgeigerAVGData = async (opts) => {
let sorting = {datetime: opts.sort}; let sorting = {datetime: opts.sort};
let client = await connectMongo() let client = await connectMongo()
try { try {
if(opts.mooving) { if(opts.moving) {
docs = await client.db(MONGOBASE).collection('sensors').aggregate([ docs = await client.db(MONGOBASE).collection('sensors').aggregate([
{ {
$sort: sorting $sort: sorting
@@ -213,8 +213,11 @@ export const fetchgeigerAVGData = async (opts) => {
} }
}, },
{ {
$project: {_id:0, cpm_avg: 1, datetime:1, uSvph_avg: { $multiply: ["$cpm_avg", opts.factor]} $project: {_id:0, cpm_avg: 1, datetime:1, uSvph_avg: { $multiply: ["$cpm_avg", opts.factor]}}
} },
{
$sort: {datetime: 1}
}
]).toArray(); ]).toArray();
} else { } else {
docs = await client.db(MONGOBASE).collection('sensors').aggregate([ docs = await client.db(MONGOBASE).collection('sensors').aggregate([
@@ -239,7 +242,10 @@ export const fetchgeigerAVGData = async (opts) => {
{ $addFields: { datetime: "$_id"}}, // change '_id' to 'datetime { $addFields: { datetime: "$_id"}}, // change '_id' to 'datetime
{ {
$project: {_id:0, uSvph_avg: { $multiply: ["$cpm_avg", opts.factor]}, datetime: 1, cpm_avg: 1} $project: {_id:0, uSvph_avg: { $multiply: ["$cpm_avg", opts.factor]}, datetime: 1, cpm_avg: 1}
} },
{
$sort: {datetime: 1}
}
]).toArray(); ]).toArray();
} }
} catch(e) { // if there was an error } catch(e) { // if there was an error
sensorspecials/geigeract.js
+2 -9
View File
@@ -80,7 +80,7 @@ export const getgeigerData = async (params, possibles, props) => {
opts.span = setoptionfromtable(opts.span, 1) opts.span = setoptionfromtable(opts.span, 1)
opts.daystart = setoptionfromtable(opts.daystart, false) opts.daystart = setoptionfromtable(opts.daystart, false)
opts.avg = setoptionfromtable(opts.avg, 1) opts.avg = setoptionfromtable(opts.avg, 1)
opts.mooving = setoptionfromtable(opts.mooving, false) opts.moving = setoptionfromtable(opts.moving, false)
let {start, stop} = calcRange(opts) // calc time range let {start, stop} = calcRange(opts) // calc time range
opts.start = start opts.start = start
opts.stop = stop opts.stop = stop
@@ -95,7 +95,7 @@ export const getgeigerData = async (params, possibles, props) => {
data: opts.data, data: opts.data,
count: erg.values.length, count: erg.values.length,
avg: opts.avg, avg: opts.avg,
mooving: opts.mooving moving: opts.moving
}, },
values: erg.values, values: erg.values,
} }
@@ -150,10 +150,3 @@ export const getgeigerData = async (params, possibles, props) => {
return erg return erg
} }
*/ */
const whatTable = [
{'what':'day', 'span': 1, 'daystart': false, 'mooving': true, 'avg': 1},
{'what':'week', 'span': 7, 'daystart': false, 'mooving': true, 'avg': 180},
{'what':'month', 'span': 31, 'daystart': true, 'mooving': false, 'avg': 1440},
];