Merge 22.4 to develop

Author: labkey-teamcity

snprc_ehr/package-lock.json

@@ -99,8 +99,8 @@
     "eslint-plugin-react": "^7.20.6",
     "file-loader": "3.0.1",
     "html-webpack-plugin": "3.2.0",
-    "jest": "^26.4.2",
-    "jest-cli": "^26.4.2",
+    "jest": "^26.6.3",
+    "jest-cli": "^26.6.3",
     "jest-teamcity-reporter": "^0.9.0",
     "mini-css-extract-plugin": "^0.11.0",
     "node-sass": "^6.0.1",

snprc_ehr/package.json

@@ -1,3 +1,7 @@
+PARAMETERS
+(
+    newAssignmentsParm INTEGER DEFAULT 1
+)
 SELECT p.protocol AS Iacuc,
        p.protocol + ' - ' +  RTRIM(p.inves)+ ' -' + RTRIM(p.title) AS DisplayValue,
        RIGHT(p.protocol, 2) AS Species,
@@ -8,5 +12,6 @@ SELECT p.protocol AS Iacuc,
        p.maxAnimals AS MaxAnimals
 FROM ehr.protocol AS p
 INNER JOIN snprc_ehr.IacucAssignmentStats as ia on p.protocol = ia.WorkingIacuc
-WHERE ia.NumAnimalsAssigned  < ia.NumAnimalsAllowed
-    AND ia.StartDate = p.approve
+WHERE ia.NumAnimalsAssigned + newAssignmentsParm < ia.NumAnimalsAllowed
+  AND ia.StartDate = p.approve
+

snprc_ehr/resources/queries/ehr/ProtocolLookup.sql

@@ -12,5 +12,5 @@ LEFT OUTER JOIN
      ) as x ON x.species = s.species_code
 WHERE s.dateDisabled is null
   AND (
-        age_in_years(x.birth, curdate()) <= 5 OR age_in_months(s.created, curdate()) <= 3
+        age_in_years(x.birth, curdate()) <= 10 OR age_in_months(s.created, curdate()) <= 3
     )

snprc_ehr/resources/queries/snprc_ehr/CurrentSpeciesLookup.sql

@@ -31,7 +31,7 @@ ALTER VIEW [labkey_etl].[v_labwork_results] AS
 -- Note:  Merged all procedure types into a single query
 -- Changes:
 --
--- 
+-- 4/11/2022 Fixed NTE concatenation bug
 -- ==========================================================================================
 
 SELECT
@@ -58,7 +58,7 @@ SELECT
                   REPLACE(
                       (SELECT RTRIM(LTRIM(nte.comment)) + '**NEWLINE**'
                        FROM dbo.CLINICAL_PATH_NTE AS nte
-                       WHERE nte.message_id = obr.message_id AND obx.set_id = nte.set_id
+                       WHERE nte.message_id = obr.message_id
                        ORDER BY CAST(nte.set_id AS INTEGER)
                        FOR XML PATH ('')        -- generates a concatenation of notes
 

snprc_ehr/resources/source_queries/create_v_labwork_results.sql

@@ -33,12 +33,14 @@ import SaveModal from './components/SaveModal'
 import { isBirthdateValid } from './services/validation'
 import { uploadAnimalData } from './api/updateAnimalData'
 import { getReportPath } from './services/printToPDF'
+import { isNonPrimate } from './services/utils'
 
 export default class NewAnimalPage extends React.Component {
   state = new NewAnimalState();
 debug = constants.debug;
 numPanels = constants.numPanels;
 selectedSpecies = undefined;
+
 componentDidMount() {
     // prevent user from navigating away from page
     window.addEventListener('beforeunload', this.beforeunload.bind(this))
@@ -105,11 +107,11 @@ loadLists() {
   }
 loadListsForSpecies = selectedSpecies => {
     const lists = {}
-
+    const newAssignments = this.state.numAnimals || 1
     async function loadListsAW(species) {
       lists.locationList = await fetchLocations(species)
       lists.colonyList = await fetchColonies(species)
-      lists.iacucList = await fetchProtocols(species)
+      lists.iacucList = await fetchProtocols(species, newAssignments)
       lists.pedigreeList = await fetchPedigrees(species)
     }
 
@@ -131,8 +133,34 @@ loadListsForSpecies = selectedSpecies => {
         }))
       })
   };
+
+  loadIacucList = (species, newAssignments ) => {
+    const lists = {}
+    
+    async function loadListsAW(species, newAssignments) {
+       lists.iacucList = await fetchProtocols(species, newAssignments)
+    }
+
+    loadListsAW(species, newAssignments)
+      .then(() => {
+        this.setState(prevState => ({
+          ...prevState,
+          iacucList: lists.iacucList
+        }))
+      })
+      .catch(error => {
+        console.log(`Error in loadIacucList: ${error}`)
+        this.setState(prevState => ({
+          ...prevState,
+          errorMessage: error.message,
+        }))
+      })
+  };
+
 disablePanels = () => !(this.state.locationList && this.state.locationList.length > 0);
+
 disableFirstPanel = () => !this.state.selectedOption || !this.state.newAnimalData.species;
+
 handleAcquisitionOptionChange = type => {
     fetchAcquisitionTypes(type)
       .then(response => this.setState(prevState => ({
@@ -151,38 +179,48 @@ handleAcquisitionOptionChange = type => {
         console.log(error)
       })
   };
-handleSpeciesChange = selectedSpecies => {
+handleSpeciesChange = selectedSpecies => {   
     // ignore sub-species change
     if (
       this.state.newAnimalData.species !== undefined
-      && this.state.newAnimalData.species.arcSpeciesCode
-      !== selectedSpecies.arcSpeciesCode
+      && this.state.newAnimalData.species.arcSpeciesCode !== selectedSpecies.arcSpeciesCode
     ) {
       this.selectedSpecies = selectedSpecies
       this.setState(prevState => ({
         ...prevState,
         showSpeciesChangeModal: true,
       }))
     } else {
+      let nonPrimate = isNonPrimate(selectedSpecies)
       this.setState(prevState => ({
         ...prevState,
         isDirty: true,
         newAnimalData: {
           ...prevState.newAnimalData,
           species: selectedSpecies,
+          isNonPrimate: nonPrimate,
         },
       }))
       this.loadListsForSpecies(selectedSpecies)
     }
   };
 handleNumAnimalChange = value => {
-    this.setState(
+  const newAssignments = this.state.numAnimals || 1
+  const species = this.state.newAnimalData.species.arcSpeciesCode
+
+  this.setState(
       prevState => ({
         ...prevState,
         numAnimals: value
       })
     )
+
+  // see if the protocol list needs to be reloaded
+  if (value != newAssignments) {
+    this.loadIacucList(species, value ) 
   }
+}
+    
 handleDataChange = (property, value) => {
     this.setState(
       prevState => ({
@@ -385,6 +423,7 @@ handleSaveReset = () => {
   };
 onSpeciesChangeClick = () => {
     const initialState = new NewAnimalState()
+    let nonPrimate = isNonPrimate(this.selectedSpecies)
     this.setState(
       prevState => ({
         ...initialState,
@@ -402,6 +441,7 @@ onSpeciesChangeClick = () => {
           ...initialState.newAnimalData,
           species: this.selectedSpecies,
           selectedOption: prevState.newAnimalData.selectedOption,
+          isNonPrimate: nonPrimate
         },
       }),
       this.loadListsForSpecies(this.selectedSpecies)

snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx

@@ -7,9 +7,10 @@ const parse = rows => {
     })
 }
 
-const fetchProtocols = species => {
+const fetchProtocols = (species, newAssignments) => {
     return new Promise((resolve, reject) => {
         request({
+            parameters: { newAssignmentsParm: newAssignments },
             schemaName: 'ehr',
             queryName: 'ProtocolLookup',
             columns: ['Iacuc', 'DisplayValue', 'Species', 'MaxAnimals'],

snprc_ehr/src/client/NewAnimalPage/api/fetchProtocols.js

@@ -59,7 +59,7 @@ handlePaste = e => {
     e.preventDefault()
   }
 render() {
-    const { acquisitionType, acqDate, species, sourceLocation } = this.props.newAnimalData
+    const { acquisitionType, acqDate, species, sourceLocation, isNonPrimate } = this.props.newAnimalData
     const { numAnimals } = this.props
     const { selectedOption } = this.props
 
@@ -122,7 +122,7 @@ render() {
             </div>
             )}
           </div>
-          { species && species.arcSpeciesCode === 'MA' && (
+          {species && isNonPrimate && (
             <div className="wizard-panel__row">
               <div className="wizard-panel__col">
                 <label className="field-label">Number of Animals</label>
@@ -147,7 +147,7 @@ render() {
           errorMessages={ this.state.errorMessage && (
             [{ propTest: this.state.errorMessage, colName: this.state.errorMessage }]
           ) }
-          infoMessages={ species && species.arcSpeciesCode === 'MA' && numAnimals && numAnimals !== 1 && [
+          infoMessages={ species && isNonPrimate && numAnimals && numAnimals !== 1 && [
             { key: 1, value: constants.hamsterWarnings }
           ] }
           messages={

snprc_ehr/src/client/NewAnimalPage/components/AcquisitionPanel.jsx

@@ -28,7 +28,8 @@ const NewAnimalState = () => {
             diet: undefined,
             pedigree: undefined,
             iacuc: undefined,
-            sourceLocation: undefined
+            sourceLocation: undefined,
+            isNonPrimate: undefined
         },
         summaryData: [],
         speciesList: [],

snprc_ehr/src/client/NewAnimalPage/constants/NewAnimalState.js

@@ -1,10 +1,11 @@
 export default {
+    nonPrimateList: 'HAM CAV', // use three-char species code
     debug: false,
     numPanels: 5,
     defaultInstitution: { id: 0, value: 1, label: 'TxBiomed - Texas Biomedical Research Institute' },
     offSiteAcqCodes: ['22', '23', '25', '97'],
     hamsterWarnings:
-    `Hamsters can be acquired in bulk; however, when added in bulk you must ensure all animals:
+    `Non-primates can be acquired in bulk; however, when added in bulk you must ensure all animals:
         1) are the same sex
         2) have the same birth and acquisition dates
         3) are in the same location