diff --git a/GeneticsCore/src/org/labkey/GeneticsCore/etl/ImportGeneticsCalculationsStep.java b/GeneticsCore/src/org/labkey/GeneticsCore/etl/ImportGeneticsCalculationsStep.java index d0515affa..02b8c249a 100644 --- a/GeneticsCore/src/org/labkey/GeneticsCore/etl/ImportGeneticsCalculationsStep.java +++ b/GeneticsCore/src/org/labkey/GeneticsCore/etl/ImportGeneticsCalculationsStep.java @@ -1,7 +1,6 @@ package org.labkey.GeneticsCore.etl; import org.apache.commons.lang3.StringUtils; -import org.apache.xmlbeans.XmlException; import org.jetbrains.annotations.NotNull; import org.labkey.GeneticsCore.GeneticsCoreModule; import org.labkey.api.data.Container; @@ -17,6 +16,8 @@ import org.labkey.api.security.permissions.UpdatePermission; import org.labkey.api.view.UnauthorizedException; import org.labkey.api.writer.ContainerUser; +import org.labkey.vfs.FileLike; +import org.labkey.vfs.FileSystemLike; import java.io.File; import java.util.Collections; @@ -64,19 +65,19 @@ public RecordedActionSet run(@NotNull PipelineJob job) throws PipelineJobExcepti throw new PipelineJobException("Must provide the filepath to import data using the KinshipDataPath module property"); } - File pipeDir = new File(pipeDirPath); + FileLike pipeDir = FileSystemLike.wrapFile(new File(pipeDirPath)); if (!pipeDir.exists()) { throw new PipelineJobException("Path does not exist: " + pipeDir.getPath()); } - File kinship = new File(pipeDir, "kinship.txt"); + FileLike kinship = pipeDir.resolveChild("kinship.txt"); if (!kinship.exists()) { throw new PipelineJobException("File does not exist: " + kinship.getPath()); } - File inbreeding = new File(pipeDir, "inbreeding.txt"); + FileLike inbreeding = pipeDir.resolveChild("inbreeding.txt"); if (!inbreeding.exists()) { throw new PipelineJobException("File does not exist: " + inbreeding.getPath()); @@ -94,7 +95,7 @@ public List getRequiredSettings() } @Override - public void setSettings(Map settings) throws XmlException + public void setSettings(Map settings) { } diff --git a/onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingController.java b/onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingController.java index bee72c3f8..fd7529311 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingController.java +++ b/onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingController.java @@ -43,11 +43,13 @@ import org.labkey.onprc_billing.notification.BillingValidationNotification; import org.labkey.onprc_billing.pipeline.BillingPipelineJob; import org.labkey.onprc_billing.security.ONPRCBillingAdminPermission; +import org.labkey.vfs.FileLike; import org.springframework.validation.BindException; import org.springframework.validation.Errors; import org.springframework.web.servlet.ModelAndView; import java.io.File; +import java.io.IOException; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -68,14 +70,14 @@ public ONPRC_BillingController() public static class RunBillingPipelineAction extends MutatingApiAction { @Override - public ApiResponse execute(BillingPipelineForm form, BindException errors) throws PipelineJobException + public ApiResponse execute(BillingPipelineForm form, BindException errors) throws IOException { Map resultProperties = new HashMap<>(); try { PipeRoot pipelineRoot = PipelineService.get().findPipelineRoot(getContainer()); - File analysisDir = BillingPipelineJob.createAnalysisDir(pipelineRoot, form.getProtocolName()); + FileLike analysisDir = BillingPipelineJob.createAnalysisDir(pipelineRoot, form.getProtocolName()); PipelineService.get().queueJob(new BillingPipelineJob(getContainer(), getUser(), getViewContext().getActionURL(), pipelineRoot, analysisDir, form)); resultProperties.put("success", true); diff --git a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJob.java b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJob.java index c55fdb6a2..df8f26ac8 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJob.java +++ b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJob.java @@ -30,8 +30,9 @@ import org.labkey.api.view.ActionURL; import org.labkey.api.view.ViewBackgroundInfo; import org.labkey.onprc_billing.ONPRC_BillingController; +import org.labkey.vfs.FileLike; -import java.io.File; +import java.io.IOException; import java.util.Calendar; import java.util.Date; @@ -42,7 +43,6 @@ */ public class BillingPipelineJob extends PipelineJob implements BillingPipelineJobSupport { - private File _analysisDir; private ONPRC_BillingController.BillingPipelineForm _form; // For deserialization @@ -50,25 +50,23 @@ public BillingPipelineJob() { } - public BillingPipelineJob(Container c, User user, ActionURL url, PipeRoot pipeRoot, File analysisDir, ONPRC_BillingController.BillingPipelineForm form) + public BillingPipelineJob(Container c, User user, ActionURL url, PipeRoot pipeRoot, FileLike analysisDir, ONPRC_BillingController.BillingPipelineForm form) { super(null, new ViewBackgroundInfo(c, user, url), pipeRoot); - - _analysisDir = analysisDir; - setLogFile(new File(analysisDir, FileUtil.makeFileNameWithTimestamp("billingPipeline", "log"))); + setLogFile(analysisDir.resolveChild(FileUtil.makeFileNameWithTimestamp("billingPipeline", "log"))); _form = form; } - public static File createAnalysisDir(PipeRoot pipeRoot, String name) throws PipelineValidationException + public static FileLike createAnalysisDir(PipeRoot pipeRoot, String name) throws PipelineValidationException, IOException { String trialName = FileUtil.makeLegalName(name); - File analysisDir = new File(pipeRoot.getRootPath(), trialName); + FileLike analysisDir = pipeRoot.resolvePathToFileLike(trialName); int suffix = 0; while (analysisDir.exists()) { suffix++; trialName = FileUtil.makeLegalName(name) + "." + suffix; - analysisDir = new File(pipeRoot.getRootPath(), trialName); + analysisDir = pipeRoot.resolvePathToFileLike(trialName); } analysisDir.mkdirs(); @@ -89,7 +87,7 @@ public ActionURL getStatusHref() } @Override - public TaskPipeline getTaskPipeline() + public TaskPipeline getTaskPipeline() { return PipelineJobService.get().getTaskPipeline(new TaskId(BillingPipelineJob.class)); } @@ -97,15 +95,13 @@ public TaskPipeline getTaskPipeline() @Override public Date getStartDate() { - Date ret = _form.getStartDate() == null ? null : DateUtils.truncate(_form.getStartDate(), Calendar.DATE); - return ret; + return _form.getStartDate() == null ? null : DateUtils.truncate(_form.getStartDate(), Calendar.DATE); } @Override public Date getEndDate() { - Date ret = _form.getEndDate() == null ? null : DateUtils.truncate(_form.getEndDate(), Calendar.DATE); - return ret; + return _form.getEndDate() == null ? null : DateUtils.truncate(_form.getEndDate(), Calendar.DATE); } @Override @@ -119,10 +115,4 @@ public String getName() { return _form.getProtocolName(); } - - @Override - public File getAnalysisDir() - { - return _analysisDir; - } } diff --git a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJobSupport.java b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJobSupport.java index 38e79f61b..e9aa60f13 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJobSupport.java +++ b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingPipelineJobSupport.java @@ -32,6 +32,4 @@ public interface BillingPipelineJobSupport String getComment(); String getName(); - - File getAnalysisDir(); } diff --git a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingTask.java b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingTask.java index 9038fd279..1f1ded27e 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingTask.java +++ b/onprc_billing/src/org/labkey/onprc_billing/pipeline/BillingTask.java @@ -15,7 +15,6 @@ */ package org.labkey.onprc_billing.pipeline; -import au.com.bytecode.opencsv.CSVWriter; import org.apache.commons.lang3.time.DateUtils; import org.jetbrains.annotations.NotNull; import org.labkey.api.collections.CaseInsensitiveHashMap; @@ -25,10 +24,8 @@ import org.labkey.api.data.DbSchema; import org.labkey.api.data.DbScope; import org.labkey.api.data.Results; -import org.labkey.api.data.ResultsImpl; import org.labkey.api.data.RuntimeSQLException; import org.labkey.api.data.SQLFragment; -import org.labkey.api.data.Selector; import org.labkey.api.data.SimpleFilter; import org.labkey.api.data.SqlSelector; import org.labkey.api.data.Table; @@ -49,10 +46,6 @@ import org.labkey.api.util.GUID; import org.labkey.onprc_billing.ONPRC_BillingSchema; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.sql.ResultSet; import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -105,11 +98,9 @@ public List getProtocolActionNames() } @Override - public PipelineJob.Task createTask(PipelineJob job) + public BillingTask createTask(PipelineJob job) { - BillingTask task = new BillingTask(this, job); - - return task; + return new BillingTask(this, job); } @Override @@ -198,43 +189,6 @@ private BillingPipelineJobSupport getSupport() return (BillingPipelineJobSupport)getJob(); } - private void writeToTsv(String fileName, List> rows, String[] headers, String[] colNames) throws PipelineJobException - { - File csvFile = new File(getSupport().getAnalysisDir(), fileName + ".txt"); - if (csvFile.exists()) - throw new PipelineJobException("There is already a file with path: " + csvFile.getPath()); - - try - { - csvFile.createNewFile(); - - try (CSVWriter csv = new CSVWriter(new FileWriter(csvFile), '\t')) - { - csv.writeNext(headers); - - if (!rows.isEmpty()) - { - for (Map row : rows) - { - String[] toWrite = new String[colNames.length]; - int i = 0; - for (String colName: colNames) - { - toWrite[i] = getString(row.get(colName)); - i++; - } - - csv.writeNext(toWrite); - } - } - } - } - catch (IOException e) - { - throw new PipelineJobException(e); - } - } - private String _invoiceId = null; private String getOrCreateInvoiceRunRecord() throws PipelineJobException @@ -312,7 +266,7 @@ private String getOrCreateInvoiceRunRecord() throws PipelineJobException "quantity", "unitCost", "totalcost", "rateId", "exemptionId", "creditaccountid", "comment", "transactionType", "sourceRecord", "chargeCategory"}; - private void writeToInvoicedItems(List> rows, String category, String[] colNames, String queryName, boolean allowNullProject) throws PipelineJobException + private void writeToInvoicedItems(List> rows, String[] colNames, String queryName, boolean allowNullProject) throws PipelineJobException { assert colNames.length >= invoicedItemsCols.length; @@ -323,7 +277,7 @@ private void writeToInvoicedItems(List> rows, String categor TableInfo invoicedItems = ONPRC_BillingSchema.getInstance().getSchema().getTable(ONPRC_BillingSchema.TABLE_INVOICED_ITEMS); for (Map row : rows) { - CaseInsensitiveHashMap toInsert = new CaseInsensitiveHashMap(); + CaseInsensitiveHashMap toInsert = new CaseInsensitiveHashMap<>(); toInsert.put("container", getJob().getContainer().getId()); toInsert.put("createdby", getJob().getUser().getUserId()); toInsert.put("created", new Date()); @@ -373,24 +327,6 @@ private void writeToInvoicedItems(List> rows, String categor } } - private String getString(Object val) - { - if (val == null) - { - return ""; - } - else if (val instanceof Date) - { - return _dateFormat.format(val); - } - else if (val instanceof Number) - { - return val.toString(); - } - - return val.toString(); - } - private void leaseFeeProcessing(Container ehrContainer) throws PipelineJobException { getJob().getLogger().info("Caching Lease Fees"); @@ -434,7 +370,7 @@ private void leaseFeeProcessing(Container ehrContainer) throws PipelineJobExcept getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Lease Fees", colNames, queryName, false); + writeToInvoicedItems(rows, colNames, queryName, false); getJob().getLogger().info("Finished Caching Lease Fees"); } @@ -467,20 +403,22 @@ private List> getRowList(Container c, String schemaName, Str ts.setNamedParameters(params); final List> rows = new ArrayList<>(); - ts.forEach(new Selector.ForEachBlock<>() + try (Results results = ts.getResults()) { - @Override - public void exec(ResultSet object) throws SQLException + while (results.next()) { - Results rs = new ResultsImpl(object, colKeys); Map ret = new HashMap<>(); - for (FieldKey fk : colKeys.keySet()) + for (Map.Entry entry: colKeys.entrySet()) { - ret.put(fk.toString(), rs.getObject(fk)); + ret.put(entry.getKey().toString(), entry.getValue().getValue(results)); } rows.add(ret); } - }); + } + catch (SQLException e) + { + throw new RuntimeSQLException(e); + } return rows; } @@ -531,7 +469,7 @@ private void perDiemProcessing(Container ehrContainer) throws PipelineJobExcepti List> rows = getRowList(ehrContainer, "onprc_billing", queryName, colNames, params); getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Per Diems", colNames, queryName, false); + writeToInvoicedItems(rows, colNames, queryName, false); getJob().getLogger().info("Finished Caching Per Diem Fees"); } @@ -583,7 +521,7 @@ private void slaPerDiemProcessing() throws PipelineJobException List> rows = getRowList(slaContainer, "onprc_billing", queryName, colNames, params); getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Small Lab Animal Per Diems", colNames, queryName, false); + writeToInvoicedItems(rows, colNames, queryName, false); getJob().getLogger().info("Finished Caching Per Diem Fees"); } @@ -629,7 +567,7 @@ private void proceduresProcessing(Container ehrContainer) throws PipelineJobExce List> rows = getRowList(ehrContainer, "onprc_billing", queryName, colNames, params); getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Procedure Fees", colNames, queryName, false); + writeToInvoicedItems(rows, colNames, queryName, false); getJob().getLogger().info("Finished Caching Procedure Fees"); } @@ -675,7 +613,7 @@ private void labworkProcessing(Container ehrContainer) throws PipelineJobExcepti List> rows = getRowList(ehrContainer, "onprc_billing", queryName, colNames, params); getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Labwork Fees", colNames, queryName, false); + writeToInvoicedItems(rows, colNames, queryName, false); getJob().getLogger().info("Finished Caching Labwork Fees"); } @@ -718,7 +656,7 @@ private void miscChargesProcessing(Container ehrContainer) throws PipelineJobExc List> rows = getRowList(ehrContainer, "onprc_billing", MISC_CHARGES_QUERY, colNames, params); getJob().getLogger().info(rows.size() + " rows found"); - writeToInvoicedItems(rows, "Other Charges", colNames, MISC_CHARGES_QUERY, true); + writeToInvoicedItems(rows, colNames, MISC_CHARGES_QUERY, true); getJob().getLogger().info("Finished Caching Other Charges"); } diff --git a/onprc_billing/src/org/labkey/onprc_billing/query/BillingAuditProvider.java b/onprc_billing/src/org/labkey/onprc_billing/query/BillingAuditProvider.java index 83f7b019b..5d9e1d3bc 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/query/BillingAuditProvider.java +++ b/onprc_billing/src/org/labkey/onprc_billing/query/BillingAuditProvider.java @@ -65,16 +65,6 @@ public String getDescription() return "Contains records of changes to data required for ONPRC billing"; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_TABLE_NAME); - legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_OBJECTID); - - return legacyNames; - } - @Override public List getDefaultVisibleColumns() { diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/BehaviorRounds.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/BehaviorRounds.js index 5b2e316a9..8d5840d5b 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/BehaviorRounds.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/BehaviorRounds.js @@ -48,6 +48,13 @@ EHR.model.DataModelManager.registerMetadata('BehaviorRounds', { columnConfig: { editable: false } + }, + caseid: { + hidden: false, + columnConfig: { + width: 10, + editable: false + } } } } diff --git a/onprc_ehr/resources/web/onprc_ehr/window/AddBehaviorCasesWindow.js b/onprc_ehr/resources/web/onprc_ehr/window/AddBehaviorCasesWindow.js new file mode 100644 index 000000000..212abe495 --- /dev/null +++ b/onprc_ehr/resources/web/onprc_ehr/window/AddBehaviorCasesWindow.js @@ -0,0 +1,198 @@ +/* Copyright (c) 2014-2019 LabKey Corporation +* +* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 + */ +/** + * This window will allow users to query open cases and add records to a task based on them + */ +Ext4.define('ONPRC_EHR.window.AddBehaviorCasesWindow', { + extend: 'EHR.window.AddSurgicalCasesWindow', + caseCategory: 'Behavior', + templateName: null, + + allowNoSelection: true, + showAssignedVetCombo: false, + showAllowOpen: true, + defaultRemark: 'BSU Rounds Entered', + + getCases: function(button){ + Ext4.Msg.wait("Loading..."); + this.hide(); + + var casesFilterArray = this.getCasesFilterArray(); + var obsFilterArray = this.getBaseFilterArray(); + obsFilterArray.push(LABKEY.Filter.create('caseCategory', this.caseCategory, LABKEY.Filter.Types.EQUAL)); + var includeOpen = this.down('#includeOpen') ? this.down('#includeOpen').getValue() : false; + if (includeOpen){ + obsFilterArray.push(LABKEY.Filter.create('caseIsOpen', true, LABKEY.Filter.Types.EQUAL)); + } + else { + obsFilterArray.push(LABKEY.Filter.create('caseIsActive', true, LABKEY.Filter.Types.EQUAL)); + } + + //find distinct animals matching criteria + var multi = new LABKEY.MultiRequest(); + + multi.add(LABKEY.Query.selectRows, { + requiredVersion: 9.1, + schemaName: 'study', + queryName: 'latestObservationsForCase', + columns: 'Id,date,category,area,observation,remark,caseid', + filterArray: obsFilterArray, + scope: this, + success: function(results){ + this.obsResults = results; + }, + failure: LDK.Utils.getErrorCallback() + }); + + multi.add(LABKEY.Query.selectRows, { + requiredVersion: 9.1, + schemaName: 'study', + queryName: 'cases', + sort: 'Id/curLocation/location,Id,remark,allProblemCategories', + columns: 'Id,objectid,remark,allProblemCategories', + filterArray: casesFilterArray, + scope: this, + success: function(results){ + this.casesResults = results; + }, + failure: LDK.Utils.getErrorCallback() + }); + + multi.send(this.onSuccess, this); + }, + + //@Override. this is to skip the duplicate case check + addRecords: function(records){ + this.doAddRecords(records); + }, + + //@Override. this is to skip the duplicate case check + doAddRecords: function(records){ + this.processObservations(records); + }, + + //apply previous observations, or inser a blank obs record. + processObservations: function(caseRecords){ + //find all distinct IDs with cases. + var distinctCaseIds = []; + if (caseRecords && caseRecords.length){ + Ext4.Array.forEach(caseRecords, function(cr){ + if (distinctCaseIds.indexOf(cr.get('caseid') == -1)){ + distinctCaseIds.push(cr.get('caseid')); + } + }, this); + } + + var previousObsMap = {}; + if (this.obsResults && this.obsResults.rows && this.obsResults.rows.length){ + Ext4.Array.forEach(this.obsResults.rows, function(sr){ + //reset variable + var newobservation = ''; + var newremark = ''; + var row = new LDK.SelectRowsRow(sr); + newobservation = row.getValue('category'); + newremark = row.getValue('remark'); + + //note: this has been changed to ensure 1 row per case + var key = row.getValue('caseid'); + if (!previousObsMap[key]) + previousObsMap[key] = []; + + previousObsMap[key].push({ + Id: row.getValue('Id'), + date: this.recordData.date, + performedby: this.recordData.performedby, + caseid: row.getValue('caseid'), + category: row.getValue('category'), + area: row.getValue('area'), + allProblemCategories:row.getValue('allProblemCategories'), + remark: row.getValue('remark') + }); + if (newobservation == 'Alopecia Score' && (newremark == null || newremark == '')) { + previousObsMap[key].push({ + Id: row.getValue('Id'), + date: this.recordData.date, + performedby: this.recordData.performedby, + caseid: row.getValue('caseid'), + category: 'Alopecia Regrowth', + area: row.getValue('area'), + allProblemCategories:row.getValue('allProblemCategories') + + }); + + } + }, this); + } + + var obsRecords = []; + var obsStore = this.targetStore.storeCollection.getClientStoreByName('Clinical Observations'); + LDK.Assert.assertNotEmpty('Unable to find Clinical Observations store', obsStore); + + var treatmentRecords = []; + var treatmentStore = this.targetStore.storeCollection.getClientStoreByName('Drug Administration'); + LDK.Assert.assertNotEmpty('Unable to find Drug Administration store', treatmentStore); + + Ext4.Array.forEach(caseRecords, function(cr){ + if (previousObsMap[cr.get('caseid')]){ + Ext4.Array.forEach(previousObsMap[cr.get('caseid')], function(r){ + r = Ext4.apply(r, { + 'Id/curLocation/location': cr.get('Id/curLocation/location') + }); + + obsRecords.push(obsStore.createModel(r)); + }, this); + } + else { + obsRecords.push(obsStore.createModel({ + 'Id/curLocation/location': cr.get('Id/curLocation/location'), + Id: cr.get('Id'), + date: this.recordData.date, + performedby: this.recordData.performedby, + caseid: cr.get('caseid') + })); + } + + treatmentRecords.push(treatmentStore.createModel({ + Id: cr.get('Id'), + caseid: cr.get('caseid'), + date: this.recordData.date, + performedby: this.recordData.performedby + })); + }, this); + + if (obsRecords.length){ + obsStore.add(obsRecords); + } + + if (treatmentRecords.length){ + treatmentStore.add(treatmentRecords); + } + + Ext4.Msg.hide(); + this.close(); + } +}); + +EHR.DataEntryUtils.registerGridButton('ADDBEHAVIORCASESAMENDED', function(config){ + return Ext4.Object.merge({ + text: 'Add Open Cases', + tooltip: 'Click to automatically add animals with open cases', + handler: function(btn){ + var grid = btn.up('gridpanel'); + if(!grid.store || !grid.store.hasLoaded()){ + console.log('no store or store hasnt loaded'); + return; + } + + var cellEditing = grid.getPlugin('cellediting'); + if(cellEditing) + cellEditing.completeEdit(); + + Ext4.create('ONPRC_EHR.window.AddBehaviorCasesWindow', { + targetStore: grid.store + }).show(); + } + }, config); +}); diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BehaviorRoundsObservationsFormSection.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BehaviorRoundsObservationsFormSection.java index 399a70462..e082cf1fa 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BehaviorRoundsObservationsFormSection.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BehaviorRoundsObservationsFormSection.java @@ -34,14 +34,14 @@ public BehaviorRoundsObservationsFormSection() addClientDependency(ClientDependency.supplierFromPath("ehr/window/AddClinicalCasesWindow.js")); addClientDependency(ClientDependency.supplierFromPath("ehr/window/AddSurgicalCasesWindow.js")); - addClientDependency(ClientDependency.supplierFromPath("ehr/window/AddBehaviorCasesWindow.js")); + addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/AddBehaviorCasesWindow.js")); } @Override public List getTbarButtons() { List defaultButtons = super.getTbarButtons(); - defaultButtons.add(0, "ADDBEHAVIORCASES"); + defaultButtons.add(0, "ADDBEHAVIORCASESAMENDED"); return defaultButtons; } 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 b6682a733..e8c58b0ef 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 @@ -1840,7 +1840,7 @@ public void testBehaviorRounds() throws Exception //just load all behavior cases waitAndClick(Ext4Helper.Locators.windowButton("Add Open Behavior Cases", "Submit")); waitForElementToDisappear(caseWindow); - obsGrid.waitForRowCount(1); + obsGrid.waitForRowCount(2); Assert.assertEquals("Alopecia Score", obsGrid.getFieldValue(1, "category")); Assert.assertEquals("Id field should not be editable.", "on", obsGrid.getCell(1, "Id") .findElement(getDriver()).findElement(By.tagName("div")).getDomAttribute("unselectable")); diff --git a/sla/src/org/labkey/sla/etl/ETLAuditProvider.java b/sla/src/org/labkey/sla/etl/ETLAuditProvider.java index 0eb0e8786..1cd3a8679 100644 --- a/sla/src/org/labkey/sla/etl/ETLAuditProvider.java +++ b/sla/src/org/labkey/sla/etl/ETLAuditProvider.java @@ -79,15 +79,6 @@ public String getDescription() return "SLA ETL Events"; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_TYPE); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_SLA_ERRORS); - return legacyNames; - } - @Override public List getDefaultVisibleColumns() {