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:
Michael 2019-06-06 14:08:28 +02:00
commit 8bdef2520e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
View File

@ -24,10 +24,10 @@
<q-card class="q-mb-md" v-for="(user) in rankinglist" :key="user.id"> <q-card class="q-mb-md" v-for="(user) in rankinglist" :key="user.id">
<q-item class="q-pr-sm "> <q-item class="q-pr-sm ">
<q-item-section> <q-item-section>
<q-item-label v-if="username === user.username" @click="gotoProfile"><a class="text-green" <q-item-label v-if="email === user.username" @click="gotoProfile"><a class="text-green"
style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a> style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
</q-item-label> </q-item-label>
<q-item-label v-if="username !== user.username"><a class="text-black" <q-item-label v-if="email !== user.username"><a class="text-black"
style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a> style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
@ -105,7 +105,8 @@
rankinglist: [], rankinglist: [],
teamRankinglist: [], teamRankinglist: [],
username: null, username: null,
deleteUser: null deleteUser: null,
email: null,
} }
}, },
created: function () { created: function () {
@ -114,6 +115,7 @@
this.fetchRankinglist(); this.fetchRankinglist();
this.fetchTeamRankinglist(); this.fetchTeamRankinglist();
this.username = JSON.parse(localStorage.getItem('userToken')).name; this.username = JSON.parse(localStorage.getItem('userToken')).name;
this.email = JSON.parse(localStorage.getItem('userMail'));
}, },
computed: { computed: {
hasAdminState() { hasAdminState() {

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

@ -425,7 +425,7 @@ public class Controller {
for (RankingListHelper rankingListHelper: sendBackUsers) { for (RankingListHelper rankingListHelper: sendBackUsers) {
logger.debug("RankingList Helper " + rankingListHelper.getUsername()); logger.debug("RankingList Helper " + rankingListHelper.getUsername());
logger.debug("User: " + user.getUsername()); logger.debug("User: " + user.getUsername());
if(rankingListHelper.getUsername().equals(user.getUsername())){ if(rankingListHelper.getUsername().equals(user.getEmail())){
userAlreadyInRankingList = true; userAlreadyInRankingList = true;
break; break;
} }
@ -435,7 +435,7 @@ public class Controller {
ResponseEntity singlePlace = getRankingPlace(user.getEmail()); ResponseEntity singlePlace = getRankingPlace(user.getEmail());
if (singlePlace.getStatusCodeValue() == 200) { if (singlePlace.getStatusCodeValue() == 200) {
RankingListHelper rankingListHelper = new RankingListHelper(user.getUsername(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum(), (Integer) getRankingPlace(user.getEmail()).getBody()); RankingListHelper rankingListHelper = new RankingListHelper(user.getEmail(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum(), (Integer) getRankingPlace(user.getEmail()).getBody());
logger.debug(String.valueOf((Integer) singlePlace.getBody())); logger.debug(String.valueOf((Integer) singlePlace.getBody()));
sendBackUsers.add(rankingListHelper); sendBackUsers.add(rankingListHelper);
} }

2
src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
View File

@ -20,7 +20,7 @@ public interface UserRepository extends CrudRepository<User, Integer> {
// "LIMIT 10;", nativeQuery = true) // "LIMIT 10;", nativeQuery = true)
// List<Object[]> getRankingList(); // List<Object[]> getRankingList();
@Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" + @Query(value = "SELECT DISTINCT u.id AS ID, u.email AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" +
"FROM user u,\n" + "FROM user u,\n" +
" user_info ui,\n" + " user_info ui,\n" +
" user_roles ur\n" + " user_roles ur\n" +