tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop

Browse Source
This commit is contained in:
Maximilian Leopold 2019-05-13 14:55:34 +02:00
commit e64b607276
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
View File

@ -706,6 +706,8 @@ public class Controller {
// verlässt team // verlässt team
user_info.setTeam(null); user_info.setTeam(null);
user_infoRepository.save(user_info);
//int i = 0; //int i = 0;
// zählt teammitglieder // zählt teammitglieder
List<User_Info> user_infos = user_infoRepository.findByTeam(team); List<User_Info> user_infos = user_infoRepository.findByTeam(team);
@ -720,8 +722,6 @@ public class Controller {
teamRepository.delete(team); teamRepository.delete(team);
} }
user_infoRepository.save(user_info);
return ResponseEntity.status(200).body("Ok"); return ResponseEntity.status(200).body("Ok");
} }

8
src/main/java/hhn/labsw/bugageocaching/util/CacheConstructionUtil.java
View File

@ -85,12 +85,12 @@ public class CacheConstructionUtil {
return ResponseEntity.status(400).body("station fields can´t be empty"); return ResponseEntity.status(400).body("station fields can´t be empty");
} }
if (station.getLattitude() < -90 || station.getLattitude() > 90) { if (station.getLattitude() < 9 || station.getLattitude() > 10) {
return ResponseEntity.status(400).body("Lattitude has to be between -90 and 90 Degree"); return ResponseEntity.status(400).body("Lattitude has to be between 9 and 10 degrees");
} }
if (station.getLongitude() < -180 || station.getLongitude() > 180) { if (station.getLongitude() < 49 || station.getLongitude() > 50) {
return ResponseEntity.status(400).body("Longitude has to be in the range of -180 to 180 degrees"); return ResponseEntity.status(400).body("Longitude has to be in the range of 49 to 50 degrees");
} }
Random r = new Random(); Random r = new Random();