Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="tissueDistributionSummary" tableDbType="TABLE">
<tableTitle>Tissue Distribution Summary</tableTitle>
<tableTitle>Tissue Distribution Summary By Calendar Year</tableTitle>
<columns>
<column columnName="totalSamples">
<columnTitle>Total Samples</columnTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="tissueDistributionSummaryByAnimalIDCalendarYr" tableDbType="TABLE">
<tableTitle>Tissue Distribution Summary By Animal ID Per Calendar Year</tableTitle>
<columns>
<column columnName="totalSamples">
<columnTitle>Total Samples</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Tissue Distributions&amp;
query.calendarYear~eq=${calendarYear}&amp;
query.id~eq=${id}&amp;
query.QCState/Label~in=Completed;Request: Pending&amp;
</url>
</column>
<column columnName="distinctAnimals">
<columnTitle>Distinct Animal IDs</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Tissue Distributions&amp;
query.calendarYear~eq=${calendarYear}&amp;
query.id~eq=${id}&amp;
query.QCState/Label~in=Completed;Request: Pending&amp;
</url>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- Added: 1-2-2018 R.Blasa
SELECT
calendarYear,
t.id,
-- t.recipient.affiliation,
-- t.requestCategory,
count(t.Id) as totalSamples,
count(distinct t.Id) as distinctAnimals,
count(distinct t.recipient) as distinctRecipients

FROM study.tissueDistributions t
Where t.taskid is not null
And t.QCState.Label in ('Request: Pending','Completed')

GROUP BY calendarYear, t.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<sorts>
<sort column="calendarYear" descending="true"/>
<sort column="id"/>
</sorts>
</customView>
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="tissueDistributionSummaryByAnimalIDFiscalYr" tableDbType="TABLE">
<tableTitle>Tissue Distribution Summary By Animal ID Per Fiscal Year</tableTitle>
<columns>
<column columnName="totalSamples">
<columnTitle>Total Samples</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Tissue Distributions&amp;
query.fiscalYear~eq=${fiscalYear}&amp;
query.id~eq=${id}&amp;
query.QCState/Label~in=Completed;Request: Pending&amp;
</url>
</column>
<column columnName="distinctAnimals">
<columnTitle>Distinct Animal IDs</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Tissue Distributions&amp;
query.fiscalYear~eq=${fiscalYear}&amp;
query.id~eq=${id}&amp;
query.QCState/Label~in=Completed;Request: Pending&amp;
</url>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-- Added: 1-2-2018 R.Blasa
SELECT
fiscalYear,
t.id,
count(t.Id) as totalSamples,
count(distinct t.Id) as distinctAnimals,
count(distinct t.recipient) as distinctRecipients

FROM study.tissueDistributions t
Where t.taskid is not null
And t.QCState.Label in ('Request: Pending','Completed')

GROUP BY fiscalYear, t.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<sorts>
<sort column="fiscalYear" descending="true"/>
<sort column="id"/>
</sorts>
</customView>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="tissueDistributionSummaryByRecipient" tableDbType="TABLE">
<tableTitle>Tissue Distribution Summary By Recipient</tableTitle>
<tableTitle>Tissue Distribution Summary By Recipient By Calendar Year</tableTitle>
<columns>
<column columnName="totalSamples">
<columnTitle>Total Samples</columnTitle>
Expand Down
9 changes: 8 additions & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,14 @@ public String toString()
// Added 1-2-2018 R.Blasa
EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Recipient(Calendar Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByRecipientCalendarYr"), "Pathology");

//Added: 12-7-2017 R.Blasa
// Added 1-7-2026 R.Blasa
EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Animal ID(Calendar Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByAnimalIDCalendarYr"), "Pathology");

// Added 1-7-2026 R.Blasa
EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Animal ID(Fiscal Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByAnimalIDFiscalYr"), "Pathology");


//Added: 12-7-2017 R.Blasa
// EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Animal Census on a Given Date Range", this, DetailsURL.fromString("/onprc_ehr/CensusGivenDateRange.view"), "Colony Management");

// Added: 2-2-2021 R.Blasa
Expand Down