From 5966a3d678074009f2a8d2d0e617a01b8a60f07d Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 18 Nov 2018 12:58:15 +0100 Subject: [PATCH] Improve journal UI when undoing a transaction --- public/viewjs/batteriesjournal.js | 4 +++- public/viewjs/choresjournal.js | 4 +++- public/viewjs/stockjournal.js | 2 ++ views/batteriesjournal.blade.php | 2 +- views/choresjournal.blade.php | 2 +- views/stockjournal.blade.php | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/public/viewjs/batteriesjournal.js b/public/viewjs/batteriesjournal.js index db34da1f..cf97c552 100644 --- a/public/viewjs/batteriesjournal.js +++ b/public/viewjs/batteriesjournal.js @@ -59,7 +59,9 @@ $(document).on('click', '.undo-battery-execution-button', function(e) function(result) { element.closest("tr").addClass("text-muted"); - element.closest(".undo-battery-execution-button").addClass("disabled"); + element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("
" + L("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " "); + element.closest(".undo-stock-booking-button").addClass("disabled"); + RefreshContextualTimeago(); toastr.success(L("Charge cycle successfully undone")); }, function(xhr) diff --git a/public/viewjs/choresjournal.js b/public/viewjs/choresjournal.js index cf2c4093..0899fa7e 100644 --- a/public/viewjs/choresjournal.js +++ b/public/viewjs/choresjournal.js @@ -59,7 +59,9 @@ $(document).on('click', '.undo-chore-execution-button', function(e) function(result) { element.closest("tr").addClass("text-muted"); - element.closest(".undo-chore-execution-button").addClass("disabled"); + element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("
" + L("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " "); + element.closest(".undo-stock-booking-button").addClass("disabled"); + RefreshContextualTimeago(); toastr.success(L("Chore execution successfully undone")); }, function(xhr) diff --git a/public/viewjs/stockjournal.js b/public/viewjs/stockjournal.js index 00cc22dc..66f03869 100644 --- a/public/viewjs/stockjournal.js +++ b/public/viewjs/stockjournal.js @@ -59,7 +59,9 @@ $(document).on('click', '.undo-stock-booking-button', function(e) function(result) { element.closest("tr").addClass("text-muted"); + element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("
" + L("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " "); element.closest(".undo-stock-booking-button").addClass("disabled"); + RefreshContextualTimeago(); toastr.success(L("Booking successfully undone")); }, function(xhr) diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php index e5c43a34..e8a5f2a9 100644 --- a/views/batteriesjournal.blade.php +++ b/views/batteriesjournal.blade.php @@ -46,7 +46,7 @@ - {{ FindObjectInArrayByPropertyValue($batteries, 'id', $chargeCycleEntry->battery_id)->name }} + {{ FindObjectInArrayByPropertyValue($batteries, 'id', $chargeCycleEntry->battery_id)->name }} @if($chargeCycleEntry->undone == 1)
{{ $L('Undone on') . ' ' . $chargeCycleEntry->undone_timestamp }} diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php index aec7f698..951ad9bc 100644 --- a/views/choresjournal.blade.php +++ b/views/choresjournal.blade.php @@ -47,7 +47,7 @@ - {{ FindObjectInArrayByPropertyValue($chores, 'id', $choreLogEntry->chore_id)->name }} + {{ FindObjectInArrayByPropertyValue($chores, 'id', $choreLogEntry->chore_id)->name }} @if($choreLogEntry->undone == 1)
{{ $L('Undone on') . ' ' . $choreLogEntry->undone_timestamp }} diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php index 7ae0eb12..fcbea8be 100644 --- a/views/stockjournal.blade.php +++ b/views/stockjournal.blade.php @@ -48,7 +48,7 @@ - {{ FindObjectInArrayByPropertyValue($products, 'id', $stockLogEntry->product_id)->name }} + {{ FindObjectInArrayByPropertyValue($products, 'id', $stockLogEntry->product_id)->name }} @if($stockLogEntry->undone == 1)
{{ $L('Undone on') . ' ' . $stockLogEntry->undone_timestamp }}