From 12ff43e970b8bb78af589eafff45092f79540df2 Mon Sep 17 00:00:00 2001 From: Bartha Maxime <231026@umons.ac.be> Date: Mon, 22 Apr 2024 02:27:21 +0200 Subject: [PATCH] fix with the stats and translations --- .../Clyde/EndPoints/MockController.java | 10 +++++----- frontend/public/i18n/EN.txt | 1 + frontend/public/i18n/FR.txt | 1 + .../ResearchComponent.vue | 2 +- .../ResearcherProfile.vue | 19 +++++++++---------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java index 10634d3..b61ff6e 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java +++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java @@ -81,7 +81,7 @@ public class MockController { // user part User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,"admin"); - User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student"); + User joe = new User("Piplo","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student"); User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,"secretary"); User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher"); User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher"); @@ -168,13 +168,13 @@ public class MockController { Research jojoResearch = new Research("Graphs : Advanced Search Algorithms", output, new Date(0), PaperType.Article, "test.pdf", null, "english", Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms",coAuthor); - Research restrictedResearch = new Research("just another Name", output, new Date(1111111111), - PaperType.Article, "restricted", null, "english", - Access.Restricted, "Restricted", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms", new HashSet<>()); + Research restrictedResearch = new Research("the great Constantinople war", output, new Date(1111111111), + PaperType.Article, "restricted", null, "Portuguese", + Access.Restricted, "history", "this is a summary", new HashSet<>()); Research privateResearch = new Research("the great Potato War", output, new Date(), PaperType.Article, "private", null, "english", - Access.Private, "private", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms",null); + Access.Private, "agriculture", "my life is potato",null); researchesService.saveResearch(restrictedResearch); diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt index d8a64b2..7ff1f3c 100644 --- a/frontend/public/i18n/EN.txt +++ b/frontend/public/i18n/EN.txt @@ -287,3 +287,4 @@ cursusprereq=The cursus you selected has some prerequisites ensure that your ext imposecurriculum=Impose a curriculum impose=Impose gotimposed=The selected curriculum has been imposed +DifferentLanguage=Different Languages diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt index 324cda1..27b48a0 100644 --- a/frontend/public/i18n/FR.txt +++ b/frontend/public/i18n/FR.txt @@ -285,3 +285,4 @@ cursusprereq=Le cursus que vous avez selectionné a des prérequis assurez vous imposecurriculum=Imposer un cursusgotimposed impose=Imposer gotimposed=Le cursus selectionné a été imposé +DifferentLanguage=Langues différentes \ No newline at end of file diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue index bdec01f..3034e0d 100644 --- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue +++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue @@ -99,7 +99,7 @@ async function articleClicked(){
  • {{i18n("PaperType")}} : {{article.paperType}}
  • {{i18n("Domain")}} : {{article.domain}}
  • {{i18n("Views")}} : {{article.views}}
    • -
  • {{i18n("Access")}} : {{i18n(article.access)}}
    • +
  • {{i18n("Access")}} : {{i18n("Access."+article.access)}}
    • {{i18n("See.Research")}} diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue index 9ae1d30..ac91fd0 100644 --- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue +++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue @@ -11,8 +11,8 @@ import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPub import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue"; import i18n from "../../i18n.js"; const input = ref(""); -const statsOf = ref(""); -const statsBy = ref(""); +const statsOf = ref(); +const statsBy = ref(); let chart; const researcherId = window.location.href.split("=")[1] @@ -63,16 +63,15 @@ const options = reactive({ function update(){ options.title = { fontColor: "white", - text: statsOf.value + " By "+ statsBy.value, } - let index = (statsOf.value === "views"?0:(statsOf.value === "researches"?3:6)) + (statsBy.value ==="years"?0:(statsBy.value==="months"?1:2)) - if (statsOf.value !== "" && statsBy.value !== "") + let index = (statsOf.value === "Views"?0:(statsOf.value === "Researches"?3:6)) + (statsBy.value ==="Years"?0:(statsBy.value==="Months"?1:2)) + if (typeof statsBy.value !== 'undefined' && typeof statsOf.value !== 'undefined'){ options.data[0].dataPoints = stats.value[index] + options.title.text = i18n(statsOf.value) +" "+ i18n("By") +" " + i18n(statsBy.value); + chart.render(); + } - - options.title.text = i18n(statsOf.value) +" "+ i18n("By") +" " + i18n(statsBy.value); - chart.render(); } @@ -97,7 +96,7 @@ function update(){
    @@ -105,7 +104,7 @@ function update(){