#1268: Added Relative Orientation: Movement to phonology fields.

media/js/glosses_toggle_edit.js

@@ -252,6 +252,23 @@ function toggle_altern(data) {
  buttonCell.attr('value', button_contents);
 }
 
+function toggle_relOriMov(data) {
+ if ($.isEmptyObject(data)) {
+ return;
+ };
+ var glossid = data.glossid;
+ var relOriMov = data.relOriMov;
+ var hCell = $("#relOriMov_cell_"+glossid);
+ $(hCell).empty();
+ var cell = "<span class='relOriMov'>"+relOriMov+"</span>";
+ hCell.html(cell);
+
+ var button_lookup = '#button_' + glossid + '_relOriMov';
+ var buttonCell = $(button_lookup);
+ var button_contents = similar_gloss_fields_labels['relOriMov'] + ': ' + relOriMov;
+ buttonCell.attr('value', button_contents);
+}
+
 function toggle_create_sense(data) {
  if ($.isEmptyObject(data)) {
  return;
@@ -583,6 +600,20 @@ $(document).ready(function() {
  });
  });
 
+ $('.quick_relOriMov').click(function(e)
+ {
+ e.preventDefault();
+ var glossid = $(this).attr('value');
+ var relOriMov = $(this).attr("data-relOriMov");
+ $.ajax({
+ url : url + "/dictionary/update/toggle_relOriMov/" + glossid + "/" + relOriMov,
+ type: 'POST',
+ data: { 'csrfmiddlewaretoken': csrf_token },
+ datatype: "json",
+ success : toggle_relOriMov
+ });
+ });
+
  $('.quick_create_sense').click(function(e)
  {
  e.preventDefault();

signbank/dictionary/adminviews.py

@@ -6540,7 +6540,7 @@ def get_context_data(self, **kwargs):
  context['available_tags'] = [tag for tag in Tag.objects.all()]
 
  similar_gloss_fields = ['handedness', 'domhndsh', 'subhndsh', 'handCh', 'relatArtic', 'locprim',
- 'contType', 'movSh', 'movDir', 'repeat', 'altern']
+ 'contType', 'movSh', 'movDir', 'repeat', 'altern', 'relOriMov']
  context['similar_gloss_fields'] = json.dumps(similar_gloss_fields)
  similar_gloss_fields_labels = {}
  for field in similar_gloss_fields:
@@ -6602,6 +6602,12 @@ def get_context_data(self, **kwargs):
  {'machine_value': 0, 'name': gettext("No")}]
  context['available_boolean'] = available_boolean
 
+ available_relOriMov = [fc for fc in FieldChoice.objects.filter(
+ field='RelOriMov', machine_value__in=[0, 1]).order_by('machine_value')]
+ available_relOriMov += [fc for fc in FieldChoice.objects.filter(
+ field='RelOriMov', machine_value__gt=1).order_by('name')]
+ context['available_relOriMov'] = available_relOriMov
+
  context['query_parameters'] = json.dumps(self.query_parameters)
  query_parameters_keys = list(self.query_parameters.keys())
  context['query_parameters_keys'] = json.dumps(query_parameters_keys)

signbank/dictionary/templates/dictionary/admin_batch_edit_view.html

@@ -556,7 +556,14 @@ <h3>{% trans "Batch Edit" %}</h3>
  </div>
  </td>
  </tr>
-
+ <tr style="height:26px;">
+ <th>{% trans "Relative Orientation: Movement" %}</th>
+ <td class="field_relOriMov" style="width:100px;">
+ <div class="relOriMov-cell"
+ id="relOriMov_cell_{{gloss.id}}"><span class='relOriMov'>{% if gloss.relOriMov %}{{gloss.relOriMov.name}}{% endif %}</span>
+ </div>
+ </td>
+ </tr>
  </table>
  </td>
  <td style="width:500px;">
@@ -823,6 +830,25 @@ <h3>{% trans "Batch Edit" %}</h3>
  </div>
  </div>
 
+ <div class="panel panel-default panel-toggles">
+ <div class='panel-heading' data-toggle='collapse' data-parent="#phonology"
+ data-target='#toggle_relOriMov_panel_{{gloss.id}}'>{% trans "Relative Orientation: Movement" %}
+ </div>
+ <div id='toggle_relOriMov_panel_{{gloss.id}}' class="panel-collapse collapse">
+ <div class="panel-body" style="display:inline-block;">
+ <p>
+ {% for wc in available_relOriMov %}
+ <button id='quick_relOriMov_btn_{{gloss.id}}' class="quick_relOriMov btn actionButton"
+ name='quick_relOriMov_{{gloss.id}}'
+ value='{{gloss.id}}' data-relOriMov='{{wc.machine_value}}' style="height:36px;"
+ type="submit" >{{wc.name}}
+ </button>
+ {% endfor %}
+ </p>
+ </div>
+ </div>
+ </div>
+
  </div>
 
  </div>

signbank/dictionary/update.py

@@ -3668,6 +3668,19 @@ def toggle_altern(request, glossid, altern):
  return JsonResponse(result)
 
 
+@permission_required('dictionary.change_gloss')
+def toggle_relOriMov(request, glossid, relOriMov):
+
+ gloss = Gloss.objects.filter(id=glossid).first()
+
+ if not okay_to_update_gloss(request, gloss):
+ return JsonResponse({})
+
+ result = mapping_toggle_relOriMov(request, gloss, relOriMov)
+
+ return JsonResponse(result)
+
+
 @permission_required('dictionary.change_gloss')
 def toggle_language_fields(request, glossid):
 

signbank/dictionary/update_glosses.py

@@ -550,6 +550,44 @@ def mapping_toggle_altern(request, gloss, altern):
  return result
 
 
+@permission_required('dictionary.change_gloss')
+def mapping_toggle_relOriMov(request, gloss, relOriMov):
+
+ try:
+ relOriMov_machine_value = int(relOriMov)
+ except TypeError:
+ return {}
+
+ empty_relOriMov = FieldChoice.objects.get(field='RelOriMov', machine_value=0)
+ new_relOriMov = FieldChoice.objects.filter(field='RelOriMov', machine_value=relOriMov_machine_value).first()
+
+ if not new_relOriMov:
+ # if the word class does not exist, set it to empty
+ relOriMov_machine_value = 0
+ new_relOriMov = empty_relOriMov
+
+ original_relOriMov = gloss.relOriMov.name if gloss.relOriMov else '-'
+
+ with atomic():
+ if not gloss.relOriMov:
+ gloss.relOriMov = new_relOriMov
+ elif gloss.relOriMov.machine_value != relOriMov_machine_value:
+ gloss.relOriMov = new_relOriMov
+ else:
+ gloss.relOriMov = empty_relOriMov
+ new_relOriMov = empty_relOriMov
+ gloss.save()
+
+ add_gloss_update_to_revision_history(request.user, gloss, 'relOriMov', original_relOriMov, new_relOriMov.name)
+
+ result = dict()
+ result['glossid'] = str(gloss.id)
+ newvalue = gloss.relOriMov.name
+ result['relOriMov'] = newvalue
+
+ return result
+
+
 @permission_required('dictionary.change_gloss')
 def batch_edit_create_sense(request, gloss):
 

signbank/dictionary/urls.py

@@ -123,6 +123,9 @@
  re_path(r'^update/toggle_altern/(?P<glossid>\d+)/(?P<altern>.*)$',
  signbank.dictionary.update.toggle_altern,
  name='toggle_altern'),
+ re_path(r'^update/toggle_relOriMov/(?P<glossid>\d+)/(?P<relOriMov>.*)$',
+ signbank.dictionary.update.toggle_relOriMov,
+ name='toggle_relOriMov'),
 
  re_path(r'^update/quick_create_sense/(?P<glossid>\d+)$',
  signbank.dictionary.update.quick_create_sense,