Skip to content

Commit 5b95566

Browse files
tien-tongtien-tong
committed
edit nichart study page
1 parent 849316e commit 5b95566

6 files changed

Lines changed: 304 additions & 121 deletions

File tree

‎_data/nichart_data_overview.csv‎

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

‎_includes/datasets/nichart_study_page.html‎

Lines changed: 87 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,46 @@
122122
{% assign age_range_has_semicolon = true %}
123123
{% endif %}
124124

125+
{% assign n_subject = row["N_subject"] | default: page.sample_size %}
126+
{% assign n_mr_session = row["N_MR_session"] | default: page.number_of_sessions %}
127+
{% assign n_subject_has_semicolon = false %}
128+
{% if n_subject and n_subject != "" and n_subject contains ";" %}
129+
{% assign n_subject_has_semicolon = true %}
130+
{% endif %}
131+
{% assign n_mr_session_has_semicolon = false %}
132+
{% if n_mr_session and n_mr_session != "" and n_mr_session contains ";" %}
133+
{% assign n_mr_session_has_semicolon = true %}
134+
{% endif %}
135+
{% assign age_show_complete_note = false %}
136+
{% if n_subject_has_semicolon == false and n_mr_session_has_semicolon == false and n_subject != "" and n_mr_session != "" %}
137+
{% assign n_subject_num = n_subject | plus: 0 %}
138+
{% assign n_mr_session_num = n_mr_session | plus: 0 %}
139+
{% if n_subject_num < n_mr_session_num %}
140+
{% assign age_show_complete_note = true %}
141+
{% endif %}
142+
{% endif %}
143+
125144
{% if age_mean_sd and age_mean_sd != "" %}
126145
<tr>
127-
<th style="font-weight:bold; width:250px;">Age (mean ± SD)</th>
146+
<th style="font-weight:bold; width:250px;">Age (mean ± SD)
147+
{% if age_show_complete_note %}
148+
<br>
149+
<span style="font-weight:normal;">(Baseline)</span>
150+
{% endif %}
151+
</th>
128152
<th style="font-weight:normal">{{ age_mean_sd }}</th>
129153
<th style="font-weight:normal"></th>
130154
</tr>
131155
{% endif %}
132156

133157
{% if age_range and age_range != "" and age_range_has_semicolon == false %}
134158
<tr>
135-
<th style="font-weight:bold; width:250px;">Age Range</th>
159+
<th style="font-weight:bold; width:250px;">Age Range
160+
{% if age_show_complete_note %}
161+
<br>
162+
<span style="font-weight:normal;">(Baseline)</span>
163+
{% endif %}
164+
</th>
136165
<th style="font-weight:normal">{{ age_range }}</th>
137166
<th style="font-weight:normal"></th>
138167
</tr>
@@ -147,8 +176,6 @@
147176
{% endif %}
148177

149178
{% comment %}=== Standard rendering for all datasets (single-row values) ==={% endcomment %}
150-
{% assign n_subject = row["N_subject"] | default: page.sample_size %}
151-
{% assign n_mr_session = row["N_MR_session"] | default: page.number_of_sessions %}
152179
{% assign cubic_path = row["CUBIC"] | default: page.cubic_path %}
153180

154181
{% if cubic_path and cubic_path != "" %}
@@ -165,15 +192,6 @@
165192
<th style="font-weight:normal"></th>
166193
</tr>
167194

168-
{% assign n_subject_has_semicolon = false %}
169-
{% if n_subject and n_subject != "" and n_subject contains ";" %}
170-
{% assign n_subject_has_semicolon = true %}
171-
{% endif %}
172-
{% assign n_mr_session_has_semicolon = false %}
173-
{% if n_mr_session and n_mr_session != "" and n_mr_session contains ";" %}
174-
{% assign n_mr_session_has_semicolon = true %}
175-
{% endif %}
176-
177195
{% if n_subject and n_subject != "" and n_subject_has_semicolon == false %}
178196
<tr>
179197
<th style="font-weight:bold; width:250px;">N Subjects</th>
@@ -292,6 +310,8 @@
292310
{% assign xcpd_version = row["XCP-D_version"] %}
293311
{% assign xcpd_complete = row["XCP-D_N_ses_completed"] %}
294312
{% assign xcpd_command = row["XCP-D_command"] %}
313+
{% assign t1_n_ses = row["T1_N_ses"] %}
314+
{% assign fl_n_ses = row["FL_N_ses"] %}
295315
{% assign nonimaging_raw = row["nonimaging_raw"] %}
296316
{% assign nonimaging_data_dictionary = row["Data_Dictionary"] %}
297317
{% assign nonimaging_consolidated_v2 = "/cbica/projects/ISTAGING/Pipelines/ISTAGING_Data_Consolidation_2020/v2.0/istaging.csv" %}
@@ -374,15 +394,54 @@
374394
{% endif %}
375395
{% endfor %}
376396
{% endif %}
397+
398+
{% assign section_t1_n_ses = t1_n_ses %}
399+
{% if t1_n_ses and t1_n_ses contains "=" %}
400+
{% assign section_t1_n_ses = "" %}
401+
{% assign t1_n_ses_parts = t1_n_ses | split: ";" %}
402+
{% for part in t1_n_ses_parts %}
403+
{% assign part_stripped = part | strip %}
404+
{% if part_stripped contains key_prefix %}
405+
{% assign section_t1_n_ses = part_stripped | replace_first: key_prefix, "" | strip %}
406+
{% endif %}
407+
{% endfor %}
408+
{% endif %}
409+
410+
{% assign section_fl_n_ses = fl_n_ses %}
411+
{% if fl_n_ses and fl_n_ses contains "=" %}
412+
{% assign section_fl_n_ses = "" %}
413+
{% assign fl_n_ses_parts = fl_n_ses | split: ";" %}
414+
{% for part in fl_n_ses_parts %}
415+
{% assign part_stripped = part | strip %}
416+
{% if part_stripped contains key_prefix %}
417+
{% assign section_fl_n_ses = part_stripped | replace_first: key_prefix, "" | strip %}
418+
{% endif %}
419+
{% endfor %}
420+
{% endif %}
377421
{% else %}
378422
{% assign section_age_range = age_range %}
379423
{% assign section_n_subject = n_subject %}
380424
{% assign section_n_mr_session = n_mr_session %}
425+
{% assign section_t1_n_ses = t1_n_ses %}
426+
{% assign section_fl_n_ses = fl_n_ses %}
381427
{% endif %}
382428

429+
{% assign section_age_show_complete_note = false %}
430+
{% if section_n_subject != "" and section_n_mr_session != "" %}
431+
{% assign section_n_subject_num = section_n_subject | plus: 0 %}
432+
{% assign section_n_mr_session_num = section_n_mr_session | plus: 0 %}
433+
{% if section_n_subject_num < section_n_mr_session_num %}
434+
{% assign section_age_show_complete_note = true %}
435+
{% endif %}
436+
{% endif %}
383437
{% if section_age_range and section_age_range != "" and age_range_has_semicolon %}
384438
<tr>
385-
<th style="font-weight:bold; width:250px;">Age Range</th>
439+
<th style="font-weight:bold; width:250px;">Age Range
440+
{% if section_age_show_complete_note %}
441+
<br>
442+
<span style="font-weight:normal;">(Baseline)</span>
443+
{% endif %}
444+
</th>
386445
<th style="font-weight:normal">{{ section_age_range }}</th>
387446
<th style="font-weight:normal"></th>
388447
</tr>
@@ -672,6 +731,18 @@
672731
{% endif %}
673732
{% endif %}
674733

734+
{% comment %}Denominator for complete note: DLMUSE/RAVENS use T1_N_ses, DLWMLS uses FL_N_ses, others use N_MR_session{% endcomment %}
735+
{% assign p_n_ses = section_n_mr_session %}
736+
{% if p_key == "DLMUSE" or p_key == "RAVENS" %}
737+
{% if section_t1_n_ses and section_t1_n_ses != "" %}
738+
{% assign p_n_ses = section_t1_n_ses %}
739+
{% endif %}
740+
{% elsif p_key == "DLWMLS" %}
741+
{% if section_fl_n_ses and section_fl_n_ses != "" %}
742+
{% assign p_n_ses = section_fl_n_ses %}
743+
{% endif %}
744+
{% endif %}
745+
675746
<tr>
676747
<th style="font-weight:bold; width:250px;">
677748
{% if p_key == "DLMUSE" %}
@@ -684,9 +755,9 @@
684755
{% if p_version and p_version != "" %}
685756
<span style="font-weight:normal;">({{ p_version }})</span>
686757
{% endif %}
687-
{% if p_complete and p_complete != "" and section_n_mr_session and section_n_mr_session != "" %}
758+
{% if p_complete and p_complete != "" and p_n_ses and p_n_ses != "" %}
688759
<br>
689-
<span style="font-weight:normal;">({{ p_complete }}/{{ section_n_mr_session }} complete)</span>
760+
<span style="font-weight:normal;">({{ p_complete }}/{{ p_n_ses }} complete)</span>
690761
{% endif %}
691762
</th>
692763
<th style="font-weight:normal">

‎_site/docs/datasets/ACCORD/index.html‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,36 @@ <h3 id="about-the-dataset">About the dataset</h3>
318318

319319

320320

321+
322+
323+
324+
325+
326+
327+
328+
329+
321330
<tr>
322-
<th style="font-weight:bold; width:250px;">Age (mean ± SD)</th>
331+
<th style="font-weight:bold; width:250px;">Age (mean ± SD)
332+
333+
<br />
334+
<span style="font-weight:normal;">(Baseline)</span>
335+
336+
</th>
323337
<th style="font-weight:normal">62.9 ± 5.8</th>
324338
<th style="font-weight:normal"></th>
325339
</tr>
326340

327341

328342

329343
<tr>
330-
<th style="font-weight:bold; width:250px;">Age Range</th>
331-
<th style="font-weight:normal">40-79</th>
344+
<th style="font-weight:bold; width:250px;">Age Range
345+
346+
<br />
347+
<span style="font-weight:normal;">(Baseline)</span>
348+
349+
</th>
350+
<th style="font-weight:normal">54.7-79.3</th>
332351
<th style="font-weight:normal"></th>
333352
</tr>
334353

@@ -343,8 +362,6 @@ <h3 id="about-the-dataset">About the dataset</h3>
343362

344363

345364

346-
347-
348365

349366

350367
<tr>
@@ -361,11 +378,6 @@ <h3 id="about-the-dataset">About the dataset</h3>
361378
</tr>
362379

363380

364-
365-
366-
367-
368-
369381
<tr>
370382
<th style="font-weight:bold; width:250px;">N Subjects</th>
371383
<th style="font-weight:normal">629</th>
@@ -653,6 +665,8 @@ <h3 id="about-the-dataset">About the dataset</h3>
653665

654666

655667

668+
669+
656670

657671

658672

@@ -668,6 +682,8 @@ <h3 id="about-the-dataset">About the dataset</h3>
668682

669683

670684

685+
686+
671687

672688

673689

@@ -687,6 +703,10 @@ <h3 id="about-the-dataset">About the dataset</h3>
687703

688704

689705

706+
707+
708+
709+
690710

691711

692712

@@ -724,6 +744,10 @@ <h3 id="about-the-dataset">About the dataset</h3>
724744

725745

726746

747+
748+
749+
750+
727751
<tr>
728752
<th style="font-weight:bold; width:250px;">
729753

@@ -757,6 +781,10 @@ <h3 id="about-the-dataset">About the dataset</h3>
757781

758782

759783

784+
785+
786+
787+
760788
<tr>
761789
<th style="font-weight:bold; width:250px;">
762790

@@ -767,7 +795,7 @@ <h3 id="about-the-dataset">About the dataset</h3>
767795

768796

769797
<br />
770-
<span style="font-weight:normal;">(1308/1414 complete)</span>
798+
<span style="font-weight:normal;">(1308/1389 complete)</span>
771799

772800
</th>
773801
<th style="font-weight:normal">
@@ -831,7 +859,7 @@ <h3 id="about-the-dataset">About the dataset</h3>
831859
<span class="copy-text"><code>/cbica/projects/ISTAGING/Pipelines/ISTAGING_Data_Consolidation_2020/v2.0/istaging.csv</code></span>
832860
<button class="copy-button" onclick="copyToClipboard('accord-default-nonimg-v2-path')">Copy</button>
833861
</div>
834-
<p style="margin-top: 12px; margin-bottom: 8px; font-size: 14px; color: #444;">Data consolidated and harmonized 2020.</p>
862+
<p style="margin-top: 12px; margin-bottom: 8px; font-size: 14px; color: #444;">Data consolidated and harmonized in 2020.</p>
835863

836864
<p style="margin-top: 0; margin-bottom: 4px; font-size: 14px; color: #444;"><strong>This study:</strong> subset with <code>df[df.Study == 'ACCORD']</code></p>
837865

0 commit comments

Comments
 (0)