kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-21 04:43:32 +00:00
Code Issues Projects Releases Wiki Activity

Keep selected date range when navigating through different group by variants of the stockreport/spendings (closes #2532)

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-13 23:13:24 +01:00
parent 645f9e2599
commit c99dd46007
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/77_UNRELEASED_xxxx-xx-xx.md
View File

@@ -21,6 +21,7 @@
- Optimized that when moving a product to a freezer location (so when freezing it) the due date will no longer be replaced when the product option "Default due days after freezing" is set to `0` - Optimized that when moving a product to a freezer location (so when freezing it) the due date will no longer be replaced when the product option "Default due days after freezing" is set to `0`
- Product barcode matching is now case-insensitive - Product barcode matching is now case-insensitive
- Added a new column "Product picture" on the products list (master data) page (hidden by default) - Added a new column "Product picture" on the products list (master data) page (hidden by default)
- Optimized that when navigation between the different "Group by"-variants on the stock report "Spendings", the selected date range now remains persistent
- Fixed that a once set quantity unit on a product barcode could not be removed on edit - Fixed that a once set quantity unit on a product barcode could not be removed on edit
- Fixed that when consuming a specific stock entry which is opened, and which originated from a before partly opened stock entry, the unopened one was wrongly consume instead - Fixed that when consuming a specific stock entry which is opened, and which originated from a before partly opened stock entry, the unopened one was wrongly consume instead

8
public/viewjs/stockreportspendings.js
View File

@@ -143,3 +143,11 @@ $("#product-group-filter").on("change", function()
UpdateUriParam("product-group", $(this).val()); UpdateUriParam("product-group", $(this).val());
window.location.reload(); window.location.reload();
}); });
$(".group-by-button").on("click", function(e)
{
e.preventDefault();
UpdateUriParam("group-by", $(this).attr("data-group-by"));
window.location.reload();
});

15
views/stockreportspendings.blade.php
View File

@@ -31,16 +31,19 @@
href="#"> href="#">
{{ $__t('Group by') }}: {{ $__t('Group by') }}:
</a> </a>
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right @if($groupBy == 'product') active @endif" <a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right group-by-button @if($groupBy == 'product') active @endif"
href="{{ $U('/stockreports/spendings?group-by=product') }}"> href="#"
data-group-by="product">
{{ $__t('Product') }} {{ $__t('Product') }}
</a> </a>
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right @if($groupBy == 'productgroup') active @endif" <a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right group-by-button @if($groupBy == 'productgroup') active @endif"
href="{{ $U('/stockreports/spendings?group-by=productgroup') }}"> href="#"
data-group-by="productgroup">
{{ $__t('Product group') }} {{ $__t('Product group') }}
</a> </a>
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right @if($groupBy == 'store') active @endif" <a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right group-by-button @if($groupBy == 'store') active @endif"
href="{{ $U('/stockreports/spendings?group-by=store') }}"> href="#"
data-group-by="store">
{{ $__t('Store') }} {{ $__t('Store') }}
</a> </a>
</div> </div>