diff --git a/lib/eventDb.js b/lib/eventDb.js index f340cf0327..14c9d6fc0e 100644 --- a/lib/eventDb.js +++ b/lib/eventDb.js @@ -1,5 +1,5 @@ var knex = require('./dbPool'); -var EVENT_COLUMNS = ['id', 'type', 'created_by', 'data']; +var EVENT_COLUMNS = ['id', 'type', 'created_by', 'created_at', 'data']; function storeEvent(event) { return knex('events').insert({ @@ -31,6 +31,7 @@ function rowToEvent(row) { id: row.id, type: row.type, createdBy: row.created_by, // jshint ignore:line + createdAt: row.created_at, // jshint ignore:line data: row.data }; } diff --git a/public/js/components/log/LogEntry.jsx b/public/js/components/log/LogEntry.jsx index b60e4d26ca..3c802b3abf 100644 --- a/public/js/components/log/LogEntry.jsx +++ b/public/js/components/log/LogEntry.jsx @@ -6,10 +6,19 @@ var LogEntry = React.createClass({ }, render: function() { + var d = new Date(this.props.event.createdAt); return ( - {this.props.event.data.name} - {this.props.event.type} + + {d.getDate() + "." + d.getMonth() + "." + d.getFullYear()}
+ kl. {d.getHours() + "." + d.getMinutes()} + + + {this.props.event.type} + + + {JSON.stringify(this.props.event.data)} + {this.props.event.createdBy} ); diff --git a/public/js/components/log/LogEntryList.jsx b/public/js/components/log/LogEntryList.jsx index 76c4d464b5..f2bf3a48c2 100644 --- a/public/js/components/log/LogEntryList.jsx +++ b/public/js/components/log/LogEntryList.jsx @@ -15,8 +15,9 @@ var LogEntryList = React.createClass({ - + +
FeatureWhen ActionData Author