mirror of
https://github.com/ail-project/ail-framework.git
synced 2024-11-27 00:07:16 +00:00
Added query of the data for the new tracked word
This commit is contained in:
parent
b78effe779
commit
8d41b109e7
2 changed files with 42 additions and 8 deletions
|
@ -218,6 +218,22 @@ def get_top_relevant_data(server, module_name):
|
||||||
# member_set.insert(0, ("passed_days", days))
|
# member_set.insert(0, ("passed_days", days))
|
||||||
# return member_set
|
# return member_set
|
||||||
|
|
||||||
|
|
||||||
|
def Term_getValueOverRange(word, startDate, num_day):
|
||||||
|
passed_days = 0
|
||||||
|
oneDay = 60*60*24
|
||||||
|
to_return = []
|
||||||
|
curr_to_return = 0
|
||||||
|
for timestamp in range(startDate, startDate - max(num_day)*oneDay, -oneDay):
|
||||||
|
value = r_serv_term.hget(timestamp, word)
|
||||||
|
curr_to_return += int(value) if value is not None else 0
|
||||||
|
for i in num_day:
|
||||||
|
if passed_days == i-1:
|
||||||
|
to_return.append(curr_to_return)
|
||||||
|
passed_days += 1
|
||||||
|
return to_return
|
||||||
|
|
||||||
|
|
||||||
# ========= CACHE CONTROL ========
|
# ========= CACHE CONTROL ========
|
||||||
@app.after_request
|
@app.after_request
|
||||||
def add_header(response):
|
def add_header(response):
|
||||||
|
@ -562,17 +578,33 @@ def terms_management():
|
||||||
TrackedTermsSet_Name = "TrackedSetTermSet"
|
TrackedTermsSet_Name = "TrackedSetTermSet"
|
||||||
BlackListTermsSet_Name = "BlackListSetTermSet"
|
BlackListTermsSet_Name = "BlackListSetTermSet"
|
||||||
|
|
||||||
|
today = datetime.datetime.now()
|
||||||
|
today = today.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||||
|
today_timestamp = calendar.timegm(today.timetuple())
|
||||||
|
|
||||||
track_list = []
|
track_list = []
|
||||||
track_list_values = []
|
track_list_values = []
|
||||||
for tracked_term in r_serv_term.smembers(TrackedTermsSet_Name):
|
for tracked_term in r_serv_term.smembers(TrackedTermsSet_Name):
|
||||||
track_list.append(tracked_term)
|
track_list.append(tracked_term)
|
||||||
|
track_list_values.append(Term_getValueOverRange(tracked_term, today_timestamp, [1, 7, 31]))
|
||||||
|
|
||||||
|
|
||||||
black_list = []
|
black_list = []
|
||||||
black_list_values = []
|
|
||||||
for blacked_term in r_serv_term.smembers(BlackListTermsSet_Name):
|
for blacked_term in r_serv_term.smembers(BlackListTermsSet_Name):
|
||||||
black_list.append(blacked_term)
|
black_list.append(blacked_term)
|
||||||
|
|
||||||
return render_template("terms_management.html", black_list=black_list, track_list=track_list)
|
return render_template("terms_management.html", black_list=black_list, track_list=track_list, track_list_values=track_list_values)
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/terms_management_query/")
|
||||||
|
def terms_management_query():
|
||||||
|
term = request.args.get('term')
|
||||||
|
today = datetime.datetime.now()
|
||||||
|
today = today.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||||
|
today_timestamp = calendar.timegm(today.timetuple())
|
||||||
|
|
||||||
|
print Term_getValueOverRange(term, today_timestamp, [1, 7, 31])
|
||||||
|
return jsonify(Term_getValueOverRange(term, today_timestamp, [1, 7, 31]))
|
||||||
|
|
||||||
|
|
||||||
@app.route("/terms_management_action/", methods=['GET'])
|
@app.route("/terms_management_action/", methods=['GET'])
|
||||||
|
|
|
@ -97,9 +97,9 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ term }}</td>
|
<td>{{ term }}</td>
|
||||||
<td>{{ i }}</td>
|
<td>{{ i }}</td>
|
||||||
<td>15</td>
|
<td>{{ track_list_values[i][0] }}</td>
|
||||||
<td>55</td>
|
<td>{{ track_list_values[i][1] }}</td>
|
||||||
<td>459</td>
|
<td>{{ track_list_values[i][2] }}</td>
|
||||||
<td><p style="margin: 0px;">
|
<td><p style="margin: 0px;">
|
||||||
<button class="btn-link" data-toggle="tooltip" data-placement="right" title="Show concerned paste(s)"><span class="glyphicon glyphicon-info-sign"></span></button>
|
<button class="btn-link" data-toggle="tooltip" data-placement="right" title="Show concerned paste(s)"><span class="glyphicon glyphicon-info-sign"></span></button>
|
||||||
<button class="btn-link btn-interaction" data-toggle="tooltip" data-placement="right" title="Remove this term" data-content="{{ term }}" data-section="followTerm" data-action="delete"><span class="glyphicon glyphicon-trash"></span></button>
|
<button class="btn-link btn-interaction" data-toggle="tooltip" data-placement="right" title="Remove this term" data-content="{{ term }}" data-section="followTerm" data-action="delete"><span class="glyphicon glyphicon-trash"></span></button>
|
||||||
|
@ -211,9 +211,11 @@ function perform_operation(){
|
||||||
if(json.section == "followTerm") {
|
if(json.section == "followTerm") {
|
||||||
if(json.action == "add") {
|
if(json.action == "add") {
|
||||||
// query data
|
// query data
|
||||||
var action_button = "<button class=\"btn-link btn-interaction\" data-toggle=\"tooltip\" data-placement=\"right\" title=\"Remove this term\" data-content=\"" + json.term + "\" data-section=\"followTerm\" data-action=\"delete\"><span class=\"glyphicon glyphicon-trash\"></span></button>"
|
$.get("{{ url_for('terms_management_query') }}", { term: json.term }, function(data2, status){
|
||||||
table_track.row.add( [ json.term, 'now', 0, 0, 0, action_button ] ).draw( false );
|
var action_button = "<button class=\"btn-link btn-interaction\" data-toggle=\"tooltip\" data-placement=\"right\" title=\"Remove this term\" data-content=\"" + json.term + "\" data-section=\"followTerm\" data-action=\"delete\"><span class=\"glyphicon glyphicon-trash\"></span></button>"
|
||||||
perform_binding();
|
table_track.row.add( [ json.term, 'now', data2[0], data2[1], data2[2], action_button ] ).draw( false );
|
||||||
|
perform_binding();
|
||||||
|
});
|
||||||
} else if (json.action == "delete") {
|
} else if (json.action == "delete") {
|
||||||
// Find indexes of row which have the term in the first column
|
// Find indexes of row which have the term in the first column
|
||||||
var index = table_track.row().eq( 0 ).filter( function (rowIdx) {
|
var index = table_track.row().eq( 0 ).filter( function (rowIdx) {
|
||||||
|
|
Loading…
Reference in a new issue