Merge pull request 'master' (#180) from Maxime/Clyde:master into master

Reviewed-on: #180

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

@@ -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);
 
 }

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

@@ -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;
     }
 }

frontend/src/Apps/ScientificPublications/ListResearches.vue

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

frontend/src/Apps/ScientificPublications/ResearchComponent.vue

@@ -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>

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

@@ -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>