diff --git a/rpg-docs/Model/Meta/Reports.js b/rpg-docs/Model/Meta/Reports.js index 14505dce..ac0679e3 100644 --- a/rpg-docs/Model/Meta/Reports.js +++ b/rpg-docs/Model/Meta/Reports.js @@ -45,12 +45,25 @@ Meteor.methods({ metaData: Object, }); report.owner = this.userId; - Reports.insert(report); + var id = Reports.insert(report); + var user = Meteor.users.findOne(this.userId); + var sender = user && + user.emails && + user.emails[0] && + user.emails[0].address || + user.services && + user.services.google && + user.services.google.email || + "reports@dicecloud.com"; + var bodyText = "Report ID: " + id + + "\nSeverity: " + report.severity + + "\nType: " + report.type + + "\n\n" + report.description; Email.send({ - from: "reports@dicecloud.com", + from: sender, to: "stefan.zermatten@gmail.com", subject: "DiceCloud feedback - " + report.title, - text: JSON.stringify(_.omit(report, "metaData"), null, '\t'), + text: bodyText, }); }, deleteReport: function(id) { diff --git a/rpg-docs/client/globalHelpers/valueString.js b/rpg-docs/client/globalHelpers/valueString.js index c0060d2f..9321a37e 100644 --- a/rpg-docs/client/globalHelpers/valueString.js +++ b/rpg-docs/client/globalHelpers/valueString.js @@ -1,25 +1,27 @@ Template.registerHelper("valueString", function(value) { + var intValue = Math.round(value * 100); + var cp = intValue % 10; + intValue -= cp; + cp = Math.round(cp); + sp = intValue % 100; + intValue -= sp; + sp = Math.round(sp / 10) + gp = Math.floor(value); + var resultArray = []; - //sp - var gp = Math.floor(value); if (gp > 0) { resultArray.push(gp + "gp"); } - //sp - var sp = Math.floor(10 * (value % 1)); if (sp > 0) { resultArray.push(sp + "sp"); } - //cp - var cp = 10 * ((value * 10) % 1); - cp = Math.round(cp * 1000) / 1000; if (cp > 0) { resultArray.push(cp + "cp"); } //build string with correct spacing var result = ""; - for (var i = 0; i < resultArray.length; i++) { + for (var i = 0, l = resultArray.length; i < l; i++) { //add a space between values if (i !== 0) { result += " "; diff --git a/rpg-docs/private/changeLogs/changeLogs.js b/rpg-docs/private/changeLogs/changeLogs.js index b68d652e..c57f03f1 100644 --- a/rpg-docs/private/changeLogs/changeLogs.js +++ b/rpg-docs/private/changeLogs/changeLogs.js @@ -135,7 +135,7 @@ ChangeLogs.insert({ }); ChangeLogs.insert({ - version: "0.5.2", + version: "0.5.3", changes: [ "Prevented a harmless error caused by effects which have no stat set", "Added the ability to hide the spells tab", @@ -144,3 +144,17 @@ ChangeLogs.insert({ "Overhauled how effects' stats are chosen", ], }); + +ChangeLogs.insert({ + version: "0.5.4", + changes: [ + "Fixed rounding error on net worth calculation", + ], +}); + +ChangeLogs.insert({ + version: "0.5.5", + changes: [ + "Fixed reports from google users not correctly storing the reply-to email address", + ], +});