Skip to content
Snippets Groups Projects
Commit 31f71764 authored by dw927's avatar dw927
Browse files

Added report detail page. Added link to report detail page from the reports page.

parent 25d647d8
No related branches found
No related tags found
1 merge request!4Dwelsh
...@@ -38,6 +38,11 @@ def reports(): ...@@ -38,6 +38,11 @@ def reports():
reports = requests.get(f'{REPORTS_SERVICE_URL}/dpath/report').json() reports = requests.get(f'{REPORTS_SERVICE_URL}/dpath/report').json()
return render_template('reports.html', reports=reports) return render_template('reports.html', reports=reports)
@app.route(f'/{BASE_URL}/reports/<string:report_id>')
def get_report(report_id):
report = requests.get(f'{REPORTS_SERVICE_URL}/dpath/report/{report_id}').json()
return render_template('reportDetail.html', report=report)
@app.route('/', methods=['GET', "POST"]) @app.route('/', methods=['GET', "POST"])
def upload_image(): def upload_image():
......
{% block content %}
<table class="report-detail-table">
<th class="left">Details</th>
<tr>
<td>Id</td>
<td>{{ report.id }}</td>
</tr>
<tr>
<td>Report Date</td>
<td>{{ report.report.runDate }}</td>
</tr>
<tr>
<td>Report Status</td>
<td>Todo</td>
</tr>
<tr>
<td>Diagnosis</td>
<td>{{ report.report.diagnosis }}</td>
</tr>
<tr>
<td>Mild Chips</td>
<td>{{ report.report.chipPredictions.mild}}</td>
</tr>
<tr>
<td>Severe Chips</td>
<td>{{ report.report.chipPredictions.severe}}</td>
</tr>
{% endblock %}
\ No newline at end of file
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
<th class="right">Run Date</th> <th class="right">Run Date</th>
{% for report in reports %} {% for report in reports %}
<tr> <tr>
<td class="left">{{ report.id }}</td>
<td class="left">
<a href="{{ url_for('get_report', report_id=report.id)}}">{{ report.id }}</a>
</td>
<td class="left">Completed</td> <td class="left">Completed</td>
<td class="right">{{ report.report.runDate }}</td> <td class="right">{{ report.report.runDate }}</td>
</tr> </tr>
......
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Reports</title>
{% include 'includes/stylesload.html' %}
</head>
<body>
{% include 'includes/navbar.html' %}
<div class="container">
{% include 'includes/reportDetail.html' %}
</div>
</body>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment