Skip to content

Commit e08651b

Browse files
committed
add tag filter and edit dx table
1 parent 43376ef commit e08651b

8 files changed

Lines changed: 838 additions & 173 deletions

File tree

_data/nichart_data_overview.csv

Lines changed: 65 additions & 61 deletions
Large diffs are not rendered by default.

_includes/datasets/nichart_study_page.html

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,95 @@
256256
{% assign only_nan = true %}
257257
{% endif %}
258258
{% endif %}
259-
{% unless only_nan %}
259+
{% assign dx_visit_format = false %}
260+
{% if dx_val contains " | " and dx_val contains "[" %}
261+
{% assign dx_visit_format = true %}
262+
{% endif %}
263+
{% assign dx_visit_only_nan = false %}
264+
{% if dx_visit_format %}
265+
{% comment %}Parse visit format to compute dx_visit_only_nan and arrays for table{% endcomment %}
266+
{% assign dx_blocks = dx_val | split: " | " %}
267+
{% assign dx_visits_delim = "|" %}
268+
{% assign dx_values_delim = "|" %}
269+
{% assign dx_lookup = "" %}
270+
{% for dx_b in dx_blocks %}
271+
{% assign dx_block_trimmed = dx_b | strip %}
272+
{% if dx_block_trimmed != "" and dx_block_trimmed contains " [" %}
273+
{% assign dx_b_parts = dx_block_trimmed | split: " [" %}
274+
{% assign dx_visit = dx_b_parts[0] | strip %}
275+
{% assign dx_content = dx_b_parts[1] | remove: "]" | strip %}
276+
{% assign dx_check_visit = "|" | append: dx_visit | append: "|" %}
277+
{% unless dx_visits_delim contains dx_check_visit %}
278+
{% assign dx_visits_delim = dx_visits_delim | append: dx_visit | append: "|" %}
279+
{% endunless %}
280+
{% assign dx_pairs = dx_content | split: "," %}
281+
{% for dx_pair in dx_pairs %}
282+
{% assign dx_pair_trimmed = dx_pair | strip %}
283+
{% if dx_pair_trimmed != "" %}
284+
{% assign dx_vn = dx_pair_trimmed | split: ":" %}
285+
{% assign dx_v = dx_vn[0] | strip %}
286+
{% assign dx_n = dx_vn[1] | strip %}
287+
{% assign dx_check_val = "|" | append: dx_v | append: "|" %}
288+
{% unless dx_values_delim contains dx_check_val %}
289+
{% assign dx_values_delim = dx_values_delim | append: dx_v | append: "|" %}
290+
{% endunless %}
291+
{% assign dx_lookup = dx_lookup | append: dx_visit | append: "_" | append: dx_v | append: ":" | append: dx_n | append: "," %}
292+
{% endif %}
293+
{% endfor %}
294+
{% endif %}
295+
{% endfor %}
296+
{% assign dx_visits_arr = dx_visits_delim | split: "|" %}
297+
{% assign dx_values_arr = dx_values_delim | split: "|" %}
298+
{% assign dx_visit_only_nan = true %}
299+
{% for dx_vv in dx_values_arr %}
300+
{% if dx_vv != "" %}
301+
{% assign dx_vv_lower = dx_vv | downcase %}
302+
{% if dx_vv_lower != "nan" %}
303+
{% assign dx_visit_only_nan = false %}
304+
{% endif %}
305+
{% endif %}
306+
{% endfor %}
307+
{% endif %}
308+
{% unless only_nan or dx_visit_only_nan %}
260309
{% assign dx_label = dx_col | replace: "DX_", "" | replace: "_", " " %}
261310
<div style="margin: 0;">
262311
<div style="text-align: left; font-weight: bold; padding: 4px 0 8px 0;">{{ dx_label }}</div>
263312
<table style="margin: 0; border-collapse: collapse; border: 1px solid #ddd;">
313+
{% if dx_visit_format %}
314+
<thead>
315+
<tr style="background: #f5f5f5;">
316+
<th style="border: 1px solid #ddd; padding: 6px 10px; text-align: left;">Value</th>
317+
{% for dx_visit in dx_visits_arr %}
318+
{% if dx_visit != "" %}
319+
<th style="border: 1px solid #ddd; padding: 6px 10px; text-align: right;">{{ dx_visit }}</th>
320+
{% endif %}
321+
{% endfor %}
322+
</tr>
323+
</thead>
324+
<tbody>
325+
{% for dx_val_row in dx_values_arr %}
326+
{% if dx_val_row != "" %}
327+
<tr>
328+
<td style="border: 1px solid #ddd; padding: 6px 10px;">{{ dx_val_row }}</td>
329+
{% for dx_visit in dx_visits_arr %}
330+
{% if dx_visit != "" %}
331+
{% assign dx_cell_key = dx_visit | append: "_" | append: dx_val_row | append: ":" %}
332+
{% assign dx_lookup_entries = dx_lookup | split: "," %}
333+
{% assign dx_cell_n = "" %}
334+
{% for dx_entry in dx_lookup_entries %}
335+
{% if dx_entry contains dx_cell_key %}
336+
{% assign dx_cell_n = dx_entry | replace: dx_cell_key, "" %}
337+
{% endif %}
338+
{% endfor %}
339+
<td style="border: 1px solid #ddd; padding: 6px 10px; text-align: right;">{{ dx_cell_n }}</td>
340+
{% endif %}
341+
{% endfor %}
342+
</tr>
343+
{% endif %}
344+
{% endfor %}
345+
</tbody>
346+
{% else %}
347+
{% comment %}Legacy: single Value / N table{% endcomment %}
264348
<thead>
265349
<tr style="background: #f5f5f5;">
266350
<th style="border: 1px solid #ddd; padding: 6px 10px; text-align: left;">Value</th>
@@ -282,6 +366,7 @@
282366
{% endif %}
283367
{% endfor %}
284368
</tbody>
369+
{% endif %}
285370
</table>
286371
</div>
287372
{% endunless %}
@@ -747,6 +832,8 @@
747832
<th style="font-weight:bold; width:250px;">
748833
{% if p_key == "DLMUSE" %}
749834
<a href="https://github.com/CBICA/NiChart_DLMUSE">{{ p_key }}</a>
835+
{% elsif p_key == "RAVENS" %}
836+
<a href="https://doi.org/10.1006/nimg.2001.0937">{{ p_key }}</a>
750837
{% elsif p_key == "DLWMLS" %}
751838
<a href="https://github.com/CBICA/NiChart_DLWMLS">{{ p_key }}</a>
752839
{% else %}

0 commit comments

Comments
 (0)