sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-14 18:10:40 +00:00
Code Issues Projects Releases Wiki Activity

corpus page: Only show compile buttons if corpus is unprepared AND has files.

Browse Source
This commit is contained in:
Patrick Jentsch
2020-04-15 14:30:41 +02:00
parent b251f9993d
commit b1d819444e
5 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/templates/corpora/add_corpus_file.html.j2
View File

@ -8,7 +8,7 @@
</div>
<div class="col s12 m8">
<form method="POST" enctype="multipart/form-data">
<form class="nopaque-job-form" data-progress-modal="progress-modal">
{{ add_corpus_file_form.hidden_tag() }}
<div class="card">
<div class="card-content">
@ -103,4 +103,16 @@
</ul>
</form>
</div>
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
<div class="progress">
<div class="determinate" style="width: 0%"></div>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-light btn red abort-request">Cancel</a>
</div>
</div>
{% endblock %}

18
app/templates/corpora/corpus.html.j2
View File

@ -35,9 +35,7 @@
</div>
<div class="card-action right-align">
<a href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" class="btn disabled hide waves-effect waves-light" id="analyze"><i class="material-icons left">search</i>Analyze</a>
{% if corpus.files[0] is defined %}
<a href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}" class="btn disabled hide waves-effect waves-light" id="compile"><i class="material-icons left">merge_type</i>Compile</a>
{% endif %}
<a data-target="delete-corpus-modal" class="btn modal-trigger red waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
@ -121,6 +119,7 @@
constructor(corpusId, foreignCorpusFlag) {
this.corpusId = corpusId;
this.foreignCorpusFlag = foreignCorpusFlag;
if (this.foreignCorpusFlag) {
nopaque.foreignCorporaSubscribers.push(this);
} else {
@ -131,14 +130,11 @@
_init() {
let corpus;
if (this.foreignCorpusFlag) {
corpus = nopaque.foreignCorpora[this.corpusId];
} else {
corpus = nopaque.corpora[this.corpusId];
}
corpus = (this.foreignCorpusFlag ? nopaque.foreignCorpora[this.corpusId]
: nopaque.corpora[this.corpusId]);
// Status
this.setStatus(corpus.status);
this.setStatus(corpus.status, corpus.files.length);
}
_update(patch) {
@ -167,7 +163,9 @@
}
setStatus(status) {
let analyzeElement, compileElement, progressIndicatorElement, statusElement;
let analyzeElement, compileElement, numFiles, progressIndicatorElement, statusElement;
numFiles = (this.foreignCorpusFlag ? nopaque.foreignCorpora[this.corpusId] : nopaque.corpora[this.corpusId]).files.length;
progressIndicatorElement = document.getElementById("progress-indicator");
if (["queued", "running", "start analysis", "stop analysis"].includes(status)) {
@ -188,7 +186,7 @@
}
compileElement = document.getElementById("compile");
if (status === 'unprepared') {
if (status === "unprepared" && numFiles > 0) {
compileElement.classList.remove("disabled", "hide");
} else {
compileElement.classList.add("disabled", "hide");

8
app/templates/jobs/job.html.j2
View File

@ -146,6 +146,7 @@
constructor(jobId, foreignJobFlag) {
this.jobId = jobId;
this.foreignJobFlag = foreignJobFlag;
if (this.foreignJobFlag) {
nopaque.foreignJobsSubscribers.push(this);
} else {
@ -156,11 +157,8 @@
_init() {
let job;
if (this.foreignJobFlag) {
job = nopaque.foreignJobs[this.jobId];
} else {
job = nopaque.jobs[this.jobId];
}
job = (this.foreignJobFlag ? nopaque.foreignJobs[this.jobId]
: nopaque.jobs[this.jobId]);
// End date
this.setEndDate(job.end_date);