Add match_count represnetation for the user.

This commit is contained in:
Stephan Porada
2020-10-05 16:55:02 +02:00
parent f195b72ebd
commit 8c707fa81c
9 changed files with 161 additions and 228 deletions

View File

@ -63,6 +63,7 @@
{% include 'modals/analysis_init.html.j2' %}
{% include 'modals/export_query_results.html.j2' %}
{% include 'modals/context_modal.html.j2' %}
{% include 'modals/show_corpus_files.html.j2' %}
<!-- import modules -->
<script type="module">
@ -126,6 +127,7 @@ import {
actionButtons,
displayOptions,
showMetaData,
showCorpusFiles,
exportFullContextSwitch,
createFullResults,
createSubResults,
@ -254,6 +256,15 @@ document.addEventListener("DOMContentLoaded", () => {
['#query-results-download-modal', {}],
'#query-results-table',
'#show-meta-data',
'#show-corpus-files',
'#show-corpus-files-modal-content',
['#show-corpus-files-modal', {
'preventScrolling': false,
'opacity': 0.0,
'dismissible': false,
'onOpenEnd': (() => {document.querySelector(".modal-overlay").remove()})
}
],
'#sub-results-create',
'#sub-results-export',
'#export-full-inspect-context',
@ -265,6 +276,7 @@ document.addEventListener("DOMContentLoaded", () => {
actionButtons(resultsList, results, client);
displayOptions(resultsList, results, client);
showMetaData(resultsList, results);
showCorpusFiles(resultsList, results);
// Still vanilla event listeners, but focused on result download and export
exportFullContextSwitch(resultsList);
createFullResults(resultsList, results);

View File

@ -16,24 +16,40 @@ result.-->
<i class="material-icons left">info_outline</i>
</button>
</div>
<div class="col s12">
<button id="loading-matches"
class="waves-effect
waves-light
btn-flat
flat-interaction
disabled black-text"
style="color: #000 !important;"
type="submit">
<i class="material-icons left">dvr</i>
<span id="recieved-match-count"></span>/
<span id="total-match-count"></span>
matches loaded
</button>
</div>
<div class="col s12">
<div class="progress hide" id="query-progress-bar">
<div class="determinate"></div>
</div>
<p>
<span id="recieved-match-count">
</span> of
<span id="total-match-count"></span>
matches loaded.
<br>
<br>
Matches occured in
</div>
<div class="col s12">
<button id="show-corpus-files"
class="waves-effect
waves-light
btn-flat
flat-interaction"
type="submit">
<i class="material-icons left">info_outline</i>
Matches in
<span id="text-lookup-count"></span>
corpus files:
<br>
<span id=text-lookup-titles></span>
</p>
<br>
files
</button>
</div>
<div class="col s12">
<p class="hide" id="query-results-user-feedback">
<i class="material-icons tiny">help</i>
Server is sending your results.

View File

@ -0,0 +1,19 @@
<!-- Modal showing the corpus files for the current query results including
title ant match count per corpus file. -->
<div id="show-corpus-files-modal" class="modal bottom-sheet">
<div class="container">
<div class="row">
<div class="section">
<div class="col s12 right-align">
<a href="#!" class="modal-close waves-effect waves-green btn red"
style="left: 5px;">Close</a>
</div>
</div>
<div class="col s12 modal-content" id="show-corpus-files-modal-content"></div>
<div class="col s12 modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn red">Close</a>
</div>
</div>
</div>
</div>

View File

@ -2,14 +2,18 @@
results -->
<div id="meta-data-modal" class="modal bottom-sheet">
<div class="section">
<div class="col s12 right-align">
<a href="#!" class="modal-close waves-effect waves-green btn red">Close</a>
<div class="container">
<div class="row">
<div class="section">
<div class="col s12 right-align">
<a href="#!" class="modal-close waves-effect waves-green btn red"
style="left: 5px;">Close</a>
</div>
</div>
<div class="col s12 modal-content" id="meta-data-modal-content"></div>
<div class="col s12 modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn red">Close</a>
</div>
</div>
</div>
<div class="modal-content" id="meta-data-modal-content">
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn red">Close</a>
</div>
</div>

View File

@ -55,6 +55,7 @@
<!-- Modals -->
{% include 'modals/show_metadata.html.j2' %}
{% include 'modals/show_corpus_files.html.j2' %}
{% include 'modals/context_modal.html.j2' %}
@ -111,6 +112,7 @@ import {
actionButtons,
displayOptions,
showMetaData,
showCorpusFiles,
} from '../../static/js/modules/corpus_analysis/view/eventListeners.js';
/**
* Second Phase:
@ -182,6 +184,15 @@ document.addEventListener("DOMContentLoaded", () => {
],
'#query-results-table',
'#show-meta-data',
'#show-corpus-files',
'#show-corpus-files-modal-content',
['#show-corpus-files-modal', {
'preventScrolling': false,
'opacity': 0.0,
'dismissible': false,
'onOpenEnd': (() => {document.querySelector(".modal-overlay").remove()})
}
],
'#sub-results-create',
'#sub-results-export',
]);
@ -199,6 +210,7 @@ document.addEventListener("DOMContentLoaded", () => {
actionButtons(resultsList, results, client);
displayOptions(resultsList, results, client);
showMetaData(resultsList, results);
showCorpusFiles(resultsList, results);
// Enable scroll to Top functionality.
scrollToTop('#headline', '#menu-scroll-to-top-div');
});