Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/logbook table summary #163

Merged
merged 3 commits into from
Oct 7, 2023
Merged

Feature/logbook table summary #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d18b1e
add rows with totals for the logbook table
vsimakhin Oct 7, 2023
dd2cc51
small typo correction
vsimakhin Oct 7, 2023
e2b3a6a
update changelog
vsimakhin Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [Unreleased]

- New: Added rows `Total this page` and `Total all pages` for the main logbook table. The values are updated if you filter the search.

## [2.26.0] - 20.09.2023

- Update: ignore case for filters on the `Map` page
Expand Down
8 changes: 4 additions & 4 deletions cmd/web/static/css/datatables.min.css
View file
Open in desktop

Large diffs are not rendered by default.

220 changes: 10 additions & 210 deletions cmd/web/static/js/datatables.min.js
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 34 additions & 1 deletion cmd/web/templates/common-js.partials.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,37 @@ wlbCommon = function () {
window.open("{{$api.Export}}/" + format, "_blank");
}

// func convertNumberToTime converts time in integer format to string
function convertNumberToTime(number) {
var hours = Math.floor(number);
var minutes = Math.round((number - hours) * 60);
if (minutes < 10) {
minutes = "0" + minutes;
}
return hours + ":" + minutes;
}

// func convertTime converts time in string format to nubmber
function convertTime(time) {
if (typeof time === 'number') {
return time
}

if (time === "") {
return 0;
}

if (!time.includes(":")) {
return parseInt(time.replace(" ","")); // already converted
}

var hoursMinutes = time.split(/[.:]/);
var hours = parseInt(hoursMinutes[0], 10);
var minutes = hoursMinutes[1] ? parseInt(hoursMinutes[1], 10) : 0;

return hours + Math.round(minutes / 60 * 100) / 100;
}

function escapeHtml(unsafe)
{
return unsafe
Expand All @@ -87,7 +118,9 @@ wlbCommon = function () {
getJSON:getJSON,
formatLandings:formatLandings,
runExport:runExport,
escapeHtml:escapeHtml
escapeHtml:escapeHtml,
convertNumberToTime:convertNumberToTime,
convertTime:convertTime
}
}();
</script>
Expand Down
47 changes: 47 additions & 0 deletions cmd/web/templates/logbook-js.partials.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,53 @@ wlbLogbook = function () {
var logbookAPI = "{{$api.Logbook}}";
$("td:eq(0)", row).html(`<a href="${logbookAPI}/${data[0]}" class="link-primary">${data[1]}</a>`);
},
footerCallback: function (row, data, start, end, display) {
let api = this.api();
let offset = 7;

let getNumbers = function (i) {
return typeof i === 'string'
? wlbCommon.convertTime(i)
: typeof i === 'number'
? i
: 0;
};

let calculateTotals = function(id, time = true) {
// Total over all pages
total = api
.column(id, {search: 'applied'})
.data().reduce((a, b) => getNumbers(a) + getNumbers(b), 0);

// Total over this page
pageTotal = api
.column(id, {page: 'current'})
.data().reduce((a, b) => getNumbers(a) + getNumbers(b), 0);

// Update footer
if (time) {
$('#logbook tfoot tr').eq(0).find('th').eq(id-offset).html(wlbCommon.convertNumberToTime(pageTotal));
$('#logbook tfoot tr').eq(1).find('th').eq(id-offset).html(wlbCommon.convertNumberToTime(total));
} else {
$('#logbook tfoot tr').eq(0).find('th').eq(id-offset).html(pageTotal);
$('#logbook tfoot tr').eq(1).find('th').eq(id-offset).html(total);
}
}

calculateTotals(8); // se time
calculateTotals(9); // me time
calculateTotals(10); // mcc
calculateTotals(11); // total time
calculateTotals(13, false); // day landings
calculateTotals(14, false); // night landings
calculateTotals(15); // night
calculateTotals(16); // ifr
calculateTotals(17); // pic
calculateTotals(18); // cop
calculateTotals(19); // dual
calculateTotals(20); // instr
calculateTotals(22); // sim
},
initComplete: function () {
// daterange field
$('.dataTables_filter').each(function () {
Expand Down
40 changes: 40 additions & 0 deletions cmd/web/templates/logbook.page.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,46 @@
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr>
<th colspan=8 class="text-end">Total this page:</th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
</tr>
<tr>
<th colspan=8 class="text-end">Total all pages:</th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
</tr>
</tfoot>
</table>
<br>
<a id="new-flight-record" href="{{$api.LogbookNew}}" class="btn btn-sm btn-outline-secondary" onclick=""><i class="bi bi-plus-square-fill"></i> Add New Flight Record</a>
Expand Down
2 changes: 1 addition & 1 deletion cmd/web/templates/map.page.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</div>
<hr>
<div class="alert alert-info row">
The Aicraft and Route filters works in the way "string contains substring" or "*filter*". So aircraft type "C172" will include "C172" and "C172RG"
The Aircraft and Route filters works in the way "string contains substring" or "*filter*". So aircraft type "C172" will include "C172" and "C172RG"
</div>
</div>
<div class="col-md-10">
Expand Down
33 changes: 3 additions & 30 deletions cmd/web/templates/stats-js.partials.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ wlbStats = function () {
// format distance value with spaces
label += context.parsed.y.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ") + " nm";
} else {
label += convertNumberToTime(context.parsed.y);
label += wlbCommon.convertNumberToTime(context.parsed.y);
}
}
return label;
Expand All @@ -46,33 +46,6 @@ wlbStats = function () {
// fields
var range_field = document.getElementById("range_field");

// func convertNumberToTime converts time in integer format to string
function convertNumberToTime(number) {
var hours = Math.floor(number);
var minutes = Math.round((number - hours) * 60);
if (minutes == 0) {
minutes = "00";
}
return hours + ":" + minutes;
}

// func convertTime converts time in string format to integer
function convertTime(time) {
if (time === "") {
return 0;
}

if (!time.includes(":")) {
return time.replace(" ",""); // already converted
}

var hoursMinutes = time.split(/[.:]/);
var hours = parseInt(hoursMinutes[0], 10);
var minutes = hoursMinutes[1] ? parseInt(hoursMinutes[1], 10) : 0;

return hours + Math.round(minutes / 60 * 100) / 100;
}

// func onStatsClick redraw the chart based on the column/stats selection
function onStatsClick(table_name, cl) {
var tb = document.getElementById(table_name);
Expand Down Expand Up @@ -109,7 +82,7 @@ wlbStats = function () {
var values = [];

for (var i = 1; i <= rows; i++) {
values.push(convertTime(tb.rows[i].cells[cl].innerText));
values.push(wlbCommon.convertTime(tb.rows[i].cells[cl].innerText));
}

chart.data.datasets = [
Expand Down Expand Up @@ -141,7 +114,7 @@ wlbStats = function () {

// func drawProgressBar generates html to show in the stats limit cell
function drawProgressBar(data, max) {
var intData = convertTime(data);
var intData = wlbCommon.convertTime(data);
var percentData = parseInt(intData/max*100);

if (data === "") {
Expand Down
Loading