From 922fe528e92f55ba620203a54e8253f5a363e311 Mon Sep 17 00:00:00 2001 From: Davide Bongiovanni Date: Wed, 2 Nov 2016 10:40:27 +0100 Subject: [PATCH] Added search by date (Smort search) --- history.json | 2 +- static/script.js | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/history.json b/history.json index ab53fea..6ea6aae 100644 --- a/history.json +++ b/history.json @@ -1 +1 @@ -[{"cardID": "2924385363", "name": "Davide Bon", "time": 1475424208.055737}, {"time": 1475424209.151567, "name": "", "cardID": "0861643457"}, {"cardID": "2924385363", "name": "Davide Bon", "time": 1475424209.758858}, {"time": 1475424211.022202, "name": "Davide Bon", "cardID": "2924385363"}, {"cardID": "0861643457", "name": "", "time": 1475424212.244935}, {"time": 1475424213.343284, "name": "", "cardID": "0861643457"}] \ No newline at end of file +[{"cardID": "2924385363", "name": "Davide Bon", "time": 1475424208.055737}, {"time": 1475424209.151567, "name": "", "cardID": "0861643457"}, {"cardID": "2924385363", "name": "Davide Bon", "time": 1475424209.758858}, {"time": 1475424211.022202, "name": "Davide Bon", "cardID": "2924385363"}, {"cardID": "0861643457", "name": "", "time": 1475424212.244935}, {"time": 1475424213.343284, "name": "", "cardID": "0861643457"}, {"time": 1478078555.343284, "name": "", "cardID": "0861643457"}] \ No newline at end of file diff --git a/static/script.js b/static/script.js index 28351f1..f759153 100644 --- a/static/script.js +++ b/static/script.js @@ -78,8 +78,24 @@ $(document).ready(function() { $('.search-bar').on('keyup', function() { 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 eventDate = new Date(eventHistory[i].time*1000); + var mdy = $('.search-bar').val().split('/'); + var dateMatch = false; + switch(mdy.length) { + case 1: + dateMatch = parseInt(mdy[0])==(eventDate.getMonth()+1); + break; + case 2: + dateMatch = (parseInt(mdy[0])==(eventDate.getMonth()+1)) && (parseInt(mdy[1])==eventDate.getDate()); + break; + case 3: + dateMatch = (parseInt(mdy[0])==(eventDate.getMonth()+1)) && (parseInt(mdy[1])==eventDate.getDate()) && (parseInt(mdy[2])==eventDate.getFullYear()); + break; + default: + break; + } + if (eventHistory[i].name.match($('.search-bar').val()) || dateMatch) { + var dateString = eventDate.toLocaleString(); var newElement = '
\
' + dateString + '
\
';