cambio de tipo de tabla, filtro de busqueda, paginación

parent d8aaa25e
......@@ -9,7 +9,9 @@ function refresh() {
dataType: "json",
url: '../reports/ws/process_progress',
success: function (data) {
$.each(data, function (key, val) {
console.log(key+ " purchase_id:"+val.purchase_id+", progress: "+val.progress);
if (val.progress != 100) {
$('#progress_bar' + val.purchase_id).attr("aria-valuenow", val.progress);
$('#progress_bar' + val.purchase_id).attr('style', 'width:' + val.progress + '%');
......@@ -88,9 +90,7 @@ $(document).ready(function () {
}],
order: [1, 'asc']
});
});
});
$(function () {
......
......@@ -96,6 +96,9 @@ def Reports(request):
#####################################################
# progress bar #
#####################################################
if os.stat(log_info).st_size == 0:
progress = 0
else:
if 'Linking Products...' in open(log_info).read():
progress = 20
if 'Merging Images...' in open(log_info).read():
......@@ -129,7 +132,10 @@ def Reports(request):
"progress": progress,
"log_info": log,
})
size = 0
final_size = 0
log_info = ""
progress = 0
##############################################
# paginacion #
##############################################
......@@ -154,6 +160,9 @@ def wsProcessProgress(request):
#####################################################
# progress bar #
#####################################################
if os.stat(log_info).st_size == 0:
progress = 0
else:
if 'Linking Products...' in open(log_info).read():
progress = 20
if 'Merging Images...' in open(log_info).read():
......@@ -165,10 +174,14 @@ def wsProcessProgress(request):
if 'Finalizing...' in open(log_info).read():
progress = 100
productList2.append({
"purchase_id": producto['id'],
"progress": progress,
})
progress = 0
log_info = ""
return HttpResponse(json.dumps(productList2))
else:
raise Http404
......
......@@ -2,16 +2,17 @@
{% load static %}
{% block headMedia %}
<link rel="stylesheet" href="{% static 'catalog/css/login.css'%}" type="text/css">
<link rel="stylesheet" href="{% static 'catalog/css/login.css' %}" type="text/css">
{% endblock %}
{% block budy %}
<div class="visible-lg-block visible-md-block">
<video id="bgvid" playsinline autoplay muted loop poster="{% static 'images/poster.jpg'%}" >
<video id="bgvid" playsinline autoplay muted loop poster="{% static 'images/poster.jpg' %}">
<!-- WCAG general accessibility recommendation is that media such as background video play through only once. Loop turned on for the purposes of illustration; if removed, the end of the video will fade in the same way created by pressing the "Pause" button -->
<source src="{% static 'catalog/images/background.mp4'%}" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' />
<source src="{% static 'catalog/images/background.ogv'%}" type='video/ogg; codecs="theora, vorbis"' />
<source src="{% static 'catalog/images/background.webm'%}" type='video/webm; codecs="vp8, vorbis"' />
<source src="{% static 'catalog/images/background.mp4' %}"
type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'/>
<source src="{% static 'catalog/images/background.ogv' %}" type='video/ogg; codecs="theora, vorbis"'/>
<source src="{% static 'catalog/images/background.webm' %}" type='video/webm; codecs="vp8, vorbis"'/>
</video>
</div>
......@@ -32,7 +33,8 @@
{% if next %}
{% if user.is_authenticated %}
<p>Your account doesn't have access to this page. To proceed, please login with an account that has access.</p>
<p>Your account doesn't have access to this page. To proceed, please login with an account that has
access.</p>
{% else %}
<p>Favor de firmarse para tener acceso.</p>
{% endif %}
......@@ -42,13 +44,15 @@
<form role="form" method="post" action="{% url 'login' %}">
{% csrf_token %}
<div class="form-group has-feedback">
<!-- <input type="text" class="form-control" placeholder="username">-->
<input class="form-control" placeholder="nombre de usuario" name="{{ form.username.name }}" type="{{ form.username.class.name}}" id="{{ form.username.auto_id }}" autofocus>
<!-- <input type="text" class="form-control" placeholder="username">-->
<input class="form-control" placeholder="nombre de usuario" name="{{ form.username.name }}"
type="{{ form.username.class.name }}" id="{{ form.username.auto_id }}" autofocus>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<!-- <input type="password" class="form-control" placeholder="assword">-->
<input class="form-control" placeholder="contraseña" name="{{ form.password.name }}" type="password" id="{{ form.password.auto_id }}" autofocus>
<!-- <input type="password" class="form-control" placeholder="assword">-->
<input class="form-control" placeholder="contraseña" name="{{ form.password.name }}" type="password"
id="{{ form.password.auto_id }}" autofocus>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row">
......@@ -71,11 +75,12 @@
</div>
<!-- /.login-box -->
<div class="row geointInfo" >
<div class="row geointInfo">
<div class="col-md-12">
<a href="http://www.centrogeo.org.mx/">© 2018 Centro de Investigación en Ciencias de Información Geoespacial</a>
<a href="http://www.centrogeo.org.mx/">© 2018 Centro de Investigación en Ciencias de Información
Geoespacial</a>
</div>
......@@ -89,20 +94,17 @@
var vid = document.getElementById("bgvid");
if (window.matchMedia('(prefers-reduced-motion)').matches)
{
if (window.matchMedia('(prefers-reduced-motion)').matches) {
vid.removeAttribute("autoplay");
vid.pause();
pauseButton.innerHTML = "Paused";
}
function vidFade()
{
function vidFade() {
vid.classList.add("stopfade");
}
vid.addEventListener('ended', function()
{
vid.addEventListener('ended', function () {
// only functional if "loop" is removed
vid.pause();
// to capture IE10
......@@ -110,6 +112,5 @@
});
</script>
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment