From 5c4de8e3c4cf8422bb4ac8d54ba767e6ed122d08 Mon Sep 17 00:00:00 2001 From: ankurjuneja Date: Tue, 11 Feb 2025 12:39:20 -0800 Subject: [PATCH 1/2] fix flags inline on click js handler in reports --- ehr/resources/web/ehr/panel/SnapshotPanel.js | 45 +++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/ehr/resources/web/ehr/panel/SnapshotPanel.js b/ehr/resources/web/ehr/panel/SnapshotPanel.js index 10719b30e..90aab341a 100644 --- a/ehr/resources/web/ehr/panel/SnapshotPanel.js +++ b/ehr/resources/web/ehr/panel/SnapshotPanel.js @@ -39,24 +39,6 @@ Ext4.define('EHR.panel.SnapshotPanel', { this.setLoading(true); this.loadData(); } - - this.on('afterrender', function() { - - var displayField = this.down('#flags'); - if (displayField && displayField.getEl()) { - - var anchor = displayField.getEl('flagsLink'); - - if (anchor) { - Ext4.get(anchor).on('click', function(e) { - e.preventDefault(); - if (anmId) { - EHR.Utils.showFlagPopup(anmId, this); - } - }); - } - } - }, this); }, getBaseItems: function(){ @@ -145,7 +127,23 @@ Ext4.define('EHR.panel.SnapshotPanel', { xtype: 'displayfield', fieldLabel: 'Flags', name: 'flags', - itemId: 'flags' + itemId: 'flags', + listeners: { + change: function(field, newValue, oldValue){ + let anchor = field.getEl('flagsLink'); + if (this?.up('panel')?.up('panel')) { + let anmId = this.up('panel').up('panel').subjectId; + if (anchor) { + Ext4.get(anchor).on('click', function(e) { + e.preventDefault(); + if (anmId) { + EHR.Utils.showFlagPopup(anmId, this); + } + }); + } + } + } + } },{ xtype: 'displayfield', fieldLabel: 'Last TB Date', @@ -723,7 +721,7 @@ Ext4.define('EHR.panel.SnapshotPanel', { } } - toSet['flags'] = values.length ? '' + values.join('
') + '' : null; + toSet['flags'] = values.length ? '
' + values.join('
') + '' : null; }, getFlagDisplayValue: function(row) { @@ -855,7 +853,12 @@ Ext4.define('EHR.panel.SnapshotChildPanel', { }, items: [{ html: '
' - }] + }], + listeners: { + afterrender: function(panel){ + debugger + } + } }] }); From e03fb2724fb1382e1566a534aadbeafb80ef749f Mon Sep 17 00:00:00 2001 From: ankurjuneja Date: Tue, 11 Feb 2025 12:40:41 -0800 Subject: [PATCH 2/2] remove debugger --- ehr/resources/web/ehr/panel/SnapshotPanel.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ehr/resources/web/ehr/panel/SnapshotPanel.js b/ehr/resources/web/ehr/panel/SnapshotPanel.js index 90aab341a..9f435158f 100644 --- a/ehr/resources/web/ehr/panel/SnapshotPanel.js +++ b/ehr/resources/web/ehr/panel/SnapshotPanel.js @@ -853,12 +853,7 @@ Ext4.define('EHR.panel.SnapshotChildPanel', { }, items: [{ html: '
' - }], - listeners: { - afterrender: function(panel){ - debugger - } - } + }] }] });