From d1bcb2be832cc39a5921a70133a6f55dbcfdffa6 Mon Sep 17 00:00:00 2001 From: jacktjong Date: Thu, 3 Nov 2022 13:25:13 +0100 Subject: [PATCH 1/2] Search/banned/sort fields now functional --- __pycache__/dashboard.cpython-310.pyc | Bin 1576 -> 1543 bytes dashboard_static/index.html | 12 ++++++------ dashboard_static/js/events.js | 17 +++++++++++++++++ eca/__pycache__/arff.cpython-310.pyc | Bin 10610 -> 10577 bytes eca/__pycache__/generators.cpython-310.pyc | Bin 3913 -> 3880 bytes 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index ef5ec2f0cc6e928b529135e87c698e9eebc9de8a..83e62a4fd2b5b9fe8cd714fed56734747144a273 100644 GIT binary patch delta 61 zcmZ3%)6T<}&&$ij00bH{lar0uHu5DhDrh@f#e^2878S>2B_?O5#gvq1mXxFx=@t~_ PXQd{W#BAQcSiu4S{8tkx delta 94 zcmZqYS;51X&&$ij00dgIl9GS3Zsbd3bo9{=Elw>e*3Zw$EK4oQ$V)8IcS$YIF3B&@ w4=pKA%_~XOk4#N0GSv6YPbtkwHPkOD&nziPEz&J0%FjwoF45oI&sf0%0D#^f`v3p{ diff --git a/dashboard_static/index.html b/dashboard_static/index.html index dc526af..560ec85 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -97,16 +97,16 @@
- - + +
Sort By arrow_drop_down
    -
  • Time
    • -
  • Likes
    • -
  • Retweets
    • -
  • Replies
    • +
  • Time
    • +
  • Likes
    • +
  • Retweets
    • +
  • Replies
diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 9000e11..86ca011 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -90,3 +90,20 @@ $(".order-btn").on("click", function() { $(window).trigger("descending") } }) + +function updateSearched(searched){ + searched = searched.split(","); + filters.searchedWords = searched; + $(window).trigger("filter"); +} + +function updateBlocked(blocked){ + blocked = blocked.split(","); + filters.blockedWords = blocked; + $(window).trigger("filter"); +} + +function updateSort(sort){ + filters.sorted = sort; + $(window).trigger("filter"); +} \ No newline at end of file diff --git a/eca/__pycache__/arff.cpython-310.pyc b/eca/__pycache__/arff.cpython-310.pyc index 1516621a59785020207256a2be42150d073cc160..f36aef8354c08050482c53791dd0cd8c9f23675a 100644 GIT binary patch delta 79 zcmewqbTNo8pO=@50SMZ+#wTCa*vQAptfJ*?6%$&VT2vg9m6)8J7E@B5SyGZ(q+3vw gpOue*3Zw$EK4oQ$V)8IcS$YIF3B&@ z4=pKA%_~XOk4#N0GSv6YPbtkwHPkOD&nziPEz&J0%FjwoF40d-PSoFQ%^b_hcx&@a Nj#yzJ^<6rO7XVB;Coup3 diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc index 155bc4d8708199018b99b564bcb0b143f7aecc2c..c47539806d4290f27437256a153bf96a224e4a7a 100644 GIT binary patch delta 64 zcmX>pw?d9LpO=@50SMZ+#wQ=$$h(M1#lYDrCbT%Us5mAoF*!RerldTxq$IUSx1cCL SD>bcT$cwpO=@50SL;sh9~=O Date: Thu, 3 Nov 2022 14:10:01 +0100 Subject: [PATCH 2/2] All ordering implemented (I think) --- dashboard_static/js/code.js | 49 +++++++++++++++++++++++------------ dashboard_static/js/events.js | 11 ++++---- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 680796a..7f5bd86 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -93,26 +93,41 @@ function searchForWords(searchWords, tweets){ return filteredTweets.reverse() } -function sortTweets(tweets, likesDes=null, retweetsDes=null, repliesDes=null, dateDes=null){ - if(likesDes && likesDes!=null){ - tweets.sort(function(a,b){return b.favorite_count-a.favorite_count}) - } else if (!likesDes && likesDes!=null){ - tweets.sort(function(a,b){return a.favorite_count-b.favorite_count}) +function sortTweets(tweets, sort){ + if(typeof sort.sortby == 'undefined'){ + return tweets } - if(retweetsDes && retweetsDes!=null){ - tweets.sort(function(a,b){return b.retweet_count-a.retweet_count}) - } else if (!retweetsDes && retweetsDes!=null){ - tweets.sort(function(a,b){return a.retweet_count-b.retweet_count}) + if(typeof sort.order == 'undefined'){ + sort.order = 'asc' } - if(repliesDes && repliesDes!=null){ - tweets.sort(function(a,b){return b.reply_count-a.reply_count}) - } else if (!repliesDes && repliesDes!=null){ - tweets.sort(function(a,b){return a.reply_count-b.reply_count}) + + if(sort.sortby == "likes"){ + if(sort.order == 'asc'){ + tweets.sort(function(a,b){return b.favorite_count-a.favorite_count}) + } else{ + tweets.sort(function(a,b){return a.favorite_count-b.favorite_count}) + } } - if(dateDes && dateDes!=null){ - tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)}) - } else if (!dateDes && dateDes!=null){ - tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)}) + if(sort.sortby == "retweets"){ + if(sort.order == 'asc'){ + tweets.sort(function(a,b){return b.retweet_count-a.retweet_count}) + } else{ + tweets.sort(function(a,b){return a.retweet_count-b.retweet_count}) + } + } + if(sort.sortby == "replies"){ + if(sort.order == 'asc'){ + tweets.sort(function(a,b){return b.reply_count-a.reply_count}) + } else { + tweets.sort(function(a,b){return a.reply_count-b.reply_count}) + } + } + if (sort.sortby == "date"){ + if(sort.order == 'asc'){ + tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)}) + } else{ + tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)}) + } } return tweets } diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 86ca011..a7dbb29 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -74,21 +74,21 @@ $(window).on("filter", function() { tweets = window.sessionStorage.getItem('tweets'); tweets = JSON.parse(tweets); tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order); - tweets = sortTweets(tweets); + tweets = sortTweets(tweets, [filters.sorted, filters.order]); for (i = 0; i < Math.min(tweets.length, 20); i++){ parent.append(tweetCell(tweets[i])); } }) + $(".order-btn").on("click", function() { if($(this).html() == "arrow_downward") { // Descending to ascending $(this).html("arrow_upward") - // trigger an event called ascending - $(window).trigger("ascending") + filters.order = 'asc' } else { // Ascending to descending $(this).html("arrow_downward") - // trigger an event called descending - $(window).trigger("descending") + filters.order = 'desc' } + $(window).trigger("filter") }) function updateSearched(searched){ @@ -104,6 +104,7 @@ function updateBlocked(blocked){ } function updateSort(sort){ + sortarray = [] filters.sorted = sort; $(window).trigger("filter"); } \ No newline at end of file