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

Jump to bottom

[bot] Merge 24.9 to develop #758

Merged
merged 5 commits into from
Sep 11, 2024
Merged

[bot] Merge 24.9 to develop #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
364adc5
TAC updates for new ERP system changes and misc bug fix (#750)
spamhurts Aug 26, 2024
57efba9
Merge 23.11 to 24.3
labkey-teamcity Aug 30, 2024
603c930
Merge 24.3 to 24.7
labkey-teamcity Sep 2, 2024
7b1a611
Merge 24.7 to 24.9
labkey-teamcity Sep 10, 2024
0ece9e3
Merge 24.9 to develop
labkey-teamcity Sep 11, 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
8 changes: 8 additions & 0 deletions snprc_ehr/resources/domain-templates/ehr.template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
<dat:rangeURI>string</dat:rangeURI>
<dat:scale>2</dat:scale>
</dat:column>
<dat:column columnName="cost_account">
<dat:columnTitle>Cost Account</dat:columnTitle>
<dat:rangeURI>string</dat:rangeURI>
</dat:column>
<dat:column columnName="speedkey">
<dat:columnTitle>Speedkey</dat:columnTitle>
<dat:rangeURI>string</dat:rangeURI>
</dat:column>
</dat:columns>
</table>
</template>
Expand Down
16 changes: 16 additions & 0 deletions snprc_ehr/resources/queries/ehr/project/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="Projects">
<columns>
<column name="project"/>
<column name="account"/>
<column name="speedkey"/>
<column name="cost_account"/>
<column name="protocol"/>
<column name="research"/>
<column name="startdate"/>
<column name="enddate"/>
<column name="displayName"/>
</columns>
<sorts>
<sort column="startdate" descending="true" />
</sorts>
</customView>
2 changes: 2 additions & 0 deletions snprc_ehr/resources/queries/study/BrowseDataSets.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ UNION
select 'snprc_ehr' as schema, 'ClinPath' as CategoryId,'Urinalysis Results' as Label, 'HL7UrinalysisPivot' as Name, true as ShowByDefault, true as isAnimal
UNION
select 'ehr' as schema, 'Colony Management' as CategoryId,'Kinship' as Label, 'kinship' as Name, true as ShowByDefault, true as isAnimal
UNION
select 'ehr' as schema, 'Colony Management' as CategoryId,'Project' as Label, 'project' as Name, true as ShowByDefault, false as isAnimal
6 changes: 1 addition & 5 deletions snprc_ehr/resources/queries/study/demographicsParentStatus.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
</column>
<column columnName="Parent_id">
<columnTitle>Parent Id</columnTitle>
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>animal</fkTable>
<fkColumnName>id</fkColumnName>
</fk>
<url>ehr/participantView.view?participantId=${Parent_id}</url>
</column>
<column columnName="calculated_status">
<columnTitle>Status</columnTitle>
Expand Down
5 changes: 4 additions & 1 deletion snprc_ehr/resources/source_queries/create_v_charge_account.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ ALTER VIEW [labkey_etl].[v_charge_account] AS
SELECT
ca.charge_id AS project,
CASE WHEN vcs.charge_id IS NULL THEN 'True' ELSE 'False' END AS research,
ca.cost_account AS account,
ca.cost_account AS cost_account,
ca.account_id AS account,
pca.speedkey AS speedkey,
ca.working_iacuc AS protocol,
coalesce(right(ca.working_iacuc, 2), vcs.arc_species_code) as species,
ca.start_date AS startdate,
Expand All @@ -46,6 +48,7 @@ ALTER VIEW [labkey_etl].[v_charge_account] AS
FROM dbo.charge_account AS ca
LEFT OUTER JOIN dbo.TAC_COLUMNS AS tc ON tc.object_id = ca.object_id
LEFT OUTER JOIN dbo.valid_charge_by_species AS vcs ON ca.charge_id = vcs.charge_id
LEFT OUTER JOIN dbo.prd_cost_account AS pca on pca.account_id = ca.account_id


GO
Expand Down
Loading