Skip to content

Remove ExtJS3 dependencies #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 3 commits into from
Sep 1, 2020
Merged

Remove ExtJS3 dependencies #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cce8f29
Purge remaining uses of ExtJS3's injected date.format() function
labkey-jeckels Aug 24, 2020
03d843d
Load WebdavFileSystem and ExtJS3 only when needed
labkey-jeckels Aug 25, 2020
8836130
Wait for Ext.onReady()
labkey-jeckels Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions snprc_ehr/resources/web/snprc_ehr/Panel/AddScheduledTreatmentPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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',
Expand Down
228 changes: 0 additions & 228 deletions snprc_ehr/resources/web/snprc_ehr/Panel/EnterDataPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
// }
// }]
// }];
// }
8 changes: 4 additions & 4 deletions snprc_ehr/resources/web/snprc_ehr/snprcOverrides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('<tr><td nowrap>' + d.format(LABKEY.extDefaultDateFormat) +
text.push('<tr><td nowrap>' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
'</td><td style="padding-left: 5px;" nowrap>' + r.account + '</td></tr>');
}, this);
}
Expand All @@ -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);
}

Expand All @@ -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('<tr><td nowrap>' + d.format(LABKEY.extDefaultDateFormat) +
text.push('<tr><td nowrap>' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
'</td><td style="padding-left: 5px;" nowrap>' + r.pedigree + '</td></tr>');
}, this);
}
Expand All @@ -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('<tr><td nowrap>' + d.format(LABKEY.extDefaultDateFormat) +
text.push('<tr><td nowrap>' + Ext4.Date.format(d, LABKEY.extDefaultDateFormat) +
'</td><td style="padding-left: 5px;" nowrap>' + r.diet + '</td></tr>');
}, this);
}
Expand Down
Loading