Commit Graph

143 Commits

Author SHA1 Message Date
Bernd Bestel
1891bc6f32 Restore fixed order for grouped column (fixes #1534) 2021-08-04 17:41:20 +02:00
Bernd Bestel
edfa404ed6 Squashed commit
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
2021-07-16 17:32:08 +02:00
Bernd Bestel
2bc108fe3e Only init meal plan menu entry when feature flag is enabled 2021-07-15 20:19:04 +02:00
Bernd Bestel
2d2700cacb Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +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
c048f403e6 Check for missing localization strings also client side (dev mode only) 2021-07-12 19:10:07 +02:00
Bernd Bestel
8348438148 Workaround for file upload problem when the file name contains Umlaute (seems to be a Linux only issue, fixes #1382) 2021-07-09 21:23:04 +02:00
Bernd Bestel
9ba7ee54a7 Invalidate browser cache on language change 2021-07-04 21:54:58 +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
4086a63ebd Improved tables horizontally scrollbar appearance (fixes #1476) 2021-07-04 15:34:39 +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
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
Kendell R
a0e5f45da3 More night mode improvements (#1336)
* More night mode improvements

* Update grocy_night_mode.css

* Update extensions.js

* Update grocy_night_mode.css

* Update public/css/grocy_night_mode.css
2021-06-12 20:39:08 +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
Bernd Bestel
f1ddd4a57e Fixed JS error 2020-12-22 10:23:26 +01:00
Bernd Bestel
dadf93a94c Merge used libraries for Barcode/QR-Code generation 2020-12-20 19:53:28 +01:00
Bernd Bestel
832141a718 Made the shopping list print view configurable (closes #740) 2020-12-19 23:57:33 +01:00
Bernd Bestel
574d17fa52 General UI review/test 2020-12-19 14:03:28 +01:00
Bernd Bestel
cc2ea93313 Make DataTable row groups collapsible everywhere (references #1189) 2020-12-17 17:41:31 +01:00
Robert Resch
07ff28da39 Add row group customization (#1189)
* Add row group customization

* fix rowGroup state loading

* activate rowGroup for all datatables

* add reset button

* reload page done on success callback

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-16 18:18:03 +01:00
Bernd Bestel
cf34df5e3f Squashed commit
Fixed some localization strings
Reviewed/optimized product deletion handling
Add option to hide products from the stock overview page (closes #906)
Prefill default_due_days also on the inventory page (closes #591)
Added DataTables accent chinese-string plugin (closes #872)
Show costs and calories per recipe ingredient (closes #1072)
Fixed user permission saving (fixes #1099)
User permissions should not have an effect for demo mode (closes #972)
Handle QU conversion when consuming a substituation (child) product (fixes #1118)
Consume/open any child product when the parent product is not in stock (closes #899)
Added a retry camera barcode scanning button to product picker workflow (closes #736)
2020-12-07 19:48:33 +01:00
Bernd Bestel
639ffe13f5 Reverted 41067b23bb because that's not needed (references #1049 and #958) 2020-11-17 21:10:26 +01:00
Bernd Bestel
d2d09cf928 Removed dragscroll dependency (fixes #1135, references #1115) 2020-11-17 20:50:04 +01:00
Bernd Bestel
887526c727 Squashed commit
Fixed number input min/max amount handling
Only (auto) save valid user inputs
More filters on the stock journal pages
Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131)
Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120)
Render shopping list userfields (closes #1052)
Fixed Focus when adding included recipes (closes #1019)
Order all base objects with NOCASE (closes #1086)
2020-11-17 19:11:02 +01:00
Bernd Bestel
e85b21384f Remove "Allow partial units in stock" product option / unify number input validation messages 2020-11-16 17:10:41 +01:00
Bernd Bestel
95fc6a6faa Fixed RefreshLocaleNumberInput 2020-11-15 23:03:12 +01:00
Bernd Bestel
1bbd7787d8 More proper number formatting 2020-11-15 22:29:47 +01:00
Bernd Bestel
7d7f9bf07a Changed default label of dialog close button 2020-11-15 15:28:50 +01:00
Bernd Bestel
6eef19dfc6 Fixed DataTables state load when there are no settings saved 2020-11-15 15:20:50 +01:00
Bernd Bestel
dd8fa5ff66 Save DataTable states server side 2020-11-15 14:58:35 +01:00
Bernd Bestel
4b342dbd43 Improved number input initial value decimal handling 2020-11-15 14:15:09 +01:00
Bernd Bestel
b267295e86 Fixed product picker workflows 2020-11-14 11:05:36 +01:00
Bernd Bestel
c360cbec4c UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
0a600d3277 Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058) 2020-11-11 22:28:05 +01:00
Bernd Bestel
0245a925b7 Make it possible to hide columns (closes #1058)
Hide new overview page columns by default
2020-11-11 21:11:17 +01:00
Bernd Bestel
b15740bded Fixed dropdown menu in tables overflow 2020-11-11 20:14:16 +01:00
Bernd Bestel
9c81fc890b Simplified "checkboxUncheckedValue" handling 2020-11-11 17:34:37 +01:00
Bernd Bestel
d82fd09fba UI test/review 2020-11-08 15:09:10 +01:00
4lloyd
76cbf796b6 [WIP] Simplified overviews on mobile (#1115)
* Simplified stock overview on mobile.

* Stock table horizontally scrollable

* Use the new mobile views for all pages (except the shopping list page, use the existing special handling there for now)
And add a clear filter button to all pages

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-07 14:53:45 +01:00
kriddles
46e8123477 Allow price up to 4 decimals instead of 2 (#1077)
* Allow price to be 4 decimals

* remove logging

* Finalize custom decimal places by user setting

* Typo

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-20 20:08:54 +02:00
Bernd Bestel
08644f95bf Revert "Excape HTML (where needed, for bootbox) (references #996)"
This reverts commit 0df2590de2.

Revert "Excape shopping list item notes (references #996)"

This reverts commit 0624b0df59.
2020-10-14 22:58:26 +02:00
fipwmaqzufheoxq92ebc
a85998dd40 Improvements (#1049)
* Fixes #1035: Check available amount after filtering by stock_entry_id

* Fixes #1036: Remove stock-related buttons/options from Shopping-list  if FEATURE_FLAG_STOCK is disabled

* Fixes #1010: Repair recipe-picture upload.

* Fixes #958: Disable auto-reload of equipments-page.

* Fix uncaught exception in locationpicker.js

* Fixes #761 and #762: Add "Remove exact amount" for products with tare weight handling and use it for recipe-consumption.

* Fixes #1048: Repair product-group-filter on "Master Data"/Products

* Renamed variable

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-14 17:48:37 +02:00
Bernd Bestel
4b5b7bcb19 Applied formatting rules for by #1000 changed files 2020-09-14 11:20:29 +02:00
fipwmaqzufheoxq92ebc
5056ca9397 Some bug fixes. (#1000)
* Fix #997. Remove datetimepicker if FEATURE_FLAG_STOCK_BEST_BEFORE_DATE is not set.

* datetimepicker: Fix that SetValue did not set the value if "shortcut-checkbox" (e.g. "never expires") was checked.

* Use parent div as clickable area for checkboxes in dropdowns

* Fix nightmode-enable

* Fix possibly undefined variables in CalendarService.php

* Fix undefined variable in GenericEntityApiController.php

* Fix "Trying to access property barcodes on non-object" in productpicker

* Fix undefined "hintId" in shoppinglocationpicker

* Fix undefined variables in locationpicker.blade.php
2020-09-14 11:15:11 +02:00
Bernd Bestel
0df2590de2 Excape HTML (where needed, for bootbox) (references #996) 2020-09-08 18:10:30 +02:00
Maximilian Bosch
34ffdb2b4b Adds a few small frontend fixes (#995)
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c7.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +02:00