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

ensure decimal is persisted by adding leading 0 if applicable #24

Merged
merged 10 commits into from
Dec 17, 2024
Merged

ensure decimal is persisted by adding leading 0 if applicable #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fab4ead
add to_json_string so it will bring periods with value
lina-roth Dec 12, 2024
063b8a2
remove uneeded change
lina-roth Dec 12, 2024
96fdc2e
Merge branch 'main' into lr/alcohol
lina-roth Dec 17, 2024
267601c
Add value helper unit tests
lina-roth Dec 17, 2024
da245a2
remove print
lina-roth Dec 17, 2024
5b1d86a
change to_json_string to_json_number
lina-roth Dec 17, 2024
41d7d11
ensure decimal is persisted by adding leading 0 if applicable
lina-roth Dec 17, 2024
71d103b
Merge branch 'main' into lr/alcohol
lina-roth Dec 17, 2024
8aab0eb
final_final_copy_4
lina-roth Dec 17, 2024
e19220b
Merge branch 'lr/alcohol' of github.com:skylight-hq/FHIR-Converter in…
lina-roth Dec 17, 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
7 changes: 6 additions & 1 deletion data/Templates/eCR/Utils/_ValueHelper.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
"valueBoolean" : {{ value.value }}
{% elsif value.value -%}
"valueQuantity": {
"value":{{ value.value | to_json_number }},
"value":
{% if value.value startswith "." %}
{{ "0" | append: value.value }},
{% else %}
{{ value.value }},
{% endif %}
{% if value.unit and value.unit != "null" -%}
"unit":"{{ value.unit }}",
{% endif -%}
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.Health.Fhir.Liquid.Converter.UnitTests/Templates/eCR/Utils/ValueHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void GivenDecimalProperlyReturnsWithDecimal()
var attributes = new Dictionary<string, object>{
{"value", Hash.FromAnonymousObject(new { value = ".29"})}
};
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\":.29, },");
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\": 0.29, },");
}

[Fact]
Expand All @@ -32,7 +32,7 @@ public void GivenIntProperlyReturnsInt()
var attributes = new Dictionary<string, object>{
{"value", Hash.FromAnonymousObject(new { value = "300"})}
};
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\":300, },");
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\": 300, },");
}

[Fact]
Expand All @@ -41,7 +41,7 @@ public void GivenDecimalProperlyReturnsDecimal()
var attributes = new Dictionary<string, object>{
{"value", Hash.FromAnonymousObject(new { value = "300.00"})}
};
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\":300.00, },");
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\": 300.00, },");
}

[Fact]
Expand All @@ -50,7 +50,7 @@ public void GivenNegativeValueProperlyReturnsNegativeValue()
var attributes = new Dictionary<string, object>{
{"value", Hash.FromAnonymousObject(new { value = "-300.00"})}
};
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\":-300.00, },");
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\": -300.00, },");
}

[Fact]
Expand All @@ -59,7 +59,7 @@ public void GivenValueUnitProperlyReturnsWithValueUnit()
var attributes = new Dictionary<string, object>{
{"value", Hash.FromAnonymousObject(new { value = ".29" , unit = "/d"})}
};
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\":.29, \"unit\":\"/d\", },");
ConvertCheckLiquidTemplate(ECRPath, attributes, "\"valueQuantity\": { \"value\": 0.29, \"unit\":\"/d\", },");
}
}
}
Loading