The query resulted in a total of ${chunk["match_count"]} matches.
${result["loaded_match_count"]} of ${result["match_count"]} matches in ${count_corpus_files} corpus files have been loaded.
`; - queryResultsMetadataElement.appendChild(exportQueryResults); - exportQueryResults.classList.remove("hide"); + let queryResultsInteractionElement = document.getElementById("interaction-elements"); + queryResultsInteractionElement.appendChild(exportQueryResultsElement); + let queryResultsHeadElement = document.getElementById("query-results-head"); + queryResultsHeadElement.classList.remove("hide"); + queryStatus = result["loaded_match_count"] / result["match_count"] * 100; + console.log(queryStatus); + queryResultsDeterminateElement.style["width"] = `${queryStatus}%`; + console.log(queryResultsDeterminateElement.style["width"]); + // enable download and inspect when query is finished + // also sets queryFinished to true + if (queryStatus === 100) { + queryResultsDeterminateElement.parentNode.parentNode.classList.add("hide"); + exportQueryResultsElement.classList.remove("disabled"); + let inspectBtnElements = document.getElementsByClassName("inspect"); + for (let inspectBtn of inspectBtnElements) { + inspectBtn.classList.remove("disabled"); + queryFinished = true; // global declaration to set downlaod button and inspects buttons back to disabled for new queries + } + } } -// Function to inspect one match, to show more details + +// ### Functions to inspect one match, to show more details ### + +// activate inspect buttons if queryFinished is true +function activateInspect() { + if (queryFinished) { + let inspectBtnElements = document.getElementsByClassName("inspect"); + for (let inspectBtn of inspectBtnElements) { + inspectBtn.classList.remove("disabled"); + } + } +} + +//gets result cpos infos for one dataIndex to send back to the server function inspect(dataIndex) { console.log("Inspect!"); console.log(result["matches"][dataIndex]["hit"]); @@ -127,6 +168,38 @@ function inspect(dataIndex) { nopaque.socket.emit("inspect_match", {"cpos": result["matches"][dataIndex]["hit"]}); } +function showMatchContext(message) { + console.log("### match_context ###"); + console.log("Incoming data:", message); + contextResultsElement.innerHTML = ""; + document.getElementById("context-modal-loading").classList.add("hide"); + document.getElementById("context-modal-ready").classList.remove("hide"); + + let sentenceElement, token, tokenElement; + + for (let [key, value] of Object.entries(message['context_s_cpos'])) { + sentenceElement = document.createElement("p"); + for (cpos of value) { + token = message["cpos_lookup"][cpos]; + tokenElement = document.createElement("span"); + tokenElement.classList.add("token"); + if (message["match_cpos_list"].includes(cpos)) { + tokenElement.classList.add("bold"); + tokenElement.classList.add("light-green"); + } + tokenElement.dataset.cpos = cpos; + tokenElement.innerText = token["word"]; + var expertModeSwitchElement = document.getElementById("expert-mode-switch"); + if (expertModeSwitchElement.checked) { + expertModeOn([tokenElement], message); + } + sentenceElement.append(tokenElement); + sentenceElement.append(document.createTextNode(" ")); + } + contextResultsElement.append(sentenceElement); + } +} + // ### Display options changing live how the matches are being displayed ### // Event function that changes the shown hits per page. @@ -151,6 +224,7 @@ function changeContext(event) { } } catch (e) { console.log(e); + console.log("This error is expected."); } finally { var contextPerItemElement = document.getElementById("context"); newValue = contextPerItemElement.value; diff --git a/app/static/js/nopaque.js b/app/static/js/nopaque.js index e99090eb..4dee34e4 100644 --- a/app/static/js/nopaque.js +++ b/app/static/js/nopaque.js @@ -188,39 +188,6 @@ nopaque.socket.on("foreign_jobs_update", function(msg) { for (let subscriber of nopaque.foreignJobsSubscribers) {subscriber._update(patch);} }); -// get context of one match if inspected -nopaque.socket.on("match_context", function(message) { - console.log("### match_context ###"); - console.log("Incoming data:", message); - contextResultsElement.innerHTML = "
"; - document.getElementById("context-modal-loading").classList.add("hide"); - document.getElementById("context-modal-ready").classList.remove("hide"); - - let sentenceElement, token, tokenElement; - - for (let [key, value] of Object.entries(message['context_s_cpos'])) { - sentenceElement = document.createElement("p"); - for (cpos of value) { - token = message["cpos_lookup"][cpos]; - tokenElement = document.createElement("span"); - tokenElement.classList.add("token"); - if (message["match_cpos_list"].includes(cpos)) { - tokenElement.classList.add("bold"); - tokenElement.classList.add("light-green"); - } - tokenElement.dataset.cpos = cpos; - tokenElement.innerText = token["word"]; - var expertModeSwitchElement = document.getElementById("expert-mode-switch"); - if (expertModeSwitchElement.checked) { - expertModeOn([tokenElement], message); - } - sentenceElement.append(tokenElement); - sentenceElement.append(document.createTextNode(" ")); - } - contextResultsElement.append(sentenceElement); - } -}); - document.addEventListener("DOMContentLoaded", function() { nopaque.Workarounds.apply(); M.AutoInit(); diff --git a/app/static/js/nopaque.lists.js b/app/static/js/nopaque.lists.js index 683f36e1..ff29ec71 100644 --- a/app/static/js/nopaque.lists.js +++ b/app/static/js/nopaque.lists.js @@ -152,7 +152,7 @@ class ResultList extends List { textTitles.add(chunk["text_lookup"][token["text"]]["title"]); // add button to trigger more context to every match td var inspectBtn = document.createElement("a"); - inspectBtn.setAttribute("class", "btn-floating btn-flat waves-effect waves-light grey right inspect"); + inspectBtn.setAttribute("class", "btn-floating btn-flat waves-effect waves-light grey right inspect disabled"); inspectBtn.innerHTML = 'search'; inspectBtn.onclick = function() {inspect(values["index"])}; } diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2 index 7745b637..bd2064e1 100644 --- a/app/templates/corpora/analyse_corpus.html.j2 +++ b/app/templates/corpora/analyse_corpus.html.j2 @@ -157,18 +157,25 @@ server side -->
-