jody/alertmon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interim commit, email code in a good spot if untested; back to alert row highlighting now that server not running in production mode (and thus not showimg template changes due to caching).

Browse Source
This commit is contained in:
jkaplon 2015-08-07 11:20:22 -04:00
parent 9d7345bee2
commit 11d8d76cc0
3 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
alertmonUtils.js
View File

@ -12,14 +12,14 @@ exports.getLocDateFromUTC = function(utcDtTm) {
return localDt; return localDt;
}; };
exports.getCoreNameFromCoreId = function(db, coreId) { // This returned undefined, it probably won't work w/out some fancy dependency injection stuff.
db.all('SELECT coreName FROM Cores WHERE coreId = ? LIMIT 1;', coreId, function(err, rows){ //exports.getCoreNameFromCoreId = function(db, coreId) {
if (err !== null) { //db.all('SELECT coreName FROM Cores WHERE coreId = ? LIMIT 1;', coreId, function(err, rows){
console.log(err); //if (err !== null) {
} else { //console.log(err);
return rows.coreName; //} else {
} //return rows.coreName;
} //}
); //}
//);
}; //};

52
server.js
View File

@ -20,7 +20,7 @@ var mailOptions = {
from: 'Alert Monitor <alertmonitorfl@gmail.com>', from: 'Alert Monitor <alertmonitorfl@gmail.com>',
to: 'jody@kaplon.us,don@gettner.com', to: 'jody@kaplon.us,don@gettner.com',
subject: 'Alert received', subject: 'Alert received',
text: 'test alert' // Get custom text in here with device info. text: 'test alert' // Get custom text later on email generation.
}; };
@ -98,17 +98,17 @@ app.get('/core/edit/:id', function(req, res){
console.log("GET /core/edit/" + coreId + ", " + JSON.stringify(d, 4)); console.log("GET /core/edit/" + coreId + ", " + JSON.stringify(d, 4));
db.all("select coreName, locationDesc from Cores where coreId = ?;", coreId, function(err, rows){ db.all("select coreName, locationDesc from Cores where coreId = ?;", coreId, function(err, rows){
if(err !== null) { if(err !== null) {
console.log(err); console.log(err);
} else { } else {
res.render('core-edit', {values: rows}, function(err, html) { res.render('core-edit', {values: rows}, function(err, html) {
if(err !== null) { if(err !== null) {
console.log(err); console.log(err);
} else { } else {
res.send(html); res.send(html);
} }
}); });
} }
}); });
}); });
@ -178,6 +178,9 @@ app.get('/core/:id', function(req, res){
rows.forEach(function(row){ rows.forEach(function(row){
row.pubDate = alertmonUtils.getLocDateFromUTC(row.published_at); row.pubDate = alertmonUtils.getLocDateFromUTC(row.published_at);
row.pubTime = alertmonUtils.getLocTimeFromUTC(row.published_at); row.pubTime = alertmonUtils.getLocTimeFromUTC(row.published_at);
if(row.status.toLowerCase().indexOf('alert') > -1){
row.isAlert = 1;
}
}); });
res.render('core', {alerts: rows}, function(err, html) { res.render('core', {alerts: rows}, function(err, html) {
@ -197,7 +200,7 @@ app.post('/', function(req, res){
var coreid = JSON.stringify(req.body.coreid, null, 4).slice(1,-1); var coreid = JSON.stringify(req.body.coreid, null, 4).slice(1,-1);
var pubAt = JSON.stringify(req.body.published_at, null, 4).slice(1,-1); var pubAt = JSON.stringify(req.body.published_at, null, 4).slice(1,-1);
var stmt = db.prepare("INSERT INTO Alerts (OrigJSON, coreid, published_at, status) VALUES (?, ?, ?, ?)"); var stmt = db.prepare("INSERT INTO Alerts (OrigJSON, coreid, published_at, status) VALUES (?, ?, ?, ?)");
stmt.run( // Use .slice to get rid of leading and trailing double quotes. stmt.run(
JSON.stringify(req.body, null, 4), JSON.stringify(req.body, null, 4),
coreid, coreid,
pubAt, pubAt,
@ -210,17 +213,24 @@ app.post('/', function(req, res){
mailOptions.text = 'An alert message was received: \n\n'; mailOptions.text = 'An alert message was received: \n\n';
mailOptions.text = mailOptions.text + 'Status message, ' + status + '\n'; mailOptions.text = mailOptions.text + 'Status message, ' + status + '\n';
mailOptions.text = mailOptions.text + 'Published at, ' + alertmonUtils.getLocDateFromUTC(pubAt) + ' ' + alertmonUtils.getLocTimeFromUTC(pubAt) + '\n'; mailOptions.text = mailOptions.text + 'Published at, ' + alertmonUtils.getLocDateFromUTC(pubAt) + ' ' + alertmonUtils.getLocTimeFromUTC(pubAt) + '\n';
mailOptions.text = mailOptions.text + 'From device, ' + alertmonUtils.getCoreNameFromCoreId(db, coreid) + '\n'; //mailOptions.text = mailOptions.text + 'From device, ' + alertmonUtils.getCoreNameFromCoreId(db, coreid) + '\n';
var nameQry = 'SELECT coreName FROM Cores WHERE coreId = ?;'
transporter.sendMail(mailOptions, function(error, info){ db.get(nameQry, coreid, function(err, row){
if(error){ if ((err) || (typeof row == undefined)) {
console.log(error); // Don't care about this error or empty result set, still need to send email.
}else{ row.coreName = '# No Name #';
console.log('Message sent: ' + info.response);
} }
mailOptions.text = mailOptions.text + 'From device, ' + row.coreName + '\n';
transporter.sendMail(mailOptions, function(error, info){
if(error){
console.log(error);
}else{
console.log('Message sent: ' + info.response);
}
});
}); });
} }
//res.send(JSON.stringify(req.body, null, 4)); //res.send(JSON.stringify(req.body, null, 4));
}); });

2
views/core.hbs
View File

@ -23,7 +23,7 @@
</thead> </thead>
<tbody> <tbody>
{{#each alerts}} {{#each alerts}}
<tr> <tr class=\"{{this.isAlert}}\">
<td>{{this.pubDate}}</td> <td>{{this.pubDate}}</td>
<td>{{this.pubTime}}</td> <td>{{this.pubTime}}</td>
<td>{{this.status}}</td> <td>{{this.status}}</td>