Commit Graph

214 Commits

Author SHA1 Message Date
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
Bernd Bestel
7498d8f13d
Applied formatting rules for by #986 changed files 2020-09-06 10:10:30 +02:00
fipwmaqzufheoxq92ebc
85a95f1973
Apikeys (#986)
* Add QR-Code for API-Url/Key

* Show only API-Keys for current user

* Allow only admin users to create custom API-Keys

* Use a managed package of qrcode-generator instead of a copy of the JS file

* Reuse existing localization string (API key)

* Center QR-Code in popups

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 10:00:49 +02:00
fipwmaqzufheoxq92ebc
07beee93a9
Add user-field-type "file" (#977)
* Add user-field-type "file"

* Add userfield-type "picture"

* Also limit image height on userfieldsform

* Prevent empty userfields (cause warnings in tables after deleting a file)

* Show files in dialogs

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 20:07:46 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e
Locales: use http-accept-language or cookie (#976)
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 19:11:51 +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
fipwmaqzufheoxq92ebc
b7d1b21f1d
[WIP] Implemented basic permissions (#960)
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-29 12:05:32 +02:00
Marc Ole Bulling
49e5eda30f
Make GetUriParam work with special characters (eg. "&") (#793) 2020-04-23 20:48:48 +02:00
Bernd Bestel
890663bf63
Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING (fixes #537) 2020-02-02 13:01:31 +01:00
Bernd Bestel
8d490351d0
Replaced jQuery UI by Animate.css (better, faster, lighter) 2020-01-28 19:27:18 +01:00
Bernd Bestel
05aceb72ae
Squashed commit
- Only refresh contextual number/datetime info/formatting where needed (closes #513)
- Also refresh correlated stock journal entries on undo (closes #471)
- Prefill "New amount" with the current stock amount on the inventory page (closes #434)
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421)
- Load initial values of the /stockedit form server side to improve loading performance (references #421)
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421)
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453)
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
2020-01-27 19:00:49 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode" 2020-01-26 15:35:01 +01:00
Bernd Bestel
f543a3a472
Fixed and optimized some things related to #421 (& some more cleanup) 2020-01-21 17:30:09 +01:00
Bernd Bestel
d4bec3bd10
Added a "keep screen on" option using NoSleep.js (closes #427) 2020-01-05 10:03:02 +01:00
Bernd Bestel
e133508814
Delay DataTables search by 200ms (references #424) 2019-10-15 19:59:14 +02:00
Bernd Bestel
9e1804252e
Centralize default DataTables init settings (references #424) 2019-10-15 19:38:51 +02:00
Bernd Bestel
2636456461
Show the journal of the product/chore/battery cards in a dialog 2019-09-27 16:54:40 +02:00
Bernd Bestel
21503c26d2
Use properly formatted numbers "everywhere" (partly references #389) 2019-09-26 15:25:30 +02:00
Bernd Bestel
b8f9d09afc
Don't remove products from stock overview on consuming all and the product has a min. stock amount & show it again on undo 2019-09-26 13:55:42 +02:00
Bernd Bestel
3b29110500
Never show close buttons in modal dialogs, this is not needed 2019-09-24 10:24:47 +02:00
Bernd Bestel
f7c4662e2b
Prevent error message spam when navigating away before the page has completely loaded 2019-09-22 09:36:28 +02:00
Bernd Bestel
6e4117526b
Improved productcard "never" date display 2019-09-21 13:40:31 +02:00
Bernd Bestel
d580990b25
Fixed JS errors on the login page 2019-09-21 08:25:32 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +02:00
Bernd Bestel
292b652437
Updated localizations & improved some special and demo translation string data handling 2019-09-20 16:26:50 +02:00
Bernd Bestel
a95d6be4f4
Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
8f798a94d1
Only allow night mode enabled manually or automatically, but not both at the same time (again fixes #71) 2019-09-18 19:43:33 +02:00
Bernd Bestel
991706920f
Fixed that datetimepickers not considered the config.php setting CALENDAR_FIRST_DAY_OF_WEEK (closes #334) 2019-09-18 18:46:07 +02:00
Bernd Bestel
918f84f568
Lazy load all images to increase page load times (references #275) 2019-09-18 13:59:37 +02:00
Bernd Bestel
0c27157db6
Implemented new Userfield type "Select list" (closes #325) 2019-09-17 19:11:06 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +02:00
Bernd Bestel
26ebeec74f
Improved date display of "Track date only"-chores (never show the time part for them) 2019-09-14 13:05:36 +02:00
Bernd Bestel
f9036f0248
Use the summernote editor for product description (closes #288) 2019-08-15 14:35:28 +02:00
Bernd Bestel
6e3407b157
Always show "Track date only" shore execution times without the time part 2019-07-07 19:38:57 +02:00
Bernd Bestel
84e6e253ea
Fixed date "never" display on stock overview page (again closes #296) 2019-07-07 09:04:40 +02:00
Bernd Bestel
c6c10c87e4
Improved date display for dates of today and no time
Instead of the hours since midnight now just "Today" will be shown
2019-07-06 17:19:28 +02:00
Bernd Bestel
df529c3c0b
Show 2999-12-31 as "Never" everywhere (closes #296) 2019-07-06 15:43:54 +02:00
Bernd Bestel
b76e51ba41
Fixed nested recipes costs calculation (fixes #299) 2019-07-06 14:48:46 +02:00
Bernd Bestel
a56f8be19e
Fixed page reloads with unsaved form data and "Auto reload on external changes" enabled (fixes #265) 2019-06-09 08:58:46 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146) 2019-05-07 19:48:14 +02:00
Bernd Bestel
24680154d8
Properly display/round recipe ingredients amounts (closes #230) 2019-05-03 19:36:27 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161) 2019-05-02 20:20:18 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
40cc0ff280
Revert changes in file public/js/grocy.js of commit "Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198)"
This reverts changes in file public/js/grocy.js of commit 12082b52ab.
2019-04-05 18:59:58 +02:00
Bernd Bestel
12082b52ab
Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198) 2019-04-05 18:41:21 +02:00
Bernd Bestel
6de4b120b3
Include changelog as markdown files and show it in the about dialog 2019-03-09 15:54:16 +01:00
Bernd Bestel
9f36a599a4
Changed the about dialog slightly 2019-03-06 19:23:53 +01:00
Bernd Bestel
fcdeda91d9
Show the iCal sharing link instead of directly open it (references #141) 2019-03-05 19:36:14 +01:00
Bernd Bestel
7f2942d414
Also filter gallery items when searching for recipes (references #147) 2019-03-05 19:17:10 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
bb5daa5f8b
Display total cost of recipes based on last purchase prices (closes #128) 2019-03-03 16:33:48 +01:00
Bernd Bestel
01e9e3f5ce
Move about dialog into separate view and add API endpoint for system info 2019-02-09 13:41:40 +01:00
Bernd Bestel
03720940d4
Resize embedded iframes to content height (this should fix #130) 2019-01-26 19:31:41 +01:00
Bernd Bestel
276bc94cc6
More improvements on the REST API (references #139) 2019-01-21 22:13:42 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Chris Forkner
0ce8d706a6 API - A bit more RESTful (#140)
* Restful routes

* Change public/viewjs to match API routes

* Move the GET and POST together. Fixed Typos. PUT for object/user edits.

* Verb-less Generic Entity Interactions

* Create Grocy.Api.Put

* Create Grocy.Api.Delete

* Fix Volatile Slim Error order in routes and adjust to english noun
2019-01-19 08:37:21 +01:00
Bernd Bestel
a3617cffb8
Small different UI improvements
Show the cursor as pointer on stock overview page while hovering the product name cell to highlight that the productcard can be opened
Show a waiting cursor and disable all form inputs while doing background XHR calls to highlight that the user should wait
Place the search field (to search a table) on all pages to the left most place
2018-11-24 19:40:50 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
c61c37e67a
Properly initialize show_clock_in_header user setting control after page reload 2018-11-20 19:34:06 +01:00
Bernd Bestel
f7f90238f2
Show optionally a clock in the header (closes #109) 2018-11-20 19:23:48 +01:00
Bernd Bestel
6f67619784
Finish "shopping list to stock workflow" (closes #98) 2018-11-17 14:50:52 +01:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
4a35477c35
Don't auto reload when database has changed in "fullscreen-card-mode" (fixes #88) 2018-10-13 09:18:16 +02:00
Bernd Bestel
7ba6fc875b
Improve responsive embeds (references #25) 2018-10-03 19:05:00 +02:00
Bernd Bestel
f1fc0ee549
Finished first version of "pictures for products" (references #58) 2018-10-01 20:20:50 +02:00
Bernd Bestel
44cd26ae77
Finish first early version of "pictures for products" (references #58) 2018-09-30 23:22:17 +02:00
Bernd Bestel
ba2d32be60
Fixes for auto night mode (references #71) 2018-09-30 19:31:03 +02:00
Bernd Bestel
7cc09cec67
The last fix (maybe) for auto night mode handling (references #71) 2018-09-30 18:07:28 +02:00
Bernd Bestel
8b815fce93
Finalize auto night mode feature (references #71) 2018-09-30 18:02:59 +02:00
Bernd Bestel
f1c78659be
Optimize user settings 2018-09-30 17:14:04 +02:00
Bernd Bestel
5c79a80f7a
Prepared auto night mode configuration option (references #71) 2018-09-30 13:33:21 +02:00
Bernd Bestel
f451e65278
Also log missing localization found in frontend (only when MODE == dev) 2018-09-30 13:02:07 +02:00
Bernd Bestel
176333df5b
Save night mode enabled state and apply night mode class to <body> on server side (references #71) 2018-09-30 11:25:07 +02:00
Bernd Bestel
d4227d2e41
Make auto reloading the page on external database changes configurable (closes #74) 2018-09-30 11:17:28 +02:00
Bernd Bestel
d11dcb38fe
Only reload the page on external changes when there is no unsaved form data (fixes #73) 2018-09-30 09:57:42 +02:00
Bernd Bestel
cda3dde120
Quick test implementation of night (references #71) 2018-09-29 15:39:16 +02:00
Bernd Bestel
596dc9e36d
Don't show tooltips on touch input devices (this closes #67) 2018-09-27 13:33:03 +02:00
Bernd Bestel
03ca5cd45b
Only detect a change when the new database changed time is actually AFTER the last remembered one (references #59) 2018-09-25 08:44:12 +02:00
Bernd Bestel
2a0ec30bb0
Auto reload the current page when the database has changed and when idling (closes #59) 2018-09-24 13:53:18 +02:00
Bernd Bestel
b01b49d10c
Show generic error message on saving master data (this closes #45) 2018-09-08 09:26:12 +02:00
Bernd Bestel
5a13cb5ffe
Fix jquery timeago update did not really work 2018-08-04 16:54:46 +02:00
Bernd Bestel
f583810d5c
Properly pluralize everything (closes #19) 2018-07-27 19:39:34 +02:00
Bernd Bestel
aa0771877f
Remember sidebar collapsed state 2018-07-14 11:25:19 +02:00
Bernd Bestel
909949a9e1
Expand and highlight parent menu item when active page sidebar navigation item is a sub menu 2018-07-14 10:28:33 +02:00
Bernd Bestel
778191fd11
Fixed all (or most of) the broken stuff after the dependency upgrade party 2018-07-11 19:43:05 +02:00
Bernd Bestel
71701804ea
(More or less) finish upgrading to Bootstrap 4 2018-07-10 20:37:13 +02:00
Bernd Bestel
02b6c3b721
Make it also possible to directly execute/track battery charge cycles and habits from overview pages 2018-05-13 09:38:22 +02:00
Bernd Bestel
7be35a90c1
Small style changes 2018-04-20 15:21:29 +02:00
Bernd Bestel
607a90cccc
Use absolute URLs everywhere, this should fix #3 2018-04-18 19:03:39 +02:00
Bernd Bestel
4656a85732
Added localization support 2018-04-16 19:11:32 +02:00
Bernd Bestel
642f95a3f8
Finalize project reorganization 2018-04-14 11:10:38 +02:00
Bernd Bestel
5a1d21ef31
Reorganize project part 3 2018-04-12 21:13:38 +02:00
Bernd Bestel
7dcd39f82f
Move public stuff into subdirectory 2018-04-11 20:47:03 +02:00