PGL/Clyde
PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Compare commits

base: PGL:2917d645faecca8b768255fe0410d5347cfd3329
Branches Tags
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
PGL:JalonB
PGL:jalonA
..
compare: PGL:cf0c465248cec23873927a7712efa28a388e8d1b
Branches Tags
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
PGL:JalonB
PGL:jalonA

6 Commits
2917d645fa ... cf0c465248

Author SHA1 Message Date
Wawilski
cf0c465248 Merge remote-tracking branch 'origin/master' into PostMockAndCorrections
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m23s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 32s
Details
2024-04-22 13:31:31 +02:00
LeoMoulin
47eb98da57 Merge pull request 'Cleaning backend' (#181) from e into master
All checks were successful
Build and test backend / Build-backend (push) Successful in 1m22s
Details
deploy to production / deploy-frontend (push) Successful in 33s
Details
deploy to production / deploy-backend (push) Successful in 50s
Details
Build and test FrontEnd / Build-frontend (push) Successful in 30s
Details 
Reviewed-on: #181
 2024-04-22 13:08:35 +02:00
LeoMoulin
eafcf6b265 Cleaning backend
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m20s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 31s
Details
2024-04-22 13:06:33 +02:00
Maxime
85c1282f48 Merge pull request 'master' (#180) from Maxime/Clyde:master into master
All checks were successful
Build and test backend / Build-backend (push) Successful in 1m24s
Details
deploy to production / deploy-frontend (push) Successful in 35s
Details
deploy to production / deploy-backend (push) Successful in 1m7s
Details
Build and test FrontEnd / Build-frontend (push) Successful in 31s
Details 
Reviewed-on: #180
 2024-04-22 11:31:25 +02:00
Bartha Maxime
4d6387ca8b fixed the search input
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m26s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 31s
Details
2024-04-22 11:29:58 +02:00
Bartha Maxime
fa2deca1b9 fix once again the stats and translations 2024-04-22 10:02:45 +02:00
8 changed files with 29 additions and 32 deletions
Show Stats Expand all files Collapse all files

34
backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
View File

@ -15,33 +15,33 @@ import java.util.Map;
public interface StatsRepository extends CrudRepository<Research,Long> {
@Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> viewsByMonths();
@Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> viewsByMonths(long researcherId);
@Query("select new map(to_char(r.releaseDate,'YYYY') as label, sum (r.views) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
Iterable<Map<String ,Integer>> viewsByYears();
Iterable<Map<String ,Integer>> viewsByYears(long researcherId);
@Query("select new map(r.domain as label, sum(r.views) as y) from Research r group by r.domain")
Iterable<Map<String ,Integer>> viewsByTopics();
@Query("select new map(r.domain as label, sum(r.views) as y) from Research r where r.author.id = ?1 group by r.domain")
Iterable<Map<String ,Integer>> viewsByTopics(long researcherId);
@Query("select new map(r.domain as label, count(distinct r.language) as y) from Research r group by r.domain")
Iterable<Map<String ,Integer>> languageByTopics();
@Query("select new map(r.domain as label, count(distinct r.language) as y) from Research r where r.author.id = ?1 group by r.domain")
Iterable<Map<String ,Integer>> languageByTopics(long researcherId);
@Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r.language) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
Iterable<Map<String ,Integer>> languageByYears();
@Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r.language) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate,'YYYY')")
Iterable<Map<String ,Integer>> languageByYears(long researcherId);
@Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r.language) as y) from Research r group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> languageByMonths();
@Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r.language) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> languageByMonths(long researcherId);
@Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
Iterable<Map<String ,Integer>> researchesByYears();
@Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate,'YYYY')")
Iterable<Map<String ,Integer>> researchesByYears(long researcherId);
@Query("select new map(r.domain as label, count(distinct r) as y) from Research r group by r.domain")
Iterable<Map<String ,Integer>> researchesByTopics();
@Query("select new map(r.domain as label, count(distinct r) as y) from Research r where r.author.id = ?1 group by r.domain")
Iterable<Map<String ,Integer>> researchesByTopics(long researcherId);
@Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r) as y) from Research r group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> researchesByMonth();
@Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
Iterable<Map<String ,Integer>> researchesByMonth(long researcherId);
}

18
backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
View File

@ -34,17 +34,17 @@ public class StatisticsService {
ArrayList<Iterable<Map<String,Integer>>> toReturn = new ArrayList<>();
toReturn.add(statsRepo.viewsByYears());
toReturn.add(statsRepo.viewsByMonths());
toReturn.add(statsRepo.viewsByTopics());
toReturn.add(statsRepo.viewsByYears(researcher.getId()));
toReturn.add(statsRepo.viewsByMonths(researcher.getId()));
toReturn.add(statsRepo.viewsByTopics(researcher.getId()));
toReturn.add(statsRepo.researchesByYears());
toReturn.add(statsRepo.researchesByMonth());
toReturn.add(statsRepo.researchesByTopics());
toReturn.add(statsRepo.researchesByYears(researcher.getId()));
toReturn.add(statsRepo.researchesByMonth(researcher.getId()));
toReturn.add(statsRepo.researchesByTopics(researcher.getId()));
toReturn.add(statsRepo.languageByYears());
toReturn.add(statsRepo.languageByMonths());
toReturn.add(statsRepo.languageByTopics());
toReturn.add(statsRepo.languageByYears(researcher.getId()));
toReturn.add(statsRepo.languageByMonths(researcher.getId()));
toReturn.add(statsRepo.languageByTopics(researcher.getId()));
return toReturn;
}
}

2
backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
View File

@ -2,8 +2,6 @@ package ovh.herisson.Clyde.Tables.Inscription;
import jakarta.persistence.*;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import ovh.herisson.Clyde.Tables.Course;
import ovh.herisson.Clyde.Tables.RequestState;
import ovh.herisson.Clyde.Tables.User;

1
backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java
View File

@ -7,7 +7,6 @@ import ovh.herisson.Clyde.Tables.RequestState;
import ovh.herisson.Clyde.Tables.User;
import java.util.Date;
import java.util.Map;
@Entity
public class ScholarshipRequest {

1
backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UnregisterRequest.java
View File

@ -3,7 +3,6 @@ package ovh.herisson.Clyde.Tables.Inscription;
import jakarta.persistence.*;
import ovh.herisson.Clyde.Tables.Curriculum;
import ovh.herisson.Clyde.Tables.RequestState;
import ovh.herisson.Clyde.Tables.User;
import java.util.Date;

1
frontend/src/Apps/ScientificPublications/ListResearches.vue
View File

@ -136,6 +136,7 @@ const emit = defineEmits(["modified"]);
<style scoped>
#researches{
padding-top: 15px;
width: 100%;
height: 100%;
overflow: scroll;

2
frontend/src/Apps/ScientificPublications/ResearchComponent.vue
View File

@ -103,7 +103,7 @@ async function articleClicked(){
</ul>
<div id="downloads" v-if="article.pdfLocation !== null && !manage">
<a :href=downloadPdf() @click.stop="articleClicked" target="_blank">{{i18n("See.Research")}}</a>
<a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')" target="_blank">{{i18n("See.BibTex")}}</a> </div>
<a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')" target="_blank">{{i18n("SeeBibTex")}}</a> </div>
</div>
<div v-if="manage" id="manage">
<div>

2
frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
View File

@ -111,7 +111,7 @@ function update(){
<CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
</div>
</div>
<div id="researches"><list-researches :researchList="researchList"></list-researches></div>
<div id="researches" style="margin-top: -15px"><list-researches :researchList="researchList"></list-researches></div>
</div>
</template>