-
-
Click here to go to, PMIC Resource Scheduler
+Click here to go to, PMIC Resource Scheduler
-
-
- Click here to view, Today's scheduled events -
- Click here to view, Weekly scheduled events +
- Click here to view, Today's scheduled events +
- Click here to view, Weekly scheduled events
\ No newline at end of file diff --git a/onprc_ehr/resources/views/begin.html b/onprc_ehr/resources/views/begin.html index 459ee726d..5f51bdf70 100644 --- a/onprc_ehr/resources/views/begin.html +++ b/onprc_ehr/resources/views/begin.html @@ -46,8 +46,8 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Animal History', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view?'}, - {name: 'Animal Search', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalSearch.view?'} + {name: 'Animal History', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view'}, + {name: 'Animal Search', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalSearch.view'} ] },{ header: 'By Dataset', @@ -56,9 +56,9 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Browse All Datasets', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/datasets.view?'}, - {name: 'Housing Queries', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/housingQueries.view?'}, - {name: 'Protocol and Project Queries', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/projectQueries.view?'} + {name: 'Browse All Datasets', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-datasets.view'}, + {name: 'Housing Queries', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-housingQueries.view'}, + {name: 'Protocol and Project Queries', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-projectQueries.view'} ] },{ header: 'By Location', @@ -67,7 +67,7 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Search By Area, Room, or Cage', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:roomCage'} + {name: 'Search By Area, Room, or Cage', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:roomCage'} ] }] }); @@ -84,12 +84,12 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Records Needing Vet Review', url: '<%=contextPath%>/project' + ctx['EHRStudyContainer'] + '/begin.view?pageId=vetAdmin'}, - {name: 'Active Behavior Cases', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:none&showReport:1&activeReport:behaviorCases'}, - {name: 'Active Clinical Cases', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:none&showReport:1&activeReport:cases'}, - {name: 'Active Surgical Cases', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:none&showReport:1&activeReport:surgicalCases'}, - {name: 'Clinical Medication Schedule', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:none&showReport:1&activeReport:clinMedicationSchedule'}, - {name: 'Surgical Medication Schedule', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/animalHistory.view#inputType:none&showReport:1&activeReport:surgMedicationSchedule'}, + {name: 'Records Needing Vet Review', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/project-begin.view?pageId=vetAdmin'}, + {name: 'Active Behavior Cases', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:none&showReport:1&activeReport:behaviorCases'}, + {name: 'Active Clinical Cases', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:none&showReport:1&activeReport:cases'}, + {name: 'Active Surgical Cases', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:none&showReport:1&activeReport:surgicalCases'}, + {name: 'Clinical Medication Schedule', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:none&showReport:1&activeReport:clinMedicationSchedule'}, + {name: 'Surgical Medication Schedule', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-animalHistory.view#inputType:none&showReport:1&activeReport:surgMedicationSchedule'}, {name: 'Printable Reports', url: LABKEY.ActionURL.buildURL('onprc_ehr', 'printableReports', ctx['EHRStudyContainer'])} ] },{ @@ -99,10 +99,10 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Animal Groups', url: '<%=contextPath%>/query' + ctx['EHRStudyContainer'] + '/executeQuery.view?schemaName=ehr&query.queryName=animal_groups&query.viewName=Active Groups'}, - {name: 'Colony Overview', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/colonyOverview.view?'}, - {name: 'Room Utilization', url: '<%=contextPath%>/query' + ctx['EHRStudyContainer'] + '/executeQuery.view?schemaName=ehr_lookups&query.queryName=roomUtilization'}, - {name: 'More Reports', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/moreReports.view?'} + {name: 'Animal Groups', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr&query.queryName=animal_groups&query.viewName=Active Groups'}, + {name: 'Colony Overview', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-colonyOverview.view'}, + {name: 'Room Utilization', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=roomUtilization'}, + {name: 'More Reports', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-moreReports.view'} ] }] }); @@ -119,15 +119,15 @@ style: 'font-weight: bold;' }, items: [ - {name: 'Compare Lists of Animals', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/utilities.view?'}, - {name: 'Bulk History Export', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/historyExport.view?'}, + {name: 'Compare Lists of Animals', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-utilities.view'}, + {name: 'Bulk History Export', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-historyExport.view'}, //Modified: 9-9-2019 R.Blasa Display Basic instead of Full Expsure report {name: 'Basic Exposure Report', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fExposure+Reports%2fBasicExposureMain&rs:Command=Render'}, - {name: 'Drug Formulary', url: '<%=contextPath%>/query' + ctx['EHRStudyContainer'] + '/executeQuery.view?schemaName=ehr_lookups&query.queryName=drug_defaults'}, + {name: 'Drug Formulary', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=drug_defaults'}, //Added by Kolli on 7/30/19 {name: 'Common Medical Abbreviations', url: '<%=contextPath%>' + '/wiki/home/Support/page.view?name=Common%20Abbreviations'}, - {name: 'Procedure List', url: '<%=contextPath%>/query' + ctx['EHRStudyContainer'] + '/executeQuery.view?schemaName=ehr_lookups&query.queryName=procedures&query.viewName=Active Procedures'}, - {name: 'Search Center SNOMED Codes', url: '<%=contextPath%>/query' + ctx['EHRStudyContainer'] + '/executeQuery.view?schemaName=ehr_lookups&query.queryName=snomed'} + {name: 'Procedure List', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=procedures&query.viewName=Active Procedures'}, + {name: 'Search Center SNOMED Codes', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=snomed'} ] },{ header: 'Data Entry', @@ -137,11 +137,11 @@ }, items: [ // Modified: 4-3-2017 R.Blasa Allow new method of presenting Necropsy entry screens - {name: 'Enter Data / Task Review', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/enterData.view'}, + {name: 'Enter Data / Task Review', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-enterData.view'}, - {name: 'Post-administration Med Verification', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/dataEntryForm.view?formType=medsignoff'} + {name: 'Post-administration Med Verification', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-dataEntryForm.view?formType=medsignoff'} ] },{ header: 'Service Requests', @@ -151,11 +151,11 @@ }, items: [ // Modified: 7-18-2017 R.Blasa - {name: 'Manage Requests', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/serviceRequests.view'}, + {name: 'Manage Requests', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-serviceRequests.view'}, - {name: 'Request Labwork', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/dataEntryForm.view?formType=Labwork Request'} + {name: 'Request Labwork', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-dataEntryForm.view?formType=Labwork Request'} ] }] }; @@ -170,7 +170,7 @@ style: 'font-weight: bold;' }, items: [ - {name: 'EHR Admin Page', url: '<%=contextPath%>/onprc_ehr' + ctx['EHRStudyContainer'] + '/ehrAdmin.view'} + {name: 'EHR Admin Page', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-ehrAdmin.view'} ] }); } diff --git a/onprc_ehr/resources/views/ehrAdmin.html b/onprc_ehr/resources/views/ehrAdmin.html index 6dc49bbfe..a8f442aea 100644 --- a/onprc_ehr/resources/views/ehrAdmin.html +++ b/onprc_ehr/resources/views/ehrAdmin.html @@ -9,32 +9,32 @@ sections: [{ header: 'Admin', items: [ - {name: 'Genetics Calculations', url: '<%=contextPath%>/ehr<%=containerPath%>/geneticCalculationSettings.view?'}, - {name: 'Manage EHR Study', url: '<%=contextPath%>/study<%=containerPath%>/manageStudy.view?'}, - {name: 'Populate Initial Data', url: '<%=contextPath%>/ONPRC_EHR<%=containerPath%>/populateData.view?'}, - {name: 'Populate Templates', url: '<%=contextPath%>/onprc_ehr<%=containerPath%>/populateTemplates.view?'}, - {name: 'Record Delete Settings', url: '<%=contextPath%>/ehr<%=containerPath%>/recordDeleteSettings.view?'}, - {name: 'Run Custom SQL', url: '<%=contextPath%>/ldk<%=containerPath%>/runCustomSql.view?schemaName=study'}, - {name: 'Set EHR Module Properties', url: '<%=contextPath%>/core<%=containerPath%>/modulePropertyAdmin.view?moduleName=EHR'}, - {name: 'Update Dataset Properties and Indexes', url: '<%=contextPath%>/ehr<%=containerPath%>/ensureDatasetProperties.view?'}, - {name: 'Update Study QCStates', url: '<%=contextPath%>/ehr<%=containerPath%>/ensureQCStates.view?'}, - {name: 'Verify Dataset Resources', url: '<%=contextPath%>/ehr<%=containerPath%>/verifyDatasetResources.view?'}, - {name: 'Verify Dataset Columns', url: '<%=contextPath%>/ehr<%=containerPath%>/validateDataSetCols.view?'}, - {name: 'Verify EHR Schema Indexes Are Compressed', url: '<%=contextPath%>/ehr<%=containerPath%>/ensureEHRSchemaIndexes.view?'}, - {name: 'Cache Demographics On All Living Animals', url: '<%=contextPath%>/ehr<%=containerPath%>/cacheLivingAnimals.view?'}, - {name: 'Prime/Refresh Data Entry Cache', url: '<%=contextPath%>/ehr<%=containerPath%>/primeDataEntryCache.view?'} + {name: 'Genetics Calculations', url: '<%=contextPath%><%=containerPath%>/ehr-geneticCalculationSettings.view'}, + {name: 'Manage EHR Study', url: '<%=contextPath%><%=containerPath%>/study-manageStudy.view'}, + {name: 'Populate Initial Data', url: '<%=contextPath%><%=containerPath%>/onprc_ehr-populateData.view'}, + {name: 'Populate Templates', url: '<%=contextPath%><%=containerPath%>/onprc_ehr-populateTemplates.view'}, + {name: 'Record Delete Settings', url: '<%=contextPath%><%=containerPath%>/ehr-recordDeleteSettings.view'}, + {name: 'Run Custom SQL', url: '<%=contextPath%><%=containerPath%>/ldk-runCustomSql.view?schemaName=study'}, + {name: 'Set EHR Module Properties', url: '<%=contextPath%><%=containerPath%>/core-modulePropertyAdmin.view?moduleName=EHR'}, + {name: 'Update Dataset Properties and Indexes', url: '<%=contextPath%><%=containerPath%>/ehr-ensureDatasetProperties.view'}, + {name: 'Update Study QCStates', url: '<%=contextPath%><%=containerPath%>/ehr-ensureQCStates.view'}, + {name: 'Verify Dataset Resources', url: '<%=contextPath%><%=containerPath%>/ehr-verifyDatasetResources.view'}, + {name: 'Verify Dataset Columns', url: '<%=contextPath%><%=containerPath%>/ehr-validateDataSetCols.view'}, + {name: 'Verify EHR Schema Indexes Are Compressed', url: '<%=contextPath%><%=containerPath%>/ehr-ensureEHRSchemaIndexes.view'}, + {name: 'Cache Demographics On All Living Animals', url: '<%=contextPath%><%=containerPath%>/ehr-cacheLivingAnimals.view'}, + {name: 'Prime/Refresh Data Entry Cache', url: '<%=contextPath%><%=containerPath%>/ehr-primeDataEntryCache.view'} ] },{ header: 'Logs', items: [ - {name: 'Labkey.log', url: '<%=contextPath%>/admin/showPrimaryLog.view'}, - {name: 'Labkey-errors.log', url: '<%=contextPath%>/admin/showAllErrors.view'}, - {name: 'ETL Log', url: '<%=contextPath%>/onprc_ehr/showEtlLog.view'} + {name: 'Labkey.log', url: '<%=contextPath%>' + '/admin-showPrimaryLog.view'}, + {name: 'Labkey-errors.log', url: '<%=contextPath%>' + '/admin-showAllErrors.view'}, + {name: 'ETL Log', url: '<%=contextPath%>' + '/onprc_ehr-showEtlLog.view'} ] },{ header: 'Notifications', items: [ - {name: 'Notification Admin', url: '<%=contextPath%>/ldk<%=containerPath%>/notificationAdmin.view?'} + {name: 'Notification Admin', url: '<%=contextPath%><%=containerPath%>/ldk-notificationAdmin.view'} ] },{ header: 'Associated Servers', diff --git a/onprc_ehr/resources/views/frontPage.html b/onprc_ehr/resources/views/frontPage.html index 9c4484880..973e18896 100644 --- a/onprc_ehr/resources/views/frontPage.html +++ b/onprc_ehr/resources/views/frontPage.html @@ -9,17 +9,17 @@ Ext4.get(webpart.wrapperDivId).update( '
Browse Data' +
+ 'Browse Data' +
'
Enter Data' +
+ 'Enter Data' +
'
Colony Overview' +
+ 'Colony Overview' +
'"); html.append(id + "
"); - html.append(""); + html.append(""); html.append("Click here to view this animal's Active Flag's history.
"); @@ -2245,14 +2245,14 @@ public void sendCullListNotifications(String id, String date, String flag) { html.append("Recently Updated Cull Animals:
"); html.append(id + "
"); - html.append(""); + html.append(""); html.append("Click here to view this animal's Active Flag's history.
"); } //Provide url link to allow users to edit Cull listings - html.append(""); + html.append(""); html.append("Click here to view and Edit Cull/Underutilzed Report.
"); sendMessage(subject, html.toString(), recipients); break; diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_BillingTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_BillingTest.java index c9ed8810c..0c7a4f924 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_BillingTest.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_BillingTest.java @@ -24,7 +24,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.categories.EHR; import org.labkey.test.categories.ONPRC; -import org.labkey.test.components.ext4.Window; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.Ext4Helper; import org.labkey.test.util.LogMethod; @@ -42,7 +41,7 @@ public class ONPRC_BillingTest extends AbstractONPRC_EHRTest protected static String PROJECT_NAME = "ONPRC_Billing_TestProject"; private static final String BILLING_FOLDER_PATH = "/" + PROJECT_NAME + "/" + BILLING_FOLDER; private static final String EHR_FOLDER_PATH = "/" + PROJECT_NAME + "/" + FOLDER_NAME; - private String ANIMAL_HISTORY_URL = "/ehr/" + getProjectName() + "/animalHistory.view?"; + private String ANIMAL_HISTORY_URL = "/" + getProjectName() + "/ehr-animalHistory.view"; @BeforeClass @LogMethod diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java index 7763fcd88..aec380b14 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java @@ -82,7 +82,7 @@ public class ONPRC_EHRTest extends AbstractGenericONPRC_EHRTest { protected String PROJECT_NAME = "ONPRC_EHR_TestProject"; private boolean _hasCreatedBirthRecords = false; - private final String ANIMAL_HISTORY_URL = "/ehr/" + getProjectName() + "/animalHistory.view?"; + private final String ANIMAL_HISTORY_URL = "/" + getProjectName() + "/ehr-animalHistory.view"; @Override protected String getProjectName() diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java index 7c3e6e2de..c27681000 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java @@ -78,7 +78,7 @@ public class ONPRC_EHRTest2 extends AbstractONPRC_EHRTest public AbstractContainerHelper _containerHelper = new APIContainerHelper(this); private final String PROJECT_NAME = "ONPRC_EHR_TestProject2"; public DataIntegrationHelper _etlHelper = new DataIntegrationHelper(PROJECT_NAME); - private final String ANIMAL_HISTORY_URL = "/ehr/" + getProjectName() + "/animalHistory.view?"; + private final String ANIMAL_HISTORY_URL = "/" + getProjectName() + "/ehr-animalHistory.view"; @BeforeClass @LogMethod diff --git a/sla/resources/views/SLA_LandingPage.html b/sla/resources/views/SLA_LandingPage.html index e1c94a745..bc595d82c 100644 --- a/sla/resources/views/SLA_LandingPage.html +++ b/sla/resources/views/SLA_LandingPage.html @@ -1,29 +1,29 @@
SLA Purchase
SLA purchase module is for PIs and staff to initiate purchase orders for rodents. It is administered by SLAU staff to ensure quality control and compliance with applicable federal regulations and guidelines. Only authorized personnel are allowed to place rodent orders. If you need access to the module, please contact sla_services@ohsu.edu.
-Click here to go to SLA Purchase Module
+Click here to go to SLA Purchase Module
Click the link below to view the SLA groups & breeding information for the protocols. This information is retrieved daily from the eIACUC database.
-SLA Groups & Breeding Information
+SLA Groups & Breeding Information
SLA Census
SLA census module is used by SLAU staff to maintain rodent demographic and location data and billing. Please click on the links below for specific operations.
Entering Animals
- -SLA Census - Edit Previous Record Menu - Choose "All Tasks" navigational tab and click the mouse on the task id to edit a record.
-SLA Census - Bulk Editing Grid - Allows editing more than one Census records.
-SLA - Entry Grid for Rabbits / Guinea Pigs - Web link to enter new Rabbits and Guinea Pig records.
+ +SLA Census - Edit Previous Record Menu - Choose "All Tasks" navigational tab and click the mouse on the task id to edit a record.
+SLA Census - Bulk Editing Grid - Allows editing more than one Census records.
+SLA - Entry Grid for Rabbits / Guinea Pigs - Web link to enter new Rabbits and Guinea Pig records.
Entering Charges
-Misc Charges - Grid - This format is best for export to Excel.
- -Return to "My Task/All Task" Page
+Misc Charges - Grid - This format is best for export to Excel.
+ +Return to "My Task/All Task" Page
Reports
- +SLA Census - Printed Report - Center Project & Date Range required.
SLA Census - Summary Printed Report - Center Project & Date Range required.