Skip to content

implemented caching #22 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onlyphantom merged 1 commit into from
Apr 18, 2019
Merged

implemented caching #22 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def accum_global():


@app.route('/data/accum_global_line')
@cache.cached(timeout=86400, key_prefix='gt_line')
@cache.cached(timeout=86400, key_prefix='accum_g_l')
def accum_global_line():
dat = df.copy()
dat = dat[['workshop_start', 'class_size']].sort_values(by='workshop_start')
Expand Down Expand Up @@ -125,7 +125,7 @@ def accum_global_line():
return chart.to_json()

@app.route('/data/punchcode')
@cache.cached(timeout=86400, key_prefix='gt_line')
@cache.cached(timeout=86400, key_prefix='pc')
def punchcode():
dat = df.copy()
dat['mnth_yr'] = dat['workshop_start'].dt.to_period('M').astype(str)
Expand All @@ -146,7 +146,7 @@ def punchcode():
return chart.to_json()

@app.route('/data/category_bars')
@cache.cached(timeout=86400, key_prefix='gt_line')
@cache.cached(timeout=86400, key_prefix='c_b')
def category_bars():
chart = alt.Chart(df).mark_bar(color='#bbc6cbe6').encode(
x=alt.X('sum(workshop_hours):Q', title='Accumulated Hours'),
Expand Down Expand Up @@ -220,6 +220,7 @@ def person_class_bar():
return chart.to_json()

@app.route('/data/person_vs_area')
@cache.cached(timeout=86400, key_prefix='p_v_a')
def person_vs_area():
dat_ori = getuserdb()
dat = dat_ori.loc[dat_ori.this_user == True,:].copy()
Expand All @@ -237,13 +238,13 @@ def person_vs_area():
chart = alt.Chart(dat).mark_area().encode(
column='workshop_category',
x=alt.X("workshop_start"),
y=alt.Y("cumsum:Q"),
y=alt.Y("value:Q"),
color=alt.Color("variable",
scale=alt.Scale(
range=['#7dbbd2cc', '#bbc6cbe6']),
legend=None
),
tooltip=['variable', 'cumsum:Q']
tooltip=['variable', 'value:Q']
).properties(
width=250
).configure_axis(
Expand Down
2 changes: 1 addition & 1 deletion app/templates/accomplishment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ <h4><i class="material-icons md-light">rate_review</i> Most Recent Reviews</h4>
}
parse("/data/person_contrib_area", "#vis_accomp_1")
parse("/data/person_class_bar", "#vis_accomp_2")
parse("/data/accum_personal", "#vis_accomp_3")
parse("/data/person_vs_area", "#vis_accomp_3")
</script>
<!-- {% endcache %} -->
{% endblock %}