diff --git a/entries/static/entries/js/components/LexicalUnitDisplay.js b/entries/static/entries/js/components/LexicalUnitDisplay.js index a1bbbce6948bd242aa9452390a592c51076de7d3..72a358071544e8d6e5f373419a4eaec6cdcfdef3 100644 --- a/entries/static/entries/js/components/LexicalUnitDisplay.js +++ b/entries/static/entries/js/components/LexicalUnitDisplay.js @@ -25,7 +25,7 @@ export default { url : `/${lang}/semantics/frame_assign/${this.frame.id}/`, dataType : 'json', timeout : 60000, - }).then(() => { this.$emit('goToEdit'); }); + }).then(() => { this.$emit('goToEdit', this.unifiedFrame.pk); }); }, confirmInvalid () { $.ajax({ @@ -62,14 +62,14 @@ export default { <a class="btn btn-sm btn-outline-dark mr-2" v-if="frame?.status === 'O' || frame?.status === 'G' && unifiedFrame?.status === 'O'" - @click="$emit('goToEdit')" + @click="$emit('goToEdit', this.unifiedFrame.pk)" > {{ gettext('Obrabiaj') }} </a> <a class="btn btn-sm btn-outline-dark mr-2" v-if="frame?.status === 'S' && unifiedFrame?.status === 'S'" - @click="$emit('goToEdit')" + @click="$emit('goToEdit', this.unifiedFrame.pk)" > {{ gettext('Obejrzyj') }} </a> diff --git a/entries/static/entries/js/components/LexicalUnitEdit.js b/entries/static/entries/js/components/LexicalUnitEdit.js index c696928cdd666c68f0b64d539d08ea107897745d..a81b1e8ebdcb7872d0a8f97d6c670de128e05491 100644 --- a/entries/static/entries/js/components/LexicalUnitEdit.js +++ b/entries/static/entries/js/components/LexicalUnitEdit.js @@ -1,7 +1,7 @@ export default { props: { - lexicalUnitId: Number + unifiedFrameId: Number }, data() { return { @@ -15,21 +15,14 @@ export default { } }, watch: { - lexicalUnitId: function() { - console.log("xxxx"); + unifiedFrameId: function() { this.loadFrame(); } }, methods: { - clicked () { - this.count++; - // addSelectivePreference(); - }, async loadFrame () { try { - let unified_frame_id = 3; - // var data = { 'unified_frame_id' : this.lexicalUnitId }; - var data = { 'unified_frame_id' : 3}; + var data = { 'unified_frame_id' : this.unifiedFrameId}; $.ajax({ type : 'post', url : '/' + lang + '/unifier/get_unified_frame/', @@ -50,16 +43,14 @@ export default { this.title_str = this.unified_frame.title; if(this.title_str == null) { //title as list of lexical units from all slowal frames - var lexical_units_html = lexical_units2dom(lexical_units); + var lexical_units_html = lexical_units2dom(this.lexical_units); this.title_str = lexical_units_html; } this.slowal_frames2selecional_preferencies_mapping = slowal_frames2selecional_preferencies(this.unified_frame, response.frames); - console.log('Submit Success') - // unified_view_frame_content = response.frames - curr_entry = unified_frame_id; + curr_entry = this.unifiedFrameId; // curr_no_filters = related; clear_info(); curr_alternations = response.alternations; @@ -92,8 +83,10 @@ export default { } } }, - template: `<div @click="clicked">edit {{ lexicalUnitId }} is {{ count }}</div> - + created () { + this.loadFrame(); + }, + template: ` <!--{% load i18n %}--> <div class="col h-100 w-100 p-0 tab-pane show active" id="semantics" role="tabpanel" aria-labelledby="semantics-tab"> diff --git a/entries/static/entries/js/components/main.js b/entries/static/entries/js/components/main.js index 46fbc9da47df0bcc55bf1c583137b63ab5913d29..0a25ec7f5c068b48b86e3e23e1cf292b6a7980df 100644 --- a/entries/static/entries/js/components/main.js +++ b/entries/static/entries/js/components/main.js @@ -12,10 +12,11 @@ export default { }, methods: { getInitialData () { - return { isEdit: false, key: this.lexicalUnitId }; + return { isEdit: false, key: this.lexicalUnitId, unifiedFrameId: Number, }; }, - goToEdit () { + goToEdit (unifiedFrameId) { this.isEdit = true; + this.unifiedFrameId = unifiedFrameId; }, refresh () { this.key = null; @@ -38,7 +39,7 @@ export default { @go-to-edit="goToEdit" @refresh="refresh" /> - <lexical-unit-edit v-if="isEdit" :lexicalUnitId="lexicalUnitId" /> + <lexical-unit-edit v-if="isEdit" :unifiedFrameId="unifiedFrameId" /> </div> </div> <div class="col h-100 px-1 pt-0 pb-0 overflow-auto" id="semantics-schemata-pane">