Closed lmd59 closed 1 year ago
St.:grey_question: |
Category | Percentage | Covered / Total |
---|---|---|---|
🟢 | Statements | 86.44% (+0.02% 🔼) |
2218/2566 |
🟡 | Branches | 75.25% (+0.07% 🔼) |
2037/2707 |
🟢 | Functions | 89.32% (+0.56% 🔼) |
410/459 |
🟢 | Lines | 86.78% (+0.03% 🔼) |
2140/2466 |
411 tests passing in 31 suites.
Report generated by 🧪jest coverage report action from 3e525bbc973fa4bd9c8a37e7b8e58ca49800f539
Summary
Fixes #238
Generated HTML sorts statements into population statements, non-functions, and function statements, where non-population statements are also in alphabetical order.
New behavior
HTML output from calculation has appropriately ordered expressions.
Code changes
Calculator.ts
- updates to pass the measure through to the HTMLBuilderHTMLBuilder.ts
- addssortStatements
function which sorts the passed statements by population statements, non-functions, and function statements. Measure information is passed through to identify population statements.DataRequirementsHelper.ts
- just a typo updateHTMLBuilder.test.ts
- test expression ordering and pass measure throughTesting guidance
npm run check
npm run cli -- -p "ecqm-content-r4-2021/bundles/measure/CervicalCancerScreeningFHIR/CervicalCancerScreeningFHIR-files/tests-denom-EXM124-bundle.json" -m "ecqm-content-r4-2021/bundles/measure/CervicalCancerScreeningFHIR/CervicalCancerScreeningFHIR-bundle.json" -o --debug
-> Searchoutput.json
file for "html" to find the html in situ or go to thedebug/html
folder and view any html there in browser to confirm expression order is correct