Skip to content
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

Jump to bottom

[bot] Merge 23.11 to 24.1 #672

Merged
merged 2 commits into from
Jan 16, 2024
Merged

[bot] Merge 23.11 to 24.1 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb21d8b
Export HTML narrative as text (#671)
labkey-martyp Jan 12, 2024
b552833
Merge 23.11 to 24.1
labkey-teamcity Jan 16, 2024
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
3 changes: 3 additions & 0 deletions snprc_ehr/resources/queries/snd/ProcedureEventListing.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
</column>
<column columnName="HTMLNarrative">
<columnTitle>Narrative</columnTitle>
<displayColumnFactory>
<className>org.labkey.snprc_ehr.table.EventNarrativeDisplayColumnFactory</className>
</displayColumnFactory>
</column>
<column columnName="AdmitChargeId">
<columnTitle>Admit / Charge ID</columnTitle>
Expand Down
31 changes: 31 additions & 0 deletions snprc_ehr/src/org/labkey/snprc_ehr/table/EventNarrativeDisplayColumnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package org.labkey.snprc_ehr.table;

import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.DataColumn;
import org.labkey.api.data.DisplayColumn;
import org.labkey.api.data.DisplayColumnFactory;
import org.labkey.api.data.RenderContext;
import org.labkey.api.snd.PlainTextNarrativeDisplayColumn;

public class EventNarrativeDisplayColumnFactory implements DisplayColumnFactory
{
@Override
public DisplayColumn createRenderer(ColumnInfo colInfo)
{
return new EventNarrativeDisplayColumnFactory.EventNarrativeDisplayColumn(colInfo);
}

public class EventNarrativeDisplayColumn extends DataColumn
{
public EventNarrativeDisplayColumn(ColumnInfo col)
{
super(col, false);
}

@Override
public Object getExportCompatibleValue(RenderContext ctx)
{
return PlainTextNarrativeDisplayColumn.removeHtmlTagsFromNarrative((String)ctx.get(getBoundColumn().getName()));
}
}
}
Loading