Cross-folder instrument utilization report by ankurjuneja · Pull Request #1253 · LabKey/targetedms

ankurjuneja · 2026-07-01T09:55:35Z

Rationale

Users want to understand how a given instrument is utilized across every folder they can read, not just the folder they happen to be in. Today:

The instrument page (targetedms-showInstrument.view) is instrument-scoped but only lists sample files.
The utilization calendar (targetedms-qcSummaryHistory.view) shows files acquired, but it's folder-scoped and not instrument-filtered as it counts every instrument
in the current folder.

This PR expands the existing Show Instrument page with two instrument-scoped, cross-folder views so utilization can be seen at a glance and analyzed as a table:

(A) a calendar heatmap of files acquired for that instrument across all readable folders, and
(B) a runs/files table by day, with a client-side toggle to summarize by month

Related Pull Requests

Changes

New queries (drive both the calendar and the grids; group SampleFile by acquisition day/month + InstrumentNickname):

resources/queries/targetedms/InstrumentUtilizationByDay.sql / .query.xml
resources/queries/targetedms/InstrumentUtilizationByMonth.sql / .query.xml

Controller — TargetedMSController.ShowInstrumentAction:

Added UtilizationByDay / UtilizationByMonth query-view branches, each with ContainerFilter.AllFolders + an InstrumentNickname filter (so counts span every readable
folder for the selected instrument).
Added the "Utilization Calendar" and "Runs Acquired" views to the page, plus the InstrumentUtilizationBean that carries the two grid views into the JSP.

Views:

view/instrumentUtilizationCalendar.jsp — cross-folder heatmap (js-year-calendar), data via LABKEY.Query.selectRows with containerFilter: allFolders; defaults to 1 month.
view/instrumentUtilizationGrids.jsp — By Day / By Month toggle (client-side show/hide, no reload).

Tests (Selenium):

test/.../components/targetedms/InstrumentUtilizationWebPart.java — page object for the "Runs Acquired" web part.
test/.../tests/targetedms/TargetedMSInstrumentUtilizationTest.java — imports one document into two QC folders and asserts the By Day/By Month grids sum to 2× the single-folder file count, proving cross-folder aggregation; also checks the calendar renders and the toggle works.

These generated view files were accidentally included in the cross-folder instrument utilization commit and are unrelated to that feature. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

labkey-jeckels · 2026-07-10T01:58:00Z

This is good data to expose but we need to improve the layout. Let's connect with @labkey-keegang to brainstorm. When is convenient for you?

ankurjuneja · 2026-07-10T16:42:46Z

This is good data to expose but we need to improve the layout. Let's connect with @labkey-keegang to brainstorm. When is convenient for you?

I am available today to chat @labkey-keegang, let me know what time works for you.

labkey-jeckels · 2026-07-13T17:54:02Z

Example of the new version of the page with new sections.

Instrument LTQ Orbitrap Velos.pdf

ankurjuneja · 2026-07-15T00:34:12Z

@labkey-jeckels , @labkey-keegang this is how it looks after the changed view:

It isn't visible in the screenshots clearly but the selected tab is being highlighted.

…panel

labkey-jeckels · 2026-07-15T01:48:16Z

That looks promising. Suggestions:

Omit the Instrument column. We're only showing data for one instrument.
Use column headings consistent with the Summary by Folder section: Replicate Count and Skyline Document Count.
Add the full listing grid (one row per replicate) as a fourth tab.
Rename tabs. Utilization Calendar->Calendar. Runs by Month->Summary by Month. Runs by Day->Summary by Day.

ankurjuneja · 2026-07-15T22:58:58Z

@labkey-jeckels Modified with above suggestions:

labkey-jeckels · 2026-07-16T00:34:37Z

@labkey-jeckels Modified with above suggestions:

Let's call the last tab simply "All Replicates". See Keegan's suggestion about linking counts a filtered version of that tab. If easy, great. If complicated, OK to not implement that.

ankurjuneja · 2026-07-16T00:36:24Z

@labkey-jeckels Modified with above suggestions:

Let's call the last tab simply "All Replicates". See Keegan's suggestion about linking counts a filtered version of that tab. If easy, great. If complicated, OK to not implement that.

I will rename that, the linking is done in previous commit along with the 4 suggested changes.

labkey-jeckels

Some terminology consistency and other small edits but otherwise ready to merge.

labkey-jeckels · 2026-07-18T00:26:28Z

+                        <columnTitle>Skyline Document Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dateeq=${AcquisitionDate:date('yyyy-MM-dd')}</url>
+                    </column>
+                    <column columnName="FileCount">


Let's rename the column itself to ReplicateCount to be more consistent

labkey-jeckels · 2026-07-18T00:26:46Z

+-- Consumed by the instrument utilization calendar and the "Runs by Day" grid on the Show Instrument page.
+SELECT
+    CAST(AcquisitionDay AS TIMESTAMP) AS AcquisitionDate,
+    COUNT(*) AS FileCount,


ReplicateCount

labkey-jeckels · 2026-07-18T00:26:55Z

+                        <columnTitle>Skyline Document Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dategte=${MonthStart:date('yyyy-MM-dd')}&amp;SampleFile.AcquiredTime~datelt=${MonthEnd:date('yyyy-MM-dd')}</url>
+                    </column>
+                    <column columnName="FileCount">


ReplicateCount

labkey-jeckels · 2026-07-18T00:27:04Z

+SELECT
+    CAST(MonthStart || '-01' AS TIMESTAMP) AS MonthStart,
+    TIMESTAMPADD('SQL_TSI_MONTH', 1, CAST(MonthStart || '-01' AS TIMESTAMP)) AS MonthEnd,
+    COUNT(*) AS FileCount,


ReplicateCount

labkey-jeckels · 2026-07-18T00:27:40Z

+                    </column>
+                    <column columnName="RunCount">
+                        <columnTitle>Skyline Document Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dategte=${MonthStart:date('yyyy-MM-dd')}&amp;SampleFile.AcquiredTime~datelt=${MonthEnd:date('yyyy-MM-dd')}</url>


Let's not link this column. It feels a little odd to click a link with one count to take you to a grid with a different row count

labkey-jeckels · 2026-07-18T00:28:45Z

+            <label for="utilizationMonthNumberSelect">Display:</label>
+            <select id="utilizationMonthNumberSelect">
+                <option value="1">1 month</option>
+                <option value="4">4 months</option>


Let's make 4 the default. It's more likely to be what the user wants than 1

labkey-jeckels · 2026-07-18T00:30:42Z

+                    <div class="heatmap-legend-element heatmap-shade9"></div>
+                    <div class="heatmap-legend-element heatmap-shade13"></div>
+                </div>
+                <div class="heatmap-legend-label" id="heatmapFileLegendMax">Files acquired</div>


Replicates acquired

labkey-jeckels · 2026-07-18T00:31:31Z

+                    content += '<div>No samples</div>';
+                }
+                else {
+                    content += '<div>' + event.fileCount + ' file' + (event.fileCount === 1 ? '' : 's') + ' acquired</div>';


labkey-jeckels · 2026-07-18T00:31:38Z

+
+                let content = '<div class="event-tooltip-content">';
+                if (!event || event.fileCount === 0) {
+                    content += '<div>No samples</div>';


No replicates

labkey-jeckels · 2026-07-18T00:31:48Z

+
+    loadData(function (data) {
+        if (!data.length) {
+            $('#instrumentUtilizationCalendar').text('No samples acquired by this instrument.');


No replicates

ankurjuneja and others added 3 commits June 29, 2026 13:21

Cross-folder instrument utilization report

ecd42bb

add selenium testing

aea27c3

Remove stray instrumentScheduler generated view stubs

425c0b2

These generated view files were accidentally included in the cross-folder instrument utilization commit and are unrelated to that feature. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

ankurjuneja marked this pull request as ready for review July 6, 2026 16:34

ankurjuneja requested a review from labkey-jeckels July 6, 2026 20:32

Optimize query a bit

6b371cc

Combine instrument utilization views into tabbed web part; pair info …

9a4a095

…panel

ankurjuneja added 2 commits July 15, 2026 13:42

feedback changes

ab46042

add links on summary-grid count cells

952da55

update comment

141a781

ankurjuneja added 2 commits July 16, 2026 09:33

rename all replicates tab

33f0687

fix test

6e012db

labkey-jeckels approved these changes Jul 18, 2026

View reviewed changes

Uh oh!

Conversation

ankurjuneja commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rationale

Related Pull Requests

Changes

Uh oh!

labkey-jeckels commented Jul 10, 2026

Uh oh!

ankurjuneja commented Jul 10, 2026

Uh oh!

labkey-jeckels commented Jul 13, 2026

Uh oh!

ankurjuneja commented Jul 15, 2026

Uh oh!

labkey-jeckels commented Jul 15, 2026

Uh oh!

ankurjuneja commented Jul 15, 2026

Uh oh!

labkey-jeckels commented Jul 16, 2026

Uh oh!

ankurjuneja commented Jul 16, 2026

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ankurjuneja commented Jul 1, 2026 •

edited

Loading