diff --git a/static/script.js b/static/script.js
index 510debb..28351f1 100644
--- a/static/script.js
+++ b/static/script.js
@@ -33,22 +33,26 @@ function save() {
$(document).ready(function() {
jQuery.ajaxSetup({ cache: false });
$.getJSON('http://127.0.0.1:5000/gethistory', function(data) {
- eventHistory = data;
+ eventHistory = data.reverse();
- for (var i = 0; i < data.length; i++) {
- var dateString = (new Date(data[i].time*1000)).toLocaleString();
- var newElement = '
\
+ var newHistory = '
';
+ for (var i = 0; i < eventHistory.length; i++) {
+ var dateString = (new Date(eventHistory[i].time*1000)).toLocaleString();
+ var newElement = '
\
' + dateString + '
\
';
- if (data[i].name == "")
- newElement += '' + data[i].cardID + '';
+ if (eventHistory[i].name == "")
+ newElement += '' + eventHistory[i].cardID + '';
else
- newElement += data[i].name;
+ newElement += eventHistory[i].name;
newElement += '
\
';
- var toInsert = $(newElement);
- $('.search-bar').after(toInsert);
+ newHistory += newElement;
}
+ newHistory += '
';
+ var toInsert = $(newHistory);
+ $('.search-bar').after(toInsert);
+
});
$('.recent').on('click', '.event', function() {
var cardID = $(this).attr('card-id');
@@ -72,8 +76,23 @@ $(document).ready(function() {
overlay_in();
});
$('.search-bar').on('keyup', function() {
- if (eventHistory[1].name.match($('.search-bar').val())) {
- alert('match');
+ var newHistory = '
';
+ for (var i = 0; i < eventHistory.length; i++) {
+ if (eventHistory[i].name.match($('.search-bar').val())) {
+ var dateString = (new Date(eventHistory[i].time*1000)).toLocaleString();
+ var newElement = '
\
+
' + dateString + '
\
+
';
+ if (eventHistory[i].name == "")
+ newElement += '' + eventHistory[i].cardID + '';
+ else
+ newElement += eventHistory[i].name;
+ newElement += '
\
+
';
+ newHistory += newElement;
+ }
}
+ newHistory += '
';
+ $('.event-wrapper').replaceWith(newHistory);
});
})
\ No newline at end of file
diff --git a/templates/status.html b/templates/status.html
index 7214f5b..990f3ee 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -20,9 +20,7 @@