From d8111b9649e21c70992d26e25aea9878e609ef80 Mon Sep 17 00:00:00 2001
From: Gary <jonesga@ohsu.edu>
Date: Mon, 27 Nov 2023 08:30:07 -0700
Subject: [PATCH 1/6] Update of link to eIACUIC

---
 .../resources/views/protocolDetails.html      | 260 ++++++++++--------
 1 file changed, 144 insertions(+), 116 deletions(-)

diff --git a/onprc_ehr/resources/views/protocolDetails.html b/onprc_ehr/resources/views/protocolDetails.html
index 98f84eb32..d388207e3 100644
--- a/onprc_ehr/resources/views/protocolDetails.html
+++ b/onprc_ehr/resources/views/protocolDetails.html
@@ -1,111 +1,101 @@
 <script type="text/javascript">
-
-Ext4.onReady(function (){
-    var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
-    if (!protocol){
-        alert('Must Provide Protocol Number');
-        return false;
-    }
-    protocol = protocol.toLowerCase();
-
-    var webpart = <%=webpartContext%>;
-    var domSpec = [{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolDetails_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolProjects_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolLinks_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'allowableAnimals_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'allowableSLAs_' + webpart.wrapperDivId
-    },{
+    /*' updated 2022-07-28 2nd tryneeded to move the buttons within the success statement and add [] to the output'
+    * Update 2022-10-04 Added to latest build for deployment
+    * */
+    Ext4.onReady(function (){
+        var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
+        if (!protocol){
+            alert('Must Provide Protocol Number');
+            return false;
+        }
+        protocol = protocol.toLowerCase();
+
+        var webpart = <%=webpartContext%>;
+        var domSpec = [{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolDetails_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolProjects_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'allowableAnimals_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'allowableSLAs_' + webpart.wrapperDivId
+        },/*{
         tag: 'div',
         style: 'padding-bottom: 10px;',
         id: 'exemptions_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'housingSummary_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'housingSummarySpecie_' + webpart.wrapperDivId
-    }];
-
-    var el = Ext4.get(webpart.wrapperDivId);
-    Ext4.DomHelper.append(el, domSpec);
-
-    LABKEY.Query.selectRows({
-        requiredVersion: 9.1,
-        schemaName: 'ehr',
-        queryName: 'protocol',
-        columns: 'protocol,displayName',
-        filterArray: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback(),
-        scope: this,
-        success: function(results){
-            if (!results || !results.rows || !results.rows.length){
-                return;
+    },*/{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'housingSummary_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'housingSummarySpecie_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolLinks_' + webpart.wrapperDivId
+        }];
+
+        var el = Ext4.get(webpart.wrapperDivId);
+        Ext4.DomHelper.append(el, domSpec);
+
+        LABKEY.Query.selectRows({
+                    requiredVersion: 9.1,
+                    schemaName: 'ehr',
+                    queryName: 'protocol',
+                    columns: 'protocol,displayName,Template_OID',
+                    filterArray: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+                    failure: LDK.Utils.getErrorCallback(),
+                    scope: this,
+                    success: function(results){
+                        if (!results || !results.rows || !results.rows.length){
+                            return;
+                        }
+                        var sr = new LDK.SelectRowsRow(results.rows[0]);
+                        var buttons = null;
+                        if (EHR.Security.hasProtocolEditorPermission()){
+                            buttons = [{
+                                buttons = [
+
+                                /*              {
+                                          text: 'More Actions',
+                                          menu: [{
+                                              text: 'Edit Protocol Details is completed thru eIACUC2 Application',
+                                              /*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*/
+                            },
+                                /!*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*!/
+                        }
+
+                    ]
+                    },*/
+                {
+                    text: 'See eIACUC2 Record',
+                    href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
+                }
+    ]
+    }]
+        text: 'edit Protocol Records in eIACUC2' ,
+                menu: [
+            /*{
+        text: 'Edit Protocol Details is completed thru eIACUC2 Application',
+        /!*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*!/
+    },*/
+            {
+                text: 'open eIACUC2 Record and update Protocol Details',
+                /* text: 'Edit Protocol Details is completed thru eIACUC2 Application',*/
+                href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
             }
-            var sr = new LDK.SelectRowsRow(results.rows[0]);
-
-            var otherReports = [{
-                name: 'View Active Animal Assignments',
-                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Assignment', 'query.viewName': 'Active Assignments', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-            },{
-                name: 'View All Animals Assigned To This Protocol Over A Date Range',
-                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'assignmentOverlapsById', 'query.param.Protocol': sr.getValue('displayName')})
-            },{
-                name: 'View Procedures Allowed Under This Protocol',
-                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'protocolProcedures', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-            },{
-                name: 'View Procedures Performed Under This Protocol',
-                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-            },{
-                name: 'View Procedure Count Performed Under This Protocol',
-                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'proceduresPerYear', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-            },{
-                name: 'View Any Assignments To This Protocol That Do Not Match Allowable Animals',
-                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'assignmentsNotAllowed', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-            },{
-                name: 'View The Number of Small Lab Animals Allowed Under This Protocol',
-                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'sla', 'query.queryName': 'allowableAnimals', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-            }];
-
-            Ext4.create('LDK.panel.WebpartPanel', {
-                title: 'Other Reports',
-                bodyStyle: 'padding:5px;',
-                items: [{
-                    xtype: 'ldk-navpanel',
-                    sections: [{
-                        header: null,
-                        items: otherReports
-                    }]
-                }]
-            }).render('protocolLinks_' + webpart.wrapperDivId);
-        }
-    });
-
-    var buttons = null;
-    if (EHR.Security.hasProtocolEditorPermission()){
-        buttons = [{
-            text: 'More Actions',
-            menu: [{
-                text: 'Edit Protocol Details',
-                href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()
-            }]
-        }]
+        ]
+    }]
     }
 
     Ext4.create('LDK.panel.DetailsPanel', {
@@ -123,6 +113,44 @@
         }
     });
 
+    /*            var otherReports = [{
+                    name: 'View Active Animal Assignments',
+                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Assignment', 'query.viewName': 'Active Assignments', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
+                },{
+                    name: 'View All Animals Assigned To This Protocol Over A Date Range',
+                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'assignmentOverlapsById', 'query.param.Protocol': sr.getValue('displayName')})
+                },{
+                    name: 'View Procedures Allowed Under This Protocol',
+                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'protocolProcedures', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                },{
+                    name: 'View Procedures Performed Under This Protocol',
+                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
+                },{
+                    name: 'View Procedure Count Performed Under This Protocol',
+                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'proceduresPerYear', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                },{
+                    name: 'View Any Assignments To This Protocol That Do Not Match Allowable Animals',
+                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'assignmentsNotAllowed', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                },{
+                    name: 'View The Number of Small Lab Animals Allowed Under This Protocol',
+                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'sla', 'query.queryName': 'allowableAnimals', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                }];*/
+
+    Ext4.create('LDK.panel.WebpartPanel', {
+        title: 'Other Reports',
+        bodyStyle: 'padding:5px;',
+        items: [{
+            xtype: 'ldk-navpanel',
+            sections: [{
+                header: null,
+                items: otherReports
+            }]
+        }]
+    }).render('protocolLinks_' + webpart.wrapperDivId);
+    }
+    });
+
+
     LDK.Utils.getReadOnlyQWP({
         title: 'Housing Summary',
         schemaName: 'study',
@@ -150,10 +178,10 @@
     }).render('protocolProjects_' + webpart.wrapperDivId);
 
     LDK.Utils.getReadOnlyQWP({
-        title: 'Allowable NHPs',
-        schemaName: 'ehr',
-        queryName: 'animalUsage',
-        filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+        title: 'Allowable NHPs By Species',
+        schemaName: 'onprc_ehr',
+        queryName: 'eIACUC_AllowableNhps_Species',
+        filters: [LABKEY.Filter.create('parent_protocol', protocol, LABKEY.Filter.Types.EQUAL)],
         failure: LDK.Utils.getErrorCallback()
     }).render('allowableAnimals_' + webpart.wrapperDivId);
 
@@ -167,14 +195,14 @@
         failure: LDK.Utils.getErrorCallback()
     }).render('allowableSLAs_' + webpart.wrapperDivId);
 
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Exemptions',
-        schemaName: 'ehr',
-        queryName: 'protocolexemptions',
-        filters: [LABKEY.Filter.create('coalescedProtocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback()
-    }).render('exemptions_' + webpart.wrapperDivId);
+    /*  LDK.Utils.getReadOnlyQWP({
+          title: 'Exemptions',
+          schemaName: 'ehr',
+          queryName: 'protocolexemptions',
+          filters: [LABKEY.Filter.create('coalescedProtocol', protocol, LABKEY.Filter.Types.EQUAL)],
+          failure: LDK.Utils.getErrorCallback()
+      }).render('exemptions_' + webpart.wrapperDivId);*/
 
-});
+    });
 
-</script>
\ No newline at end of file
+</script>

From 7d8a6540b606e9c74a91b67dfdecdc1a9c928cd1 Mon Sep 17 00:00:00 2001
From: Gary <jonesga@ohsu.edu>
Date: Mon, 27 Nov 2023 08:36:53 -0700
Subject: [PATCH 2/6] Update of link to eIACUIC

---
 .../resources/views/protocolDetails.html      | 82 +++++++++----------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/onprc_ehr/resources/views/protocolDetails.html b/onprc_ehr/resources/views/protocolDetails.html
index d388207e3..dc8f771a1 100644
--- a/onprc_ehr/resources/views/protocolDetails.html
+++ b/onprc_ehr/resources/views/protocolDetails.html
@@ -1,49 +1,47 @@
 <script type="text/javascript">
-    /*' updated 2022-07-28 2nd tryneeded to move the buttons within the success statement and add [] to the output'
-    * Update 2022-10-04 Added to latest build for deployment
-    * */
-    Ext4.onReady(function (){
-        var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
-        if (!protocol){
-            alert('Must Provide Protocol Number');
-            return false;
-        }
-        protocol = protocol.toLowerCase();
-
-        var webpart = <%=webpartContext%>;
-        var domSpec = [{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolDetails_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolProjects_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'allowableAnimals_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'allowableSLAs_' + webpart.wrapperDivId
-        },/*{
+
+Ext4.onReady(function (){
+    var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
+    if (!protocol){
+        alert('Must Provide Protocol Number');
+        return false;
+    }
+    protocol = protocol.toLowerCase();
+
+    var webpart = <%=webpartContext%>;
+    var domSpec = [{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'protocolDetails_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'protocolProjects_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'protocolLinks_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'allowableAnimals_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'allowableSLAs_' + webpart.wrapperDivId
+    },{
         tag: 'div',
         style: 'padding-bottom: 10px;',
         id: 'exemptions_' + webpart.wrapperDivId
-    },*/{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'housingSummary_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'housingSummarySpecie_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolLinks_' + webpart.wrapperDivId
-        }];
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'housingSummary_' + webpart.wrapperDivId
+    },{
+        tag: 'div',
+        style: 'padding-bottom: 10px;',
+        id: 'housingSummarySpecie_' + webpart.wrapperDivId
+    }];
 
         var el = Ext4.get(webpart.wrapperDivId);
         Ext4.DomHelper.append(el, domSpec);

From 3409d713bf0c5c396f7c0b42a6c10172cd1323cb Mon Sep 17 00:00:00 2001
From: Gary <jonesga@ohsu.edu>
Date: Tue, 28 Nov 2023 07:44:40 -0700
Subject: [PATCH 3/6] Update of link to eIACUIC

---
 .../resources/views/protocolDetails.html      | 354 ++++++++----------
 1 file changed, 166 insertions(+), 188 deletions(-)

diff --git a/onprc_ehr/resources/views/protocolDetails.html b/onprc_ehr/resources/views/protocolDetails.html
index dc8f771a1..091b71169 100644
--- a/onprc_ehr/resources/views/protocolDetails.html
+++ b/onprc_ehr/resources/views/protocolDetails.html
@@ -1,205 +1,183 @@
 <script type="text/javascript">
 
-Ext4.onReady(function (){
-    var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
-    if (!protocol){
-        alert('Must Provide Protocol Number');
-        return false;
-    }
-    protocol = protocol.toLowerCase();
-
-    var webpart = <%=webpartContext%>;
-    var domSpec = [{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolDetails_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolProjects_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'protocolLinks_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'allowableAnimals_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'allowableSLAs_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'exemptions_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'housingSummary_' + webpart.wrapperDivId
-    },{
-        tag: 'div',
-        style: 'padding-bottom: 10px;',
-        id: 'housingSummarySpecie_' + webpart.wrapperDivId
-    }];
+    Ext4.onReady(function (){
+        var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
+        if (!protocol){
+            alert('Must Provide Protocol Number');
+            return false;
+        }
+        protocol = protocol.toLowerCase();
+
+        var webpart = <%=webpartContext%>;
+        var domSpec = [{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolDetails_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolProjects_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'protocolLinks_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'allowableAnimals_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'allowableSLAs_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'exemptions_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'housingSummary_' + webpart.wrapperDivId
+        },{
+            tag: 'div',
+            style: 'padding-bottom: 10px;',
+            id: 'housingSummarySpecie_' + webpart.wrapperDivId
+        }];
 
         var el = Ext4.get(webpart.wrapperDivId);
         Ext4.DomHelper.append(el, domSpec);
 
         LABKEY.Query.selectRows({
-                    requiredVersion: 9.1,
-                    schemaName: 'ehr',
-                    queryName: 'protocol',
-                    columns: 'protocol,displayName,Template_OID',
-                    filterArray: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-                    failure: LDK.Utils.getErrorCallback(),
-                    scope: this,
-                    success: function(results){
-                        if (!results || !results.rows || !results.rows.length){
-                            return;
-                        }
-                        var sr = new LDK.SelectRowsRow(results.rows[0]);
-                        var buttons = null;
-                        if (EHR.Security.hasProtocolEditorPermission()){
-                            buttons = [{
-                                buttons = [
-
-                                /*              {
-                                          text: 'More Actions',
-                                          menu: [{
-                                              text: 'Edit Protocol Details is completed thru eIACUC2 Application',
-                                              /*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*/
-                            },
-                                /!*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*!/
-                        }
+            requiredVersion: 9.1,
+            schemaName: 'ehr',
+            queryName: 'protocol',
+            columns: 'protocol,displayName,Template_OID',
+            filterArray: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            failure: LDK.Utils.getErrorCallback(),
+            scope: this,
+            success: function(results){
+                if (!results || !results.rows || !results.rows.length){
+                    return;
+                }
+                var sr = new LDK.SelectRowsRow(results.rows[0]);
+                var buttons = null;
+                if (EHR.Security.hasProtocolEditorPermission()){
+                    buttons = [
 
+
+                        {
+                            text: 'See eIACUC2 Record',
+                            href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
+                        }
                     ]
-                    },*/
-                {
-                    text: 'See eIACUC2 Record',
-                    href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
                 }
-    ]
-    }]
-        text: 'edit Protocol Records in eIACUC2' ,
-                menu: [
-            /*{
-        text: 'Edit Protocol Details is completed thru eIACUC2 Application',
-        /!*href: LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'protocol', protocol: protocol}) + '&returnUrl=' + LDK.Utils.getSrcURL()*!/
-    },*/
-            {
-                text: 'open eIACUC2 Record and update Protocol Details',
-                /* text: 'Edit Protocol Details is completed thru eIACUC2 Application',*/
-                href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
-            }
-        ]
-    }]
-    }
 
-    Ext4.create('LDK.panel.DetailsPanel', {
-        store: {
-            schemaName: 'ehr',
-            queryName: 'protocol',
-            filterArray: [
-                LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)
-            ]
-        },
-        title: 'Protocol Details:',
-        renderTo: 'protocolDetails_' + webpart.wrapperDivId,
-        detailsConfig: {
-            buttons: buttons
-        }
-    });
 
-    /*            var otherReports = [{
-                    name: 'View Active Animal Assignments',
-                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Assignment', 'query.viewName': 'Active Assignments', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-                },{
-                    name: 'View All Animals Assigned To This Protocol Over A Date Range',
-                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'assignmentOverlapsById', 'query.param.Protocol': sr.getValue('displayName')})
-                },{
-                    name: 'View Procedures Allowed Under This Protocol',
-                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'protocolProcedures', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                },{
-                    name: 'View Procedures Performed Under This Protocol',
-                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-                },{
-                    name: 'View Procedure Count Performed Under This Protocol',
-                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'proceduresPerYear', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                },{
-                    name: 'View Any Assignments To This Protocol That Do Not Match Allowable Animals',
-                    url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'assignmentsNotAllowed', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                },{
-                    name: 'View The Number of Small Lab Animals Allowed Under This Protocol',
-                    url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'sla', 'query.queryName': 'allowableAnimals', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                }];*/
-
-    Ext4.create('LDK.panel.WebpartPanel', {
-        title: 'Other Reports',
-        bodyStyle: 'padding:5px;',
-        items: [{
-            xtype: 'ldk-navpanel',
-            sections: [{
-                header: null,
-                items: otherReports
-            }]
-        }]
-    }).render('protocolLinks_' + webpart.wrapperDivId);
-    }
-    });
 
 
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Housing Summary',
-        schemaName: 'study',
-        queryName: 'protocolHousingSummary',
-        columns: 'room,room/housingType,room/housingCondition,totalAnimals',
-        filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback()
-    }).render('housingSummary_' + webpart.wrapperDivId);
-
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Housing Summary By Specie',
-        schemaName: 'study',
-        queryName: 'protocolHousingSummary_Species',
-        columns: 'id/demographics/species,totalAnimals',
-        filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback()
-    }).render('housingSummarySpecie_' + webpart.wrapperDivId);
-
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Projects Under This Protocol',
-        schemaName: 'ehr',
-        queryName: 'project',
-        filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback()
-    }).render('protocolProjects_' + webpart.wrapperDivId);
-
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Allowable NHPs By Species',
-        schemaName: 'onprc_ehr',
-        queryName: 'eIACUC_AllowableNhps_Species',
-        filters: [LABKEY.Filter.create('parent_protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        failure: LDK.Utils.getErrorCallback()
-    }).render('allowableAnimals_' + webpart.wrapperDivId);
-
-    //Added the SLAs count by Kollil, 10/18/2021
-    LDK.Utils.getReadOnlyQWP({
-        title: 'Allowable SLAs',
-        schemaName: 'sla',
-        queryName: 'allowableSLA',
-        filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-        sort: '-startdate',
-        failure: LDK.Utils.getErrorCallback()
-    }).render('allowableSLAs_' + webpart.wrapperDivId);
-
-    /*  LDK.Utils.getReadOnlyQWP({
-          title: 'Exemptions',
-          schemaName: 'ehr',
-          queryName: 'protocolexemptions',
-          filters: [LABKEY.Filter.create('coalescedProtocol', protocol, LABKEY.Filter.Types.EQUAL)],
-          failure: LDK.Utils.getErrorCallback()
-      }).render('exemptions_' + webpart.wrapperDivId);*/
+                Ext4.create('LDK.panel.DetailsPanel', {
+                    store: {
+                        schemaName: 'ehr',
+                        queryName: 'protocol',
+                        filterArray: [
+                            LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)
+                        ]
+                    },
+                    title: 'Protocol Details:',
+                    renderTo: 'protocolDetails_' + webpart.wrapperDivId,
+                    detailsConfig: {
+                        buttons: buttons
+                    }
+                });
+
+                /*            var otherReports = [{
+                                name: 'View Active Animal Assignments',
+                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Assignment', 'query.viewName': 'Active Assignments', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
+                            },{
+                                name: 'View All Animals Assigned To This Protocol Over A Date Range',
+                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'assignmentOverlapsById', 'query.param.Protocol': sr.getValue('displayName')})
+                            },{
+                                name: 'View Procedures Allowed Under This Protocol',
+                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'protocolProcedures', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                            },{
+                                name: 'View Procedures Performed Under This Protocol',
+                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
+                            },{
+                                name: 'View Procedure Count Performed Under This Protocol',
+                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'proceduresPerYear', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                            },{
+                                name: 'View Any Assignments To This Protocol That Do Not Match Allowable Animals',
+                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'assignmentsNotAllowed', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                            },{
+                                name: 'View The Number of Small Lab Animals Allowed Under This Protocol',
+                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'sla', 'query.queryName': 'allowableAnimals', 'query.protocol/displayName~eq': sr.getValue('displayName')})
+                            }];*/
+
+                Ext4.create('LDK.panel.WebpartPanel', {
+                    title: 'Other Reports',
+                    bodyStyle: 'padding:5px;',
+                    items: [{
+                        xtype: 'ldk-navpanel',
+                        sections: [{
+                            header: null,
+                            items: otherReports
+                        }]
+                    }]
+                }).render('protocolLinks_' + webpart.wrapperDivId);
+            }
+        });
+
+
+        LDK.Utils.getReadOnlyQWP({
+            title: 'Housing Summary',
+            schemaName: 'study',
+            queryName: 'protocolHousingSummary',
+            columns: 'room,room/housingType,room/housingCondition,totalAnimals',
+            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            failure: LDK.Utils.getErrorCallback()
+        }).render('housingSummary_' + webpart.wrapperDivId);
+
+        LDK.Utils.getReadOnlyQWP({
+            title: 'Housing Summary By Specie',
+            schemaName: 'study',
+            queryName: 'protocolHousingSummary_Species',
+            columns: 'id/demographics/species,totalAnimals',
+            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            failure: LDK.Utils.getErrorCallback()
+        }).render('housingSummarySpecie_' + webpart.wrapperDivId);
+
+        LDK.Utils.getReadOnlyQWP({
+            title: 'Projects Under This Protocol',
+            schemaName: 'ehr',
+            queryName: 'project',
+            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            failure: LDK.Utils.getErrorCallback()
+        }).render('protocolProjects_' + webpart.wrapperDivId);
+
+        LDK.Utils.getReadOnlyQWP({
+            title: 'Allowable NHPs By Species',
+            schemaName: 'onprc_ehr',
+            queryName: 'eIACUC_AllowableNhps_Species',
+            filters: [LABKEY.Filter.create('parent_protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            failure: LDK.Utils.getErrorCallback()
+        }).render('allowableAnimals_' + webpart.wrapperDivId);
+
+        //Added the SLAs count by Kollil, 10/18/2021
+        LDK.Utils.getReadOnlyQWP({
+            title: 'Allowable SLAs',
+            schemaName: 'sla',
+            queryName: 'allowableSLA',
+            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
+            sort: '-startdate',
+            failure: LDK.Utils.getErrorCallback()
+        }).render('allowableSLAs_' + webpart.wrapperDivId);
+
+        /*  LDK.Utils.getReadOnlyQWP({
+              title: 'Exemptions',
+              schemaName: 'ehr',
+              queryName: 'protocolexemptions',
+              filters: [LABKEY.Filter.create('coalescedProtocol', protocol, LABKEY.Filter.Types.EQUAL)],
+              failure: LDK.Utils.getErrorCallback()
+          }).render('exemptions_' + webpart.wrapperDivId);*/
 
     });
 

From 7ea188f7e20a535be4e2b749c9abe424b41b3255 Mon Sep 17 00:00:00 2001
From: Gary <jonesga@ohsu.edu>
Date: Tue, 28 Nov 2023 08:15:01 -0700
Subject: [PATCH 4/6] Update of link to eIACUIC

---
 .../resources/views/protocolDetails.html      | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/onprc_ehr/resources/views/protocolDetails.html b/onprc_ehr/resources/views/protocolDetails.html
index 091b71169..f30e38e75 100644
--- a/onprc_ehr/resources/views/protocolDetails.html
+++ b/onprc_ehr/resources/views/protocolDetails.html
@@ -8,7 +8,7 @@
         }
         protocol = protocol.toLowerCase();
 
-        var webpart = <%=webpartContext%>;
+        var webpart = webpartContext.webPart;
         var domSpec = [{
             tag: 'div',
             style: 'padding-bottom: 10px;',
@@ -89,28 +89,6 @@
                     }
                 });
 
-                /*            var otherReports = [{
-                                name: 'View Active Animal Assignments',
-                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Assignment', 'query.viewName': 'Active Assignments', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-                            },{
-                                name: 'View All Animals Assigned To This Protocol Over A Date Range',
-                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'assignmentOverlapsById', 'query.param.Protocol': sr.getValue('displayName')})
-                            },{
-                                name: 'View Procedures Allowed Under This Protocol',
-                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'protocolProcedures', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                            },{
-                                name: 'View Procedures Performed Under This Protocol',
-                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.project/protocol/displayName~eq': sr.getValue('displayName')})
-                            },{
-                                name: 'View Procedure Count Performed Under This Protocol',
-                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'proceduresPerYear', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                            },{
-                                name: 'View Any Assignments To This Protocol That Do Not Match Allowable Animals',
-                                url: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr', 'query.queryName': 'assignmentsNotAllowed', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                            },{
-                                name: 'View The Number of Small Lab Animals Allowed Under This Protocol',
-                                url : LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'sla', 'query.queryName': 'allowableAnimals', 'query.protocol/displayName~eq': sr.getValue('displayName')})
-                            }];*/
 
                 Ext4.create('LDK.panel.WebpartPanel', {
                     title: 'Other Reports',
@@ -171,13 +149,6 @@
             failure: LDK.Utils.getErrorCallback()
         }).render('allowableSLAs_' + webpart.wrapperDivId);
 
-        /*  LDK.Utils.getReadOnlyQWP({
-              title: 'Exemptions',
-              schemaName: 'ehr',
-              queryName: 'protocolexemptions',
-              filters: [LABKEY.Filter.create('coalescedProtocol', protocol, LABKEY.Filter.Types.EQUAL)],
-              failure: LDK.Utils.getErrorCallback()
-          }).render('exemptions_' + webpart.wrapperDivId);*/
 
     });
 

From b86e5e68b1d77b6f566a57870c9e71f9957923a4 Mon Sep 17 00:00:00 2001
From: Gary <jonesga@ohsu.edu>
Date: Tue, 9 Jan 2024 14:23:23 -0700
Subject: [PATCH 5/6] New ETL For Hansen and changed apha numeric to numeric
 for step names

---
 .../resources/etls/HansenQueriesToFile.xml    | 105 -----------------
 .../resources/etls/mfshToRandalData_2024.xml  | 106 ++++++++++++++++++
 2 files changed, 106 insertions(+), 105 deletions(-)
 delete mode 100644 onprc_ehr/resources/etls/HansenQueriesToFile.xml
 create mode 100644 onprc_ehr/resources/etls/mfshToRandalData_2024.xml

diff --git a/onprc_ehr/resources/etls/HansenQueriesToFile.xml b/onprc_ehr/resources/etls/HansenQueriesToFile.xml
deleted file mode 100644
index 640fd5763..000000000
--- a/onprc_ehr/resources/etls/HansenQueriesToFile.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<etl xmlns="http://labkey.org/etl/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://labkey.org/etl/xml ">
-    <name>mfshToRandalData</name>    <description>imports the data from mfsh animal details on ONPRC</description>
-    <description>imports the data from mfsh animal details on ONPRC</description>
-    <transforms>
-        <transform id="step1">
-            <description>Define Study Animals</description>
-            <source queryName="studyAnimals" schemaName="Randal_data"/>
-            <destination schemaName="Onprc_ehr" queryName="StudyDetails_RandalData"/>
-        </transform>
-        <transform id="step2">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_AnimalGroups" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="AnimalGroups-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_blood" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="BloodDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3a">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_birth" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="BirthDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3b">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_assignment" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="assignment-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3c">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_arrival" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="arrival-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3d">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_animalgroups" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="animal_groups-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3e">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_weights" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="weights-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3f">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_Cases" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="Cases-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3g">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_clinremarks" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="clinremarks-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3h">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_demographics" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="demographics-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3i">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_deaths" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="deaths-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3j">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_departure" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="departure-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3k">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_drug" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="drug-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3l">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_flags" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="flags-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3m">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_Hematology" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="Hematology-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3n">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_Housing" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="Housing-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3o">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_MHCData" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="MHCData-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-        <transform id="step3p">
-            <description>Export Query to File Share</description>
-            <source queryName="RandData_Notes" schemaName="onprc_ehr"/>
-            <destination type="file" dir="hansonFiles" fileBaseName="Notes-${TransformRunId}-${Timestamp}" fileExtension="csv" />
-        </transform>
-    </transforms>
-
-</etl>
diff --git a/onprc_ehr/resources/etls/mfshToRandalData_2024.xml b/onprc_ehr/resources/etls/mfshToRandalData_2024.xml
new file mode 100644
index 000000000..4aa435783
--- /dev/null
+++ b/onprc_ehr/resources/etls/mfshToRandalData_2024.xml
@@ -0,0 +1,106 @@
+<etl xmlns="http://labkey.org/etl/xml">
+    <name>mfshToRandalData_update</name>
+    <description>imports the data from mfsh animal details on ONPRC</description>
+    <transforms>
+        <transform id="step1">
+            <description>Define Hansen Study Animals 2022</description>
+            <source queryName="studyAnimals" schemaName="Randal_data"/>
+            <destination queryName="StudyDetails_RandalData" schemaName="Onprc_ehr" targetOption="truncate"/>
+        </transform>
+        <transform id="step2">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_AnimalGroups" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="AnimalGroups-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step3">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_blood" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="BloodDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step4">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_birth" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="BirthDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step5">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_assignment" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="assignment-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step6">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_arrival" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="arrival-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+
+        <transform id="step7">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_weights" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="weights-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step8">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_Cases" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="Cases-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step9">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_clinremarks" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="clinremarks-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step10">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_demographics" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="demographics-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step11">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_deaths" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="deaths-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step12">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_departure" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="departure-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step13">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_drug" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="drug-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step14">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_flags" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="flags-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step15">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_Hematology" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="Hematology-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step16">
+            <description>Export Query to File Share</description>
+            <source queryName="RandData_Housing" schemaName="onprc_ehr"/>
+            <destination dir="hansenFiles" fileBaseName="Housing-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step17">
+            <description>Export Query to File Share Project</description>
+            <source queryName="project" schemaName="pf_ehrData"/>
+            <destination dir="hansenFiles" fileBaseName="Projects-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step18">
+            <description>Export Query to File Share Protocols</description>
+            <source queryName="protocol" schemaName="pf_ehrData"/>
+            <destination dir="hansenFiles" fileBaseName="Protocol-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+        <transform id="step19">
+            <description>Export Query to File Share</description>
+            <source queryName="RandalData_bcs" schemaName="onprc_ehr"/>
+            <destination dir="hansonFiles" fileBaseName="Notes-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
+        </transform>
+    </transforms>
+    <schedule>
+        <!--5AM-->
+        <cron expression="0 0 05 * * ?"/>
+    </schedule>
+</etl>

From 3b35c0fb3c690e9aae4b6d3ccc6e617d796a608e Mon Sep 17 00:00:00 2001
From: Gary Jones <jonesga@ohsu.edu>
Date: Tue, 9 Jan 2024 14:27:03 -0700
Subject: [PATCH 6/6] Delete onprc_ehr/resources/views/protocolDetails.html

Was not relevant to the current Feature Branch so deleted before build
---
 .../resources/views/protocolDetails.html      | 155 ------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 onprc_ehr/resources/views/protocolDetails.html

diff --git a/onprc_ehr/resources/views/protocolDetails.html b/onprc_ehr/resources/views/protocolDetails.html
deleted file mode 100644
index f30e38e75..000000000
--- a/onprc_ehr/resources/views/protocolDetails.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<script type="text/javascript">
-
-    Ext4.onReady(function (){
-        var protocol = LABKEY.ActionURL.getParameter('protocol') || LABKEY.ActionURL.getParameter('key');
-        if (!protocol){
-            alert('Must Provide Protocol Number');
-            return false;
-        }
-        protocol = protocol.toLowerCase();
-
-        var webpart = webpartContext.webPart;
-        var domSpec = [{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolDetails_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolProjects_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'protocolLinks_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'allowableAnimals_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'allowableSLAs_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'exemptions_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'housingSummary_' + webpart.wrapperDivId
-        },{
-            tag: 'div',
-            style: 'padding-bottom: 10px;',
-            id: 'housingSummarySpecie_' + webpart.wrapperDivId
-        }];
-
-        var el = Ext4.get(webpart.wrapperDivId);
-        Ext4.DomHelper.append(el, domSpec);
-
-        LABKEY.Query.selectRows({
-            requiredVersion: 9.1,
-            schemaName: 'ehr',
-            queryName: 'protocol',
-            columns: 'protocol,displayName,Template_OID',
-            filterArray: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            failure: LDK.Utils.getErrorCallback(),
-            scope: this,
-            success: function(results){
-                if (!results || !results.rows || !results.rows.length){
-                    return;
-                }
-                var sr = new LDK.SelectRowsRow(results.rows[0]);
-                var buttons = null;
-                if (EHR.Security.hasProtocolEditorPermission()){
-                    buttons = [
-
-
-                        {
-                            text: 'See eIACUC2 Record',
-                            href: `https://iacucapp.ohsu.edu/iacuc/sd/Rooms/DisplayPages/LayoutInitial?Container=com.webridge.entity.Entity[OID[${sr.getValue('Template_OID')}]]`
-                        }
-                    ]
-                }
-
-
-
-
-                Ext4.create('LDK.panel.DetailsPanel', {
-                    store: {
-                        schemaName: 'ehr',
-                        queryName: 'protocol',
-                        filterArray: [
-                            LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)
-                        ]
-                    },
-                    title: 'Protocol Details:',
-                    renderTo: 'protocolDetails_' + webpart.wrapperDivId,
-                    detailsConfig: {
-                        buttons: buttons
-                    }
-                });
-
-
-                Ext4.create('LDK.panel.WebpartPanel', {
-                    title: 'Other Reports',
-                    bodyStyle: 'padding:5px;',
-                    items: [{
-                        xtype: 'ldk-navpanel',
-                        sections: [{
-                            header: null,
-                            items: otherReports
-                        }]
-                    }]
-                }).render('protocolLinks_' + webpart.wrapperDivId);
-            }
-        });
-
-
-        LDK.Utils.getReadOnlyQWP({
-            title: 'Housing Summary',
-            schemaName: 'study',
-            queryName: 'protocolHousingSummary',
-            columns: 'room,room/housingType,room/housingCondition,totalAnimals',
-            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            failure: LDK.Utils.getErrorCallback()
-        }).render('housingSummary_' + webpart.wrapperDivId);
-
-        LDK.Utils.getReadOnlyQWP({
-            title: 'Housing Summary By Specie',
-            schemaName: 'study',
-            queryName: 'protocolHousingSummary_Species',
-            columns: 'id/demographics/species,totalAnimals',
-            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            failure: LDK.Utils.getErrorCallback()
-        }).render('housingSummarySpecie_' + webpart.wrapperDivId);
-
-        LDK.Utils.getReadOnlyQWP({
-            title: 'Projects Under This Protocol',
-            schemaName: 'ehr',
-            queryName: 'project',
-            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            failure: LDK.Utils.getErrorCallback()
-        }).render('protocolProjects_' + webpart.wrapperDivId);
-
-        LDK.Utils.getReadOnlyQWP({
-            title: 'Allowable NHPs By Species',
-            schemaName: 'onprc_ehr',
-            queryName: 'eIACUC_AllowableNhps_Species',
-            filters: [LABKEY.Filter.create('parent_protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            failure: LDK.Utils.getErrorCallback()
-        }).render('allowableAnimals_' + webpart.wrapperDivId);
-
-        //Added the SLAs count by Kollil, 10/18/2021
-        LDK.Utils.getReadOnlyQWP({
-            title: 'Allowable SLAs',
-            schemaName: 'sla',
-            queryName: 'allowableSLA',
-            filters: [LABKEY.Filter.create('protocol', protocol, LABKEY.Filter.Types.EQUAL)],
-            sort: '-startdate',
-            failure: LDK.Utils.getErrorCallback()
-        }).render('allowableSLAs_' + webpart.wrapperDivId);
-
-
-    });
-
-</script>