Maximilian Leopold
|
a3a61dbce0
|
New Rankingplace Method
|
2019-04-30 15:24:56 +02:00 |
|
rchrist
|
247e762289
|
design of profl
|
2019-04-30 14:21:22 +02:00 |
|
Maximilian Leopold
|
5246249bf8
|
Added getCurrentStation
|
2019-04-30 13:46:12 +02:00 |
|
Timo Volkmann
|
865d48cd63
|
reworked cache creation
|
2019-04-30 02:00:38 +02:00 |
|
Timo Volkmann
|
8636443f87
|
fixed merge problems
|
2019-04-29 22:16:18 +02:00 |
|
Timo Volkmann
|
2509d0dc6d
|
Merge branch 'release2' into frontend/timo
# Conflicts:
# src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
|
2019-04-29 21:53:05 +02:00 |
|
Michael
|
e1944ff8d4
|
works???? pls?
|
2019-04-29 20:51:40 +02:00 |
|
rchrist
|
30d90b2a21
|
fixed merge conflicts
|
2019-04-29 19:55:08 +02:00 |
|
rchrist
|
51b9587410
|
started logical implementation of profile and team
|
2019-04-29 19:51:12 +02:00 |
|
Maximilian Leopold
|
565bf98432
|
Added some team methods
|
2019-04-29 19:48:32 +02:00 |
|
Maximilian Leopold
|
9816cdf488
|
Some changes
|
2019-04-29 17:35:50 +02:00 |
|
Michael
|
c53fbaf9d5
|
added table annotation for teaminvite
|
2019-04-29 14:44:38 +02:00 |
|
Michael
|
37af0bb49e
|
changed return body to JSON
|
2019-04-29 11:40:29 +02:00 |
|
Michael
|
d9a76e9783
|
added teamStatus and setTeamStatus API method
|
2019-04-29 11:15:24 +02:00 |
|
Michael
|
ac484e5d0c
|
removed old unneeded methods
|
2019-04-29 11:03:59 +02:00 |
|
Michael
|
ac15616e22
|
added deleteTeamInvite API method
|
2019-04-29 11:02:43 +02:00 |
|
Michael
|
80510eb467
|
improved sendTeamInvite
|
2019-04-29 10:58:09 +02:00 |
|
Michael
|
06e2b54aef
|
added getMyTeamInvites API method
|
2019-04-29 10:51:49 +02:00 |
|
Michael
|
54e488ac28
|
added sendTeamInvite API method and all needed database tables
|
2019-04-29 10:19:52 +02:00 |
|
Michael
|
1a6fb9d35e
|
added a getTeamRankingList API method
|
2019-04-27 20:17:24 +02:00 |
|
Michael
|
50f7204cf5
|
added teamRankingListHelper
|
2019-04-27 20:15:18 +02:00 |
|
Michael
|
c4b3c52fea
|
added getTeamRankingList sql query
|
2019-04-27 20:12:51 +02:00 |
|
Michael
|
35ad020c84
|
added leaveTeam and added some comments
|
2019-04-27 19:48:14 +02:00 |
|
Maximilian Leopold
|
ccba1fcab1
|
Fixed RankingPoints Vue
|
2019-04-26 19:38:58 +02:00 |
|
Michael
|
e81338dd38
|
more bugfixes
|
2019-04-25 14:33:58 +02:00 |
|
Michael
|
5e10ffbe1b
|
fixed a bug
|
2019-04-25 14:26:14 +02:00 |
|
Michael
|
b10226b5b9
|
added joinTeam
|
2019-04-25 14:22:43 +02:00 |
|
Michael
|
a8b0b1bbb4
|
added createTeam
|
2019-04-25 12:40:56 +02:00 |
|
Michael
|
73cd87765f
|
checkStation is a god now
|
2019-04-23 22:53:21 +02:00 |
|
Michael
|
7cfae18552
|
added another error message
|
2019-04-23 15:44:09 +02:00 |
|
Michael
|
b0ee8a75f6
|
removed unneeded roles
|
2019-04-23 13:32:52 +02:00 |
|
Timo Volkmann
|
0ec3dbb0b1
|
qr-code scanner working
|
2019-04-22 22:43:58 +02:00 |
|
Maximilian Leopold
|
f244cf408b
|
Added Query to get Rankingplace of specific User
|
2019-04-22 14:15:47 +02:00 |
|
Maximilian Leopold
|
76c426b252
|
Rankinglist user now isnt dupkicate
|
2019-04-19 22:34:18 +02:00 |
|
Michael
|
deb50cad9c
|
a cache needs atleast 2 stations
|
2019-04-18 14:38:20 +02:00 |
|
Michael
|
48275e09f1
|
fixed a mistake
|
2019-04-18 14:21:10 +02:00 |
|
Michael
|
7d17277c46
|
fixed a bug in CacheConstrutctionUtil
|
2019-04-18 13:50:22 +02:00 |
|
Timo Volkmann
|
e1a10ed23d
|
Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop
|
2019-04-18 13:01:18 +02:00 |
|
Timo Volkmann
|
621978e08d
|
resolved merge conflict
|
2019-04-18 12:59:02 +02:00 |
|
Michael
|
cfd520501e
|
changed response status
|
2019-04-18 12:53:57 +02:00 |
|
Maximilian Leopold
|
5aa9b9537a
|
Merge branch 'backend/max' into develop
|
2019-04-18 12:50:08 +02:00 |
|
Maximilian Leopold
|
496c5fcb6b
|
Ready to deploy
|
2019-04-18 12:48:33 +02:00 |
|
Michael
|
ab119b5006
|
changed the rankingListQuery so it only shows user from the domain geocaching
|
2019-04-18 12:10:24 +02:00 |
|
Michael
|
eaaa1fb2bb
|
fixed some bugs with FinderUtil
|
2019-04-18 00:31:31 +02:00 |
|
Michael
|
22ed8e41e2
|
- implemented the checkAdmin logic
- fixed a mistake in checkStation
- simplified some code and removed old unnecessary comments
|
2019-04-17 18:44:32 +02:00 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Timo Volkmann
|
1c7a34a735
|
Finished „create Cache/Station“
fixed Login and Frontend Usermanagement,
implemented delete Cache,
fixed some problems with store logic and router
|
2019-04-10 00:16:28 +02:00 |
|
Maximilian Leopold
|
1cd7e29fc1
|
Changed HTTP Respnse code
|
2019-04-09 16:54:19 +02:00 |
|
Maximilian Leopold
|
59103da8ac
|
Changed responeentity json param.
|
2019-04-09 16:51:01 +02:00 |
|
Maximilian Leopold
|
283f56e02d
|
There cant be two bearbeitet entities in the db featuring the same cache and user
|
2019-04-09 16:49:17 +02:00 |
|
Maximilian Leopold
|
40661fb689
|
Build fail fixed
|
2019-04-09 16:01:48 +02:00 |
|
Maximilian Leopold
|
d4a73ab436
|
Merged
|
2019-04-09 13:26:35 +02:00 |
|
Maximilian Leopold
|
14049730a4
|
Changed something, that previously worked without the anotation...
|
2019-04-09 13:24:33 +02:00 |
|
Maximilian Leopold
|
5145b203c4
|
Chaged format of RankingList JSON
|
2019-04-08 14:44:13 +02:00 |
|
Maximilian Leopold
|
629145b9c6
|
Komma vergessen
|
2019-04-08 14:14:11 +02:00 |
|
Maximilian Leopold
|
eb15f1fe35
|
Added id to rankinglist
|
2019-04-08 14:13:22 +02:00 |
|
Michael
|
e86aa6adc2
|
removed stationReihenfolge database table, because its not needed
|
2019-04-07 14:06:41 +02:00 |
|
Maximilian Leopold
|
11d2b6165c
|
Merged
|
2019-04-06 16:14:26 +02:00 |
|
Maximilian Leopold
|
d8780744a5
|
Implemented JWT
|
2019-04-06 16:10:01 +02:00 |
|
Maximilian Leopold
|
affd0a20f8
|
MErge Conflict
|
2019-04-06 12:39:45 +02:00 |
|
Maximilian Leopold
|
df13ac10c9
|
Merge branch 'backend/max' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into backend/max
|
2019-04-06 12:36:21 +02:00 |
|
Maximilian Leopold
|
e45bdb0456
|
Slight changes to jwt
|
2019-04-06 12:36:13 +02:00 |
|
Maximilian Leopold
|
9006272bff
|
Merged
|
2019-04-06 12:30:00 +02:00 |
|
Maximilian Leopold
|
99512b4250
|
Implemented Login with JWT
|
2019-04-06 12:29:09 +02:00 |
|
Michael
|
3d78f0bc42
|
merge
|
2019-04-06 11:06:26 +02:00 |
|
Michael
|
99d29ffdec
|
added comments
|
2019-04-05 15:45:53 +02:00 |
|
Michael
|
5bf05616c8
|
reworked checks to work with double instead of Double
|
2019-04-05 15:43:10 +02:00 |
|
Michael
|
6cf52503bc
|
if a mistake occurs during cache creation, all previously created stations related to that cache get deleted now
|
2019-04-05 15:33:31 +02:00 |
|
Michael
|
c0448bda84
|
removed startStation field from cache
|
2019-04-05 15:24:02 +02:00 |
|
Michael
|
148254e610
|
reworked createCache to work with @RequestBody Cache cache
|
2019-04-05 14:51:51 +02:00 |
|
Maximilian Leopold
|
01d860542b
|
Changed some ResponseEntities
|
2019-04-05 11:04:53 +02:00 |
|
Michael
|
67a2defe41
|
made all api methods public
|
2019-04-05 06:13:01 +02:00 |
|
Maximilian Leopold
|
ebd05f2be9
|
Added Repsoneentities for Api Request
|
2019-04-04 16:07:59 +02:00 |
|
Maximilian Leopold
|
9153685c33
|
Merged branches
|
2019-04-04 15:38:05 +02:00 |
|
Michael
|
cc8c337833
|
Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop
|
2019-04-04 15:03:23 +02:00 |
|
Michael
|
072a1f286d
|
reworked methods to return a http response
|
2019-04-04 15:03:01 +02:00 |
|
Michael
|
cd3508090b
|
added getUser API method
|
2019-04-04 12:16:26 +02:00 |
|
Timo Volkmann
|
fee5f4319d
|
Implemented: startCache Call and logout Call, some improvements in controller
|
2019-04-02 23:28:27 +02:00 |
|
Maximilian Leopold
|
61330b3f0b
|
Implemented Backend for getting the RankingList
|
2019-03-31 14:46:39 +02:00 |
|
Michael
|
9b64672a32
|
refactored code
|
2019-03-29 03:41:33 +01:00 |
|
Michael
|
dcce7b31e8
|
added getMyCaches API method
|
2019-03-29 03:09:04 +01:00 |
|
Michael
|
8fad8e427e
|
added deleteCache API and fixed some mistakes in other methods
|
2019-03-29 02:23:25 +01:00 |
|
Michael
|
baab96059b
|
refactored code
|
2019-03-29 01:57:49 +01:00 |
|
Michael
|
38097dad8e
|
added createCache API and reworked some other methods
|
2019-03-29 01:55:05 +01:00 |
|
Michael
|
73681073dd
|
implemented api to get all stations
|
2019-03-28 23:20:36 +01:00 |
|
Michael
|
ddf3bb3a5d
|
added a check whether a given user identified by his token is an admin or not, returns true if yes
|
2019-03-28 23:07:02 +01:00 |
|
Michael
|
2123a9177e
|
implemented api for createStation and fixed some bugs in other methods
|
2019-03-28 20:47:34 +01:00 |
|
Michael
|
0f6ca8a9d9
|
merge conflcits
|
2019-03-28 17:13:21 +01:00 |
|
Michael
|
e0c2f4eda0
|
added @RequestParam i accidently removed earlier
|
2019-03-28 17:11:31 +01:00 |
|
Michael
|
623c1c7ab0
|
logout returns a boolean now which indicates that the logout worked out
|
2019-03-28 15:46:18 +01:00 |
|
Michael
|
5c9cfc08fe
|
removed default parameter
|
2019-03-28 14:53:03 +01:00 |
|
Michael
|
0d6f765367
|
api methods use the user token instead of the userID now, also added a logout apit method
|
2019-03-28 14:51:45 +01:00 |
|
Michael
|
ab1c6899d6
|
a cache has a startStation now
|
2019-03-28 14:50:52 +01:00 |
|
Michael
|
bf7f178d17
|
Merge branch 'develop' into backend/michael
|
2019-03-26 22:33:34 +01:00 |
|
Michael
|
98e501c7b0
|
station has a field for a solution to a possible question now, also added some testdata
|
2019-03-26 22:33:21 +01:00 |
|
Maximilian Leopold
|
6c72dacb20
|
Console now shows executed SQL Statements
|
2019-03-26 14:33:01 +01:00 |
|
Timo Volkmann
|
3527b681be
|
Merge branch 'develop' into frontend/timo
|
2019-03-26 01:53:56 +01:00 |
|
Timo Volkmann
|
ab4a642619
|
login implemented and wired
|
2019-03-25 22:39:41 +01:00 |
|
Michael
|
d5ca26bbd3
|
startCache wurde aufgrund des neuen Attributs station in der bearbeitet-Tabelle überarbeitet
|
2019-03-25 21:51:00 +01:00 |
|
Michael
|
161d29f248
|
bearbeitet tabelle trackt nun die station, bis zu der ein user innerhalb eines caches gekommen ist
|
2019-03-25 21:49:37 +01:00 |
|
Michael
|
8bcaab5bff
|
Station hat nun ein Feld für den code
|
2019-03-25 21:48:13 +01:00 |
|
Michael
|
2db55ac35d
|
stationen haben nun eine reihenfolge innerhalb eines caches
|
2019-03-25 21:47:46 +01:00 |
|
Maximilian Leopold
|
251f5c3f25
|
@RequestBody hinzugefügt beim login
|
2019-03-25 17:22:58 +01:00 |
|
Maximilian Leopold
|
211b7279b5
|
Login is now possible
|
2019-03-25 15:56:45 +01:00 |
|
Michael
|
f031ae9a91
|
mapping is done with /api beforehand now
|
2019-03-25 13:14:54 +01:00 |
|
Maximilian Leopold
|
22bf31bfe8
|
Merge branch 'develop' into backend/max
|
2019-03-24 15:11:19 +01:00 |
|
Maximilian Leopold
|
d377594720
|
Implemented Login
|
2019-03-24 15:09:28 +01:00 |
|
Michael
|
8803f4419a
|
startCache throws an IllegalParameterExcpetion if the method gets called with illegal parameters
|
2019-03-24 06:31:35 +01:00 |
|
Michael
|
920a34920e
|
removed cacheAccesDefinition as a parameter
|
2019-03-24 00:24:04 +01:00 |
|
Michael
|
5b6fe52a04
|
added a isPresent() check and unregistered users are able start a cache now
|
2019-03-24 00:16:01 +01:00 |
|
Michael
|
033682ada1
|
bearbeitet uses objects foreign keys now
|
2019-03-23 19:23:39 +01:00 |
|
Michael
|
99f8a26c9f
|
added a first implementation for /startCache
|
2019-03-23 19:08:02 +01:00 |
|
Michael
|
4ed03b2f3f
|
renamned bearbeitet to Bearbeitet
|
2019-03-23 19:07:40 +01:00 |
|
Michael
|
0ef66cc48f
|
removed unneeded annotations
|
2019-03-23 18:22:42 +01:00 |
|
Michael
|
ffca748e93
|
changed the type of the IDs inside bearbeitet to the correct type
|
2019-03-23 17:49:57 +01:00 |
|
Michael
|
f7ea304d40
|
added remaining entity classes/repositories
|
2019-03-23 17:45:22 +01:00 |
|