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

Merge branch 'develop' into frontend/timo_neu

Browse Source
This commit is contained in:
Timo Volkmann 2019-05-28 11:36:51 +02:00
commit f2005aec5a
5 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -15,6 +15,11 @@ repositories {
mavenCentral()
}
bootWar{
baseName = 'buga19geocachingbackend'
archiveName 'buga19geocachingbackend.war'
}
dependencies {
compile project('labswp_2019_sose_geocaching_frontend')
//Java Spring

2
labswp_2019_sose_geocaching_frontend/build.gradle
View File

@ -18,6 +18,8 @@ war {
from 'web/' // adds a file-set to the root of the archive
webInf { from 'WEB-INF' } // adds a file-set to the WEB-INF dir.
webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml
baseName = 'buga19geocaching'
archiveName 'buga19geocaching.war'
}
buildDir '../build'

2
labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js
View File

@ -121,7 +121,7 @@ module.exports = function (ctx) {
}
: { // Base URL for API-Calls: PRODUCTION (build)
//API: JSON.stringify('http://localhost:8080'),
API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocachingbackend'),
USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
}
},

6
labswp_2019_sose_geocaching_frontend/frontend/src/pages/Overview.vue
View File

@ -195,11 +195,11 @@ Vue.use(VueLayers);
},
methods: {
matchHeight() {
console.log("matchHeight");
// console.log("matchHeight");
const heightWindow = window.innerHeight;
const heightBar = this.$refs.tabView.$el.clientHeight + document.getElementById('toolbar').clientHeight;
console.log("heightWindow="+heightWindow);
console.log("heightBar="+heightBar);
// console.log("heightWindow="+heightWindow);
// console.log("heightBar="+heightBar);
this.mapHeight = heightWindow - heightBar;
},
async loadData() {

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

@ -9,30 +9,53 @@ import java.util.List;
public interface UserRepository extends CrudRepository<User, Integer> {
User findByEmail(String email);
@Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
// @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
// "FROM user u,\n" +
// " user_info ui,\n" +
// " user_roles ur\n" +
// "WHERE u.id = ui.user_id\n" +
// "AND u.id = ur.user_id\n" +
// "order by ranking_points_sum DESC\n" +
// "LIMIT 10;", nativeQuery = true)
// List<Object[]> getRankingList();
@Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" +
"FROM user u,\n" +
" user_info ui,\n" +
" user_roles ur\n" +
"WHERE u.id = ui.user_id\n" +
"AND u.id = ur.user_id\n" +
"order by ranking_points_sum DESC\n" +
" AND u.id = ur.user_id\n" +
"order by ranking_points_sum DESC, Email\n" +
"LIMIT 10;", nativeQuery = true)
List<Object[]> getRankingList();
// @Query(value = "SELECT Rang\n" +
// "From (\n" +
// "\n" +
// "SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC) AS Rang, Name\n" +
// "FROM (\n" +
// " SELECT DISTINCT u.Email AS Name,\n" +
// " ui.ranking_points_sum AS Ranglistenpunkte\n" +
// " FROM user u,\n" +
// " user_info ui,\n" +
// " user_roles ur\n" +
// " WHERE u.id = ui.user_id\n" +
// " AND u.id = ur.user_id\n" +
// " order by ranking_points_sum DESC) as INR) as RN\n" +
// "WHERE Name = ?1", nativeQuery = true)
// int getRankingPlaceFromUser(String username);
@Query(value = "SELECT Rang\n" +
"From (\n" +
"\n" +
"SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC) AS Rang, Name\n" +
"FROM (\n" +
" SELECT DISTINCT u.Email AS Name,\n" +
" ui.ranking_points_sum AS Ranglistenpunkte\n" +
"From (SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC, Email) AS Rang, Email\n" +
" FROM (SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" +
" FROM user u,\n" +
" user_info ui,\n" +
" user_roles ur\n" +
" WHERE u.id = ui.user_id\n" +
" AND u.id = ur.user_id\n" +
" order by ranking_points_sum DESC) as INR) as RN\n" +
"WHERE Name = ?1", nativeQuery = true)
" order by ranking_points_sum DESC, Email) as INR) as RN\n" +
"WHERE Email = ?1", nativeQuery = true)
int getRankingPlaceFromUser(String username);
@Query(value = "SELECT DISTINCT t.name AS teamname, SUM(ui.ranking_points_sum) AS Ranglistenpunkte\n" +