diff --git a/snprc_ehr/resources/web/snprc_ehr/Panel/AddScheduledTreatmentPanel.js b/snprc_ehr/resources/web/snprc_ehr/Panel/AddScheduledTreatmentPanel.js
index f470e440f..49eab064e 100644
--- a/snprc_ehr/resources/web/snprc_ehr/Panel/AddScheduledTreatmentPanel.js
+++ b/snprc_ehr/resources/web/snprc_ehr/Panel/AddScheduledTreatmentPanel.js
@@ -100,7 +100,7 @@ Ext4.define('snprc_ehr.panel.AddScheduledTreatmentPanel', {
var filterArray = [];
- filterArray.push(LABKEY.Filter.create('date', date.format('Y-m-d'), LABKEY.Filter.Types.DATE_EQUAL));
+ filterArray.push(LABKEY.Filter.create('date', Ext4.Date.format(date, 'Y-m-d'), LABKEY.Filter.Types.DATE_EQUAL));
filterArray.push(LABKEY.Filter.create('taskid', null, LABKEY.Filter.Types.ISBLANK));
filterArray.push(LABKEY.Filter.create('treatmentStatus', null, LABKEY.Filter.Types.ISBLANK));
@@ -135,7 +135,7 @@ Ext4.define('snprc_ehr.panel.AddScheduledTreatmentPanel', {
queryName: 'treatmentSchedule',
parameters: {
NumDays: 1,
- StartDate: date.format(LABKEY.extDefaultDateFormat)
+ StartDate: Ext4.Date.format(date, LABKEY.extDefaultDateFormat)
},
sort: 'date,Id/curlocation/room_sortValue,Id/curlocation/cage_sortValue,Id',
columns: 'primaryKey,lsid,treatmentid,Id,date,project,meaning,code,qualifier,route,concentration,conc_units,amount,amount_units,dosage,dosage_units,volume,vol_units,remark,category,chargetype',
diff --git a/snprc_ehr/resources/web/snprc_ehr/Panel/EnterDataPanel.js b/snprc_ehr/resources/web/snprc_ehr/Panel/EnterDataPanel.js
index 578d1dc62..00e7a1890 100644
--- a/snprc_ehr/resources/web/snprc_ehr/Panel/EnterDataPanel.js
+++ b/snprc_ehr/resources/web/snprc_ehr/Panel/EnterDataPanel.js
@@ -132,231 +132,3 @@ Ext4.define('SNPRC_EHR.panel.EnterDataPanel', {
}]
}
});
-
-// cut from EHR variant of panel - saved for later review. tjh
-// getQueueSections: function() {
-// return [{
-// header: 'Reports',
-// renderer: function (item) {
-// return item;
-// },
-// items: [{
-// xtype: 'ldk-linkbutton',
-// text: 'Service Request Summary',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('ldk', 'runNotification', null, {key: 'org.labkey.onprc_ehr.notification.RequestAdminNotification'})
-// }]
-// },{
-// header: 'Blood Draw Requests',
-// renderer: function(item){
-// return {
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: LABKEY.Utils.encodeHtml(item.name) + ':',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Unapproved Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Blood Draws', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Pending', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Approved Requests',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Blood Draws', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Scheduled Today',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Blood Draws', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType, 'query.date~dateeq': (new Date()).format('Y-m-d')})
-// }]
-// }
-// },
-// items: [{
-// name: 'ASB Services',
-// chargeType: 'DCM: ASB Services'
-// },{
-// name: 'Colony Services',
-// chargeType: 'DCM: Colony Services'
-// }]
-// },{
-// header: 'Treatment Requests',
-// renderer: function(item){
-// return {
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: LABKEY.Utils.encodeHtml(item.name) + ':',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Unapproved Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'drug', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Pending', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Approved Requests',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'drug', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Scheduled Today',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'drug', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType, 'query.date~dateeq': (new Date()).format('Y-m-d')})
-// }]
-// }
-// },
-// items: [{
-// name: 'ASB Services',
-// chargeType: 'DCM: ASB Services'
-// },{
-// name: 'Colony Services',
-// chargeType: 'DCM: Colony Services'
-// }]
-// },{
-// header: 'Procedure Requests',
-// renderer: function(item){
-// return {
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: LABKEY.Utils.encodeHtml(item.name) + ':',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Unapproved Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Pending', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Approved Requests',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Scheduled Today',
-// linkCls: 'labkey-text-link',
-// style: 'padding-left: 5px;',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'encounters', 'query.viewName': 'Requests', 'query.QCState/Label~eq': 'Request: Approved', 'query.chargetype~eq': item.chargeType, 'query.date~dateeq': (new Date()).format('Y-m-d')})
-// }]
-// }
-// },
-// items: [{
-// name: 'ASB Services',
-// chargeType: 'DCM: ASB Services'
-// },{
-// name: 'Colony Services',
-// chargeType: 'DCM: Colony Services'
-// }]
-// },{
-// header: 'Lab Tests',
-// renderer: function(item){
-// return item;
-// },
-// items: [{
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: 'Clinpath:',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Requests With Manual Results',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Clinpath Runs', 'query.viewName': 'Requests', 'query.QCState/Label~startswith': 'Request:', 'query.servicerequested/chargetype~eq': 'Clinpath', 'query.mergeSyncInfo/automaticresults~eq': false})
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Requests With Automatic Results',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Clinpath Runs', 'query.viewName': 'Requests', 'query.QCState/Label~startswith': 'Request:', 'query.servicerequested/chargetype~eq': 'Clinpath', 'query.mergeSyncInfo/automaticresults~eq': true})
-// }]
-// },{
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: 'SPF Surveillance:',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'All Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'study', 'query.queryName': 'Clinpath Runs', 'query.QCState/Label~startswith': 'Request:', 'query.servicerequested/chargetype~eq': 'SPF Surveillance Lab'})
-// }]
-// }]
-// },{
-// header: 'Transfer Requests',
-// renderer: function(item){
-// return {
-// layout: 'hbox',
-// bodyStyle: 'padding: 2px;background-color: transparent;',
-// defaults: {
-// border: false,
-// bodyStyle: 'background-color: transparent;'
-// },
-// items: [{
-// html: LABKEY.Utils.encodeHtml(item.name) + ':',
-// width: 200
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Unapproved Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, Ext4.apply({schemaName: 'onprc_ehr', 'query.queryName': 'housing_transfer_requests', 'query.viewName': 'Unapproved Requests'}, item.areaFilter))
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Approved Requests',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, Ext4.apply({schemaName: 'onprc_ehr', 'query.queryName': 'housing_transfer_requests', 'query.viewName': 'Approved Requests'}, item.areaFilter))
-// },{
-// xtype: 'ldk-linkbutton',
-// text: 'Transfers Today',
-// linkCls: 'labkey-text-link',
-// href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, Ext4.apply({schemaName: 'onprc_ehr', 'query.queryName': 'housing_transfer_requests', 'query.viewName': 'Approved Requests', 'query.date~dateeq': (new Date()).format('Y-m-d')}, item.areaFilter))
-// }]
-// }
-// },
-// items: [{
-// name: 'Corral',
-// chargeType: 'DCM: Colony Services',
-// areaFilter: {
-// 'query.room/area~eq': 'Corral'
-// }
-// },{
-// name: 'PENS/Shelters',
-// chargeType: 'DCM: ASB Services',
-// areaFilter: {
-// 'query.room/area~in': 'PENS;Shelters'
-// }
-// },{
-// name: 'All Other',
-// areaFilter: {
-// 'query.room/area~notin': 'Corral;PENS;Shelters'
-// }
-// }]
-// }];
-// }
\ No newline at end of file
diff --git a/snprc_ehr/resources/web/snprc_ehr/snprcOverrides.js b/snprc_ehr/resources/web/snprc_ehr/snprcOverrides.js
index 1036e8b3b..a8bfca822 100644
--- a/snprc_ehr/resources/web/snprc_ehr/snprcOverrides.js
+++ b/snprc_ehr/resources/web/snprc_ehr/snprcOverrides.js
@@ -125,7 +125,7 @@ Ext4.override(EHR.panel.SnapshotPanel, {
Ext4.each(rows, function (r) {
var d = LDK.ConvertUtils.parseDate(r.account_date, LABKEY.extDefaultDateFormat);
- text.push('| ' + d.format(LABKEY.extDefaultDateFormat) +
+ text.push(' |
| ' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
' | ' + r.account + ' |
');
}, this);
}
@@ -148,7 +148,7 @@ Ext4.override(EHR.panel.SnapshotPanel, {
Ext4.each(rows, function (r) {
var d = LDK.ConvertUtils.parseDate(r.admit_date, LABKEY.extDefaultDateFormat);
- text.push(d.format(LABKEY.extDefaultDateFormat) + ' ' + r.admit_complaint);
+ text.push(Ext4.Date.format(d, LABKEY.extDefaultDateFormat) + ' ' + r.admit_complaint);
}, this);
}
@@ -169,7 +169,7 @@ Ext4.override(EHR.panel.SnapshotPanel, {
Ext4.each(rows, function (r) {
var d = LDK.ConvertUtils.parseDate(r.pedigree_date, LABKEY.extDefaultDateFormat);
- text.push('| ' + d.format(LABKEY.extDefaultDateFormat) +
+ text.push(' |
| ' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
' | ' + r.pedigree + ' |
');
}, this);
}
@@ -191,7 +191,7 @@ Ext4.override(EHR.panel.SnapshotPanel, {
Ext4.each(rows, function (r) {
var d = LDK.ConvertUtils.parseDate(r.diet_date, LABKEY.extDefaultDateFormat);
- text.push('| ' + d.format(LABKEY.extDefaultDateFormat) +
+ text.push(' |
| ' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
' | ' + r.diet + ' |
');
}, this);
}
diff --git a/snprc_ehr/resources/web/snprc_ehr/snprcReports.js b/snprc_ehr/resources/web/snprc_ehr/snprcReports.js
index ffc38e6b1..efb3c55e4 100644
--- a/snprc_ehr/resources/web/snprc_ehr/snprcReports.js
+++ b/snprc_ehr/resources/web/snprc_ehr/snprcReports.js
@@ -304,181 +304,165 @@ EHR.reports.FileRepository = function(panel,tab) {
return;
}
- var toAdd = [];
-
- if (subjects.length >1)
- {
- var containerPath = LABKEY.container.path +'/FileRepository';
- var animalFolder = new LABKEY.FileSystem.WebdavFileSystem({baseUrl: LABKEY.ActionURL.getBaseURL() + '_webdav' + containerPath});
- var location = {id: animalIds};
- //animalFolder.listFiles({success:function(){console.log("success",arguments)},failure:function(){console.log("failed",arguments)},forceReload:true,path:"/@files/animalPortal/"});
- console.log("Id of animal " + animalIds);
-
-
- var panel = tab.add({id: 'filesDiv', style: 'margin-bottom:20px'});
- //toAdd.push({id: 'filesDiv', style: 'margin-bottom:20px'});
-
- var handler = function (location)
- {
- var webPart = new LABKEY.WebPart({
- title: 'File Repository for ' + animalIds,
- partName: 'Files',
- renderTo: 'filesDiv-body',
- containerPath: containerPath,
- partConfig: {path: location},
- success: function ()
- {
- panel.setHeight(450);
- }
- });
- webPart.render();
-
- };
-
- animalFolder.listFiles({
- success: function ()
- {
- console.log("success", arguments);
- handler(location.id);
- },
- path: "/@files/" + animalIds + "/",
- failure: function ()
- {
- LABKEY.Security.getUserPermissions({
+
+ if (subjects.length === 0)
+ return;
+
+ // WebdavFileSystem depends on ExtJS3 so load it it dynamically
+ LABKEY.requiresExt3ClientAPI(function() {
+ Ext.onReady(function() {
+ var containerPath = LABKEY.container.path + '/FileRepository';
+ var animalFolder = new LABKEY.FileSystem.WebdavFileSystem({baseUrl: LABKEY.ActionURL.getBaseURL() + '_webdav' + containerPath});
+ var location = {id: animalIds};
+ //animalFolder.listFiles({success:function(){console.log("success",arguments)},failure:function(){console.log("failed",arguments)},forceReload:true,path:"/@files/animalPortal/"});
+ console.log("Id of animal " + animalIds);
+
+
+ var panel = tab.add({id: 'filesDiv', style: 'margin-bottom:20px'});
+ //toAdd.push({id: 'filesDiv', style: 'margin-bottom:20px'});
+
+ var handler = function (location) {
+ var webPart = new LABKEY.WebPart({
+ title: 'File Repository for ' + animalIds,
+ partName: 'Files',
+ renderTo: 'filesDiv-body',
containerPath: containerPath,
- success: function(userPermsInfo) {
- var hasInsert = false;
- for (var i = 0; i < userPermsInfo.container.effectivePermissions.length; i++) {
- if (userPermsInfo.container.effectivePermissions[i] == 'org.labkey.api.security.permissions.InsertPermission') {
- hasInsert = true;
+ partConfig: {path: location},
+ success: function () {
+ panel.setHeight(450);
+ }
+ });
+ webPart.render();
+
+ };
+
+ animalFolder.listFiles({
+ success: function () {
+ console.log("success", arguments);
+ handler(location.id);
+ },
+ path: "/@files/" + animalIds + "/",
+ failure: function () {
+ LABKEY.Security.getUserPermissions({
+ containerPath: containerPath,
+ success: function (userPermsInfo) {
+ var hasInsert = false;
+ for (var i = 0; i < userPermsInfo.container.effectivePermissions.length; i++) {
+ if (userPermsInfo.container.effectivePermissions[i] == 'org.labkey.api.security.permissions.InsertPermission') {
+ hasInsert = true;
+ }
}
- }
- if (hasInsert)
- {
- panel.add({
- xtype: 'ldk-webpartpanel',
- title: 'File Reposotory for ' + animalIds,
- //text: 'No directory found for this animal',
- items: [
- {
- xtype: 'label',
- text: 'No directory found for this animal. To upload files, you must create the folders first. '
- },
- {
- xtype: 'label',
- html: '
'
+ if (hasInsert) {
+ panel.add({
+ xtype: 'ldk-webpartpanel',
+ title: 'File Repository for ' + animalIds,
+ //text: 'No directory found for this animal',
+ items: [
+ {
+ xtype: 'label',
+ text: 'No directory found for this animal. To upload files, you must create the folders first. '
+ },
+ {
+ xtype: 'label',
+ html: '
'
- },
- {
- xtype: 'button',
- style: 'margin-left: 10px;',
- border: true,
- text: 'Create Folders',
- handler: function ()
+ },
{
- animalFolder.createDirectory({
- path: "/@files/" + animalIds + "/",
- success: function ()
- {
- const folders = [
- "Surgery Sheets",
- "Radiology Reports",
- "Misc Docs",
- "Images",
- "Pathology Reports",
- "Lab Reports",
- "Procurement Docs",
- "Dental Records",
- "Cardiology Docs",
- "Anesthesia Reports"
- ];
-
- var createdCount = 0;
-
- folders.forEach(function (folder) {
- animalFolder.createDirectory({
- path: "/@files/" + animalIds + "/" + folder,
- success: function () {
- console.log("created " + folder + " folder for " + animalIds);
- createdCount++;
- if (createdCount === folders.length) {
- handler(location.id);
+ xtype: 'button',
+ style: 'margin-left: 10px;',
+ border: true,
+ text: 'Create Folders',
+ handler: function () {
+ animalFolder.createDirectory({
+ path: "/@files/" + animalIds + "/",
+ success: function () {
+ const folders = [
+ "Surgery Sheets",
+ "Radiology Reports",
+ "Misc Docs",
+ "Images",
+ "Pathology Reports",
+ "Lab Reports",
+ "Procurement Docs",
+ "Dental Records",
+ "Cardiology Docs",
+ "Anesthesia Reports"
+ ];
+
+ var createdCount = 0;
+
+ folders.forEach(function (folder) {
+ animalFolder.createDirectory({
+ path: "/@files/" + animalIds + "/" + folder,
+ success: function () {
+ console.log("created " + folder + " folder for " + animalIds);
+ createdCount++;
+ if (createdCount === folders.length) {
+ handler(location.id);
+ }
+ },
+ failure: function (error) {
+ console.log("failed to create " + folder + " folder" + error.status)
}
- },
- failure: function (error) {
- console.log("failed to create " + folder + " folder" + error.status)
- }
- })
- }),
- console.log("folder created for " + animalIds);
- },
- failure: function (error)
- {
- console.log("failed to created folder" + error.status)
- }
- })
-
- }
-
- }]
- });
- }
- else {
+ })
+ }),
+ console.log("folder created for " + animalIds);
+ },
+ failure: function (error) {
+ console.log("failed to created folder" + error.status)
+ }
+ })
+
+ }
+
+ }]
+ });
+ }
+ else {
+ panel.add({
+ xtype: 'ldk-webpartpanel',
+ title: 'File Repository for ' + animalIds,
+ items: [
+ {
+ xtype: 'label',
+ text: 'The current animal does not have any files, and you do not have permission to upload new files.'
+ }]
+ });
+ }
+ },
+ failure: function (error, response) {
+ var message;
+ if (response.status == 404) {
+ message = 'The folder ' + containerPath + ' does not exist, so no files can be shown or uploaded. Contact EHR services to correct the configuration.';
+ }
+ else if (response.status == 401 || response.status == 403) {
+ message = 'You do not have permission to upload or view files. Contact EHR services to get permission.';
+ }
+ else {
+ message = 'There was an error attempting to load the file data: ' + response.status;
+ }
panel.add({
xtype: 'ldk-webpartpanel',
title: 'File Repository for ' + animalIds,
items: [
{
xtype: 'label',
- text: 'The current animal does not have any files, and you do not have permission to upload new files.'
+ text: message
}]
});
}
- },
- failure: function(error, response) {
- var message;
- if (response.status == 404) {
- message = 'The folder ' + containerPath + ' does not exist, so no files can be shown or uploaded. Contact EHR services to correct the configuration.';
- }
- else if (response.status == 401 || response.status == 403) {
- message = 'You do not have permission to upload or view files. Contact EHR services to get permission.';
- }
- else {
- message = 'There was an error attempting to load the file data: ' + response.status;
- }
- panel.add({
- xtype: 'ldk-webpartpanel',
- title: 'File Repository for ' + animalIds,
- items: [
- {
- xtype: 'label',
- text: message
- }]
- });
- }
- });
- },
-
- forceReload: true
- });
-
-
- if (File && File.panel && File.panel.Browser && File.panel.Browser._pipelineConfigurationCache)
- {
- File.panel.Browser._pipelineConfigurationCache = {};
- }
-
- }
- if (toAdd.length){
- panel = tab.add(toAdd);
-
- //webPart.render();
- }
+ });
+ },
+ forceReload: true
+ });
+ if (File && File.panel && File.panel.Browser && File.panel.Browser._pipelineConfigurationCache) {
+ File.panel.Browser._pipelineConfigurationCache = {};
+ }
+ });
+ }, this);
}
-
-
};
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BulkBloodDrawWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BulkBloodDrawWindow.js
index d80617ee3..52c80bc1e 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BulkBloodDrawWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BulkBloodDrawWindow.js
@@ -266,7 +266,7 @@ Ext4.define('SNPRC_EHR.window.BulkBloodDrawWindow', {
}
timeStr = Ext4.String.leftPad(timeStr, 5, '0'); //expect: HH:mm
- var ret = LDK.ConvertUtils.parseDate(date.format('Y-m-d') + ' ' + timeStr);
+ var ret = LDK.ConvertUtils.parseDate(Ext4.Date.format(date, 'Y-m-d') + ' ' + timeStr);
if (!ret){
errors.push('Row ' + rowIdx + ': invalid time: ' + timeStr);
}
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BulkChangeCasesWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BulkChangeCasesWindow.js
index 03fa25f32..9e9e80a30 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BulkChangeCasesWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BulkChangeCasesWindow.js
@@ -98,7 +98,7 @@ Ext4.define('SNPRC_EHR.window.BulkChangeCasesWindow', {
toAdd.push({
xtype: 'displayfield',
- value: LDK.ConvertUtils.parseDate(caseRow.date).format('Y-m-d')
+ value: Ext4.Date.format(LDK.ConvertUtils.parseDate(caseRow.date), 'Y-m-d')
});
toAdd.push({
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyScanWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyScanWindow.js
index 982104f5c..3ce22d210 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyScanWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyScanWindow.js
@@ -274,7 +274,7 @@ Ext4.define('SNPRC_EHR.window.BulkSerologyScanWindow', {
}
timeStr = Ext4.String.leftPad(timeStr, 5, '0'); //expect: HH:mm
- var ret = LDK.ConvertUtils.parseDate(date.format('Y-m-d') + ' ' + timeStr);
+ var ret = LDK.ConvertUtils.parseDate(Ext4.Date.format(date, 'Y-m-d') + ' ' + timeStr);
if (!ret){
errors.push('Row ' + rowIdx + ': invalid time: ' + timeStr);
}
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyVirologyWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyVirologyWindow.js
index 16510e9b2..72ea29166 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyVirologyWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BulkSerologyVirologyWindow.js
@@ -266,7 +266,7 @@ Ext4.define('SNPRC_EHR.window.BulkSerology_VirologyWindow', {
}
timeStr = Ext4.String.leftPad(timeStr, 5, '0'); //expect: HH:mm
- var ret = LDK.ConvertUtils.parseDate(date.format('Y-m-d') + ' ' + timeStr);
+ var ret = LDK.ConvertUtils.parseDate(Ext4.Date.format(date, 'Y-m-d') + ' ' + timeStr);
if (!ret){
errors.push('Row ' + rowIdx + ': invalid time: ' + timeStr);
}
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BulkStrokeRoundsWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BulkStrokeRoundsWindow.js
index a4a7c566d..dfcbb39e7 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BulkStrokeRoundsWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BulkStrokeRoundsWindow.js
@@ -329,7 +329,7 @@ Ext4.define('SNPRC_EHR.window.BulkStrokeRoundsWindow', {
}
timeStr = Ext4.String.leftPad(timeStr, 5, '0'); //expect: HH:mm
- var ret = LDK.ConvertUtils.parseDate(date.format('Y-m-d') + ' ' + timeStr);
+ var ret = LDK.ConvertUtils.parseDate(Ext4.Date.format(date, 'Y-m-d') + ' ' + timeStr);
if (!ret){
errors.push('Row ' + rowIdx + ': invalid time: ' + timeStr);
}
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/CopyFromRunsTemplateWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/CopyFromRunsTemplateWindow.js
index 683c96210..0fd8a49d8 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/CopyFromRunsTemplateWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/CopyFromRunsTemplateWindow.js
@@ -143,7 +143,7 @@ Ext4.define('SNPRC_EHR.window.CopyFromRunsTemplateWindow', {
width: 60
});
toAdd.push({
- html: r.get('date').format(LABKEY.extDefaultDateTimeFormat), //Modified 2-5-2015 to include date hour minutes
+ html: Ext4.Date.format(r.get('date'), LABKEY.extDefaultDateTimeFormat), //Modified 2-5-2015 to include date hour minutes
width: 100
});
toAdd.push({
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/MassBleedWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/MassBleedWindow.js
index 1981a0f73..05e29df4f 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/MassBleedWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/MassBleedWindow.js
@@ -396,7 +396,7 @@ Ext4.define('SNPRC_EHR.window.MassBleedWindow', {
}
timeStr = Ext4.String.leftPad(timeStr, 5, '0'); //expect: HH:mm
- var ret = LDK.ConvertUtils.parseDate(date.format('Y-m-d') + ' ' + timeStr);
+ var ret = LDK.ConvertUtils.parseDate(Ext4.Date.format(date, 'Y-m-d') + ' ' + timeStr);
if (!ret){
errors.push('Row ' + rowIdx + ': invalid time: ' + timeStr);
}