82 Commits

Author SHA1 Message Date
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
fbb84277bf
Unified form validation handling 2022-03-30 18:00:28 +02:00
Bernd Bestel
81b54182de
Improved form validation handling (closes #1836) 2022-03-26 10:34:00 +01:00
Bernd Bestel
a4b1a80cdc
Fixed meal plan note item edit button tooltip (fixes #1821) 2022-03-14 22:43:07 +01:00
Bernd Bestel
f52b8e11bb
Support camera barcode scanning in recipepicker (references #1562) 2022-02-11 18:18:17 +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
12e5377c40
Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +01:00
Bernd Bestel
49f44d241b
Fixed meal plan edit product entry initial amount 2022-01-23 12:53:21 +01:00
Bernd Bestel
f6c750a1ea
Fixed meal plan calories display (fixes #1757) 2022-01-23 12:43:16 +01: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
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
02d0121f4d
Fixed meal plan note adding 2021-07-15 20:11:49 +02:00
Bernd Bestel
cd05a95a0f
Fix meal plan section title in (some) foreign languages 2021-07-15 20:07:31 +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
71cede74a3
Make it possible to copy meal plan days (closes #573) 2021-07-12 20:44:42 +02:00
Bernd Bestel
866d6647d2
Small meal plan page adjustments 2021-07-12 17:43:30 +02:00
Bernd Bestel
27b46e1abf
Optimized meal plan week navigation 2021-07-11 18:44:04 +02:00
Bernd Bestel
7380175093
Make it possible to mark meal plan entries as done (closes #924) 2021-07-11 18:32:26 +02:00
Bernd Bestel
7ee15946c7
Improved page loading time of /recipes and /mealplan when having a big meal plan (closes #695) 2021-07-10 22:56:39 +02:00
Bernd Bestel
90a0caf1dc
Fixed meal plan recipe servings stock fulfillment checking (fixes #1391) 2021-07-10 12:32:29 +02:00
Bernd Bestel
1459f8c441
Prevent form submit when any combobox-dropdown is open (fixes #1236) 2020-12-31 13:45:14 +01:00
Bernd Bestel
694b78f72a
Optimized GROCY_FEATURE_FLAG_STOCK handling (closes #966) 2020-12-21 20:13:49 +01:00
Bernd Bestel
a5326aa95c
Improve API stock action endpoint response (closes #769) 2020-12-20 14:43:07 +01:00
Bernd Bestel
574d17fa52
General UI review/test 2020-12-19 14:03:28 +01:00
PhyberApex
596a7ccd36
Removing of resize event (#1190)
* Removing of resize event

Hey,

I removed that resize event as it get's thrown every time you scroll on a mobile device. Which prevented me from actually viewing the list view of the calender on mobile devices.

Let me know if you think it is still needed tho!

~Cheers

* Update calendar.js

Now it only get's called once :)

* Update mealplan.js

Same thing here as in calendar.js

* Update calendar.js

Removed redundant variable
2020-12-16 17:26:39 +01:00
Bernd Bestel
4b342dbd43
Improved number input initial value decimal handling 2020-11-15 14:15:09 +01:00
Bernd Bestel
b0b3322266
Also relate the shopping list amount to QU stock 2020-11-13 17:30:57 +01:00
Bernd Bestel
fa3a4ed688
Fixed productamountpicker initial converted amount was undefined 2020-11-12 22:47:00 +01:00
Bernd Bestel
c360cbec4c
UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
68eeb07e5f
Test/review/rework (and hopefully finalized) new price handling 2020-11-10 18:11:33 +01:00
Benoit Anastay
5303952be1
Unit stock name in the mealplan (#1109)
Stock name instead of purchase name
2020-10-31 16:15:26 +01:00
Bernd Bestel
08644f95bf
Revert "Excape HTML (where needed, for bootbox) (references #996)"
This reverts commit 0df2590de27c60c18b7db6e056347bd2aff5a887.

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

This reverts commit 0624b0df594a4353ef25e6b1874565ea52ce7772.
2020-10-14 22:58:26 +02:00
Bernd Bestel
0df2590de2
Excape HTML (where needed, for bootbox) (references #996) 2020-09-08 18:10:30 +02:00
Bernd Bestel
9cea0c77cd
Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
kriddles
e8845fe2e8
Qu factor purchase to stock & Product Barcode Details (#801)
* Puchase add qu_factor_to_stock

* qu_factor_purchase_to_stock for stock edit

* product barcodes with QU and Stores

* remove product barcode tags

* migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content

* Remove unused method

* StockService#GetProductDetails: include stock_value

* productcard: include stock_value

* Add Purchase Factor to Stock Overview

* update demo data with stock qu_factor_purchase_to_stock

* recipes_pos_resolved update

* avg_price and oldest_price in product details

* add average price to product card

* hint for recipe costs not included if not in stock

* Round value and factor_purchas_amount. Include currency for stock value

* Add factor_purchase_amount to product card stock amount

* Allow editing qu_factor_purchase_to_stock for stock entries

* fix update qu_factor_purchase_to_stock for Transfers

* Add barcode to existing product update to add to product_barcodes table

* Add barcode to new product workflow update to add to product_barcodes table

* *** Price now saved as 1 QU to stock in stock tables ***

* remove column product barcode and use product_barcodes

* Allow products to be deactivated instead of deleted

* Embedded barcode and qu-conversion with page reload on change

* Save current product barcode into new product_barcodes table

* Embedded popup for product group add/edit

* barcode scanner added to product barcodes input

* Edit product qu_stock is unavailable after first purchase

* StockOverview: Filters break when columns are reordered so for now just disable colReorder

* view stockoverview.blade: display product_group column

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-17 21:47:33 +02:00
Bernd Bestel
3c4264c3a0
Reload the meal plan after consuming a recipe 2020-02-11 19:24:34 +01:00
Bernd Bestel
49edd011b4
Changelog and small fixes for #545 2020-02-09 21:50:56 +01:00
kriddles
7638254f14
Mealplan - use mealplan recipe_servings when consuming and adding missing recipe ingredients (#545) 2020-02-09 21:43:31 +01:00
Bernd Bestel
5a65f37f4a
Little wording change/fix 2020-02-09 21:03:11 +01:00
Bernd Bestel
540ae2627a
Changelog & small changes for #554 2020-02-09 21:01:29 +01:00
kriddles
2c0f7f0883 Default initial recipe add for mealplan to use recipe's base_servings (#554) 2020-02-09 20:57:25 +01:00
Bernd Bestel
62dae64a88
Make meal plan entries editable (references #545) 2020-02-09 17:15:13 +01:00
Bernd Bestel
e9f55de987
Fixed FullCalendar height was not calculated dynamically (fixes #549) 2020-02-09 15:24:05 +01:00
Bernd Bestel
58cff18b03
Improved the meal plan add-dialogs (closes #540) 2020-02-03 20:04:22 +01:00
Bernd Bestel
f09ba08549
Typo... (references #517) 2020-01-26 18:02:12 +01:00