Skip to content

Commit

Permalink
Quick report icon: now display the SeriesDate - SeriesDescription in …
Browse files Browse the repository at this point in the history
…a tooltip
  • Loading branch information
amazy committed Dec 19, 2024
1 parent dd32037 commit 41851dd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
25 changes: 19 additions & 6 deletions WebApplication/src/components/StudyItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default {
expanded: false,
collapseElement: null,
selected: false,
pdfReportsUrl: []
pdfReports: []
};
},
created() {
Expand Down Expand Up @@ -60,10 +60,22 @@ export default {
}
if (this.hasPdfReportIcon) {
let instances = await api.getStudyInstancesExpanded(this.study.ID, ["SOPClassUID"]);
let instances = await api.getStudyInstancesExpanded(this.study.ID, ["SOPClassUID", "SeriesDate", "SeriesDescription"]);
for (let instance of instances) {
if (instance.RequestedTags.SOPClassUID == "1.2.840.10008.5.1.4.1.1.104.1") {
this.pdfReportsUrl.push(api.getInstancePdfUrl(instance.ID));
let titles = [];
if (instance.RequestedTags.SeriesDate) {
titles.push(dateHelpers.formatDateForDisplay(instance.RequestedTags.SeriesDate));
}
if (instance.RequestedTags.SeriesDescription) {
titles.push(instance.RequestedTags.SeriesDescription);
}
this.pdfReports.push({
'url': api.getInstancePdfUrl(instance.ID),
'title': titles.join(' - '),
'id': instance.ID
});
}
}
}
Expand Down Expand Up @@ -187,11 +199,12 @@ export default {
</td>
<td v-if="hasPrimaryViewerIconPlaceholder"></td>
<td v-if="hasPdfReportIcon" class="td-pdf-icon">
<TokenLinkButton v-for="pdfReportUrl in pdfReportsUrl" :key="pdfReportUrl"
level="study" :linkUrl="pdfReportUrl"
<TokenLinkButton v-for="pdfReport in pdfReports" :key="pdfReport.id"
level="study" :linkUrl="pdfReport.url"
:resourcesOrthancId="[study.ID]" linkType="icon"
iconClass="bi bi-file-earmark-text"
:tokenType="'download-instant-link'" :opensInNewTab="true">
:tokenType="'download-instant-link'" :opensInNewTab="true"
:title="pdfReport.title">
</TokenLinkButton>
</td>
<td v-if="hasPdfReportIconPlaceholder"></td>
Expand Down
2 changes: 1 addition & 1 deletion WebApplication/src/components/TokenLinkButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default {
:href="linkUrl">{{ title }}
</a>
<a v-if="isIcon" class="icon" :target="target" @click="clicked"
:href="linkUrl">
data-bs-toggle="tooltip" :title="title" :href="linkUrl">
<i :class="iconClass" style="padding-top: 4px;"></i>
</a>
</div>
Expand Down
5 changes: 3 additions & 2 deletions release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ Pending changes in the mainline (upcoming 1.7.0)
===============================

Changes:
- Disable some UI components on ReadOnly systems.
- The study list header is now sticking on top of the screen.
- When Orthanc DB supports "ExtendedFind" (SQLite in 1.12.5+ and PosgreSQL 7.0+):
- new features in the local studies list:
- Allow sorting by columns
Expand All @@ -15,6 +13,9 @@ Changes:
is still used when performing remote DicomWEB queries.
- New configuration "PageLoadSize" that defines the number of items that are loaded when scrolling the study or instance list.
- The "StudyListContentIfNoSearch" configuration is now taken into account and always considered as "most-recents".
- Disable some UI components on ReadOnly systems.
- The study list header is now sticking on top of the screen.
- Quick report icon: now display the SeriesDate - SeriesDescription in a tooltip.

Fixes:
- When modifying studies, dates selected from the DatePicker were not always taken into account.
Expand Down

0 comments on commit 41851dd

Please sign in to comment.