223 Commits

Author SHA1 Message Date
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
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
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
Hannes Heine
9193eeb6a8 Change calls to have query for last three months. 2021-11-24 14:23:32 +01:00
Hannes Heine
735a47779f Prepare complete query 2021-11-24 14:13:22 +01:00
Hannes Heine
e825184b4d Divide the call to get the last 2021-11-24 14:09:59 +01:00
Hannes Heine
7abf1e4c44 Add where date > 2 month 2021-11-24 13:54:37 +01:00
Hannes Heine
53adaf49ee Change Query select 2021-11-24 13:51:45 +01:00
Hannes Heine
16aef73adc Addawait 2021-11-24 13:49:35 +01:00
Hannes Heine
1112b538ea Addawait to get the datas 2021-11-24 13:45:07 +01:00
Hannes Heine
00abbb4413 Add console log of query and id 2021-11-24 13:43:01 +01:00
Hannes Heine
cadec27c9a Reintroduced table name 2021-11-24 13:38:30 +01:00
Hannes Heine
db609d1d78 Change query to query bui. 2021-11-24 13:36:42 +01:00
Hannes Heine
7a27bf52bf Change query to query builder withdrew table name. 2021-11-24 13:35:31 +01:00
Hannes Heine
76b372fb64 Change query to query builder. to get many 2021-11-24 13:34:08 +01:00
Hannes Heine
6a152a8791 Change query to query builder. 2021-11-24 13:31:27 +01:00
Hannes Heine
1a0c0907c4 Corrected. 2021-11-24 13:09:30 +01:00
ogerly
b5baa9d883 Added PendingCreationRepository and added find all pending creations. 2021-11-24 12:29:49 +01:00
ogerly
367122fb1b Search db for transactions. 2021-11-24 12:08:38 +01:00
ogerly
ed5baeccc0 Implementation of the TransactionCreationRepository. 2021-11-24 11:46:12 +01:00
ogerly
c68386be85 Test log. 2021-11-24 11:27:22 +01:00
ogerly
4544d701fb Withdrew Promise 2021-11-24 11:23:21 +01:00
ogerly
0dcceb682e add function getUserCreations 2021-11-24 11:11:48 +01:00
ogerly
048d75f167 Added a default random value for the last three creations. 2021-11-24 11:09:53 +01:00
ogerly
cd12d621fe Methode to get user creations. 2021-11-24 10:51:40 +01:00
ogerly
5f8235c7af Added last todo before sending success. 2021-11-24 10:42:05 +01:00
ogerly
f3cd722e9f User creations logic in comments. 2021-11-24 10:41:34 +01:00
ogerly
c2c03d1032 implementation of createPendingCreation search for the state_user. 2021-11-24 10:40:49 +01:00
87059a6588
Merge branch 'master' into login_hook_elopage 2021-11-24 09:08:14 +01:00
fc054cc2f9
Merge branch 'master' into login_admin_interface 2021-11-24 09:06:56 +01:00
dc1715eea0
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 08:50:54 +01:00
636c4c8df3
implement verifyLogin 2021-11-23 14:05:02 +01:00
ogerly
52aa7e437e Added creation to useradmin model, adding call to apollo in backend. 2021-11-23 13:12:11 +01:00
41d6a7ba45
implemented isAdmin from backend 2021-11-23 12:48:59 +01:00
9ea1edb010
Merge branch 'master' into login_hook_elopage 2021-11-23 12:43:24 +01:00
ogerly
dc1cf1fbcb Implemented the graphql AdminResolver method getUsers. 2021-11-23 12:15:24 +01:00
ogerly
1697c69e8c WiP getUsers for Admin. 2021-11-23 11:20:50 +01:00
elweyn
8479975425 Since we don't make a request to the login_server we need to catch if user email has been activated. 2021-11-23 08:05:52 +01:00
635c7b6e51
Merge branch 'master' into bugfix_coinanimation_update_only_send_for_true 2021-11-22 23:48:53 +01:00
Hannes Heine
ed01bca12b
Update backend/src/graphql/resolver/UserResolver.ts 2021-11-22 23:35:02 +01:00
elweyn
fccc7b4434 Changed the Auto increment so that it is done after the rollback and not in the finally block. 2021-11-22 23:17:11 +01:00