diff --git a/entries/views.py b/entries/views.py index 9ad899e8371cc06bea44a236a04381f9a50cf68b..eb3210f7c1cf8541d57b54dc327defb39bdd7aa4 100644 --- a/entries/views.py +++ b/entries/views.py @@ -1018,11 +1018,12 @@ def ajax_predefined_preferences(request): return context + @ajax(method='get', encode_result=True) def ajax_roles(request): roles = [] for role in SemanticRole.objects.order_by('priority'): - roles.append({"id": role.id, "role": role.role, "priority": role.priority}) + roles.append({"id": role.id, "role": role.role, "priority": role.priority, "color": role.color}) context = { 'roles': roles, @@ -1030,11 +1031,13 @@ def ajax_roles(request): return context + @ajax(method='get', encode_result=True) def ajax_role_attributes(request): roleAttributes = [] for roleAttribute in RoleAttribute.objects.order_by('priority'): - roleAttributes.append({"id": roleAttribute.id, "attribute": roleAttribute.attribute, "priority": roleAttribute.priority}) + roleAttributes.append({"id": roleAttribute.id, "attribute": roleAttribute.attribute, + "priority": roleAttribute.priority, "gradient": roleAttribute.gradient}) context = { 'role_attributes': roleAttributes, diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue index a2ea35f7644d1f648b8e4925702d054a5bfb4947..11d5298b21a8cae2953030778501934c19fdf340 100644 --- a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue +++ b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue @@ -273,7 +273,7 @@ Object.assign(LexicalUnitEdit, { const newSelect = function () { let rolesHTML = roles.map(role => { - return `<label><input type="radio" name="role" value="${role.id}" /> ${role.role}</label><br />`; + return `<label style="background-color:rgb(${role.color})"><input type="radio" name="role" value="${role.id}" /> ${role.role}</label><br />`; }).join(""); let attributesHTML = role_attributes.map(attribute => { return `<label><input type="radio" name="attribute" value="${attribute.id}" /> ${attribute.attribute}</label><br />`; diff --git a/unifier/views.py b/unifier/views.py index f9ca63772de0451380067e0460a9a24ec56fa4a3..41a0d071caf5753d290cf819ac2254a1082dcc16 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -550,11 +550,12 @@ def create_unified_frame(frame_id): @csrf_exempt def build_unified_frame_xml(request): - if request.method == 'POST': - lu_id = request.GET.get('lu_id') + if request.method == 'GET': + frame_id = request.GET.get('frame_id') - lu = LexicalUnit.objects.get(pk=lu_id) - frames = list(lu.frames.all()) + frames = Frame.objects.filter(id=frame_id) + # lu = LexicalUnit.objects.get(pk=lu_id) + # frames = list(lu.frames.all()) if len(frames) > 0: matching_elem = Element('matching') unifier_frame_elem = SubElement(matching_elem, 'unifier_frame')