Dehalion
72d7257f6b
Merge branch 'feature-recipe-side-by-side' of https://github.com/Dehalion/grocy into feature-recipe-side-by-side
2022-12-23 16:21:02 +00:00
Dehalion
0f1f1149b6
Merge branch 'grocy:master' into feature-recipe-side-by-side
2022-12-23 17:20:02 +01:00
Dehalion
e843e66de1
Move recipe CSS to the recipe view
2022-12-23 16:18:45 +00:00
Bernd Bestel
dd409b4bf9
Fixed consume amount calculation when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved ( fixes #2076 )
2022-12-21 21:00:49 +01:00
Bernd Bestel
407344e86a
Fixed recipe ingredient costs/calories calculation when product substitution and unit conversions is involved at the same time ( fixes #2075 )
2022-12-21 20:16: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
Dehalion
f1812d680e
Display ingredients and recipe side by side
...
This tries to improve PR#1628 from
adamschmalhofer:feature-recipe-side-by-side
to implement Feature Request:
Recipe fullscreen ingredients and preparation both visible #2051
2022-12-20 19:16:10 +00:00
Bernd Bestel
2ebb9b2cd9
Show product group Userfields on the shopping list ( closes #2069 )
2022-12-18 20:56:02 +01:00
Bernd Bestel
38a4ad8ec4
Upgraded to PHP 8.1
2022-12-10 15:19:11 +01:00
Bernd Bestel
84e3707f4f
Optimized .devtools
2022-12-06 20:41:09 +01:00
Bernd Bestel
fce6458df6
Optimized modal dialog sizing
2022-12-04 21:59:20 +01:00
Bernd Bestel
018449c648
Added more demo QU conversions
2022-12-04 20:39:16 +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
c1dea5c254
Optimized /quantityunitconversionsresolved view
2022-12-04 19:52:48 +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
Daniel Albert
d889e9d3ad
Fix quantity_unit_conversions_resolved view ( #2057 )
...
This change makes the view work for products to which only default
conversions apply.
Before, they would not have appeared in the results.
2022-12-04 18:39:33 +01:00
Bernd Bestel
4be447fc60
Expose quantity_unit_conversions_resolved via the API (read only) (references #2056 and #1360 )
2022-12-04 13:41:44 +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
df39f94fca
Added changelog for #2056
2022-12-04 12:37:50 +01:00
Bernd Bestel
46313e2c75
Applied code formatting rules for #2056
2022-12-04 12:33:12 +01:00
Daniel Albert
541c0be6be
Add support for transitive unit conversions ( #2056 )
...
* Add support for transitive unit conversions
* Rewrite quantity_unit_conversions_resolved view
2022-12-04 12:18:18 +01:00
Bernd Bestel
3b3212d101
Updated README + Changelog regarding supported PHP runtime info
2022-11-29 20:03:40 +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
605ceb1b19
Fixed typos
2022-11-19 19:35:10 +01:00
Bernd Bestel
7d4a9602ab
Return the battery object in endpoint /batteries ( closes #2045 )
2022-11-19 19:33:50 +01:00
Bernd Bestel
eb370dad1e
Fixed changelog typo
2022-11-13 14:22:29 +01:00
Bernd Bestel
8676b86575
Prepared next release
2022-11-12 18:24:01 +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
88950f00d5
Pulled translations from Transifex
2022-11-12 17:31:17 +01:00
Bernd Bestel
f90ced5a39
Updated dependencies
2022-11-12 17:29:04 +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
3f60a2b5fa
Move back again to own forked tempusdominus-bootstrap-4 package ( fixes #2036 , references #143 )
2022-11-10 11:42:28 +01:00
Bernd Bestel
3070448555
Fixed granular user permission checking in GenericEntityApiController ( fixes #2025 )
2022-10-17 21:00:10 +02:00
Bernd Bestel
80a873da3e
Removed old products.barcode field in grocy.openapi.json (references #2023 )
2022-10-12 21:07:03 +02:00
Bernd Bestel
e8f76e5694
Prevent adding recipe ingredients with a unit for which no conversion exists ( closes #2013 )
...
Wasn't a problem of the web frontend, only possible by externally/manually using the API and not thinking about that that's bullshit.
2022-09-30 12:32:39 +02:00
Bernd Bestel
fa49b449dd
Allow img style attribute in HTML filter ( fixes #2011 )
2022-09-28 21:04:41 +02:00
Bernd Bestel
121050960c
Fixed conflicting php-cs-fixer VSCode setting
2022-09-28 11:17:03 +02:00
Bernd Bestel
bb0cc50ffc
Added Ukrainian translation ( closes #2008 )
2022-09-26 13:31:35 +02:00
Bernd Bestel
e1967bd603
Allow chevrons in HTML filter ( fixes #2007 )
2022-09-25 22:39:06 +02:00
Bernd Bestel
a5c2157320
Fixed more chore form validation edge cases ( fixes #2001 )
2022-09-20 15:02:24 +02:00
Bernd Bestel
ff056f8d81
Raise minimum SQLite version in PrerequisiteChecker as mentioned in #1939
2022-09-03 19:13:40 +02:00
Bernd Bestel
af4715e17f
Fixed product average price rounding
2022-08-29 20:56:15 +02:00
Bernd Bestel
68aad90a59
Optimize SQLite database file after migrations have run
2022-08-28 20:45:22 +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
7e2f30396f
Fixed consume recipe product_id handling /w parent/child products ( closes #1982 )
2022-08-27 14:25:55 +02:00
Bernd Bestel
e8dc334758
Always allow move_on_open ( closes #1983 )
2022-08-27 11:27:49 +02:00
Bernd Bestel
f1bc2cc40f
Fixed that consuming partially fulfilled recipes was possible ( fixes #1981 )
2022-08-27 00:08:23 +02:00
Bernd Bestel
c0d0b8fc90
Fixed default consume rule ORDER BY handling related to stock_next_use ( fixes #1979 )
2022-08-26 11:15:15 +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
