Merge 24.7 to 24.11

LabKey · Nov 25, 2024 · b6e614f · b6e614f
2 parents f1d440e + 57fe137
commit b6e614f
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 6 deletions.
diff --git a/WNPRC_EHR/resources/queries/study/Necropsy/Summary.qview.xml b/WNPRC_EHR/resources/queries/study/Necropsy/Summary.qview.xml
@@ -1,20 +1,27 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
    <columns>
        <column name="Id" />
+       <column name="is_prenatal_necropsy" />
+       <column name="dam" />
+       <column name="perfusion_area" />
+       <column name="perfusion_soln1" />
+       <column name="perfusion_soln2" />
+       <column name="project" />
+       <column name="account" />
        <column name="date" />
+       <column name="location" />
+       <column name="shipping" />
+       <column name="shipping_comment" />
+       <column name="comments" />
+
        <column name="timeofdeath" />
        <column name="caseno" />
 
-       <column name="project" />
-       <column name="account" />
        <column name="performedby" />
        <column name="assistant" />
 
        <!--<column name="nhpbmd" />-->
-       <!--<column name="perfusion_area" />-->
-       <!--<column name="perfusion_soln1" />-->
        <!--<column name="perfusion_time1" />-->
-       <!--<column name="perfusion_soln2" />-->
        <!--<column name="perfusion_time2" />-->
        <column name="grossdescription" />
        <!--<column name="patho_notes" />-->

diff --git a/WNPRC_EHR/resources/queries/study/necropsy.query.xml b/WNPRC_EHR/resources/queries/study/necropsy.query.xml
@@ -2,7 +2,7 @@
     <metadata> 
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="necropsies" tableDbType="TABLE">
-                <tableUrl>/EHR/necropsyDetails.view?key=${objectid}</tableUrl>
+                <tableUrl>/WNPRC_EHR-necropsyDetails.view?key=${objectid}&amp;requestid=${requestid}</tableUrl>
                 <insertUrl />
                 <importUrl />
                 <updateUrl />

diff --git a/WNPRC_EHR/resources/views/necropsyDetails.html b/WNPRC_EHR/resources/views/necropsyDetails.html
@@ -0,0 +1,86 @@
+<script type="text/javascript" nonce="<%=scriptNonce%>">
+
+  Ext4.onReady(function (){
+    if (!LABKEY.ActionURL.getParameter('key')){
+      alert('Must Provide Necropsy Number');
+      return;
+    }
+
+    var key = LABKEY.ActionURL.getParameter('key');
+    var requestid = LABKEY.ActionURL.getParameter('requestid');
+    var webpart = <%=webpartContext%>;
+    var domSpec = [{
+        tag: 'div',
+        id: 'necropsyDetails_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyReport_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyTissues_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyWeights_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyDiagnosis_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyImages_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'necropsyHistology_' + webpart.wrapperDivId
+    }]
+
+    var el = Ext4.get(webpart.wrapperDivId);
+    Ext4.DomHelper.append(el, domSpec);
+
+    Ext4.create('LDK.panel.DetailsPanel', {
+      store: {
+        schemaName: 'study',
+        queryName: 'Necropsies',
+        viewName: 'Summary',
+        filterArray: [LABKEY.Filter.create('objectId', key, LABKEY.Filter.Types.EQUAL)]
+      },
+      showBackBtn: false,
+      title: 'Necropsy Details:',
+      renderTo: 'necropsyDetails_' + webpart.wrapperDivId
+    });
+
+    LDK.Utils.getReadOnlyQWP({
+      title: 'Morphologic Diagnoses',
+      schemaName: 'study',
+      queryName: 'Morphologic Diagnosis',
+      filters: [LABKEY.Filter.create('parentid', key, LABKEY.Filter.Types.EQUAL)]
+    }).render('necropsyDiagnosis_' + webpart.wrapperDivId);
+
+    LDK.Utils.getReadOnlyQWP({
+      title: 'Histology',
+      schemaName: 'study',
+      queryName: 'histology',
+      filters: [LABKEY.Filter.create('parentid', key, LABKEY.Filter.Types.EQUAL)],
+      sort: '-Date'
+    }).render('necropsyHistology_' + webpart.wrapperDivId);
+
+    LDK.Utils.getReadOnlyQWP({
+      title: 'Tissue Samples',
+      schemaName: 'study',
+      queryName: 'tissue_samples',
+      filters: [LABKEY.Filter.create('requestid', requestid, LABKEY.Filter.Types.EQUAL)],
+    }).render('necropsyTissues_' + webpart.wrapperDivId);
+
+    LDK.Utils.getReadOnlyQWP({
+      title: 'Organ Weights',
+      schemaName: 'study',
+      queryName: 'organ_weights',
+      filters: [LABKEY.Filter.create('requestid', requestid, LABKEY.Filter.Types.EQUAL)],
+    }).render('necropsyWeights_' + webpart.wrapperDivId);
+  });
+
+</script>
diff --git a/WNPRC_EHR/resources/views/necropsyDetails.view.xml b/WNPRC_EHR/resources/views/necropsyDetails.view.xml
@@ -0,0 +1,5 @@
+<view xmlns="http://labkey.org/data/xml/view" frame="none">
+    <dependencies>
+        <dependency path="ehr.context" />
+    </dependencies>
+</view>