Skip to content

[Configuration] Fix: Decouple Visit Window Columns from SupplementalSessionStatus Config #10359

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

Open
arnav-makkar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Configuration] Fix: Decouple Visit Window Columns from SupplementalSessionStatus Config #10359

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
12 changes: 8 additions & 4 deletions modules/instrument_list/templates/menu_instrument_list.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,21 @@
<th>
{dgettext("timepoint_list", "Imaging Scan Done")}
</th>
{if $display.WindowInfo.WindowDefined|default}
<th>
{dgettext("instrument_list", "Within Optimal")}
</th>
<th>
{dgettext("instrument_list", "Within Permitted")}
</th>
{if $SupplementalSessionStatuses|default}
{/if}
{if $SupplementalSessionStatuses|default}
{foreach from=$timePoint.status item=status key=name}
<th>
{$name}
</th>
{/foreach}
{/if}
{/if}
{/if}
</tr>
</thead>
Expand Down Expand Up @@ -122,6 +124,7 @@
<img alt="Data Missing" src="{$baseurl|default}/images/help2.gif" border=0>
{/if}
</td>
{if $display.WindowInfo.WindowDefined|default}
<td>
{if $display.WindowInfo.Optimum|default}
{dgettext("loris", "Yes")}
Expand All @@ -136,13 +139,14 @@
{dgettext("loris", "No")}
{/if}
</td>
{if $SupplementalSessionStatuses|default}
{/if}
{if $SupplementalSessionStatuses|default}
{foreach from=$display.status item=status}
<td>
{$status}
</td>
{/foreach}
{/if}
{/if}
{/if}
</tr>
</tbody>
Expand Down
36 changes: 19 additions & 17 deletions php/libraries/TimePoint.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,25 +211,27 @@ class TimePoint implements \LORIS\StudyEntities\AccessibleResource,
}
$this->_timePointInfo['status'][$row['Name']] = $row['Value'];
}
$this->_timePointInfo['WindowInfo'] = $db->pSelectRow(
"SELECT DATEDIFF(s.Date_visit, c.DoB) as AgeDays,
DATEDIFF(s.Date_visit, c.DoB) BETWEEN
w.OptimumMinDays
AND w.OptimumMaxDays as Optimum,
(DATEDIFF(s.Date_visit, c.DoB) BETWEEN
w.WindowMinDays AND w.WindowMaxDays
) as Permitted
FROM session s
JOIN candidate c ON c.ID=s.CandidateID
JOIN Visit_Windows w ON (
LOWER(w.Visit_label)=LOWER(s.Visit_label)
)
WHERE s.ID=:sessionID",
[":sessionID" => $sessionID]
);

}

$this->_timePointInfo['WindowInfo'] = $db->pSelectRow(
"SELECT (w.WindowMinDays IS NOT NULL
OR w.OptimumMinDays IS NOT NULL)
as WindowDefined,
DATEDIFF(s.Date_visit, c.DoB) as AgeDays,
DATEDIFF(s.Date_visit, c.DoB) BETWEEN
w.OptimumMinDays
AND w.OptimumMaxDays as Optimum,
(DATEDIFF(s.Date_visit, c.DoB) BETWEEN
w.WindowMinDays AND w.WindowMaxDays
) as Permitted
FROM session s
JOIN candidate c ON c.ID=s.CandidateID
JOIN Visit_Windows w ON (
LOWER(w.Visit_label)=LOWER(s.Visit_label)
)
WHERE s.ID=:sessionID",
[":sessionID" => $sessionID]
);
}

/**
Expand Down
4 changes: 4 additions & 0 deletions smarty/templates/instrument_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@
<th>
{dgettext("timepoint_list", "Imaging Scan Done")}
</th>
{if $display.WindowInfo.WindowDefined|default}
<th>
{dgettext("instrument_list", "Within Optimal")}
</th>
<th>
{dgettext("instrument_list", "Within Permitted")}
</th>
{/if}
{if $SupplementalSessionStatuses }
{foreach from=$timePoint.status item=status key=name}
<th>
Expand Down Expand Up @@ -123,6 +125,7 @@
<img alt="Data Missing" src="{$baseurl|default}/images/help2.gif" border=0>
{/if}
</td>
{if $display.WindowInfo.WindowDefined|default}
<td>
{if $display.WindowInfo.Optimum|default}
{dgettext("loris", "Yes")}
Expand All @@ -137,6 +140,7 @@
{dgettext("loris", "No")}
{/if}
</td>
{/if}
{if $SupplementalSessionStatuses|default}
{foreach from=$timePoint.status item=status}
<td>
Expand Down
Loading