diff --git a/lib/adf_web.py b/lib/adf_web.py
index 339535b8d..e39981f8f 100644
--- a/lib/adf_web.py
+++ b/lib/adf_web.py
@@ -607,6 +607,15 @@ def jinja_enumerate(arg):
"table_html": table_html,
"multi_head": False}
rend_kwarg_dict["plot_types"] = multi_plot_type_html
+
+ if web_data.name == case1:
+ rend_kwarg_dict["disp_table_name"] = case1
+ rend_kwarg_dict["disp_table_html"] = table_html
+
+ if web_data.name == "Case Comparison":
+ rend_kwarg_dict["disp_table_name"] = "Case Comparison"
+ rend_kwarg_dict["disp_table_html"] = table_html
+
table_tmpl = jinenv.get_template('template_table.html')
table_rndr = table_tmpl.render(rend_kwarg_dict)
@@ -620,10 +629,8 @@ def jinja_enumerate(arg):
#Construct mean_table.html
mean_table_tmpl = jinenv.get_template('template_mean_tables.html')
- #Reuse the rend_kwarg_dict, but ignore certain keys
- #since all others are the same
- new_dict = {k: rend_kwarg_dict[k] for k in rend_kwarg_dict.keys() - {'table_name', 'table_html'}}
- mean_table_rndr = mean_table_tmpl.render(new_dict)
+ #Reuse the rend_kwarg_dict
+ mean_table_rndr = mean_table_tmpl.render(rend_kwarg_dict)
#Write mean diagnostic tables HTML file:
with open(mean_table_file, 'w', encoding='utf-8') as ofil:
ofil.write(mean_table_rndr)
@@ -714,7 +721,7 @@ def jinja_enumerate(arg):
index_title = "AMP Diagnostics Prototype"
index_tmpl = jinenv.get_template('template_index.html')
index_rndr = index_tmpl.render(title=index_title,
- case_name=case1,
+ case_name=web_data.case,
base_name=data_name,
case_yrs=case_yrs,
baseline_yrs=baseline_yrs,
diff --git a/lib/website_templates/template_mean_tables.html b/lib/website_templates/template_mean_tables.html
index debaae534..877d96e26 100644
--- a/lib/website_templates/template_mean_tables.html
+++ b/lib/website_templates/template_mean_tables.html
@@ -42,13 +42,17 @@
AMWG Tables
-
- {% for case_name, html_file in amwg_tables.items() %}
-
- {{ case_name }} |
-
- {% endfor %}
-
+
+ {% for case_name, html_file in amwg_tables.items() %}
+
+ {{ case_name }} |
+
+ {% endfor %}
+
+
+
+
{{ disp_table_name }}
+ {{ disp_table_html }}