From d36e038197669b187d56ac4836eed0672f3c0d2b Mon Sep 17 00:00:00 2001 From: dcz <dcz@ipipan.waw.pl> Date: Mon, 31 Jul 2023 23:08:38 +0200 Subject: [PATCH] Misslpelling Correct duplicated frame user assign Additional semantic roles and attributes --- .../components/unification/Unification/LexicalUnitEdit.vue | 1 + .../src/components/unification/hierarchy/HierarchyEdit.vue | 2 +- shellvalier/settings.py | 2 +- syntax/management/commands/import_tei.py | 7 +++++-- unifier/views.py | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue index 11d5298..6f85ccc 100644 --- a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue +++ b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue @@ -508,6 +508,7 @@ Object.assign(LexicalUnitEdit, { success: function (response) { show_info('Zunifikowana rama została zduplikowana.'); this.currentPreviewedUnifiedFrameId = response.unified_frame_id; + this.$emit('refreshEntriesList'); $.prompt.close(); }.bind(this), error: function (request, errorType, errorMessage) { diff --git a/frontend/src/components/unification/hierarchy/HierarchyEdit.vue b/frontend/src/components/unification/hierarchy/HierarchyEdit.vue index c19168d..07878c4 100644 --- a/frontend/src/components/unification/hierarchy/HierarchyEdit.vue +++ b/frontend/src/components/unification/hierarchy/HierarchyEdit.vue @@ -417,7 +417,7 @@ export default HierarchyEdit; <tr style="background-color: white;"> <td id="change-title" @click="create_hyponym_or_hyperonym_relation(false)" style="padding: 10px 15px 10px 15px; color: #000000;">Nadrama</td> <td id="add-arg" @click="create_hyponym_or_hyperonym_relation(true)" style="padding: 10px 15px 10px 15px; color: #000000;">Podrama</td> - <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="delete_hyponym_or_hyperonym_relation">Usiń powiązanie</td> + <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="delete_hyponym_or_hyperonym_relation">Usuń powiązanie</td> <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="goToEdit">Edytuj</td> </tr> </table> diff --git a/shellvalier/settings.py b/shellvalier/settings.py index 45be427..29a44e7 100644 --- a/shellvalier/settings.py +++ b/shellvalier/settings.py @@ -190,4 +190,4 @@ SUPER_LEXICOGRAPHS_GROUP_NAME = 'Super Leksykografowie' DATE_INPUT_FORMATS = ['%d-%m-%Y'] UNIFIED_FRAME_SERVICE_URL = get_environment('UNIFIED_FRAME_SERVICE_URL', - default="http://127.0.0.1:8000/en/unifier/build_unified_frame_xml/?lu_id=") + default="http://127.0.0.1:8000/en/unifier/build_unified_frame_xml/?frame_id=") diff --git a/syntax/management/commands/import_tei.py b/syntax/management/commands/import_tei.py index 4f8faa2..8917105 100644 --- a/syntax/management/commands/import_tei.py +++ b/syntax/management/commands/import_tei.py @@ -188,13 +188,16 @@ def import_semantic_roles(): (150, u'Time', u'242,236,54', None), (160, u'Duration', u'233,192,6', None), (170, u'Measure', u'238,72,154', None), - (180, u'Lemma', u'256,256,256', None) + (180, u'Lemma', u'256,256,256', None), + (190, u'Disponent', u'127,255,212', None), + (200, u'Means', u'pre', None) ] # priorities set so that, when role and attribute priorities are added, # Role_Source < Role_Foreground < Role_Background < Role_Goal # and Role can be inserted anywhere into that hierarchy attributes = [(1, u'Source', None, u'left'), (3, u'Foreground', None, u'top'), (5, u'Background', None, u'bottom'), - (7, u'Goal', None, u'right')] + (7, u'Goal', None, u'right'), (8, u'Source_Part', None, u'right'), + (9, u'Source_Attrib', None, u'right')] for pri, role, color, gradient in roles: role = SemanticRole(role=role, color=color, priority=pri) role.save() diff --git a/unifier/views.py b/unifier/views.py index 41a0d07..ce20416 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -347,6 +347,9 @@ def duplicate_unified_frame(request): unified_frame = UnifiedFrame.objects.get(id=unified_frame_id) new_frame = unified_frame.duplicate(new_frame_title=target_unified_frame_title) + + Assignment.assign(user=request.user, subject=new_frame) + return JsonResponse(get_unified_frame_json(new_frame, request)) return JsonResponse({}) -- GitLab