Skip to content

Ticket 42744: Grid view menu selection items clipped in task details #148

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 1 commit into from
Apr 14, 2021
Merged

Ticket 42744: Grid view menu selection items clipped in task details #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion ehr/resources/views/dataEntryFormDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<div id="detailsParent"></div>

<script type="text/javascript">

Ext4.onReady(function(){
Expand All @@ -18,4 +20,4 @@
}
});

</script>
</script>
52 changes: 20 additions & 32 deletions ehr/resources/web/ehr/panel/DataEntryFormDetailsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,35 +108,31 @@ Ext4.define('EHR.panel.DataEntryFormDetailsPanel', {
LDK.Assert.assertTrue('No filter array applied in DataEntryFormDetailsPanel', filterArray.length > 0);
LABKEY.NavTrail.setTrail(navTitle, null, navTitle, true, false);

var toAdd = [];
Ext4.Array.forEach(queries, function(q){
Ext4.Array.forEach(queries, function(q) {
var id = LABKEY.Utils.id();
var isPrimaryCmp = q.schemaName === 'ehr' && (q.queryName === 'requests' || q.queryName === 'tasks');

toAdd.push({
xtype: 'ldk-querycmp',
id: 'ldk-querycmp-' + id,
style: 'margin-bottom: 20px;',
queryConfig: {
id: id,
title: LABKEY.Utils.encodeHtml(q.label),
frame: isPrimaryCmp ? 'portal' : 'dialog',
schemaName: q.schemaName,
queryName: q.queryName,
viewName: viewName,
filters: filterArray,
//note: changed to removeableSort so it will take priority over any view-based sorts
removeableSort: viewName === undefined ? q.serverStoreSort : undefined,
success: this.onDataRegionLoad,
scope: this
}
Ext4.get('detailsParent').createChild({id: id, tag: 'div', style: 'margin-bottom: 20px;'});

var qwp = new LABKEY.QueryWebPart({
renderTo: id,
title: LABKEY.Utils.encodeHtml(q.label),
frame: isPrimaryCmp ? 'portal' : 'dialog',
schemaName: q.schemaName,
queryName: q.queryName,
viewName: viewName,
filters: filterArray,
//note: changed to removeableSort so it will take priority over any view-based sorts
removeableSort: viewName === undefined ? q.serverStoreSort : undefined,
success: this.onDataRegionLoad,
scope: this
});
qwp.render();
}, this);

this.showEditBtn('Completed', results.form.permissions);

this.removeAll();
this.add(toAdd);
},

getParentRequestStatus: function(callback) {
Expand Down Expand Up @@ -166,18 +162,10 @@ Ext4.define('EHR.panel.DataEntryFormDetailsPanel', {
},

onDataRegionLoad: function(dr){
var drEl = Ext4.get(dr.domId);
LDK.Assert.assertNotEmpty('Unable to find dataRegion element in DataEntryFormDetailsPanel', drEl);

if (drEl) {
if (dr.totalRows > 0) {
var itemWidth = drEl.getSize().width + 100;
if (itemWidth > this.getWidth()){
this.setWidth(itemWidth + 20);
}
}
else {
Ext4.getCmp('ldk-querycmp-' + dr.id).hide();
if (dr.totalRows === 0) {
var el = document.getElementById(dr.renderTo);
if (el) {
el.style.display = 'none';
}
}
}
Expand Down