Commit Graph

753 Commits

Author SHA1 Message Date
Bernd Bestel
acebed5aae
Clear manually rescheduled date on chore execution (references #1830) 2022-03-27 16:11:16 +02:00
Bernd Bestel
fa07b861ad
Optimized reschedule-chore-modal (references #1830) 2022-03-26 20:25:17 +01: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
81b54182de
Improved form validation handling (closes #1836) 2022-03-26 10:34:00 +01:00
Bernd Bestel
6aae97de73
Fixed number input page reload behavior (fixes #1835) 2022-03-25 18:17:20 +01:00
Bernd Bestel
23f285c3fb
Fixed recipes gallery view search (fixes #1825) 2022-03-22 13:21:09 +01:00
Bernd Bestel
0ba1a82e01
Show the products grocycode as a (hidden by default) column on /products (closes #1820) 2022-03-14 22:39:35 +01:00
Bernd Bestel
7ea9984fd3
Make it possible to change a products stock QU after it was once added to stock (closes #1326) 2022-03-13 17:09:07 +01:00
Bernd Bestel
cc2a137783
Fixed calories locale number display (fixes #1802) 2022-02-28 20:59:58 +01:00
Bernd Bestel
1aa7db9c2a
Added an daily-same-time chore period type (closes #1793) 2022-02-20 16:03:50 +01:00
Bernd Bestel
424bfa9313
Fixed formatting 2022-02-15 18:43:02 +01:00
Bernd Bestel
926b7d8aea
Table options: Only allow columns to be grouped for which it makes sense (closes #1535) 2022-02-15 18:40:42 +01:00
Bernd Bestel
21d5952950
Fixed batteries stock overview page was broken when having any Userfield (fixes #1786) 2022-02-14 17:52:24 +01:00
Bernd Bestel
2457c2c2fd
Optimized returnto-links handling (fixes #1785) 2022-02-13 20:07:29 +01:00
Bernd Bestel
1344e84534
Fixed recipe consume stock fulfillment checking (frontend and API) (fixes #1781) 2022-02-12 22:08:10 +01:00
Bernd Bestel
f52b8e11bb
Support camera barcode scanning in recipepicker (references #1562) 2022-02-11 18:18:17 +01:00
Bernd Bestel
222c518a5f
Added grocycode for recipes (closes #1562) 2022-02-11 17:49:30 +01:00
Bernd Bestel
51fdefaede
Removed unused properties 2022-02-11 17:48:44 +01:00
Bernd Bestel
69a7ea6057
Added a new "adaptive" chore period type (closes #1495) 2022-02-10 18:06:33 +01:00
Bernd Bestel
7d4c9fefa9
Removed the dynamic regular chore period type (since it's the same as daily) 2022-02-09 20:25:16 +01:00
Bernd Bestel
10d7d44825
Added new hourly chore period type (closes #266) 2022-02-09 20:02:11 +01:00
Bernd Bestel
c9a2041fae
Optimized chore schedule help text 2022-02-09 19:52:19 +01:00
Bernd Bestel
0d1f2ad09d
Squashed commit
Optimized new chore start date handling (references #1612)
Change yearly chore schedule to be on the same day each year (closes #817)
Use the last price for out of stock ingredients (closes #779)
Make it optionally possible to show the recipes list full-width (closes #1772)
2022-02-09 17:48:21 +01:00
Bernd Bestel
aaf248c1b3
Added missing localization string 2022-02-08 21:21:19 +01:00
Bernd Bestel
61a1b1428a
Added a chore start date option (closes #1612) 2022-02-08 20:35:47 +01:00
Bernd Bestel
66cf7e4ffa
Squashed commit
Updated dependencies
Added the possibility to skip chore schedules (closes #1486)
Show the meal plan section on the corresponding calendar events (closes #1582)
Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582)
Added a changelog template
Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
2022-02-08 18:08:26 +01:00
Bernd Bestel
d1d52aea44
Move FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT to per product option (closes #1753) 2022-02-07 19:12:31 +01:00
Bernd Bestel
12e5377c40
Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +01:00
Bernd Bestel
9eb46df517
Added a button to quickly create multiple tasks without having to close/reopen the dialog (closes #1776) 2022-02-06 18:35:19 +01:00
Bernd Bestel
da54b945da
Fixed task edit page initial due date (fixes #1774) 2022-02-06 17:49:04 +01:00
Bernd Bestel
7e6efb4a14
Optimized no-sidebar pages spacing / centering (closes #1760) 2022-01-24 21:17:45 +01:00
Bernd Bestel
fa3e705673
Show chore description on chorecard (closes #1759) 2022-01-23 20:02:16 +01:00
Bernd Bestel
cf52e5ec96
Make it possible to disable chores/tasks/batteries due soon filters/highlighting (closes #1485) 2022-01-23 19:20:23 +01:00
Bernd Bestel
aef646e9df
Highlight chores/tasks/batteries due today in a separate color + status filter (closes #1740) 2022-01-23 17:42:55 +01:00
Bernd Bestel
789e6a5291
Don't crash the recipes page when the amount contains user-desired (and manually edited) bullshit (fixes #1691) 2022-01-06 14:36:35 +01:00
Bernd Bestel
5f8299cf4a
Also show the logout button when using externally managed auth (fixes #1709) 2022-01-06 13:46:20 +01:00
Bernd Bestel
8455b5a64a
Allow HTML tags for the product description column on the stock overview page (fixes #1735) 2022-01-06 13:38:00 +01:00
Bernd Bestel
a711bbd8f6
Print stock entry labels also on inventory when adding products (closes #1713) 2021-12-09 18:32:59 +01:00
JOKer
b2eec2b111
Improve sorting for stock entries view (#1695)
In the stockentries view the ordering by expiration date, amount, price
and purchase date did not work as expected. b5fc64cf already addressed a
similar issue for other views. This commit now does the same: set
DataTables types on the specific columns.

Since the units being part of the "amount" column break numeric sorting,
this commit adds a "data-order" field for that column, so numeric
sorting can still work. This is done in aligment with the stockoverview
page, that already contains such an entry to facilitate proper sorting.
2021-11-25 19:08:53 +01:00
Tallyrald
98bf36dbc8
Replace Timeago with momentjs (#1687)
* Replaced timeago with moment.fromNow

* Fixed datetime when best_before_date is empty

* Removed the now unnecessary timeago package

* Removed not longer localization strings

* Check for empty instead of string comparison

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-11-15 20:05:10 +01:00
Bernd Bestel
4d21668265
Added the possibility to merge chores 2021-11-14 16:19:52 +01:00
Bernd Bestel
f5562602f0
Always show the add item button on the shopping list on mobile (closes #1645) 2021-11-14 15:50:48 +01:00
Bernd Bestel
6070507b04
Fixed per unit stock grocycodes weren't unique per unit (fixes #1676) 2021-11-14 15:26:38 +01:00
Bernd Bestel
fc413a05d1
Simplified stock entry label printing options (on purchase) (references #1647) 2021-11-13 18:26:01 +01:00
Bernd Bestel
10bd5ce900
Added a new "Presets for new products" stock setting for the "Default due days" option of new products (closes #1552) 2021-11-13 17:05:23 +01:00
Bernd Bestel
a6ffe8480a
Show stock QU hint also for the energy field on the product edit page (closes #1682) 2021-11-13 16:45:55 +01:00
Bernd Bestel
beae32ef23
Added the products average price as a hidden by default column on the stock overview page (closes #1677) 2021-11-09 19:39:32 +01:00
Bernd Bestel
2b97ac7c1c
Added buttons to the products stock entries/journal on the product edit page (like on the productcard) (closes #1670) 2021-11-08 17:21:15 +01:00
Bernd Bestel
3c656ba618
Allow renaming the default shopping list (closes #1667) 2021-11-08 17:08:37 +01:00
Bernd Bestel
edddfe234c
Include duesoon/overdue/expired products for the belowminstockamount filter on the stock overview page (closes #1666) 2021-11-08 17:06:20 +01:00
Dmitri Iouchtchenko
dc1954cb05
Add name to stay_logged_in checkbox (#1661)
The attribute was dropped in 9942a2d.
2021-11-03 21:47:35 +01:00
Bernd Bestel
038917b030
Don't show battery grocycode when not available 2021-09-27 17:20:52 +02:00
Bernd Bestel
e0735ce2e4
Hide stock value on productcard when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled 2021-09-24 13:13:38 +02:00
Bernd Bestel
c06bb7784a
Include OS and client information in easy error info copy/paste and on the about dialog 2021-09-20 20:16:41 +02:00
Bernd Bestel
7aa9e5748e
Allow to add a product picture on product creation (closes #1620) 2021-09-19 16:06:16 +02:00
Bernd Bestel
305f846dbf
Implemented bottom-sticky save buttons for product and chore edit forms (closes #1589) 2021-09-15 14:59:11 +02:00
Bernd Bestel
3f850c540b
Fixed stock overview context menu item disabled handling (fixes #1609) 2021-09-15 14:24:50 +02:00
Kris
b539c93319
Hide elements when printing (#1559)
* Hide elements when printing

* Hide elements when printing

* Also hide the title menu collapse button

* Added a print button

All print-optimized pages have that

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-06 20:18:43 +02:00
Bernd Bestel
b5acb4c49b
Settings menu order == sidebar menu order 2021-07-15 20:09:33 +02:00
Bernd Bestel
2d2700cacb
Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +02:00
Bernd Bestel
8b6f882edc
Fixed missing FEATURE_FLAG_SHOPPINGLIST handling on /stockoverview, /mealplan and /stockentries pages (references #322) 2021-07-13 21:24:08 +02:00
Bernd Bestel
91d8eaeb74
Squashed commit
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
2021-07-13 19:29:23 +02:00
Bernd Bestel
8d2c3ae584
Partly reverted b856911f0f
Loading localization strings async for the fronted currently doesn't work in all cases...
2021-07-12 21:20:39 +02:00
Bernd Bestel
71cede74a3
Make it possible to copy meal plan days (closes #573) 2021-07-12 20:44:42 +02:00
Bernd Bestel
7b0bc9e472
Fixed stock entries page missing columns 2021-07-12 19:55:53 +02:00
Bernd Bestel
8cb8611b4f
Added a new product option "Should not be frozen" (closes #1320) 2021-07-12 19:27:21 +02:00
Bernd Bestel
cf8604e984
Show row_created_timestamp on the stock entries page (closes #1063) 2021-07-12 18:25:07 +02:00
Bernd Bestel
cdf6ac78e2
Optimized product edit page default button handling (closes #1276) 2021-07-12 18:15:57 +02:00
Bernd Bestel
70433aace5
Added an status filter to only show in-stock products on the stock overview page (closes #1263) 2021-07-12 18:02:57 +02:00
Bernd Bestel
247221950d
Never extend the original due date on when opening a product which has default_best_before_days (closes #1342) 2021-07-12 17:56:09 +02:00
Bernd Bestel
866d6647d2
Small meal plan page adjustments 2021-07-12 17:43:30 +02:00
Bernd Bestel
6659a5cd08
Add an option to make Userfields mandatory (closes #1339) 2021-07-11 22:05:08 +02:00
Bernd Bestel
21c221b520
Improved recipe page / group by fulfillment status 2021-07-11 21:32:24 +02:00
Bernd Bestel
198216f38b
Make it possible to track any information on chore execution (by using Userfields, closes #825) 2021-07-11 19:44:06 +02:00
Bernd Bestel
2847908523
Some small recipe page adjustments 2021-07-10 20:35:38 +02:00
Bernd Bestel
8ff8c1ac5d
Made the used grocycode barcode type configurable
DataMatrix reading via Quagga2 doesn't work currently, so default to an supported 1D barcode (=> Code128)
2021-07-09 23:08:47 +02:00
Bernd Bestel
72e6ed76bf
Fixed an error when adding object and there are no Userfields (references b0d38b87de) 2021-07-09 21:30:35 +02:00
Bernd Bestel
8c5c12cb47
Added new columns on the stock overview page (closes #1351) 2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7
Added the product descrption as a column on the stock overview page (closes #1362) 2021-07-08 20:22:51 +02:00
Bernd Bestel
1ead23cb87
Added on option to only show in-stock products on the /products page (closes #1388) 2021-07-06 20:08:02 +02:00
Bernd Bestel
135ac118b0
Added a filter for only done items on the /shoppinglist page (closes #1406) 2021-07-06 19:40:26 +02:00
Bernd Bestel
ffad8bfa7f
Make it possible to search on the stock overview page for product barcodes (closes #1443) 2021-07-06 19:25:34 +02:00
Bernd Bestel
54bf7ed659
Produce a schema-valid OpenAPI specification (closes #1457) 2021-07-05 23:23:59 +02:00
Bernd Bestel
079437384e
Use the now available @once directive instead of the legacy hack to only include component scripts once 2021-07-05 22:49:51 +02:00
Bernd Bestel
cb24a7149f
Revert "Upgraded gettext/gettext (+ JS-Translator)"
This reverts commit 9abb92763d.
2021-07-04 21:47:55 +02:00
Bernd Bestel
9abb92763d
Upgraded gettext/gettext (+ JS-Translator) 2021-07-04 21:47:10 +02:00
Bernd Bestel
0dc37fb361
Don't allow a min. stock amount for child products when the parent has "Accumulate sub products min. stock amount" set (references #1409) 2021-07-04 17:36:44 +02:00
Bernd Bestel
47c936e026
Reworked authentication related menu item handling (fixes #1462) 2021-07-03 19:40:42 +02:00
Bernd Bestel
b856911f0f
Browser-cache localization strings (+ new API endpoint to get them) 2021-06-29 20:24:02 +02:00
Bernd Bestel
7587ead732
Fixed /tasks group by category (fixes #1274) 2021-06-28 19:31:27 +02:00
Bernd Bestel
69f8c237ff
Fixed /stockentries group by purchased_date (fixes #1419) 2021-06-28 19:14:15 +02:00
Bernd Bestel
b8e15b990b
Typo 2021-06-28 18:39:08 +02:00
Bernd Bestel
35fb87ab1e
Squashed commit
Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218)
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302)
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396)
Allow arrays in HTMLPurifier (fixes #1407)
2021-06-28 17:00:16 +02:00
Bernd Bestel
33ea1e56cf
Trigger help-tooltips also by click (instead of only hover, which is Bootstraps default) (fixes #1468) 2021-06-27 19:34:28 +02:00
Bernd Bestel
44d6173569
Also disable generic consume context menu item on /stockoverview when the item is not in stock (fixes #1523) 2021-06-27 18:34:58 +02:00
Katharina Bogad
f5da53a761
Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Bernd Bestel
f8fa5db3e7
Fixed multiple datetimepicker contextual timeago (references #1520) 2021-06-24 07:46:32 +02:00
Katharina Bogad
2471e78188
Grocycode, label printing (#1500)
* Grocycode: Productpicker, StockService

* Grocycode: Datamatrix generation

* Grocycode: Display in UI, make Images downloadable

* Grocycode: Do not show on product card

* Grocycode: Stockentry Label view

* Grocycode: Webhooks & Labelprinter Feature

* Grocycode: Manual Label printing

* Grocycode: Print Label from product form

* Quagga2: use zxing for DataMatrix recognition

* Grocycode: Default settings for label printing

* Prepare merge of master

* Grocycode: docs

* Docs: label printing webhook

* Review

- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3)
- Default `FEATURE_FLAG_LABELPRINTER` to disabled

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-12 17:21:12 +02:00
rozgonik
980778e599
Fix untranslateable hint values (#1435) 2021-03-31 22:14:42 +02:00