honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update date rendering

This commit is contained in:
Grahame Grieve 2024-03-25 15:58:40 +11:00
parent a4055877c4
commit 459f04a490
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ListRenderer.java
View File

@ -40,7 +40,7 @@ public class ListRenderer extends ResourceRenderer {
XhtmlNode tr = t.tr(); XhtmlNode tr = t.tr();
XhtmlNode td = tr.td(); XhtmlNode td = tr.td();
if (list.has("date")) { if (list.has("date")) {
td.tx(/*!#*/"Date: "+list.get("date").dateTimeValue().toHumanDisplay()); td.tx(/*!#*/"Date: "+context.toStr(list.get("date").dateTimeValue()));
} }
if (list.has("mode")) { if (list.has("mode")) {
td.tx(/*!#*/"Mode: "+list.get("mode").primitiveValue()); td.tx(/*!#*/"Mode: "+list.get("mode").primitiveValue());
@ -113,7 +113,7 @@ public class ListRenderer extends ResourceRenderer {
XhtmlNode t = x.table("clstu"); XhtmlNode t = x.table("clstu");
XhtmlNode tr = t.tr(); XhtmlNode tr = t.tr();
if (list.hasDate()) { if (list.hasDate()) {
tr.td().tx(/*!#*/"Date: "+list.getDate().toLocaleString()); tr.td().tx(/*!#*/"Date: "+context.toStr(list.getDateElement()));
} }
if (list.hasMode()) { if (list.hasMode()) {
tr.td().tx(/*!#*/"Mode: "+list.getMode().getDisplay()); tr.td().tx(/*!#*/"Mode: "+list.getMode().getDisplay());

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProvenanceRenderer.java
View File

@ -55,7 +55,7 @@ public class ProvenanceRenderer extends ResourceRenderer {
if (prv.hasRecorded()) { if (prv.hasRecorded()) {
tr = t.tr(); tr = t.tr();
tr.td().tx(/*!#*/"Recorded"); tr.td().tx(/*!#*/"Recorded");
tr.td().addText(prv.getRecordedElement().toHumanDisplay()); tr.td().addText(context.toStr(prv.getRecordedElement()));
} }
if (prv.hasPolicy()) { if (prv.hasPolicy()) {
tr = t.tr(); tr = t.tr();

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
View File

@ -18,6 +18,7 @@ import org.hl7.fhir.r5.context.IWorkerContext;
import org.hl7.fhir.r5.elementmodel.Element; import org.hl7.fhir.r5.elementmodel.Element;
import org.hl7.fhir.r5.fhirpath.FHIRPathEngine.IEvaluationContext; import org.hl7.fhir.r5.fhirpath.FHIRPathEngine.IEvaluationContext;
import org.hl7.fhir.r5.model.Base; import org.hl7.fhir.r5.model.Base;
import org.hl7.fhir.r5.model.BaseDateTimeType;
import org.hl7.fhir.r5.model.DateTimeType; import org.hl7.fhir.r5.model.DateTimeType;
import org.hl7.fhir.r5.model.DomainResource; import org.hl7.fhir.r5.model.DomainResource;
import org.hl7.fhir.r5.model.Extension; import org.hl7.fhir.r5.model.Extension;
@ -745,7 +746,7 @@ public class RenderingContext extends RenderingI18nContext {
return nf.format(v); return nf.format(v);
} }
public String toStr(DateTimeType dt) { public String toStr(BaseDateTimeType dt) {
return dt.toHumanDisplay(); return dt.toHumanDisplay();
} }