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

Merge branch 'develop' into frontend/kathy

Browse Source
This commit is contained in:
Katharina Will 2019-04-23 15:54:27 +02:00
commit 75798eaaca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,6 +231,9 @@ public class Controller {
int i = cache.getStationen().indexOf(station); int i = cache.getStationen().indexOf(station);
if (i == 0) {
return ResponseEntity.status(400).body("The scanned station isn´t the correct following station");
}
if (cache.getStationen().get(i - 1).equals(aktuelleStation)) { if (cache.getStationen().get(i - 1).equals(aktuelleStation)) {
bearbeitet.setAktuelleStation(station); bearbeitet.setAktuelleStation(station);
@ -398,7 +401,7 @@ public class Controller {
} }
@RequestMapping("/api/hello") @RequestMapping("/api/hello")
public ResponseEntity hello(@RequestParam String name){ public ResponseEntity hello(@RequestParam String name) {
return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name)); return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
} }
} }