Skip to content
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

fix: only display service window on HTML report, not start/end date #1855

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix: only display service window on HTML report, not start/end date #1855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fffb56c
only display service window on HTML report, not start/end date
qcdyx Sep 27, 2024
7d81550
avoided repeating condition in Thymeleaf template
qcdyx Sep 30, 2024
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
26 changes: 14 additions & 12 deletions main/src/main/resources/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,19 +265,21 @@ <h4>Feed Info</h4>
<hr />
<dl>
<div th:each="info: ${metadata.feedInfo}">
<dd th:text="${info.key} + ':'" />
<dt>
<span th:if="${info.key.contains('URL') and info.value != 'N/A'}">
<a th:href="${info.value}" target="_blank" th:text="${info.value}" />
</span>
<span th:if="${info.key.contains('URL') and info.value == 'N/A'}" th:text="${info.value}"></span>
<span th:unless="${info.key.contains('URL')}" th:text="${info.value}"/>
<span th:if="${info.key.contains('Service Window')}" >
<a href="#" class="tooltip" onclick="event.preventDefault();"><span>(?)</span>
<span class="tooltiptext" style="transform: translateX(-100%)">The range of service dates covered by the feed, based on trips with an associated service_id in calendar.txt and/or calendar_dates.txt</span>
</a>
<div th:with="isNotServiceWindow=${info.key != 'Service Window Start' and info.key != 'Service Window End'}">
<dd th:if="${isNotServiceWindow}" th:text="${info.key} + ':'" />
<dt th:if="${isNotServiceWindow}">
<span th:if="${info.key.contains('URL') and info.value != 'N/A'}">
<a th:href="${info.value}" target="_blank" th:text="${info.value}" />
</span>
</dt>
<span th:if="${info.key.contains('URL') and info.value == 'N/A'}" th:text="${info.value}"></span>
<span th:unless="${info.key.contains('URL')}" th:text="${info.value}"/>
<span th:if="${info.key == 'Service Window'}" >
<a href="#" class="tooltip" onclick="event.preventDefault();"><span>(?)</span>
<span class="tooltiptext" style="transform: translateX(-100%)">The range of service dates covered by the feed, based on trips with an associated service_id in calendar.txt and/or calendar_dates.txt</span>
</a>
</span>
</dt>
</div>
</div>
</dl>
</div>
Expand Down
Loading