Skip to content

Commit ffb1020

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 26.1 to develop
2 parents 1fc462e + d385c69 commit ffb1020

9 files changed

Lines changed: 112 additions & 3 deletions

‎onprc_ehr/resources/queries/study/TissueDistributionSummaryCalendarYr.query.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="tissueDistributionSummary" tableDbType="TABLE">
5-
<tableTitle>Tissue Distribution Summary</tableTitle>
5+
<tableTitle>Tissue Distribution Summary By Calendar Year</tableTitle>
66
<columns>
77
<column columnName="totalSamples">
88
<columnTitle>Total Samples</columnTitle>

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="tissueDistributionSummaryByAnimalIDCalendarYr" tableDbType="TABLE">
5+
<tableTitle>Tissue Distribution Summary By Animal ID Per Calendar Year</tableTitle>
6+
<columns>
7+
<column columnName="totalSamples">
8+
<columnTitle>Total Samples</columnTitle>
9+
<url>/query/executeQuery.view?
10+
schemaName=study&amp;
11+
query.queryName=Tissue Distributions&amp;
12+
query.calendarYear~eq=${calendarYear}&amp;
13+
query.id~eq=${id}&amp;
14+
query.QCState/Label~in=Completed;Request: Pending&amp;
15+
</url>
16+
</column>
17+
<column columnName="distinctAnimals">
18+
<columnTitle>Distinct Animal IDs</columnTitle>
19+
<url>/query/executeQuery.view?
20+
schemaName=study&amp;
21+
query.queryName=Tissue Distributions&amp;
22+
query.calendarYear~eq=${calendarYear}&amp;
23+
query.id~eq=${id}&amp;
24+
query.QCState/Label~in=Completed;Request: Pending&amp;
25+
</url>
26+
</column>
27+
</columns>
28+
</table>
29+
</tables>
30+
</metadata>
31+
</query>

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.sql‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
-- Added: 1-2-2018 R.Blasa
2+
SELECT
3+
calendarYear,
4+
t.id,
5+
-- t.recipient.affiliation,
6+
-- t.requestCategory,
7+
count(t.Id) as totalSamples,
8+
count(distinct t.Id) as distinctAnimals,
9+
count(distinct t.recipient) as distinctRecipients
10+
11+
FROM study.tissueDistributions t
12+
Where t.taskid is not null
13+
And t.QCState.Label in ('Request: Pending','Completed')
14+
15+
GROUP BY calendarYear, t.id

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr/.qview.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<sorts>
3+
<sort column="calendarYear" descending="true"/>
4+
<sort column="id"/>
5+
</sorts>
6+
</customView>

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="tissueDistributionSummaryByAnimalIDFiscalYr" tableDbType="TABLE">
5+
<tableTitle>Tissue Distribution Summary By Animal ID Per Fiscal Year</tableTitle>
6+
<columns>
7+
<column columnName="totalSamples">
8+
<columnTitle>Total Samples</columnTitle>
9+
<url>/query/executeQuery.view?
10+
schemaName=study&amp;
11+
query.queryName=Tissue Distributions&amp;
12+
query.fiscalYear~eq=${fiscalYear}&amp;
13+
query.id~eq=${id}&amp;
14+
query.QCState/Label~in=Completed;Request: Pending&amp;
15+
</url>
16+
</column>
17+
<column columnName="distinctAnimals">
18+
<columnTitle>Distinct Animal IDs</columnTitle>
19+
<url>/query/executeQuery.view?
20+
schemaName=study&amp;
21+
query.queryName=Tissue Distributions&amp;
22+
query.fiscalYear~eq=${fiscalYear}&amp;
23+
query.id~eq=${id}&amp;
24+
query.QCState/Label~in=Completed;Request: Pending&amp;
25+
</url>
26+
</column>
27+
</columns>
28+
</table>
29+
</tables>
30+
</metadata>
31+
</query>

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-- Added: 1-2-2018 R.Blasa
2+
SELECT
3+
fiscalYear,
4+
t.id,
5+
count(t.Id) as totalSamples,
6+
count(distinct t.Id) as distinctAnimals,
7+
count(distinct t.recipient) as distinctRecipients
8+
9+
FROM study.tissueDistributions t
10+
Where t.taskid is not null
11+
And t.QCState.Label in ('Request: Pending','Completed')
12+
13+
GROUP BY fiscalYear, t.id

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr/.qview.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<sorts>
3+
<sort column="fiscalYear" descending="true"/>
4+
<sort column="id"/>
5+
</sorts>
6+
</customView>

‎onprc_ehr/resources/queries/study/TissueDistributionSummarybyRecipientCalendarYr.query.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="tissueDistributionSummaryByRecipient" tableDbType="TABLE">
5-
<tableTitle>Tissue Distribution Summary By Recipient</tableTitle>
5+
<tableTitle>Tissue Distribution Summary By Recipient By Calendar Year</tableTitle>
66
<columns>
77
<column columnName="totalSamples">
88
<columnTitle>Total Samples</columnTitle>

‎onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,14 @@ public String toString()
498498
// Added 1-2-2018 R.Blasa
499499
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");
500500

501-
//Added: 12-7-2017 R.Blasa
501+
// Added 1-7-2026 R.Blasa
502+
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");
503+
504+
// Added 1-7-2026 R.Blasa
505+
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");
506+
507+
508+
//Added: 12-7-2017 R.Blasa
502509
// EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Animal Census on a Given Date Range", this, DetailsURL.fromString("/onprc_ehr/CensusGivenDateRange.view"), "Colony Management");
503510

504511
// Added: 2-2-2021 R.Blasa

0 commit comments

Comments
 (0)