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

Issue/175 Template Engine for HTML UIs #180

Merged
merged 12 commits into from
Feb 21, 2024
Merged

Issue/175 Template Engine for HTML UIs #180

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1a1f99
Merge remote-tracking branch 'origin/develop' into
hhund Feb 20, 2024
3c7d73a
adds missing radio input name attribute
hhund Feb 20, 2024
93a95d4
improved regex
hhund Feb 20, 2024
a530877
improved regex, removed duplicate + and not needed groups
hhund Feb 20, 2024
c99c23e
copy display items into completed questionnaire responses
wetret Feb 20, 2024
b0787e6
fix bpe web ui for multiple process plugin versions
schwzr Feb 20, 2024
e4a980f
reworked page and count parsing/links/display for search sets
hhund Feb 20, 2024
c3f301b
fixed "invalid search criteria" rule and added integration test
hhund Feb 20, 2024
486b1dc
Merge branch 'issue/175_Template_Engine_for_HTML_UIs' of [email protected]…
hhund Feb 20, 2024
bb31f6e
improved validation behavior for optional multi-input inputs/items
wetret Feb 21, 2024
9c84b21
postgresql dependency to 42.7.2
hhund Feb 21, 2024
50031a2
removed useless null checks
hhund Feb 21, 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
2 changes: 1 addition & 1 deletion ...r/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/EndpointAuthorizationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
private static final Logger logger = LoggerFactory.getLogger(EndpointAuthorizationRule.class);

private static final String ENDPOINT_IDENTIFIER_SYSTEM = "http://dsf.dev/sid/endpoint-identifier";
private static final String ENDPOINT_ADDRESS_PATTERN_STRING = "https://([0-9a-zA-Z\\.-]+)+(:\\d{1,4})?([-\\w/]*)";
private static final String ENDPOINT_ADDRESS_PATTERN_STRING = "https://(?:[0-9a-zA-Z.-]+)+(?::\\d{1,4})?(?:[-\\w/]*)";
Fixed Show fixed Hide fixed
private static final Pattern ENDPOINT_ADDRESS_PATTERN = Pattern.compile(ENDPOINT_ADDRESS_PATTERN_STRING);

public EndpointAuthorizationRule(DaoProvider daoProvider, String serverBase, ReferenceResolver referenceResolver,
Expand Down
4 changes: 2 additions & 2 deletions dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ <h3 th:if="${not #lists.isEmpty(task.input)}">Input</h3>
<label class="row-label" th:if="${i.label}" th:title="${i.labelTitle}">[[${i.label}]]<span class="cardinalities"></span></label>
<div class="input-group">
<div class="input-group-radio" th:id="${i.id}">
<label class="radio"><input type="radio" value="true" th:attr="${resource.status == 'draft' ? 'placeholder' : 'checked'} = ${i.booleanValue} ?: _, fhir-type = ${i.fhirType + '.true'}" th:id="${i.id + '-true'}">Yes</label>
<label class="radio"><input type="radio" value="false" th:attr="${resource.status == 'draft' ? 'placeholder' : 'checked'} = ${!i.booleanValue} ?: _, fhir-type = ${i.fhirType + '.false'}" th:id="${i.id + '-false'}">No</label>
<label class="radio"><input type="radio" value="true" th:attr="${resource.status == 'draft' ? 'placeholder' : 'checked'} = ${i.booleanValue} ?: _, fhir-type = ${i.fhirType + '.true'}" th:id="${i.id + '-true'}" th:name="${i.id}">Yes</label>
<label class="radio"><input type="radio" value="false" th:attr="${resource.status == 'draft' ? 'placeholder' : 'checked'} = ${!i.booleanValue} ?: _, fhir-type = ${i.fhirType + '.false'}" th:id="${i.id + '-false'}" th:name="${i.id}">No</label>
</div>
<svg class="insert" height="22" width="22" viewBox="0 -960 960 960" th:disabled="${i.booleanValue} == null" th:if="${resource.status == 'draft'}"><title>Insert Placeholder Value</title><path d="M140-160q-24 0-42-18t-18-42v-169h60v169h680v-520H140v171H80v-171q0-24 18-42t42-18h680q24 0 42 18t18 42v520q0 24-18 42t-42 18H140Zm319-143-43-43 103-103H80v-60h439L416-612l43-43 176 176-176 176Z"></path></svg>
<svg class="copy" height="22" width="22" viewBox="0 -960 960 960" th:if="${resource.status != 'draft'}"><title>Copy to Clipboard</title><path d="M362.308-260.001q-30.308 0-51.307-21-21-21-21-51.308v-455.382q0-30.308 21-51.308 20.999-21 51.307-21h335.383q30.307 0 51.307 21 21 21 21 51.308v455.382q0 30.308-21 51.308t-51.307 21H362.308Zm0-59.999h335.383q4.615 0 8.462-3.846 3.846-3.847 3.846-8.463v-455.382q0-4.616-3.846-8.463-3.847-3.846-8.462-3.846H362.308q-4.616 0-8.462 3.846-3.847 3.847-3.847 8.463v455.382q0 4.616 3.847 8.463 3.846 3.846 8.462 3.846ZM222.309-120.003q-30.307 0-51.307-21-21-21-21-51.307v-515.381h59.999v515.381q0 4.616 3.846 8.462 3.847 3.847 8.462 3.847h395.382v59.998H222.309ZM349.999-320V-800-320Z"/></svg>
Expand Down
Loading