Modified Environmental Assessment reporting program specifically desi… (

#1008) * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified Environmental Assessment reporting program specifically designed for Kati's editing process
LabKey · May 16, 2024 · 999cece · 999cece
1 parent 2ffedec
commit 999cece
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 14 deletions.
diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_ATP.query.xml b/onprc_ehr/resources/queries/onprc_ehr/Env_ATP.query.xml
@@ -16,11 +16,21 @@
                     <column columnName="testing_location">
                         <columnTitle>Area</columnTitle>
                         <displayWidth>150</displayWidth>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_testingLocation</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="surface_tested">
                         <columnTitle>Surface</columnTitle>
                         <displayWidth>80</displayWidth>
                         <isHidden>false</isHidden>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_ATPSurfaceTesting</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="action">
                         <columnTitle>Location</columnTitle>

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_ATP/.qview.xml b/onprc_ehr/resources/queries/onprc_ehr/Env_ATP/.qview.xml
@@ -1,7 +1,6 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" >
     <columns>
         <column name="date"/>
-        <column name="charge_unit"/>
         <column name="testing_location" />
         <column name="test_method"/>
         <column name="surface_tested" />

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_ATPSurfaceTesting.sql b/onprc_ehr/resources/queries/onprc_ehr/Env_ATPSurfaceTesting.sql
@@ -0,0 +1,6 @@
+
+Select value
+from onprc_ehr.Environmental_Reference_Data
+Where ColumnName in ('ATP_surfacetest')
+order by value
+
diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_Biological_indicators.query.xml b/onprc_ehr/resources/queries/onprc_ehr/Env_Biological_indicators.query.xml
@@ -16,6 +16,11 @@
                     <column columnName="testing_location">
                         <columnTitle>Autoclave</columnTitle>
                         <displayWidth>150</displayWidth>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_testingLocation</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="biological_Cycle">
                         <columnTitle>Cycle</columnTitle>

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_Contactplate.query.xml b/onprc_ehr/resources/queries/onprc_ehr/Env_Contactplate.query.xml
@@ -16,6 +16,11 @@
                     <column columnName="testing_location">
                         <columnTitle>Testing Location</columnTitle>
                         <displayWidth>150</displayWidth>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_testingLocation</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="colony_count">
                         <columnTitle>Colony Count</columnTitle>

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_SurfaceTestingATP.sql b/onprc_ehr/resources/queries/onprc_ehr/Env_SurfaceTestingATP.sql
@@ -0,0 +1,4 @@
+Select value
+from onprc_ehr.Environmental_Reference_Data
+Where ColumnName in ('ATP_surfacetest')
+order by value
diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_Water.query.xml b/onprc_ehr/resources/queries/onprc_ehr/Env_Water.query.xml
@@ -17,6 +17,11 @@
                     <column columnName="testing_location">
                         <columnTitle>Testing Location</columnTitle>
                         <displayWidth>150</displayWidth>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_testingLocation</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
 
                     <column columnName="water_source">

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Env_testingLocation.sql b/onprc_ehr/resources/queries/onprc_ehr/Env_testingLocation.sql
@@ -0,0 +1,4 @@
+Select value
+from onprc_ehr.Environmental_Reference_Data
+Where ColumnName in ('testLocation', 'testAtpLocation')
+order by value
diff --git a/onprc_ehr/resources/queries/onprc_ehr/Environmental_Assessment.query.xml b/onprc_ehr/resources/queries/onprc_ehr/Environmental_Assessment.query.xml
@@ -14,8 +14,13 @@
                         <displayWidth>100</displayWidth>
                     </column>
                     <column columnName="testing_location">
-                        <columnTitle>Test Location</columnTitle>
+                        <columnTitle>Area</columnTitle>
                         <displayWidth>150</displayWidth>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_testingLocation</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="test_method">
                         <columnTitle>Method</columnTitle>
@@ -27,45 +32,63 @@
                     </column>
 
                     <column columnName="pass_fail">
-                        <columnTitle>Pass/Fail</columnTitle>
+                        <columnTitle>Initial</columnTitle>
                         <displayWidth>50</displayWidth>
                     </column>
                     <column columnName="test_results">
-                        <columnTitle>Test Results</columnTitle>
+                        <columnTitle>Lab/Group</columnTitle>
                         <displayWidth>100</displayWidth>
                     </column>
                     <column columnName="test_type">
                         <columnTitle>Test Type</columnTitle>
+                        <isHidden>true</isHidden>
                         <displayWidth>100</displayWidth>
                     </column>
                     <column columnName="qcstate">
                         <isHidden>true</isHidden>
                     </column>
-                    <column columnName="biological_BI#">
+                    <column columnName="biological_BI">
                         <isHidden>true</isHidden>
                     </column>
                     <column columnName="retest">
-                        <columnTitle>Results Read By</columnTitle>
+                        <columnTitle>Retest</columnTitle>
                         <displayWidth>60</displayWidth>
-                        <isHidden>false</isHidden>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="action">
+                        <columnTitle>Location</columnTitle>
+                        <displayWidth>150</displayWidth>
+                    </column>
+                    <column columnName="biological_cycle">
+                        <columnTitle>Location</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="water_source">
+                        <columnTitle>Location</columnTitle>
+                        <isHidden>true</isHidden>
                     </column>
                     <column columnName="colony_count">
                         <columnTitle>Colony Count</columnTitle>
                         <displayWidth>60</displayWidth>
-                        <isHidden>false</isHidden>
+                        <isHidden>true</isHidden>
                     </column>
 
                     <column columnName="surface_tested">
                         <columnTitle>Surface Tested</columnTitle>
                         <displayWidth>80</displayWidth>
                         <isHidden>false</isHidden>
+                        <fk>
+                            <fkDbSchema>onprc_ehr</fkDbSchema>
+                            <fkTable>Env_SurfaceTestingATP</fkTable>
+                            <fkColumnName>value</fkColumnName>
+                        </fk>
                     </column>
                     <column columnName="remarks">
                         <columnTitle>Comments</columnTitle>
                         <displayWidth>200</displayWidth>
                     </column>
                     <column columnName="performedby">
-                        <columnTitle>Collected by</columnTitle>
+                        <columnTitle>Tech</columnTitle>
                     </column>
                     <column columnName="taskid">
                         <columnTitle>Task ID</columnTitle>

diff --git a/onprc_ehr/resources/queries/onprc_ehr/Environmental_Assessment/.qview.xml b/onprc_ehr/resources/queries/onprc_ehr/Environmental_Assessment/.qview.xml
@@ -0,0 +1,21 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" >
+    <columns>
+        <column name="date"/>
+        <column name="testing_location" />
+        <column name="test_method"/>
+        <column name="surface_tested" />
+        <column name="action" />
+        <column name="test_results"/>
+        <column name="pass_fail"/>
+        <column name="performedby"/>
+        <column name="qcstate"/>
+        <column name="taskid"/>
+
+
+    </columns>
+
+    <sorts>
+        <sort column="date" descending="true"/>
+        <sort column="testing_location" descending="false"/>
+    </sorts>
+</customView>
diff --git a/onprc_ehr/resources/views/EnvironmentalLandingpage.html b/onprc_ehr/resources/views/EnvironmentalLandingpage.html
@@ -26,6 +26,8 @@
                         name: 'Environmental Assessment ATP Input form', url: LABKEY.ActionURL.buildURL('ehr','dataEntryForm', '/ehr/ONPRC/DCM/Environmental Assessment/',{formType: 'Environmental_ATP'})
                     },{
                      name: 'Environmental Assessment EDIT TASK RECORDS', url: LABKEY.ActionURL.buildURL('ONPRC_EHR', 'enterData.view', null, null)
+                    },{
+                        name: 'Environmental Assessment ATP Editing Interface', url: '<%=contextPath%>/ldk' + '/ehr/ONPRC/DCM/Environmental Assessment/' + '/updateQuery.view?schemaName=onprc_ehr&query.queryName=Environmental_Assessment&query.service_requested~eq=Sanitation%3A%20ATP'
                     }]
                 },{
                     header: 'Environmental Assessment Reports',
@@ -34,7 +36,14 @@
                     },{
                         name: 'Environmental Assessment Detailed printable reports', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fClinPath%2fPrimeLaboratory_AssessmentMain&rs:Command=Render'
                     },{
-                        name: 'Environmental Assessment Prime Grid reports', url: LABKEY.ActionURL.buildURL('ONPRC_EHR', 'EnvironmentalDetails.view', null, null)
+                        name: 'Environmental Assessment Biological Indicators Grid reports', url: '<%=contextPath%>/query' + '/ehr/ONPRC/DCM/Environmental Assessment/' + '/executeQuery.view?schemaName=onprc_ehr&query.queryName=Env_Biological_indicators'
+                    },{
+                        name: 'Environmental Assessment Water Testing Grid reports', url: '<%=contextPath%>/query' + '/ehr/ONPRC/DCM/Environmental Assessment/' + '/executeQuery.view?schemaName=onprc_ehr&query.queryName=Env_Water'
+                    },{
+                        name: 'Environmental Assessment Contact Plate Grid reports', url: '<%=contextPath%>/query' + '/ehr/ONPRC/DCM/Environmental Assessment/' + '/executeQuery.view?schemaName=onprc_ehr&query.queryName=Env_Contactplate'
+                    },{
+                        name: 'Environmental Assessment ATP Grid reports', url: '<%=contextPath%>/query' + '/ehr/ONPRC/DCM/Environmental Assessment/' + '/executeQuery.view?schemaName=onprc_ehr&query.queryName=Env_ATP'
+
 
                     }]
                 }]

diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Env_Sanitation.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Env_Sanitation.js
@@ -23,6 +23,7 @@ EHR.model.DataModelManager.registerMetadata('Environmental', {
             },
             testing_location: {
                 xtype: 'onprc-env_testLocation',
+                header: 'Test Location',
                 columnConfig: {
                     width: 200
                 }
@@ -36,6 +37,7 @@ EHR.model.DataModelManager.registerMetadata('Environmental', {
             },
             test_results: {
                 xtype: 'onprc-env_testresults',
+                header: 'Test Results-',
                 columnConfig: {
                     width: 100
                 }
@@ -113,6 +115,7 @@ EHR.model.DataModelManager.registerMetadata('Environmental', {
 
             pass_fail: {
                 xtype: 'onprc-env_passfail',
+                header: 'Pass/Fail',
                 columnConfig: {
                     width: 100
                 }
@@ -123,6 +126,13 @@ EHR.model.DataModelManager.registerMetadata('Environmental', {
                 columnConfig: {
                     width: 90
                 }
+            },
+            remarks: {
+                xtype: 'textfield',
+                header: 'Comments',
+                columnConfig: {
+                    width: 150
+                }
             }
         }
     }

diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Env_Sanitation_ATP.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Env_Sanitation_ATP.js
@@ -24,10 +24,8 @@ EHR.model.DataModelManager.registerMetadata('Environmental_ATP', {
             },
 
             charge_unit: {
-                xtype: 'onprc-env_chargeunit',
-                columnConfig: {
-                    width: 100
-                }
+                defaultValue: 'Kati',
+                hidden: true
             },
             testing_location: {
                 xtype: 'onprc-env_testLocation',
@@ -62,6 +60,7 @@ EHR.model.DataModelManager.registerMetadata('Environmental_ATP', {
             },
             surface_tested: {
                 xtype: 'onprc-env_surfacetest',
+                header: 'Surface Tested',
                 hidden: false,
                 columnConfig: {
                     width: 180

diff --git a/onprc_ehr/resources/web/onprc_ehr/templates/BulkEnvironmental_ATP_Template.xlsx b/onprc_ehr/resources/web/onprc_ehr/templates/BulkEnvironmental_ATP_Template.xlsx