diff --git a/docker-compose.yml b/docker-compose.yml index aab724889fd2b646e1dbe91db5e64bb0e05d9c9c..8120daf026084c3a254af05d4e25af49ef7e907f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./.datastore/postgresql:/var/lib/postgresql/data backend: - platform: linux/amd64 + #platform: linux/amd64 container_name: shellvalier-backend image: shellvalier-developer:latest build: diff --git a/entries/static/entries/js/forms.js b/entries/static/entries/js/forms.js index b0daed0700b3699bfe42ac10bc1e6c065487b4a2..cef394d5e36e9d47df398a7397a1db4c2dc9c1cb 100644 --- a/entries/static/entries/js/forms.js +++ b/entries/static/entries/js/forms.js @@ -412,9 +412,9 @@ function initialize_main_form() { var submit = main_form.find('input[type="submit"]'); submit.prop('disabled', true); event.preventDefault(); - clear_results(); + // clear_results(); clear_info(); - show_entry_list_spinner(); + // show_entry_list_spinner(); clear_form_errors(main_form); var data = { 'forms' : serialize_forms(main_form) }; $.ajax({ diff --git a/frontend/src/components/unification/Entries/EntriesList.vue b/frontend/src/components/unification/Entries/EntriesList.vue index 41d3175194ed9632185fdc9cc207e52b7fa32acb..72b1f494606216d22eca6cba2b0a9c7875024e04 100644 --- a/frontend/src/components/unification/Entries/EntriesList.vue +++ b/frontend/src/components/unification/Entries/EntriesList.vue @@ -23,8 +23,18 @@ canViewAssignment: has_permission("users.view_assignment"), } }, + methods: { + setup() { + setup_entries_list({ + table: this.$refs.table, + lexicalUnitSelected: (entryId, lexicalUnitId) => { this.$emit('lexicalUnitSelected', entryId, lexicalUnitId); }, + selectEntryId: this.initialEntryId + }); + } + }, emits: ['lexicalUnitSelected'], mounted () { + this.$.appContext.config.globalProperties.$entries_list = this; setup_entries_list({ table: this.$refs.table, lexicalUnitSelected: (entryId, lexicalUnitId) => { this.$emit('lexicalUnitSelected', entryId, lexicalUnitId); }, diff --git a/frontend/src/components/unification/shared/LexicalUnitDisplay.vue b/frontend/src/components/unification/shared/LexicalUnitDisplay.vue index 1fcd3094dd1ea1ecc30fc838d004abd157d34b36..bdd4a5718716386b48d31bde45f072f0c11c96eb 100644 --- a/frontend/src/components/unification/shared/LexicalUnitDisplay.vue +++ b/frontend/src/components/unification/shared/LexicalUnitDisplay.vue @@ -168,6 +168,7 @@ export default { } }, mounted () { + this.$.appContext.config.globalProperties.$lexical_unit_display = this; Split(['#main-frames-pane', '#vue-examples'], { direction: 'vertical', sizes: [75, 25], diff --git a/frontend/src/main.js b/frontend/src/main.js index f0fbbbc5d721560d7c8e27ab8478693c56b03d01..38a4e6c524b697e4b3c365cbbd8010bcb9444ddd 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -24,4 +24,7 @@ window.update_entries = function () { app.mount('#vue-app'); mounted = true; } + if(app._context.config.globalProperties.$entries_list) { + app._context.config.globalProperties.$entries_list.setup(); + } } diff --git a/syntax/management/commands/import_tei.py b/syntax/management/commands/import_tei.py index e936e5d538f7ff23613928a4b4fbad37b7732119..4b92b1ea942a309e8cd7cb416aa215b23cfe22d1 100644 --- a/syntax/management/commands/import_tei.py +++ b/syntax/management/commands/import_tei.py @@ -34,9 +34,9 @@ def import_tei(): logging.basicConfig(filename='import.log', level=logging.DEBUG) #xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20200926_smaller.xml') - xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913_smaller.xml') - # xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913_smallest.xml') - xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913.xml') + #xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913_smaller.xml') + xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913_smallest.xml') + #xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'walenty_20210913.xml') xml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), xml_file)