Skip to content

Commit

Permalink
Merge pull request #662 from eresearchqut/ERP-905_Fix_Bug_clicking_fo…
Browse files Browse the repository at this point in the history 
…rm_label_triggers_checkboxes_and_radios

[ERP-905] Fix bug where clicking a form label triggers the selection of the first checkbox or radio option
  • Loading branch information
@ppettitau
ppettitau authored Dec 17, 2023
2 parents bc703b6 + d08e064 commit 998d8b2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions rdrf/rdrf/templates/rdrf_cdes/form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
{% endif %}
{% if element.label == "Delete" %}
{% else %}
<label for="{{ element.id_for_label}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
{{ element.label }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down Expand Up @@ -447,7 +447,7 @@
{% if changes_since_version and element.label == "Delete" %}
<div></div>
{% else %}
<label for="{{ element.id_for_label}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
{% if element.label == "Delete" %}
{% trans "Mark for deletion" %}
{% else %}
Expand Down Expand Up @@ -498,7 +498,7 @@
{% else %}
{% for field in forms|get_form_object:s %}
<div class="row rdrf-cde-field invisibutton-container">
<label for="{{field.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{field.auto_id}}" class="col-sm-3 col-form-label">
{% if field.field.cde.code and not CREATE_MODE and have_dynamic_data %}
<a href="{% url 'registry_form_field_history' registry_code form_name patient_id s context_id field.field.cde.code %}"
onclick="rdrf_click_form_field_history(event, this)"
Expand Down
6 changes: 3 additions & 3 deletions rdrf/rdrf/templates/rdrf_cdes/form_readonly.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
{% endif %}
{% if element.label == "Delete" %}
{% else %}
<label for="{{ element.id_for_label}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
{{ element.label }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down Expand Up @@ -287,7 +287,7 @@
{% else %}
<div class="row rdrf-cde-field">
{% endif %}
<label for="{{ element.id_for_label}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
{% if element.label == "Delete" %}
Mark for deletion
{% else %}
Expand Down Expand Up @@ -318,7 +318,7 @@
{% else %}
{% for field in forms|get_form_object:s %}
<div class="row rdrf-cde-field">
<label for="{{field.id_for_label}}" class="col-md-4 col-form-label">
<label for="{{field.auto_id}}" class="col-md-4 col-form-label">
{{field.label}}
{% if field.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down
8 changes: 4 additions & 4 deletions rdrf/rdrf/templates/rdrf_cdes/generic_patient.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
{% endif %}
{% if element.label == "Delete" %}
{% else %}
<label for="{{ element.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" class="col-sm-3 col-form-label">
{{ element.label|translate }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down Expand Up @@ -260,7 +260,7 @@
{% else %}
<div class="row" style="display: {{element.is_hidden|yesno:"None,flex"}}">
{% endif %}
<label for="{{ element.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" class="col-sm-3 col-form-label">
{% if element.label == "Delete" %}
Mark for deletion
{% else %}
Expand Down Expand Up @@ -324,15 +324,15 @@
<div class="row" style="display: {{element.is_hidden|yesno:"None,flex"}}">
{% endif %}
{% if link %}
<label for="{{ element.id_for_label}}" style="text-align: left" class="col-sm-11 col-form-label">
<label for="{{ element.auto_id}}" style="text-align: left" class="col-sm-11 col-form-label">
{{ element.label|translate }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
{% endif %}
</label>
<div class="col-sm-1">
{% else %}
<label for="{{ element.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" class="col-sm-3 col-form-label">
{{ element.label|translate }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down
2 changes: 1 addition & 1 deletion rdrf/rdrf/templates/rdrf_cdes/parent_edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{% csrf_token %}
{% for field in parent_form %}
<div class="row {% if field.errors %}has-error{% endif %}">
<label for="{{field.id_for_label}}" class="col-md-3 offset-md-1 col-form-label">{% if field.field.required %}<span class="fa fa-asterisk" style="color: red" aria-hidden="true"></span>{% endif %} {{field.label}}</label>
<label for="{{field.auto_id}}" class="col-md-3 offset-md-1 col-form-label">{% if field.field.required %}<span class="fa fa-asterisk" style="color: red" aria-hidden="true"></span>{% endif %} {{field.label}}</label>
<div class="col-md-6">
{{ field }}
</div>
Expand Down
8 changes: 4 additions & 4 deletions rdrf/rdrf/templates/rdrf_cdes/patient_edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h2>{% trans form_title %}</h2>
{% endif %}
{% if element.label == "Delete" %}
{% else %}
<label for="{{ element.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" class="col-sm-3 col-form-label">
{{ element.label|translate}}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down Expand Up @@ -280,7 +280,7 @@ <h2>{% trans form_title %}</h2>
{% else %}
<div class="row" style="display: {{element.is_hidden|yesno:"None,flex"}}">
{% endif %}
<label for="{{ element.id_for_label}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" class="col-sm-3 col-form-label">
{% if element.label == "Delete" %}
{% trans 'Mark for deletion' %}
{% else %}
Expand Down Expand Up @@ -356,15 +356,15 @@ <h2>{% trans form_title %}</h2>
<div class="row" style="display: {{element.is_hidden|yesno:"None,flex"}}">
{% endif %}
{% if link %}
<label for="{{ element.id_for_label}}" style="text-align: left" class="col-sm-11 col-form-label">
<label for="{{ element.auto_id}}" style="text-align: left" class="col-sm-11 col-form-label">
{{ element.label|translate }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
{% endif %}
</label>
<div class="col-sm-1">
{% else %}
<label for="{{ element.id_for_label}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
<label for="{{ element.auto_id}}" style="display: {{element.is_hidden|yesno:"None,block"}}" class="col-sm-3 col-form-label">
{{ element.label|translate }}
{% if element.field.required %}
<span class="fa fa-asterisk" style="color: red;" aria-hidden="true"></span>
Expand Down

0 comments on commit 998d8b2

Please sign in to comment.