github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-27 23:29:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,550 Commits 2 Branches 81 Tags 29 MiB
master
Commit Graph

1035 Commits

Author SHA1 Message Date
Bernd Bestel
80d7284d72
Implemented calendar category colors (closes #2368) 2023-11-04 14:11:02 +01:00
Bernd Bestel
f01ca33c33
Optimized initial focus / workflow handling for recipeposform and shoppinglistitemform 2023-11-04 13:19:46 +01:00
Bernd Bestel
27f9d70b56
Implemented a way to use the external barcode lookup plugin also from within the frontend as a product picker workflow 2023-11-03 20:47:43 +01:00
Bernd Bestel
c9215a9a4e
Added a workaround for the not working customRangeLabel option of the daterangepicker component (fixes #2353) 2023-10-04 16:46:24 +02:00
Bernd Bestel
1e60f940e4
Properly handle empty select-multiple userfield (fixes #2339) 2023-09-15 13:43:58 +02:00
Bernd Bestel
b0d6e24bd4
Fixed consume page location dropdown handling (fixes #2328) 2023-09-02 10:17:43 +02:00
Bernd Bestel
82d899d609
Optimized DataTables state save handling performance 2023-09-01 17:04:11 +02:00
Bernd Bestel
5080d776a7
Only accept application/json requests for (JSON) API requests 2023-09-01 00:53:25 +02:00
Bernd Bestel
a965d01fb9
Optimized server error display handling when consuming a recipe (closes #2310) 2023-08-15 18:51:40 +02:00
Bernd Bestel
a123535b0a
Optimized locale number display handling (fixes #2309) 2023-08-15 09:35:40 +02:00
Bernd Bestel
3a2929c016
stockreports/spendings: Support grouping by store (closes #2308) 2023-08-14 18:12:40 +02:00
Bernd Bestel
106f25cc6b
Fixed stock entry open button amount on /stockentries (fixes #2303) 2023-08-13 08:27:02 +02:00
Bernd Bestel
b74fbddd94
Use a dynamic (title / URL) manifest 2023-08-01 17:12:35 +02:00
Bernd Bestel
8b444a03e5
Simplified initial /mealplan start date handling (fixes #2286) 2023-07-31 21:29:28 +02:00
Bernd Bestel
9ae7c72e87
Unified calendar time format (closes #2266) 2023-07-05 21:30:00 +02:00
Bernd Bestel
1496a58673
Show sidebar scroll bar only on hover (closes #2255) 2023-06-17 10:39:26 +02:00
Bernd Bestel
d05038e311
Exclude products with hide_on_stock_overview enabled in current stock info on /stockoverview (fixes #2250) 2023-06-08 22:15:33 +02:00
Bernd Bestel
8c79cc4f8e
Fixed new API key modal 2023-05-23 21:22:54 +02:00
Bernd Bestel
d0e0102752
API keys can now have a description 2023-05-23 20:31:51 +02:00
Bernd Bestel
08c1efa0ad
Unified product-/chore-/battery-card modal handling 2023-05-23 17:32:54 +02:00
Bernd Bestel
2633d3d1a5
Fixed stock entry label info handling when the corresponding feature flag is disabled 2023-05-22 22:33:36 +02:00
Bernd Bestel
2c0a71078f
Fixed productcard opened amount display 2023-05-22 21:53:15 +02:00
Bernd Bestel
02fe3f2119
Show to amount of "Label per unit" stock entry labels (closes #2241) 2023-05-22 21:23:19 +02:00
Bernd Bestel
04f362b723
Added a product context menu on /stockjournal (the same as on /stockoverview) (closes #2239) 2023-05-21 18:40:59 +02:00
Bernd Bestel
979c67b44c
Various JS optimizations 2023-05-21 18:01:47 +02:00
Bernd Bestel
f427849e89
Load all frontend packages conditionally 2023-05-21 10:56:38 +02:00
Bernd Bestel
d16d976d0b
Simplified viewjs / active page handling 2023-05-20 18:20:30 +02:00
Bernd Bestel
ddf0ff0aef
Various small layout adjustments 2023-05-20 11:03:13 +02:00
Bernd Bestel
fb57d9ef13
Fixed frontend translation with numbered arguments did not work (after upgrading gettext-translator) 2023-05-20 09:58:33 +02:00
Bernd Bestel
c43fe24e47
Changed font 2023-05-20 09:31:03 +02:00
Bernd Bestel
6ab5bc3a29
Optimized sidebar collapsed state / active nav handling 2023-05-19 21:14:57 +02:00
Bernd Bestel
6e3182884a
Changed app icon background color 2023-05-19 19:23:50 +02:00
Bernd Bestel
5f65f2abd0
New logo 2023-05-19 18:08:26 +02:00
Bernd Bestel
49daed6c2b
Upgraded some frontend dependencies 2023-05-19 17:23:32 +02:00
Bernd Bestel
628e779902
Moved sidebar / menu layout into own (customized) component 2023-05-19 15:12:11 +02:00
Bernd Bestel
d03175f75a
Added a separate QU for displaying prices (closes #2225) 2023-05-18 13:37:13 +02:00
Bernd Bestel
631f03e62c
Optimized DataTables fixedOrder handling (fixes #2235) 2023-05-17 22:44:42 +02:00
Bernd Bestel
778cf847d3
Fixed more missing fields when copying a product (fixes #2231) 2023-05-17 21:10:14 +02:00
Bernd Bestel
491412807c
Fixed table column visibility selection 2023-05-13 14:28:50 +02:00
Bernd Bestel
9cdb0908d6
Make it possible to hide locations/stores/QUs/product_groups/task_categories (closes #2222) 2023-05-13 14:24:52 +02:00
Bernd Bestel
b5d3e68d68
Added a "today button" to the calendar (closes #2218) 2023-05-12 20:53:04 +02:00
Bernd Bestel
48564b5286
Fixed that default_consume_location_id wasn't copied on copying a product (fixes #2223) 2023-05-12 20:48:44 +02:00
Bernd Bestel
8bdb74a8e0
Optimized button click tooltip hide handling (fixes #2206) 2023-05-03 08:32:49 +02:00
Bernd Bestel
5ab31f726a
Support dynamic "today" for MEAL_PLAN_FIRST_DAY_OF_WEEK (closes #2205) 2023-05-01 14:49:02 +02:00
Bernd Bestel
a4992ff602
Optimized purchase/inventory price hint / last price suggestion decimals handling 2023-04-24 18:17:39 +02:00
Bernd Bestel
f4874ed8d0
Prefill barcode note on /purchase and /inventory (closes #2193) 2023-04-17 19:54:24 +02:00
Bernd Bestel
84bd74a1bc
Show the product card also on /products (closes #2185) 2023-04-13 20:36:21 +02:00
Bernd Bestel
16011b91c6
Added a filter option to only show currently out-of-stock products on /products (closes #2192) 2023-04-13 20:28:28 +02:00
Bernd Bestel
2bce428339
Fixed missing plural localization strings.pot 
(Report from a translator on Transifex)
 2023-04-12 09:06:39 +02:00
Bernd Bestel
a56de30268
Fixed /stockoverview "Min. stock amount" column sorting (fixes #2189) 2023-04-03 18:35:38 +02:00
Bernd Bestel
71d44edb8c
Optimized week recipe handling in mealplan (fixes #2168) 2023-04-01 22:04:30 +02:00
Travis Raup
340832c361
Feature: Stock Purchase Metrics (#2135) 
* Feature: Stock Purchase Metrics

* chart update

* Refactor to chartjs

* More suggestion edits

- locale in javascript
- global translations
- commit migrations sql file

* Rename 0215.sql to 0216.sql

Fixed merge conflict

* Fixed merge conflict

* Applied code style

* Added missing demo data translations

* Removed unused package "canvasjs"

* Don't include daterangepicker globally when only needed on a single page / fixed view section imports

* Rename this to "Spendings" / name it more generically "Stock reports"

* Reuse the existing product_price_history view

* Final cleanup

* Whitespace fix

---------

Co-authored-by: Travis Raup <travis.raup@platform.sh>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2023-04-01 17:05:41 +02:00
Bernd Bestel
98469248eb
Optimized tracking button handling on /choresoverview (closes #2186) 2023-03-31 20:12:06 +02:00
Bernd Bestel
756133a9eb
Removed shopping list table fixed order (fixes #2167) 2023-03-16 18:52:41 +01:00
Bernd Bestel
1090f070c9
Optimized shopping list done items filter handling (fixes #2169) 2023-03-16 18:47:01 +01:00
Bernd Bestel
91700e7dae
Fixed JS syntax error 2023-02-06 20:42:11 +01:00
Bernd Bestel
c9c0baefeb
Optimized datetime Userfields handling (fixes #2108) 2023-02-06 20:36:26 +01:00
Bernd Bestel
b18bd2ff87
Fixed table dropdown menu overflow handling when columns are reordered (fixes #2130) 2023-02-06 20:25:51 +01:00
Bernd Bestel
d9667b4534
Removed type conversions where no longer needed 
PHP 8.1 PDO SQLite now returns native data types
 2023-02-06 20:22:10 +01:00
Bernd Bestel
d8d3c3ef0b
Split the quick consume and open amount product option (closes #2127) 2023-02-05 20:37:39 +01:00
Bernd Bestel
b64d726c42
Added a new config option for energy unit display (closes #2109) 2023-02-05 15:55:45 +01:00
Bernd Bestel
83fa02d8ad
Added an option to reprint stock entry labels when editing them (closes #2092) 2023-01-05 18:15:21 +01:00
Bernd Bestel
daf5ad33c7
Show recipe ingredients/preparation side by side in fullscreen mode (closes #2051) 2023-01-05 17:44:07 +01:00
Bernd Bestel
0c8e8cab97
Revert "Refresh product/chore/battery card only when actually visible" 
This reverts commit c934bfb7b3.
 2023-01-04 20:06:19 +01:00
Bernd Bestel
f057ae7e06
Add note to barcode created by the workflow InplaceAddBarcodeToExistingProduct on /purchase and /inventory (closes #2093) 2023-01-04 19:56:55 +01:00
Bernd Bestel
c0fbc4adaf
Fixed /stockoverview value column sort format (fixes #2088) 2023-01-01 20:33:08 +01:00
Bernd Bestel
efae0b193d
Add amount to barcode created by the workflow InplaceAddBarcodeToExistingProduct on /purchase (closes #2085) 2022-12-29 11:21:33 +01:00
Bernd Bestel
c934bfb7b3
Refresh product/chore/battery card only when actually visible 2022-12-26 20:22:38 +01:00
Bernd Bestel
3f2ad17460
Make it possible to add recipes from /recipes to the meal plan (closes #2003) 2022-12-26 14:25:33 +01:00
Bernd Bestel
0585e80c70
Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
0229d187ae
Removed qu_factor_purchase_to_stock (migrated existing factors to normal product specific QU conversions) 2022-12-25 19:48:22 +01:00
Bernd Bestel
f6e0ff11f1
Fixed column visibility handling when there is a shadow rowgroup column (fixes #2074) 2022-12-20 22:11:35 +01:00
Bernd Bestel
fce6458df6
Optimized modal dialog sizing 2022-12-04 21:59:20 +01:00
Bernd Bestel
8175b1bcfe
Simplified product specific QU display/edit and added more demo QU conversions 2022-12-04 20:25:33 +01:00
Bernd Bestel
50fac692ad
Added a dialog to show product related resolved QU conversions (references #2056 and #1360) 2022-12-04 19:02:15 +01:00
Bernd Bestel
daa0a59c5f
Support transitive QU conversions on the frontend (references #2056, closes #1360) 2022-12-04 13:12:01 +01:00
Bernd Bestel
f03bb5eeee
Optimized default consume location empty check (references #2053) 2022-11-28 17:58:30 +01:00
Bernd Bestel
6affa01f81
Added a "Clear done items" button to the shopping list (closes #1999) 2022-11-19 19:45:00 +01:00
Bernd Bestel
6036786153
Fix/Workaround for DataTables ColReorder bug with data-order attributes (fixes #2019) 2022-11-12 18:10:32 +01:00
Bernd Bestel
2b2dd0568b
Move back again to original tempusdominus-bootstrap-4 package (references #143 and #2036) 2022-11-12 17:25:09 +01:00
Bernd Bestel
a5c2157320
Fixed more chore form validation edge cases (fixes #2001) 2022-09-20 15:02:24 +02:00
Bernd Bestel
24c9247663
Make it possible to edit a user without necessarily updating the users password (closes #1942) 2022-08-27 14:54:52 +02:00
Bernd Bestel
e8dc334758
Always allow move_on_open (closes #1983) 2022-08-27 11:27:49 +02:00
Bernd Bestel
d883474f03
Fixed LABEL_PRINTER_HOOK_JSON check was missing when running label printer WebHooks client side (fixes #1978) 2022-08-25 18:46:49 +02:00
Bernd Bestel
06968ac289
Fixed stock entry Userfield edit handling (fixes #1969) 2022-08-18 21:29:19 +02:00
Bernd Bestel
57d70851c8
Fixed stock overview page status button counters related to the product option "Never show on stock overview" (fixes #1956) 2022-07-24 21:36:29 +02:00
Bernd Bestel
5b53175ed6
Handle null Userfield values in userfieldsform component (fixes #1953) 2022-07-22 16:47:23 +02:00
Bernd Bestel
e64df711e2
Optimized dynamic leading zeros rounding in productamountpicker (fixes #1943) 2022-07-14 17:01:12 +02:00
Bernd Bestel
8cb9157c73
Fixed shopping list item form product barcode scan handling (fixes #1940) 2022-07-12 19:00:40 +02:00
Bernd Bestel
b57ba59243
Fixed unreproducible edge case JS error when rescheduling chores (references #1938) 2022-07-09 09:00:15 +02:00
Bernd Bestel
dbf660f953
Fix stock_auto_decimal_separator_prices input value handling (references #1917) 2022-06-11 13:51:19 +02:00
Bernd Bestel
2de87eb446
Only apply stock_auto_decimal_separator_prices when value is not empty and not already contains a decimal separator (fixes #1917) 2022-06-11 13:25:52 +02:00
Bernd Bestel
fe92caaed4
Fixed price history chart data parsing (fixes #1914) 2022-06-09 22:14:00 +02:00
Bernd Bestel
27582611c1
Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893) 2022-06-04 14:09:35 +02:00
Bernd Bestel
1ef64025c5
Fixed potential JS error when copying product with empty but not null description 2022-06-04 13:32:31 +02:00
Bernd Bestel
cd41c27ee1
Fixed plural form missing handling (references #1878 and #1903) 2022-06-01 22:33:13 +02:00
Bernd Bestel
fd7a4e02be
Fixed chore form validation edge case (fixes #1905) 2022-06-01 20:59:57 +02:00
Bernd Bestel
3d3e4bac75
Fixed edit shopping list item QU initialisation 2022-06-01 20:43:42 +02:00
Bernd Bestel
5406448be0
Use singular localization form when plural form is not provided (closes #1878) 2022-05-14 17:10:48 +02:00
Bernd Bestel
9c1fd176c0
Fixed shopping_list_to_stock_workflow_auto_submit_when_prefilled user settings control initialization (fixes #1875) 2022-04-29 11:46:50 +02:00
Bernd Bestel
845e69fb96
Escape HTML when displaying recipes on /mealplan (references #1868) 2022-04-21 21:32:28 +02:00
Bernd Bestel
900a49a36a
Fixed JS / display errors on refreshing a row on /stockentries 2022-04-18 18:42:40 +02:00
Rosemary Orchard
5e30e89737
Add support for "Move on Open" (#1863) 
* Add functionality to move a product when it is opened

* Update the API to support this (and some other new fields)

* Remove console, update move on open when either the default or the consume location change

* Fix conflict from fridge

* Ignore .DS_STORE from macOS

* Fix the migration conflict

* Fix the default location not appending properly

* Revert changes no longer needed

* Fix the checkbox disable logic, and call the function on page load

* Simplify the transfer to use the existing function (which also adds logs)

* Only move it if it's moving

* Code formatting / naming

* Clarify help text (it's not always about one unit, but about the corresponding amount opened)

* Handle splitted stock entries + optimized/unified product property checks

* Added UI feedback on auto moving

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2022-04-18 18:25:08 +02:00
Bernd Bestel
f7eb8cc127
Optimized stock entry form initial input field focus 2022-04-12 22:54:12 +02:00
Bernd Bestel
150cfba455
Don't show invisible columns in table options 2022-04-07 19:46:13 +02:00
Bernd Bestel
632db0d8d1
Fixed new user settings naming 2022-04-07 19:25:27 +02:00
Bernd Bestel
73e539604f
Don't show relative time for invalid dates 2022-04-07 18:12:49 +02:00
Bernd Bestel
ca77ba6d19
Improved QU conversion validation messages (references #1844) 2022-04-07 07:26:06 +02:00
Bernd Bestel
6ecf94073d
Automatically create/update/delete inverse QU conversions (closes #1844) 2022-04-06 22:21:21 +02:00
Bernd Bestel
cefc1b7b9c
Fixed shopping list item form initial input field focus 2022-04-06 21:32:35 +02:00
Bernd Bestel
cab34df2d6
Related the price on /inventory to the selected QU instead of QU stock (closes #1346) 2022-04-06 21:27:47 +02:00
Bernd Bestel
e91fa02974
Optimized shopping list item form success message handling 2022-04-06 20:58:16 +02:00
Bernd Bestel
59277c898a
Fixed shopping list item form initial input field focus 2022-04-06 20:54:42 +02:00
Bernd Bestel
76d6342156
Show stock userfields on the stock entry edit form 2022-04-06 19:08:17 +02:00
Bernd Bestel
03bba4b9e5
Fixed "Search for recipes containing this product" (fixes #1842) 2022-04-05 18:21:25 +02:00
Bernd Bestel
adaa54ba8b
Only load night mode stylesheet when night mode is actually on 2022-04-05 18:18:38 +02:00
Bernd Bestel
4d4ae9812b
Make it more clear that QU stock = QU purchase means always a conversion factor of 1 (references #1841) 2022-04-05 00:08:27 +02:00
Bernd Bestel
efbb0ebf6a
Removed debug statement 2022-04-04 21:10:35 +02:00
Bernd Bestel
cca35a302c
Make clear filter buttons more compact 2022-04-04 21:07:14 +02:00
Bernd Bestel
e336f24225
Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
b6d7ef403c
Some night mode style refinements 2022-04-04 18:34:22 +02:00
Bernd Bestel
70f5e616c1
Optimized datetimepicker (references #1478) 2022-04-03 22:32:25 +02:00
Bernd Bestel
61ed756dd0
Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +02:00
Bernd Bestel
e69e7a9a9a
Added a location filter to the stock entries page 2022-04-03 19:28:59 +02:00
Bernd Bestel
5c6f84a68e
General code review 2022-04-03 19:14:54 +02:00
Bernd Bestel
3091a06194
Optimized meal plan entry add/edit dialog titles 2022-04-03 19:08:36 +02:00
Bernd Bestel
d4eb5f07db
Make the meal plan entry day editable (closes #775) 2022-04-03 17:03:23 +02:00
Bernd Bestel
97626b4a59
Added userfield default values for userfield types date & datetime (closes #1166) 2022-04-03 14:32:31 +02:00
Bernd Bestel
3efecb8bed
Make it possible to manually re-assign chores (closes #1492, references #1830) 2022-04-03 13:56:14 +02:00
Bernd Bestel
a5294262e6
Added a user setting to automatically add missing products to the shopping list (closes #1266) 2022-04-03 13:00:14 +02:00
Bernd Bestel
34859ada02
Make new barcode added via productpicker InplaceAddBarcodeToExistingProduct flow immediately searchable (closes #839) 2022-04-03 12:33:22 +02:00
Bernd Bestel
2042db29ee
Use prefers-color-scheme for night mode by default (closes #1334) 2022-04-02 19:26:55 +02:00
Bernd Bestel
6a50f74a14
Optimizations regarding displaying prices (closes #1743) 2022-04-02 17:49:35 +02:00
Bernd Bestel
05485b3a4c
Make it possible to add multiple files / PDFs to equipment by using Userfields (closes #978) 2022-04-02 10:37:53 +02:00
Bernd Bestel
8c1deefebf
Show a little optional checkbox to mark recipe ingredients as done (closes #1606) 2022-04-01 22:43:49 +02:00
Bernd Bestel
f7c33a4579
Optionally show out of stock products on the location content sheet (closes #1641) 2022-04-01 21:55:06 +02:00
Bernd Bestel
ccc59dfc8b
Added a new product option "Disable own stock" (closes #564) 2022-04-01 18:49:17 +02:00
Bernd Bestel
cd60c239af
Squashed commit 
Improved locale number display on stockoverview page
Fixed choresoverview chore execution color highlighting
Highlight recipe ingredients based on the new due score (references #1813)
Reworked current price handling views (mostly needed for recipes)
 2022-03-31 22:52:38 +02:00
Bernd Bestel
fbb84277bf
Unified form validation handling 2022-03-30 18:00:28 +02:00
Bernd Bestel
62fcc89ddc
Fixed recipes status search (references #1813) 2022-03-30 17:39:26 +02:00
Bernd Bestel
d3a39270de
Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +02:00
Bernd Bestel
8e68477a78
Implemented a "recipes due score" (closes #1813) 2022-03-29 20:38:26 +02:00
Bernd Bestel
acebed5aae
Clear manually rescheduled date on chore execution (references #1830) 2022-03-27 16:11:16 +02:00
Bernd Bestel
d65734c896
Added the possibility to manually reschedule chores (closes #1830) 2022-03-26 18:30:26 +01:00
Bernd Bestel
033cd306c1
Improved products/chore merge dialogs form validation 2022-03-26 11:17:08 +01:00
Bernd Bestel
585ec1212d
Fixed chore tracking page skip button disabled handling (references #1836) 2022-03-26 11:06:03 +01:00
Bernd Bestel
81b54182de
Improved form validation handling (closes #1836) 2022-03-26 10:34:00 +01:00
Bernd Bestel
9db66048d1
Fixed chore skip handling via /choresoverview (references #1830) 2022-03-23 18:22:50 +01:00
Bernd Bestel
bda230537a
Fixed purchase/consume page handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #1829) 2022-03-23 17:35:06 +01:00
miguelangel-nubla
e2c1d2e226
fix: can't print in landscape (#1819) 
* fix: can't print in landscape

Layout settings are hidden in the print dialog when printing a page like the mealplan.Bootstrap 4 bug https://github.com/twbs/bootstrap/issues/25629

* Moved @page rule to @media print section

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2022-03-14 22:47:12 +01:00