put the correct links

This commit is contained in:
Cayo Puigdefabregas 2022-11-23 19:22:49 +01:00
parent ade9fbd018
commit 925ce473e6
1 changed files with 28 additions and 39 deletions

View File

@ -109,8 +109,12 @@
</div> </div>
{% endif %} {% endif %}
<div id="select-devices-info" class="alert alert-info mb-0 mt-3 d-none" role="alert">
If this text is showing is because there are an error
</div>
<div class="tab-content pt-2"> <div class="tab-content pt-2">
<div class="dataTable-top"> <div class="dataTable-top" style="float: left;">
<div class="dataTable-dropdown"> <div class="dataTable-dropdown">
<label> <label>
<select class="dataTable-selector"> <select class="dataTable-selector">
@ -226,8 +230,6 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="dataTable-bottom"> <div class="dataTable-bottom">
<div class="dataTable-info"> <div class="dataTable-info">
@ -237,7 +239,11 @@
<ul class="dataTable-pagination-list"> <ul class="dataTable-pagination-list">
{% if erasure.has_prev %} {% if erasure.has_prev %}
<li class="pager"> <li class="pager">
{% if orphans %}
<a href="{{ url_for('inventory.device_erasure_list_orphans', orphans=1, page=erasure.prev_num, per_page=erasure.per_page) }}"></a>
{% else %}
<a href="{{ url_for('inventory.device_erasure_list', page=erasure.prev_num, per_page=erasure.per_page) }}"></a> <a href="{{ url_for('inventory.device_erasure_list', page=erasure.prev_num, per_page=erasure.per_page) }}"></a>
{% endif %}
</li> </li>
{% endif %} {% endif %}
{% for page in erasure.iter_pages() %} {% for page in erasure.iter_pages() %}
@ -246,51 +252,32 @@
<li class="active"><a href="javascript:void()">{{ page }}</a></li> <li class="active"><a href="javascript:void()">{{ page }}</a></li>
{% else %} {% else %}
<li class=""> <li class="">
{% if orphans %}
<a href="{{ url_for('inventory.device_erasure_list_orphans', orphans=1, page=page, per_page=erasure.per_page) }}">
{{ page }}
</a>
{% else %}
<a href="{{ url_for('inventory.device_erasure_list', page=page, per_page=erasure.per_page) }}"> <a href="{{ url_for('inventory.device_erasure_list', page=page, per_page=erasure.per_page) }}">
{{ page }} {{ page }}
</a> </a>
{% endif %}
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if erasure.has_next %} {% if erasure.has_next %}
<li class="pager"> <li class="pager">
{% if orphans %}
<a href="{{ url_for('inventory.device_erasure_list_orphans', orphans=1, page=erasure.next_num, per_page=erasure.per_page) }}"></a>
{% else %}
<a href="{{ url_for('inventory.device_erasure_list', page=erasure.next_num, per_page=erasure.per_page) }}"></a> <a href="{{ url_for('inventory.device_erasure_list', page=erasure.next_num, per_page=erasure.per_page) }}"></a>
{% endif %}
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</nav> </nav>
</div> </div>
</div> </div>
{% if lot and not lot.is_temporary %}
<div id="trade-documents-list" class="tab-pane fade trade-documents-list">
<h5 class="card-title">Documents</h5>
<table class="table">
<thead>
<tr>
<th scope="col">File</th>
<th scope="col" data-type="date" data-format="DD-MM-YYYY">Uploaded on</th>
</tr>
</thead>
<tbody>
{% for doc in lot.trade.documents %}
<tr>
<td>
{% if doc.url %}
<a href="{{ doc.url.to_text() }}" target="_blank">{{ doc.file_name}}</a>
{% else %}
{{ doc.file_name}}
{% endif %}
</td>
<td>
{{ doc.created.strftime('%H:%M %d-%m-%Y')}}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
</div><!-- End Bordered Tabs --> </div><!-- End Bordered Tabs -->
</div> </div>
@ -302,11 +289,6 @@
</div> </div>
</div> </div>
</section> </section>
{% include "inventory/lot_delete_modal.html" %}
{% include "inventory/actions.html" %}
{% include "inventory/allocate.html" %}
{% include "inventory/data_wipe.html" %}
{% include "inventory/trade.html" %}
{% include "inventory/alert_export_error.html" %} {% include "inventory/alert_export_error.html" %}
{% include "inventory/alert_lots_changes.html" %} {% include "inventory/alert_lots_changes.html" %}
@ -315,14 +297,21 @@
$(document).ready(() => { $(document).ready(() => {
$(".dataTable-selector").on("change", function() { $(".dataTable-selector").on("change", function() {
const per_page = $('.dataTable-selector').val(); const per_page = $('.dataTable-selector').val();
{% if orphans %}
window.location.href = "{{ url_for('inventory.device_erasure_list_orphans', orphans=1, page=1) }}&per_page="+per_page;
{% else %}
window.location.href = "{{ url_for('inventory.device_erasure_list', page=1) }}&per_page="+per_page; window.location.href = "{{ url_for('inventory.device_erasure_list', page=1) }}&per_page="+per_page;
{% endif %}
}); });
}); });
</script> </script>
<script> <script>
let table = new simpleDatatables.DataTable("table", { let table = new simpleDatatables.DataTable("table", {
perPageSelect: [5, 10, 15, 20, 25, 50, 100], //perPageSelect: [5, 10, 15, 20, 25, 50, 100],
perPage: 20 //perPage: 20,
footer: false,
paging: false,
}) })
</script> </script>