Commit Graph

352 Commits

Author SHA1 Message Date
Maximilian Leopold
0bc1855284 Changed Find User Methods so its matching to the user management 2019-04-17 15:02:42 +02:00
Maximilian Leopold
4b039cb198 Changed format of rankinglist 2019-04-17 14:47:12 +02:00
Maximilian Leopold
b9a975c101 Added helper class for rankinglist 2019-04-17 11:12:13 +02:00
Michael
da75fbb922 fixed a mistake 2019-04-17 08:36:52 +02:00
Michael
26e98f3db4 added a possible way to get the user with a given token 2019-04-17 08:30:22 +02:00
Michael
57f7cd4164 simplified code 2019-04-17 08:07:44 +02:00
Michael
3d10c6a906 added some TODO comments/thoughts to methods 2019-04-17 07:54:56 +02:00
Michael
ca61861961 rewrote sql query cause of new database 2019-04-17 07:54:00 +02:00
Michael
07e8825554 userInfo primamry key consists or user/rankingPointsSum now 2019-04-17 02:40:15 +02:00
Michael
c98894bb08 Merge branch 'develop' into backend/michael 2019-04-17 01:33:21 +02:00
Michael
363640d5b7 deleted login, login is done through the userManagement now 2019-04-17 01:11:09 +02:00
Michael
5845f85c65 checkStation also adds the rankingPoints to the users current score after the cache is done and saves it in user_info 2019-04-17 01:09:19 +02:00
Michael
e235a72c08 added a method to find a user_info by id 2019-04-17 01:07:19 +02:00
Michael
3ec8ac93e9 added User_InfoRepository 2019-04-17 01:06:58 +02:00
Michael
cd6cd061cd - user info uses foreign keys again
- user is the primary key
- added trigger so user_info is automatically generated whenever a user is created/deleted
2019-04-16 22:49:51 +02:00
Maximilian Leopold
090e43e7d7 Merge branch 'backend/michael' into backend/max 2019-04-16 18:12:16 +02:00
Maximilian Leopold
01b1ca190d Made User ID not autogenerated bcs. the database wouldnt work otherwise 2019-04-16 18:11:35 +02:00
Michael
de852f08f4 fixed a bug 2019-04-16 10:21:15 +02:00
Michael
4b16b6a2b1 returns bearbeitet instead of the station now so the frontend is able to see whether the cache is finished or not
added a FinderUtil method for cacheAccesDefinition
2019-04-16 10:17:36 +02:00
Timo Volkmann
377f28a564 first test implementation of qr-code-scanner 2019-04-15 21:45:38 +02:00
Timo Volkmann
03b5476dd2 Merge branch 'frontend/timo' into develop 2019-04-15 18:02:11 +02:00
Timo Volkmann
789c04a8e8 centralized API-URL in quasar.conf.js 2019-04-15 18:00:32 +02:00
Maximilian Leopold
663d3482ee Changed Methods to user FinderUtil 2019-04-15 17:23:34 +02:00
Maximilian Leopold
41c5dc482d Added FinderUtil 2019-04-15 17:06:16 +02:00
Timo Volkmann
8ee93cd9c0 upgraded quasar. removed yarn as package-manager 2019-04-15 17:01:25 +02:00
Timo Volkmann
e1c118fa57 implemented dialog 2019-04-15 16:40:22 +02:00
Maximilian Leopold
81c2b19f09 Merge branch 'backend/michael' into backend/max 2019-04-15 16:25:45 +02:00
Maximilian Leopold
b82bab1f8e Stash 2019-04-15 13:33:29 +02:00
Michael
4f7b8bd4f6 added comments 2019-04-13 22:01:18 +02:00
Michael
d14a4b5d86 modified checkStation 2019-04-13 21:41:24 +02:00
Michael
ff7ddde5ee returns the station as JSON now if everything is OK 2019-04-13 21:34:57 +02:00
Michael
749fcd119a fixed more bugs 2019-04-13 21:24:14 +02:00
Michael
2a5dbd9e72 fixed a bug 2019-04-13 21:18:20 +02:00
Michael
0f856b1ec2 first implementation for checkStation(API method for cache durchführen) 2019-04-13 19:44:47 +02:00
Maximilian Leopold
43caf76471 Implemented public key fetching 2019-04-13 18:08:11 +02:00
Maximilian Leopold
d718446f36 More code cleanup 2019-04-13 14:35:08 +02:00
Maximilian Leopold
0de405167b Merge branch 'develop' into backend/max 2019-04-13 14:28:32 +02:00
Maximilian Leopold
fe0dd478cd Started reorganising backend code 2019-04-13 13:52:42 +02:00
Timo Volkmann
a96e1693ed layout: tabbar scrollable in profile 2019-04-11 12:56:23 +02:00
Timo Volkmann
2fe73aebc9 cleaned repository 2019-04-11 12:17:30 +02:00
Maximilian Leopold
032c4e5d70 Merge branch 'frontend/robin' into develop 2019-04-11 12:01:10 +02:00
Maximilian Leopold
c0d6c1090e Changed iml files 2019-04-11 12:00:56 +02:00
Katharina Will
88505fb038 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-11 11:42:05 +02:00
Michael
16cae0ba90 fixed a bug with deleteCache 2019-04-11 03:20:17 +02:00
Michael
9828f88f7b a cache needs atleast 2 stations now(start and endstation) 2019-04-11 02:56:01 +02:00
Michael
1c602c1dab deleteCache deletes all stations related to taht cache now 2019-04-11 02:54:53 +02:00
rchrist
d810d782cb finished user story angefangene und abgeschlossene Caches ansehen 2019-04-11 00:52:27 +02:00
rchrist
46ac72ffa2 error 404 with api/getMyCaches 2019-04-10 16:52:05 +02:00
rchrist
2d024fc884 merge develop 2019-04-10 15:16:33 +02:00
rchrist
98da1b8094 local file structure changed 2019-04-10 15:11:29 +02:00