Commit Graph

512 Commits

Author SHA1 Message Date
Tim Gröger 8ecbddc6ca Merge branch 'develop' into feature/pricelist 2021-03-31 15:21:35 +02:00
Tim Gröger f25651a71e [pricelist][receipt] change to table with grid, add search 2021-03-31 15:17:43 +02:00
Ferdinand Thiessen 1b1888d4fd [notification] Disable native is not available 2021-03-31 14:25:58 +02:00
Tim Gröger fb14df0c43 [pricelist] add search 2021-03-31 14:18:55 +02:00
Tim Gröger 6cdc143aa9 [pricelist] some styling on pricelist 2021-03-30 22:32:18 +02:00
Tim Gröger 7089ee4d62 [pricelist][receipt] some more styling 2021-03-30 22:16:12 +02:00
Tim Gröger aadfca2d31 Merge branch 'develop' into feature/pricelist 2021-03-30 20:43:54 +02:00
Ferdinand Thiessen 6891a3ffba [notifications] Make text clickable if link is present 2021-03-30 15:48:15 +02:00
Tim Gröger a7d32d6f7c [pricelist][styling] style up receipts 2021-03-30 15:40:02 +02:00
Ferdinand Thiessen b7aeea0a23 [notifications] Fixed some warnings about inject outside setup() 2021-03-30 15:08:12 +02:00
Tim Gröger 1b478d7680 Merge remote-tracking branch 'origin/develop' into feature/pricelist 2021-03-30 09:59:27 +02:00
Ferdinand Thiessen e564901d2e [core] Remove last vuex references
* src/stores can not be used as quasar thinks it contains vuex
2021-03-30 00:28:18 +02:00
Tim Gröger d185b84823 [pricelist] receipt as list, fixed some merge issues 2021-03-29 22:35:54 +02:00
Tim Gröger 0d044b505a [pricelist] fix some merge issues 2021-03-29 21:29:04 +02:00
Tim Gröger 3eea079871 Merge remote-tracking branch 'origin/develop' into feature/pricelist 2021-03-29 20:22:50 +02:00
Tim Gröger 30e101c364 [pricelist] add Receipts 2021-03-29 12:50:50 +02:00
Ferdinand Thiessen 534d5e3034 [users] Require all needed backend plugins 2021-03-29 07:36:02 +02:00
Ferdinand Thiessen 5731fc9d6d [events] Fixed permissions names 2021-03-29 07:35:37 +02:00
Ferdinand Thiessen 852b1dad03 [notifications] Implemented 2021-03-29 07:35:23 +02:00
Ferdinand Thiessen c362843c8e [pricelist] Same cleanup as in backend 2021-03-28 23:45:35 +02:00
Tim Gröger cf0f453b7c [pricelist][reciepts] first try for reciepts 2021-03-28 20:34:06 +02:00
Tim Gröger 24aec1a98c [pricelist] add Cocktailbuilder 2021-03-28 19:53:04 +02:00
Tim Gröger 8eecb70df0 [pricelist] add public (outer) pricelist withoud login 2021-03-28 16:43:30 +02:00
Tim Gröger 59d6023462 [pricelist] add picture and visiblity for user pricelist 2021-03-28 13:40:41 +02:00
Tim Gröger f58e0c382c [pricelist][fix] new price will be shown after adding it 2021-03-28 13:08:41 +02:00
Tim Gröger 3d20292898 [pricelist][picture] update picture if changed, add no-image.svg 2021-03-28 11:34:36 +02:00
Ferdinand Thiessen e9333c4af4 [events] Fixed tables for Event and JobTypes 2021-03-28 03:11:09 +02:00
Tim Gröger d42c6dcce1 [pricelist] delete drink pictures 2021-03-25 23:14:49 +01:00
Ferdinand Thiessen 8c6036c686 [events] Edit events in calendar (QDialog) 2021-03-25 14:11:54 +01:00
Ferdinand Thiessen f28e597d53 [pricelist] Fixed store issue 2021-03-24 23:14:06 +01:00
Ferdinand Thiessen 61ed9e70e2 [events] Remove invalid ref 2021-03-24 21:50:05 +01:00
Ferdinand Thiessen 27ad9984d4 [core] Minor cleanup / fixed typo 2021-03-24 20:49:54 +01:00
Ferdinand Thiessen fb2febdadd [events] Allow editing events and removing templates 2021-03-24 20:49:35 +01:00
Ferdinand Thiessen b15ff0f5e3 [events] Sync route names 2021-03-24 20:48:45 +01:00
Ferdinand Thiessen 6da4f67d68 [events] Hide edit on old events. Update deps. 2021-03-24 18:15:17 +01:00
Ferdinand Thiessen 6dc70d12f6 [pricelist] Fixed warnings 2021-03-24 17:28:41 +01:00
Ferdinand Thiessen 87139077da [plugin] Error message if loading failed 2021-03-24 17:18:10 +01:00
Tim Gröger 827fb1aadd [pricelist] save and load pictures 2021-03-22 23:18:22 +01:00
Tim Gröger e0046aa7d2 Merge remote-tracking branch 'origin/next' into next 2021-03-22 13:00:22 +01:00
Ferdinand Thiessen f2610b8e84 [events]: Added removal of events + minor optical improvement 2021-03-22 03:31:14 +01:00
Ferdinand Thiessen 851ce3aa8b [plugins] Cleanup, documentation and refactoring of plugin system 2021-03-22 03:26:12 +01:00
Tim Gröger 6097e510c5 [pricelist] simple pricelist 2021-03-21 23:25:22 +01:00
Tim Gröger 14206d9117 [pricelist] improved add drink 2021-03-21 23:02:25 +01:00
Tim Gröger cd937f111c [pricelist][vue3] now it works 2021-03-21 22:07:12 +01:00
Ferdinand Thiessen 218e41e94a [events] Fixed minor optical issues 2021-03-21 16:00:19 +01:00
Ferdinand Thiessen 77bb463e5e [schedule][events] Improved plugin
* Allow creating recurring events
* Fixed AgendaView
2021-03-21 00:58:31 +01:00
Ferdinand Thiessen 17460a8543 [pricelist] Fixed warnings 2021-03-20 22:16:37 +01:00
Ferdinand Thiessen c5a34ce63f [pricelist] Fixed build errors 2021-03-20 18:05:00 +01:00
Ferdinand Thiessen 0b255c481a Sync, improved IsoDateInput, composeable
* Synchronized with backend definitions
* Improved IsoDateInput to support clear (undefined model)
* Split validators to reuse them instead of redefine everywhere
2021-03-20 17:11:51 +01:00
Ferdinand Thiessen b8531ad816 [API] Fixed logout loop 2021-03-20 17:07:42 +01:00
Tim Gröger 73a5de021d [pricelist][break] some cleanup code. update not work 2021-03-20 14:59:55 +01:00
Tim Gröger c3e3a272dc Merge remote-tracking branch 'origin/next' into next 2021-03-20 11:34:40 +01:00
Ferdinand Thiessen 7e7f9c943d [schedule] Improved creating new events 2021-03-20 00:59:44 +01:00
Ferdinand Thiessen a4ce273bb1 [plugin] Fixed setting permission if non are set 2021-03-19 21:34:49 +01:00
Ferdinand Thiessen 575090552f [schedule] Improved calendar view
* Load events on next and prev
* Resize if display is not wide enough
* Fixed permissions
2021-03-19 21:34:28 +01:00
Tim Gröger e2d2a5cf9d [pricelist][pinia] can load data und modify some data 2021-03-19 20:41:21 +01:00
Ferdinand Thiessen 1316c47706 [schedule][quasar2] Fixed overview and eventslot 2021-03-19 18:33:57 +01:00
Ferdinand Thiessen 42b43aa56c [Backend] Exported current API 2021-03-19 18:33:04 +01:00
Ferdinand Thiessen 9469cda4b0 [Dashboard] Fixed display of widgets 2021-03-19 17:36:34 +01:00
Ferdinand Thiessen 51fcc6f9be [Vue3][pinia] Make pricelist compile with vue3, needs more work! 2021-03-19 16:33:27 +01:00
Ferdinand Thiessen 26148f8827 Fixed Agenda 2021-03-19 15:53:41 +01:00
Ferdinand Thiessen dbcd1b2c5f Fixed dependencies, calendar and submodule 2021-03-19 15:53:25 +01:00
Tim Gröger 9b273c2501 [QuasarV2][fix] table-data 2021-03-19 15:48:45 +01:00
Ferdinand Thiessen ccf13eae9c Fixed some recursion issues 2021-03-19 15:48:44 +01:00
Ferdinand Thiessen f18897caf4 [pinia] Remove last vuex parts 2021-03-19 15:48:03 +01:00
Ferdinand Thiessen 98375f81be [pinia] use pinia for pricelist 2021-03-19 15:47:45 +01:00
Ferdinand Thiessen 76978e8883 [Pinia] Use pinia for schedule 2021-03-19 15:47:15 +01:00
Ferdinand Thiessen e347129ba9 [pinia] Fixed handling of multiple calls to logout
* Better handling if we are logged out
2021-03-19 15:46:01 +01:00
Ferdinand Thiessen fd45a46c01 [pinia] Implemented and migrated balance
* Fixed revert of transaction if Conflic occures
2021-03-19 15:44:59 +01:00
Ferdinand Thiessen 4a7ed50281 [Vue3] Fixed usage of plugins 2021-03-19 15:43:36 +01:00
Ferdinand Thiessen bc3c15e3bc Fixed login and login-guard, redirect when offline 2021-03-19 15:43:13 +01:00
Ferdinand Thiessen 0922d468d9 [pinia] Some work on balance store 2021-03-19 15:42:10 +01:00
Ferdinand Thiessen 544d58889b Fixed Sessions 2021-03-19 15:42:10 +01:00
Ferdinand Thiessen 4b198b6472 [pinia] Added Pinia, replaced vuex on user and session 2021-03-19 15:42:10 +01:00
Ferdinand Thiessen 5153f074b5 [Vue3] Fixed pricelist 2021-03-19 15:41:03 +01:00
Ferdinand Thiessen 78427aa5d2 [quasar2] Updated depencies to fix TS Error.
* Fixed some merge issues
  * Fixed minor issues
  * Fixed some warnings
2021-03-19 15:32:22 +01:00
Ferdinand Thiessen d54b398c14 Fixed redirect when offline 2021-03-19 15:31:04 +01:00
Ferdinand Thiessen 50f1f028eb Allow empty value in UserSelector 2021-03-19 15:31:04 +01:00
Ferdinand Thiessen b2d54a046f [Vue3] Fixed usage of plugins 2021-03-19 15:31:03 +01:00
Ferdinand Thiessen 9967296698 Fixed IsoDateInput 2021-03-19 15:30:20 +01:00
Ferdinand Thiessen 17ffd19c5b [Vue3] Fixed loading of current plugins 2021-03-19 15:29:10 +01:00
Ferdinand Thiessen d3d8c1e5f2 [Vue3] Fixed usage of value vs modelValue 2021-03-19 15:28:55 +01:00
Ferdinand Thiessen 34312cca96 [Vue3] Increase warning level for better code quality and fixed issues found. 2021-03-19 15:26:58 +01:00
Ferdinand Thiessen 68fa8fa1a8 [Vue3] Fixed some more error and merge issues 2021-03-19 15:25:22 +01:00
Tim Gröger ee2a6a71eb [Vue3] can now compile 2021-03-19 15:22:37 +01:00
Tim Gröger 8f8da5ffd1 [Vue3] fixed some errors. first steps to reconstruct storage 2021-03-19 15:22:36 +01:00
Ferdinand Thiessen 152b86fb4f [Vue3] Fixed some eslint warnings on template part of vue files 2021-03-19 15:21:21 +01:00
Ferdinand Thiessen 6be07b1001 [Vue3] Fixed Components with components options definied. Fixed config files. 2021-03-19 15:19:52 +01:00
Ferdinand Thiessen 6e50a510eb [Vue3] More fixes in setup and MainUserSettings 2021-03-19 15:19:52 +01:00
Ferdinand Thiessen 897c98c53a [Vue3] Fixed users plugin and some basic stuff, still broken. 2021-03-19 15:19:50 +01:00
Ferdinand Thiessen 117d8256be [Vue3][Quasar2] Migrated some more files. 2021-03-19 15:16:29 +01:00
Ferdinand Thiessen b7db5ea3a6 [Vue3][Quasar2] Fixed boot files and UserSessionStore 2021-03-19 15:14:36 +01:00
Ferdinand Thiessen d147e538d1 [Vue3][Quasar2] Fixed Store and Router, breaking changes in both. 2021-03-19 15:12:37 +01:00
Ferdinand Thiessen 0efe445864 [Vue3][Quasar2] Removed old composition-api, now included in Vue 2021-03-19 15:07:03 +01:00
Ferdinand Thiessen 074fae4da3 [Vue3][Quasar2] Switch to new framework versions 2021-03-19 15:06:58 +01:00
Tim Gröger fb8fc09e8d [pricelist] persistent save visible_columns 2021-03-18 22:33:25 +01:00
Tim Gröger b141c2e5c4 [pricelist] sorting 2021-03-18 21:10:54 +01:00
Tim Gröger 73f16d6cbb [prettier] format with prettier, fixed some pricelist issues 2021-03-18 17:23:57 +01:00
Ferdinand Thiessen caa09a3c2c Added correct definitions file 2021-03-18 13:08:43 +01:00
Tim Gröger 20191be5dc [pricelist] modify, delete and add for ExtraIngredients 2021-03-17 22:49:23 +01:00
Tim Gröger 57f21936c0 [pricelist] finish drinks, can add, modify and delete 2021-03-17 21:36:26 +01:00
Tim Gröger c272c9e4a5 [pricelist] add, modify, delete ingredients of volume 2021-03-16 23:28:38 +01:00
Tim Gröger 7e01ffc507 [pricelist] fixed some computed values, new interfaces 2021-03-16 18:10:37 +01:00
Tim Gröger e4851bd178 [pricelist] fixed prices. first steps for volume 2021-03-15 23:52:40 +01:00
Tim Gröger f6951bdf0b [pricelist] with backend, with errors
price can be add and deleted
2021-03-15 19:57:42 +01:00
Tim Gröger 724ae66dd7 [Pricelist] break no backend new view 2021-03-14 20:37:41 +01:00
Tim Gröger c0d57c6a71 [pricelist] add first commit for plugin (with errors) 2021-02-13 14:11:25 +01:00
Ferdinand Thiessen cd74612e6d Login compat. with backend 2021-02-10 18:09:37 +01:00
Dominik 567e994b71 Fixed minor issues 2021-02-07 20:35:08 +01:00
Dominik af79a30497 Minor Styling Changes to Eventslots and enrollment functionality 2021-02-07 20:16:21 +01:00
Ferdinand Thiessen 7fe59f67f5 Updated definitions for API 2021-02-07 14:42:27 +01:00
Dominik cc47e21a31 Finished Basic Calendar Week Functionality 2021-02-06 00:07:58 +01:00
Dominik e03b2f20ff Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-02-03 20:07:49 +01:00
Ferdinand Thiessen 3283d8a862 improved balance 2021-02-03 13:26:39 +01:00
Ferdinand Thiessen cf2fcc0664 Enable our awsome SVG favicon 2021-02-03 11:13:27 +01:00
Dominik 8dbd6cc5eb Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-02-01 20:18:41 +01:00
Tim Gröger 44b50edf82 [balance] fixed transactions exists only once in store
change icons in circular progress
2021-01-30 11:23:18 +01:00
Dominik 0a2be0e5ff Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-01-30 01:30:35 +01:00
Dominik ac30659aeb Changed Eventtype to optional 2021-01-30 01:30:02 +01:00
Ferdinand Thiessen 008d40b56a Balance Admin: Load all balances 2021-01-29 23:29:38 +01:00
Ferdinand Thiessen c9d8365def Balance Overview: Fixed issue if users are not loaded 2021-01-29 23:29:20 +01:00
Ferdinand Thiessen bda5602e9f Only safe transaction if user owns it 2021-01-29 23:03:29 +01:00
Tim Gröger b4c080fec6 [balance] fixed some typescript errors 2021-01-29 23:00:46 +01:00
Tim Gröger 006e7e4048 [balance] fixed some style 2021-01-29 22:57:10 +01:00
Tim Gröger 059142c506 Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-01-29 22:53:20 +01:00
Tim Gröger 6e406c9b2c fixed bug in IsoDateInput.vue (Props must be function for Object/Array) 2021-01-29 21:59:06 +01:00
Ferdinand Thiessen 3ace1e43da Balance: Filter shown transactions in Overview 2021-01-29 21:05:03 +01:00
Ferdinand Thiessen 2630da3ca4 Balance: Fixed paginated transactions 2021-01-29 20:11:13 +01:00
Ferdinand Thiessen 99d3acaef5 Prettier, committed to prevent conflicts 2021-01-29 20:10:53 +01:00
Tim Gröger 9f53cb6cab New Logo 2021-01-29 16:24:43 +01:00
Tim Gröger feaeb3f4e4 fixed errors, persist save of server (cordova) 2021-01-29 14:06:25 +01:00
Tim Gröger 797f7dd67a add server settings for cordova 2021-01-29 11:51:56 +01:00
Ferdinand Thiessen d396940071 First try with an overview page for the balance 2021-01-29 04:38:20 +01:00
Ferdinand Thiessen 502c40329c Merged balance actions into one page 2021-01-29 04:37:56 +01:00
Ferdinand Thiessen 17e640892a Implemented load Transactions 2021-01-29 02:29:27 +01:00
Ferdinand Thiessen 4ff63b458d Move files 2021-01-29 02:24:48 +01:00
Ferdinand Thiessen 9734dc41a4 scuttlebutt: Hide debit button if user is missing the permission 2021-01-28 23:09:19 +01:00
Ferdinand Thiessen a8ad2f1da5 Code formatting with prettier 2021-01-28 23:08:34 +01:00
Dominik 1dc0603df3 Fixed IsoDateInput and Rulevalidation + CreateEvent Validation 2021-01-28 00:55:17 +01:00
Dominik 663d1d3e4d Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-01-27 22:39:21 +01:00
Dominik 0844b0997d Cleaned CreateEvent 2021-01-27 22:37:12 +01:00
Tim Gröger 69e68b92f9 add function to change session lifetime 2021-01-27 14:04:09 +01:00
Tim Gröger 693b6a11d3 prettier all files 2021-01-27 08:16:44 +01:00
Ferdinand Thiessen 91200f277c Display Balance as fixed 2021-01-27 02:47:19 +01:00
Ferdinand Thiessen a787abdbc0 Improved Transaction design and function 2021-01-27 02:41:11 +01:00
Ferdinand Thiessen e366a25838 Save transactions in store and allow setting and getting a single user from store 2021-01-27 02:41:11 +01:00
Dominik 45bf4aa223 Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-01-26 22:14:18 +01:00
Tim Gröger 51240dd98b fix Bug in IsoDateInput that you can write the date 2021-01-26 21:54:16 +01:00
Dominik aba0046c84 Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next 2021-01-26 20:49:33 +01:00
Dominik 1ccddb228d Minor changes to createEvent 2021-01-26 20:38:46 +01:00