Skip to content
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

Jump to bottom

pass data as part of body #7

Merged
merged 1 commit into from
Dec 12, 2023
Merged

pass data as part of body #7

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
22 changes: 12 additions & 10 deletions app/api/v1/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@

@bp.get('/data/random')
def random_data():
data = {'data': np.random.randint(0, 100, 6).tolist(),
'label': f'blah{np.random.randint(0, 10000)}'}
label = f'blah{np.random.randint(0, 10000)}'
data = {'datasets': [{'data': np.random.randint(0, 100, 6).tolist(),
'label': label}]}
if request.headers.get('Hx-Request'):
resp = flask.Response()
resp.headers['HX-Trigger'] = json.dumps(
{'drawChart': {'target': 'chart_id',
'datasets': [data]}})
resp = flask.Response(
'<script id="%s" type="application/json">%s</script>' %
(label, json.dumps(data)))
resp.headers['HX-Trigger-After-Swap'] = json.dumps(
{'drawChart': {'target': 'chartId', 'dataId': label}})
return resp

return data
Expand All @@ -43,10 +45,10 @@ def sales_data():
'data': table['Auto sales'].to_pylist()}],
'labels': pc.strftime(table['Date'], format='%Y-%m-%d').to_pylist()}
if request.headers.get('Hx-Request'):
resp = flask.Response()
resp.headers['HX-Trigger'] = json.dumps(
{'drawChart': {'target': 'line_chart_id',
**data}})
resp = flask.Response(
'<script id="lineChartData" type="application/json">%s</script>' % (json.dumps(data)))
resp.headers['HX-Trigger-After-Swap'] = json.dumps(
{'drawChart': {'target': 'lineChartId', 'dataId': 'lineChartData'}})
return resp
return data

Expand Down
30 changes: 21 additions & 9 deletions app/templates/analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ <h1 class="title">
<hr></hr>
<div class="field">
<input id="switchSalesView" type="checkbox" name="switchSalesView" class="switch"
onchange="toggleView(this, Chart.getChart('line_chart_id'))"
onchange="toggleView(this, Chart.getChart('lineChartId'))"
autocomplete="off">
<label for="switchSalesView">As Percentage</label>
</div>
<canvas hx-get="/api/v1/data/sales" hx-trigger="load" hx-indicator='.htmx-indicator'
id="line_chart_id"></canvas>
<canvas
hx-get="/api/v1/data/sales"
hx-trigger="load"
hx-indicator='.htmx-indicator'
hx-swap="beforeend"
hx-target="body"
id="lineChartId"></canvas>
<span>https://data.bts.gov/Research-and-Statistics/Auto-Sales/7n6a-n5tz</span>
<progress class="progress is-small htmx-indicator" max="100"></progress>
</div>
Expand All @@ -44,12 +49,16 @@ <h1 class="title">
<div class="columns">
<div class="column">
<div class="field">
<button class="button" hx-get="/api/v1/data/random" hx-trigger="click, revealed"
hx-swap="none">populate</button>
<button
class="button"
hx-get="/api/v1/data/random"
hx-trigger="click, revealed"
hx-swap="beforeend"
hx-target="body">populate</button>
</div>
</div>
<div class="column is-10">
<canvas id="chart_id" />
<canvas id="chartId" />
</div>
</div>
</div>
Expand All @@ -68,11 +77,14 @@ <h1 class="title">
// chartjs + htmx with payload in HX-Trigger
document.body.addEventListener("drawChart", function(evt){
const chart = Chart.getChart(evt.detail.target)
addData(chart, evt.detail.datasets, evt.detail.labels);
// https://www.reddit.com/r/htmx/comments/10sdk43/comment/j72m2j7/
data = JSON.parse(document.getElementById(evt.detail.dataId).textContent);
addData(chart, data.datasets, data.labels);
document.getElementById(evt.detail.dataId).remove()
})

new Chart(
document.getElementById("chart_id"),
document.getElementById("chartId"),
{
type: "bar",
options: {
Expand All @@ -89,7 +101,7 @@ <h1 class="title">
);

new Chart(
document.getElementById("line_chart_id"),
document.getElementById("lineChartId"),
{
type: "line",
options: {
Expand Down