Skip to content

Commit b176c6e

Browse files
authored
Fb new animal wizard (#353)
* Added EventsWidget HTML page * 1. Corrected adult age by gender in PotentialDams.sql 2. Closed AcqCodes that haven't been used in the past five years (in tsv file) 3. Added missing acquisition codes to tsv file 4. Filtered acq code 97 from fetchAcquisitionTypes API 5. Removed the join on the v_demographics view from arrivals and departures ETL source queries - if animal is removed from the colony before the ETL runs, then the deletion will be missed 6. Started refactoring retrieval of dams and sires to use a birthdate parameter * 1. Refactored PotentialDams.sql and PotentialSires.sql to use selectedOptionParm parameter to account for differences in how potential sires and dams are handled depending on whether a birth or other acquisition is being recorded 2. fetchLocations.js API updated to filter based on acquisiton codes for offsite acquisitions 3. fetchPotentialDams.js and fetchPotentialSires.js APIs updated to handle SQL parameters 4. Changes to AccountPanel.jsx to allow non-birth acquisitions to have null accounts 5. Changes to AcquisitionPanel.js to reload location codes when acquisition type changes 6. Changes made to DemographicsPanel.js to reload dams and sires after birth date is entered 7. Added new constant offSiteAcqCodes to track acquisition of animals not being added to the colony 8. Updated request API to handle parameters 9. UpdateAnimalData.js to allow null animal accounts 10. Updated ANPRC_EHRValidator.java to permit null accounts in certain conditions 11. Updated Jest tests * Updated Jest test and snapshots * 1. added source location to New Animal Wizard UI - AcquisitionPanel.jsx 2. changed how ehr_lookups.source is being populated - went from TSV file to ETL 3. added source query for source locations - labkey_etl.v_sourceLocations 4. added location description to lookup list 5. added sourceLocation to the updateAnimalData.js API 6. added sourceLocation to SummaryPanel.jsx - also tweaked hover text locations 7. added sourceLocation to default state - NewAnimalState.js 8. added sourceLocation jest tests, test data, mock API 9. updated snapshots 10. many lint fixes including files outside the scope of this feature branch * removed ehr_lookups.source from populateData page * 1. updates related to sourceLocation for updating newAnimalData table 2. added query meta data for sourceLocation * missed file in last commit
1 parent b1dcd93 commit b176c6e

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

snprc_ehr/resources/queries/snprc_ehr/NewAnimalData.query.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,16 @@
130130
<column columnName="objectid">
131131
<isHidden>true</isHidden>
132132
</column>
133+
<column columnName="SourceInstitutionLocation">
134+
<shownInInsertView>false</shownInInsertView>
135+
<columnTitle>Source Location</columnTitle>
136+
<fk>
137+
<fkDbSchema>ehr_lookups</fkDbSchema>
138+
<fkTable>source</fkTable>
139+
<fkColumnName>rowId</fkColumnName>
140+
<fkDisplayColumnName>code</fkDisplayColumnName>
141+
</fk>
142+
</column>
133143
</columns>
134144
</table>
135145
</tables>

0 commit comments

Comments
 (0)