tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
453 Commits 1 Branch 0 Tags 17 MiB
896702b8f8
Commit Graph

245 Commits

Author SHA1 Message Date
rchrist
caa5494840 Merge branch 'develop' into frontend/robin 2019-05-09 13:07:57 +02:00
Maximilian Leopold
525e705bf9 Fixed Create Team 2019-05-09 13:06:41 +02:00
rchrist
4774b6d111 Merge branch 'develop' into frontend/robin 2019-05-08 17:02:59 +02:00
Maximilian Leopold
eb0483af21 Changed hello method 2019-05-08 17:01:11 +02:00
rchrist
31bc540d4f Merge branch 'develop' into frontend/robin 2019-05-08 16:56:20 +02:00
Maximilian Leopold
1173664f93 Fixed personal rankingplace 2019-05-08 16:54:04 +02:00
rchrist
54b98e5f6a fixed merge conflicts 2019-05-08 16:20:57 +02:00
rchrist
80459cd793 implementation of some api calls finished 2019-05-08 16:15:44 +02:00
Maximilian Leopold
1d3bd11331 Changed get my Station POIS Method 2019-05-08 14:19:04 +02:00
Maximilian Leopold
2c7d47e0f0 Fixed Delete Cache Method 2019-05-08 14:04:50 +02:00
Maximilian Leopold
4783f8e7c8 Fixed Team Ranking List Call 2019-05-07 18:41:45 +02:00
Michael
45d84db362 adjusted the categoryIDs again 2019-05-07 17:54:25 +02:00
Michael
d32d8ca3ea adjusted categoryID values for POIS 2019-05-07 17:45:28 +02:00
Maximilian Leopold
51e87c239a Added getTeamOfUser 2019-05-06 15:49:54 +02:00
Maximilian Leopold
ef819e5e54 Usermanagement fixed 2019-05-06 13:53:42 +02:00
Michael
68098b1fff fixed a spelling mistake 2019-05-03 19:18:47 +02:00
Michael
ed3fb3ff0e renamed to getMyStationPOIS 2019-05-03 19:13:21 +02:00
Michael
6ca87f84fc implemented getStationPOIS 2019-05-03 19:10:03 +02:00
Michael
c86ce22d27 renamed the helper class 2019-05-03 18:48:02 +02:00
Michael
3cc9fd5597 added StationPOI helper class 2019-05-03 18:43:09 +02:00
Maximilian Leopold
e78157e2f5 More documentation 2019-05-03 17:06:32 +02:00
Maximilian Leopold
d92d43e63e More Swagger Doku 2019-05-02 20:31:13 +02:00
Maximilian Leopold
5c5adebbc4 Started Swagger Documentation 2019-05-02 19:55:39 +02:00
Maximilian Leopold
22e94a8c1a Merge branch 'frontend/timo' into develop 2019-05-02 19:32:02 +02:00
Maximilian Leopold
742d2b5d66 Startes Swagger Documentation 2019-05-02 19:31:16 +02:00
Michael
a5c630d0d5 more merge fixes... 2019-05-02 13:27:36 +02:00
Michael
2c1f40bc5f fixed more previous merge mistakes... 2019-05-02 12:57:06 +02:00
Michael
800c9d96cd fixed previous merge conflict mistakes 2019-05-02 12:46:37 +02:00
Timo Volkmann
44086c630d fixed register & continue cache 2019-04-30 19:07:18 +02:00
Timo Volkmann
8c647b0b09 changed some configurations for https 2019-04-30 17:09:51 +02:00
Timo Volkmann
9e132b21ef Merge branch 'develop' into frontend/timo; weird merge conflicts 
# Conflicts:
#	.idea/modules.xml
#	src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
 2019-04-30 15:39:50 +02:00
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