#1268: Show gloss field values in similar glosses buttons.

Signbank · Jul 2, 2024 · 154069d · 154069d
1 parent 6ad2676
commit 154069d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 5 deletions.
diff --git a/media/js/glosses_toggle_edit.js b/media/js/glosses_toggle_edit.js
@@ -75,6 +75,11 @@ function toggle_handedness(data) {
  $(hCell).empty();
  var cell = "<span class='handedness'>"+handedness+"</span>";
  hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_handedness';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['handedness'] + ': ' + handedness;
+ buttonCell.attr('value', button_contents);
 }
 
 function toggle_domhndsh(data) {
@@ -87,6 +92,11 @@ function toggle_domhndsh(data) {
  $(hCell).empty();
  var cell = "<span class='domhndsh'>"+domhndsh+"</span>";
  hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_domhndsh';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['domhndsh'] + ': ' + domhndsh;
+ buttonCell.attr('value', button_contents);
 }
 
 function toggle_subhndsh(data) {
@@ -99,6 +109,11 @@ function toggle_subhndsh(data) {
  $(hCell).empty();
  var cell = "<span class='subhndsh'>"+subhndsh+"</span>";
  hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_subhndsh';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['subhndsh'] + ': ' + subhndsh;
+ buttonCell.attr('value', button_contents);
 }
 
 function toggle_locprim(data) {
@@ -111,6 +126,11 @@ function toggle_locprim(data) {
  $(hCell).empty();
  var cell = "<span class='locprim'>"+locprim+"</span>";
  hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_locprim';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['locprim'] + ': ' + locprim;
+ buttonCell.attr('value', button_contents);
 }
 
 function toggle_movSh(data) {
@@ -123,6 +143,11 @@ function toggle_movSh(data) {
  $(hCell).empty();
  var cell = "<span class='movSh'>"+movSh+"</span>";
  hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_movSh';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['movSh'] + ': ' + movSh;
+ buttonCell.attr('value', button_contents);
 }
 
 function toggle_create_sense(data) {

diff --git a/signbank/dictionary/templates/dictionary/admin_batch_edit_view.html b/signbank/dictionary/templates/dictionary/admin_batch_edit_view.html
@@ -25,6 +25,7 @@
 var query_parameters_dict = {{query_parameters|safe}};
 var language_2chars = {{language_2chars|safe}};
 var similar_gloss_fields = {{similar_gloss_fields|safe}};
+var similar_gloss_fields_labels = {{similar_gloss_fields_labels|safe}};
 var number_of_matches_found = '{% trans "Number of Similar Videos" %}';
 </script>
 
@@ -657,13 +658,15 @@ <h4>{% trans "On initial view, the most recent query results are shown." %}</h4>
  <table class="table-responsive">
  <tr>
  <td>
+ {% load field_choice %}
  {% for fieldname, label in similar_gloss_fields_labels.items %}
-
+ {% with gloss|get_gloss_field:fieldname as fieldvalue %}
  <input name="button_{{gloss.id}}_{{fieldname}}" id="button_{{gloss.id}}_{{fieldname}}"
- class="similar"
+ class="similar actionButton"
  type='button' onclick="do_toggle_field(this);" data-glossid="{{gloss.id}}"
  data-value="{{fieldname}}" style="text-decoration:none;color:black;"
- value="{{label}}">
+ value="{{label}}: {{fieldvalue}}">
+ {% endwith %}
  {% endfor %}
  </td>
  </tr>
@@ -672,8 +675,8 @@ <h4>{% trans "On initial view, the most recent query results are shown." %}</h4>
  <button id='quick_similarglosses_btn_{{gloss.id}}'
  class="quick_similarglosses btn actionButton"
  name='quick_similarglosses_{{gloss.id}}'
- data-glossid='{{gloss.id}}' style="height:26px;"
- type="submit" >{% trans "Query" %}
+ data-glossid='{{gloss.id}}' style="height:26px;margin-top:10px;"
+ type="submit" >{% trans "QUERY" %}
  </button>
  </td>
  </tr>

diff --git a/signbank/dictionary/templatetags/field_choice.py b/signbank/dictionary/templatetags/field_choice.py
@@ -34,3 +34,12 @@ def normalise_empty(machine_value):
 def translated_frequency_list(dataset):
  generated_dict = dataset.generate_frequency_dict()
  return generated_dict
+
+
+@register.filter
+def get_gloss_field(gloss, field):
+ field_value = getattr(gloss, field)
+ if field_value:
+ return field_value.name
+ else:
+ return '-'