447 Commits

Author	SHA1	Message	Date
elweyn	2d2409b65d	Added moderator query to the creationFormular so we can send the right moderator id.	2021-12-02 06:35:35 +01:00
ogerly	06983d786b	remove all console logs	2021-12-01 16:54:57 +01:00
Hannes Heine	4c2e51b517	Update pending creation	2021-12-01 15:43:22 +01:00
elweyn	83af3bc692	Merge last branch in this.	2021-12-01 09:33:26 +01:00
elweyn	c71eccec0e	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 14:59:13 +01:00
elweyn	daeb0ed32c	Change create method from query to mutation.	2021-11-30 14:58:47 +01:00
elweyn	ea9bf54c16	Merge changes from last branch.	2021-11-30 10:13:42 +01:00
elweyn	3a5999ffe5	Change note to memo.	2021-11-30 10:11:28 +01:00
elweyn	ffed004b1a	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 10:10:15 +01:00
elweyn	e2743b979e	Change note to memo.	2021-11-30 10:08:12 +01:00
ogerly	f2c31b7d68	pendingCreationRepository.manager.remove res - fix prettier	2021-11-26 17:49:29 +01:00
ogerly	a618ac678e	Created delete query.	2021-11-26 15:35:21 +01:00
ogerly	e0ad9ab40a	Removed unused imports.	2021-11-26 15:11:46 +01:00
ogerly	18a530b1b1	Withdrew console.logs.	2021-11-26 15:11:03 +01:00
ogerly	48c0b687d6	Query changed to Type PendingCreation, changed the login user search to state user search, adding parameters to PendingCreation object, changed frontend to map the query informations.	2021-11-26 15:05:49 +01:00
Hannes Heine	602dfd64f1	Corected return type for getPendingCreations and corected query.	2021-11-26 12:36:01 +01:00
Hannes Heine	99749eebb2	Apollo first steps getPendingCreations.	2021-11-26 11:28:14 +01:00
ogerly	7169a3635d	adding formatter function on table field creation. Formatter Funktion Object to String	2021-11-26 07:54:08 +01:00
Hannes Heine	927c61ae6e	Merge branch 'master' into admin_pending_creation	2021-11-26 06:52:26 +01:00
Hannes Heine	33c50560d6	creationDate to string and changed the other parameters to int	2021-11-25 12:06:14 +01:00
Hannes Heine	ade3719c33	Changed the response to array of openCreations.	2021-11-25 10:55:12 +01:00
Hannes Heine	4f61af06aa	Withdrew console.logs and changed creationDate type from any to Date.	2021-11-25 10:22:42 +01:00
Hannes Heine	03cb7fa558	Create entry in LoginPendingTaskAdmin table. Save creation in database.	2021-11-25 10:15:34 +01:00
Ulf Gebhardt	897ff2ec6c	comment	2021-11-25 10:02:17 +01:00
Ulf Gebhardt	fddc39efe5	compare with jwt assigne drole on verifyLogin instead of database query again	2021-11-25 09:57:27 +01:00
Hannes Heine	ead93b98fd	Implemented check if creation is allowed.	2021-11-25 09:54:22 +01:00
Ulf Gebhardt	ffc45d5cde	implemented JWT Admin role assignment	2021-11-25 09:52:01 +01:00
Ulf Gebhardt	08f7952ad7	implemened isAdmin	2021-11-25 09:51:38 +01:00
Hannes Heine	1c96161401	Replaced fix dates from pending queries to the calculated dates, withdrew comments.	2021-11-25 09:22:49 +01:00
Ulf Gebhardt	0565ff4d85	reverted createUser process - this is done in another PR	2021-11-25 09:18:37 +01:00
Ulf Gebhardt	31a3837fa5	right check for searchUsers & verifyLogin	2021-11-25 09:01:23 +01:00
Hannes Heine	72f06ede08	Change the date calculation so we get the three last month and next month as string and search with this values.	2021-11-25 08:57:40 +01:00
Ulf Gebhardt	754bd89723	lint	2021-11-25 08:49:47 +01:00
Ulf Gebhardt	77dc54155a	Merge branch 'master' into backend_rights ... # Conflicts: # admin/src/router/guards.js # admin/src/store/store.js # backend/src/graphql/resolver/UserResolver.ts # frontend/src/components/SidebarPlugin/SideBar.vue # frontend/src/graphql/queries.js # frontend/src/routes/guards.js	2021-11-25 08:49:06 +01:00
Hannes Heine	1d612c034e	add users Promis all	2021-11-25 08:08:27 +01:00
Moriz Wahl	2f92aec460	Merge branch 'master' into admin_pending_creation	2021-11-24 21:27:44 +01:00
Moriz Wahl	fd9f6f6d55	fix error caused by merging	2021-11-24 19:49:17 +01:00
Ulf Gebhardt	a3b87c39bf	moved hasRight into Role class ... defined roles better	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	a24c6119a6	check rights on all resolvers	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	44365bccf1	refactored isAuthorized & implemented a new role & rights based system	2021-11-24 19:40:49 +01:00
Ulf Gebhardt	cefc963780	implemented isAdmin from backend	2021-11-24 19:38:42 +01:00
Moriz Wahl	b0ac9b6632	Merge branch 'login_admin_interface' of github.com:gradido/gradido into login_admin_interface	2021-11-24 18:26:38 +01:00
Moriz Wahl	ac7eb303b4	Merge branch 'master' into login_admin_interface	2021-11-24 18:23:31 +01:00
Moriz Wahl	fa717e7046	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 18:03:38 +01:00
Hannes Heine	e67b724058	Calculate the usedAmount with the pending amounts.	2021-11-24 16:08:01 +01:00
Hannes Heine	7c0f1cfc0f	Query Builder to get the pending creation amount of this, last and beforeLast Month	2021-11-24 16:04:40 +01:00
Hannes Heine	91089c6668	Change the result value to the sum value.	2021-11-24 14:46:56 +01:00
Hannes Heine	3cd5ab27db	Change getRawOne to getOne.	2021-11-24 14:40:22 +01:00
Hannes Heine	6a2a4ee649	Change where to >=	2021-11-24 14:37:42 +01:00
Hannes Heine	3ec7960865	Withdrew table name from query builder.	2021-11-24 14:29:07 +01:00