sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-04 12:22:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada
2019-09-17 16:31:45 +02:00
parent 0d060f0cbf d7e71638a2
commit 0ea87de072
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/static/js/opaque.js
View File

@@ -10,14 +10,18 @@ function sendNewJobFormData(newJobFormElement, progressModalElement, request) {
progressModal.options.dismissible = false; progressModal.options.dismissible = false;
progressModalElement.querySelector(".title").innerHTML = newJobFormElement.title.value; progressModalElement.querySelector(".title").innerHTML = newJobFormElement.title.value;
request.upload.addEventListener("progress", function(event) { request.upload.addEventListener("progress", function(event) {
progressModalElement.querySelector(".loaded").innerHTML = event.loaded.toString(); progressInPercent = Math.floor(100 * event.loaded / event.total).toString() + "%";
progressModalElement.querySelector(".total").innerHTML = event.total.toString(); progressModalElement.querySelector(".progress-in-percent").innerHTML = progressInPercent;
progressModalElement.querySelector(".determinate").style.width = ((event.loaded / event.total) * 100).toString() + "%"; progressModalElement.querySelector(".determinate").style.width = progressInPercent;
}); });
request.addEventListener("load", function(event) { request.addEventListener("load", function(event) {
newJobFormElement.reset(); newJobFormElement.reset();
location.reload(); location.reload();
}); });
request.addEventListener("abort", function(event) {
progressModalElement.querySelector(".progress-in-percent").innerHTML = "0%";
progressModalElement.querySelector(".determinate").style.width = "0%";
});
progressModal.open(); progressModal.open();
request.open("POST", window.location.href); request.open("POST", window.location.href);

4
app/templates/services/nlp.html.j2
View File

@@ -124,11 +124,11 @@
<div id="progress-modal" class="modal"> <div id="progress-modal" class="modal">
<div class="modal-content"> <div class="modal-content">
<h4 class="title"></h4> <h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
<p>Uploading files... <span class="loaded"></span>/<span class="total"></span></p>
<div class="progress"> <div class="progress">
<div class="determinate" style="width: 0%"></div> <div class="determinate" style="width: 0%"></div>
</div> </div>
<p><span class="progress-in-percent"></span> uploaded</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn red cancel">Cancel</a> <a href="#!" class="modal-close waves-effect waves-green btn red cancel">Cancel</a>

4
app/templates/services/ocr.html.j2
View File

@@ -141,11 +141,11 @@
<div id="progress-modal" class="modal"> <div id="progress-modal" class="modal">
<div class="modal-content"> <div class="modal-content">
<h4 class="title"></h4> <h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
<p>Uploading files... <span class="loaded"></span>/<span class="total"></span></p>
<div class="progress"> <div class="progress">
<div class="determinate" style="width: 0%"></div> <div class="determinate" style="width: 0%"></div>
</div> </div>
<p><span class="progress-in-percent"></span> uploaded</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn red cancel">Cancel</a> <a href="#!" class="modal-close waves-effect waves-green btn red cancel">Cancel</a>