johannes/Inventur
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed sorting

Browse Source
This commit is contained in:
Johannes Randerath 2024-09-01 21:17:42 +02:00
parent 7a4a878c7c
commit 4250b3e1e9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/table/table_view.rs
View File

@ -77,11 +77,12 @@ async fn sort_and_search(tbl: Tbl, sort_dir: Option<u8>, sort_field: Option<usiz
sortfield = sort_field.unwrap(); sortfield = sort_field.unwrap();
} }
let tbl = inventur_db::sort_table(tbl.clone(), sortfield, sortdir);
let column_names = tbl.column_names.clone(); let column_names = tbl.column_names.clone();
let column_types = tbl.column_types.clone().iter().map(|x: &inventur_db::FIELDTYPE| *x as i32).collect::<Vec<i32>>(); let column_types = tbl.column_types.clone().iter().map(|x: &inventur_db::FIELDTYPE| *x as i32).collect::<Vec<i32>>();
let rows : Vec<Vec<String>>= tbl.rows.iter().map(|v| {let mut r = v.cells.clone(); r.insert(0, v.row_pos.to_string()); r}).collect(); let rows : Vec<Vec<String>>= tbl.rows.iter().map(|v| {let mut r = v.cells.clone(); r.insert(0, v.row_pos.to_string()); r}).collect();
PassTbl { tbl: inventur_db::sort_table(tbl.clone(), sortfield, sortdir), searchvalue, searchfields, sortdir, sortfield, tname: tbl.name, column_names, column_types, rows } PassTbl { tbl: tbl.clone(), searchvalue, searchfields, sortdir, sortfield, tname: tbl.name, column_names, column_types, rows }
} }

8
templates/table.html.tera
View File

@ -25,7 +25,7 @@
<!-- Table header and editing --> <!-- Table header and editing -->
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-2 me-0 pe-0 pt-0 mt-0"> <div class="col-auto me-0 pe-0 pt-0 mt-0">
<h1> <h1>
<div class='input-group mt-0'> <div class='input-group mt-0'>
<span id="tname">{{ tblname }}</span> <span id="tname">{{ tblname }}</span>
@ -35,17 +35,17 @@
</h1> </h1>
</div> </div>
<div class="col-1 align-self-start align-content-start ms-0 ps-0 mt-0 pt-0"> <div class="col-auto align-self-start align-content-start ms-0 ps-0 mt-0 pt-2">
{% block share %} {% block share %}
{% endblock share %} {% endblock share %}
</div> </div>
<div class="col-6"> <div class="col-auto">
</div> </div>
<!-- Search bar --> <!-- Search bar -->
<div class="col-3 align-self-end align-content-end pt-0 mt-0"> <div class="col-auto align-self-end align-content-end pt-0 mt-0">
<div class="btn-toolbar mt-0 pt-0" role="toolbar"> <div class="btn-toolbar mt-0 pt-0" role="toolbar">
{% block new_entry %} {% block new_entry %}
{% endblock new_entry %} {% endblock new_entry %}