backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java

@@ -24,14 +24,13 @@ public class ResearchDTO {
     private Date releaseDate;
     private PaperType paperType;
     private String pdfLocation;
-    private String bibTexLocation;
     private String language;
     private Access access;
     private String domain;
     private String summary;
     private long views;
 
-    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain,String bibTexLocation, String summary, long id,long views) {
+    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String summary, long id,long views) {
         this.title = title;
         this.researcher = researcherDTO;
         this.releaseDate = releaseDate;
@@ -42,7 +41,6 @@ public class ResearchDTO {
         this.domain = domain;
         this.summary = summary;
         this.id = id;
-        this.bibTexLocation = bibTexLocation;
         this.views = views;
     }
 
@@ -50,6 +48,6 @@ public class ResearchDTO {
     public static ResearchDTO construct(Research research){
         return new ResearchDTO(research.getTitle(), ResearcherDTO.construct(research.getAuthor()), research.getReleaseDate(),
                 research.getPaperType(),research.getPdfLocation(),research.getLanguage(),research.getAccess(),
-                research.getDomain(),research.getBibTexLocation(), research.getSummary(), research.getId(), research.getViews());
+                research.getDomain(), research.getSummary(), research.getId(), research.getViews());
     }
 }

frontend/src/Apps/ScientificPublications/FilterComponent.vue

@@ -7,6 +7,7 @@
 <script setup>
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
+let checked = ref([])
 const yearList = ref([])
 const monthList = ref([])
 const accessList = ref([])
@@ -14,44 +15,27 @@ const languageList = ref([])
 const domainList = ref([])
 const paperTypeList = ref([])
 
-const filters = Object.assign({},{
-  year:[],
-  month:[],
-  access:[],
-  language:[],
-  domain:[],
-  paperType:[],
-})
-
 const props = defineProps({
   isOpen: Boolean,
   allArticles: ref([Object])
 });
 
-
-function submit(){
-  emit("modal-close")
-  emit("submit", filters)
-}
-
-
-
 for (let i=0;i< props.allArticles.length;i++) {
   let r = props.allArticles[i];
   let year = r.releaseDate.split("-")[0]
   let month = r.releaseDate.split("-")[1]
 
-  if (!yearList.value.includes(year) && year !== null) yearList.value.push(year);
+  if (!yearList.value.includes(year)) yearList.value.push(year);
 
-  if (!monthList.value.includes(month) && month !== null) monthList.value.push(month);
+  if (!monthList.value.includes(month)) monthList.value.push(month);
 
-  if (!accessList.value.includes(r.access) && r.access !== null ) accessList.value.push(r.access);
+  if (!accessList.value.includes(r.access)) accessList.value.push(r.access);
 
-  if (!languageList.value.includes(r.language) && r.language !== null) languageList.value.push(r.language);
+  if (!languageList.value.includes(r.language)) languageList.value.push(r.language);
 
-  if (!domainList.value.includes(r.domain) && r.domain !== null) domainList.value.push(r.domain);
+  if (!domainList.value.includes(r.domain)) domainList.value.push(r.domain);
 
-  if (!paperTypeList.value.includes(r.paperType) && r.paperType !== null) paperTypeList.value.push(r.paperType);
+  if (!paperTypeList.value.includes(r.paperType)) paperTypeList.value.push(r.paperType);
 }
 function monthToString(month){
 
@@ -84,7 +68,10 @@ function monthToString(month){
       return "unknown"
   }
 }
-const emit = defineEmits(["modal-close", "submit"]);
+
+
+
+const emit = defineEmits(["modal-close"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -96,15 +83,15 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="filters.year"> {{n}} </li> </ul> </div>
+          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="filters.access"> {{n}} </li> </ul> </div>
+          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="filters.language"> {{n}} </li> </ul> </div>
+          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="filters.month"> {{monthToString(n)}} </li> </ul> </div>
+          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="checked"> {{monthToString(n)}} </li> </ul> </div>
-          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="filters.domain"> {{n}} </li> </ul> </div>
+          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="filters.paperType"> {{n}} </li> </ul> </div>
+          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
       </div>
         <div id="submit">
-          <button @click.stop="submit">Submit</button>
+          <button @click.stop="emit('modal-close', 'submit')">Submit</button>
         </div>
       </div>
   </div>

frontend/src/Apps/ScientificPublications/ListResearches.vue

@@ -1,45 +1,28 @@
 <script setup>
-import {ref, watch} from "vue";
+import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchAllResearches} from "@/rest/ScientificPublications/ManageResearch.js";
+import { fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
-const isResearcher = ref(false)
-const filters = ref(null)
-const researchList = ref(await fetchAllResearches())
 
+const researchList = ref(await fetchAllResearches());
+const isResearcher = ref(false)
 
 const props = defineProps({
-  researchList:ref(),
+  filters: ref([""]),
-  manage:Boolean
 });
 
-if (typeof props.researchList !== 'undefined'){
-  researchList.value = props.researchList
-}
-watch(
-    () => props.researchList,
-    (newValue) => {
-      researchList.value = newValue
-    }
-);
-
-
 const openFilter = () => {
   isFilterOpened.value = true;
 };
 const closeFilter = () => {
   isFilterOpened.value = false;
 };
-const submitFilters = (receivedFilters)=>{
+const submitFilters = ()=>{
-  filters.value = receivedFilters
-  console.log(filters.value)
 }
-
-
 const openResearch = (article) => {
   isResearchOpened.value = true;
   articleToDisplay.value = article;
@@ -59,20 +42,7 @@ function searchInList(list, searchInput) {
       retList.push(list[i])
     }
     if (!isResearcher.value && (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1)){
-
+      retList.push(list[i])
-      if (filters.value === null) {
-        retList.push(list[i])
-        continue;
-      }
-      if ( (filters.value.access.length === 0 || filters.value.access.includes(list[i].access))
-          && ( filters.value.domain.length === 0|| filters.value.domain.includes(list[i].domain))
-          && ( filters.value.paperType.length === 0 || filters.value.paperType.includes(list[i].paperType))
-          && ( filters.value.year.length === 0|| filters.value.year.includes(list[i].releaseDate.split("-")[0]))
-          && ( filters.value.month.length === 0|| filters.value.month.includes(list[i].releaseDate.split("-")[1]))
-          && ( filters.value.language.length === 0|| filters.value.language.includes(list[i].language)))
-      {
-        retList.push(list[i])
-      }
     }
   }
   return retList
@@ -98,19 +68,17 @@ function lDistance(s,t){
   return arr[t.length][s.length];
 }
 
-const emit = defineEmits(["modified"]);
-
 </script>
 
 <template>
-<div id="researches">
+<div id="main">
-  <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
+  <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
+  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" ></ArticleComponent>
   <div id="researches">
     <div id="search">
       <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
       <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
-      <button v-if="!isResearcher" id="filterButton" @click="openFilter">  Filters </button>
+      <button id="filterButton" @click="openFilter">  Filters </button>
       <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
       <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
     </div>
@@ -119,8 +87,7 @@ const emit = defineEmits(["modified"]);
         <div class="vl"> {{n.title}}</div>
         <div class="vl"> <a :href="'#/researcher-profile?id=' + n.researcher.id"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</a>
         </div>
-        <a v-if="!manage" @click="openResearch(n)"> MoreInfo  </a>
+        <a @click="openResearch(n)"> MoreInfo  </a></li>
-        <a v-else @click="openResearch(n)"> Modify Research</a></li>
     </ul>
   </div>
 </div>
@@ -128,6 +95,11 @@ const emit = defineEmits(["modified"]);
 
 <style scoped>
 
+#main {
+  height: 100%;
+  width: 100%;
+}
+
 #search{
   width: 100%;
   height: 10%;
@@ -189,7 +161,7 @@ a{
 #unToggledResearchButton{
   align-self: center;
   margin-left: 2px;
-  font-size:16px ;
+  font-size: large;
   color: white;
   background: #2a1981;
   border:2px solid black;

frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue

@@ -5,7 +5,6 @@ import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vu
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
-import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
@@ -17,7 +16,10 @@ let toModify= Object.assign({}, {});
 
 const researcher = ref(await getSelf());
 const researchList = ref(await fetchResearches(researcher.value.id));
-//todo get the filters
+
+const props = defineProps({
+  filters: ref([]),
+});
 
 const openFilter = () => {
   isFilterOpened.value = true;
@@ -88,6 +90,7 @@ async function modifiedResearch(){
 }
 
 
+
 </script>
 
 <template> <div class="body"><div id="main">
@@ -126,7 +129,18 @@ async function modifiedResearch(){
 
 
     </div>
-    <div id="researches"> <ListResearches :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
+    <div id="researches">
+      <div id="search">
+        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+        <button id="filterButton" @click="openFilter">  Filters </button>
+      </div>
+      <ul id="researchUL">
+        <li id="researchLi" v-for="n in searchInList(researchList,input)">
+          <div class="vl"> {{n.title}}</div>
+          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+         <a @click="openResearch(n)"> Modify Research</a></li>
+      </ul>
+    </div>
   </div>
 </div>
 </template>

frontend/src/Apps/ScientificPublications/ResearchComponent.vue

@@ -18,6 +18,7 @@ const props = defineProps({
 });
 
 
+
 function format(date){
   let split = date.split("-")
   let month = split[1]
@@ -90,9 +91,10 @@ function downloadCoAuthors(){
           <li>Views : {{article.views}}</li>
           <li>Access : {{article.access}}</li>
         </ul>
-          <div id="downloads" v-if="article.pdfLocation !== null && !manage">
+          <button @click="console.log(props.article)"> infos</button>
+          <div id="downloads" v-if="article !== null && !manage">
             <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">See Research</a>
-            <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
+            <a :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
         </div>
         <div v-if="manage">
           <div>

frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue

@@ -2,7 +2,8 @@
 
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {uploadPdf,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
+import {uploadPdf, uploadBibTex,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
+import i18n from "@/i18n.js";
 let toPost = Object.assign({}, {});
 
 const props = defineProps({
@@ -15,9 +16,9 @@ async function uploadResearchPdf(pdf){
   const data = await uploadPdf(pdf);
   toPost.pdfLocation = data.url;
 }
-async function uploadBibTex(pdf){
+async function uploadResearchBibTexPdf(pdf){
   const data = await uploadPdf(pdf);
-  toPost.bibTexLocation = data.url;
+  toPost.pdfLocation = data.url;
 }
 
 // Date when sent!!
@@ -113,6 +114,10 @@ onClickOutside(target, ()=>emit('modal-close'))
   margin-top: 9px;
 }
 
+
+#downloads {
+  text-align: end;
+}
 #downloads button {
   align-self: center;
   margin-left: 2px;
@@ -126,6 +131,20 @@ onClickOutside(target, ()=>emit('modal-close'))
   background: rgba(191, 64, 191);
 }
 
+#deleteButton{
+  margin-left: 80%;
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: large;
+  border-radius: 20px;
+  background-color: red;
+}
+
+#deleteButton:hover{
+  background: #ff2d55;
+}
 
 #cancelButton{
   align-self: center;

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

@@ -11,27 +11,39 @@ import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchResearcher, fetchResearches, fetchStats, fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getFile, addView} from "@/rest/ScientificPublications/ManageResearch.js";
-import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
+const filters = ref([]);
 let chart;
 
 const researcherId = window.location.href.split("=")[1]
 
+const props = defineProps({
+  filters: ref([]),
+});
+
+
 
 const researchList = ref(await fetchResearches(researcherId));
 const researcher = ref(await fetchResearcher(researcherId));
 const stats = ref(await fetchStats(researcherId))
 
+const openFilter = () => {
+  isFilterOpened.value = true;
+};
 const closeFilter = () => {
   isFilterOpened.value = false;
 };
 const submitFilters = ()=>{
 }
+const openResearch = (article) => {
+  isResearchOpened.value = true;
+  articleToDisplay.value = article;
+}
 
 const closeResearch = () => {
   isResearchOpened.value =false;
@@ -56,6 +68,37 @@ function downloadCoAuthors(){
   return URL.createObjectURL(blob);
 }
 
+
+function searchInList(list, searchInput) {
+  let retList = []
+  for (let i = 0; i < list.length; i++) {
+    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+      retList.push(list[i])
+    }
+  }
+  return retList
+}
+
+function lDistance(s,t){
+  if (!s.length) return t.length;
+  if (!t.length) return s.length;
+  const arr = [];
+  for (let i = 0; i <= t.length; i++) {
+    arr[i] = [i];
+    for (let j = 1; j <= s.length; j++) {
+      arr[i][j] =
+          i === 0
+              ? j
+              : Math.min(
+                  arr[i - 1][j] + 1,
+                  arr[i][j - 1] + 1,
+                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
+              );
+    }
+  }
+  return arr[t.length][s.length];
+}
+
 const options = reactive({
     backgroundColor:null,
     theme: "light2",
@@ -129,7 +172,18 @@ 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">
+      <div id="search">
+        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+        <button id="filterButton" @click="openFilter">  Filters </button>
+      </div>
+      <ul id="researchUL">
+        <li id="researchLi" v-for="n in searchInList(researchList,input)">
+          <div class="vl"> {{n.title}}</div>
+          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+         <a @click="openResearch(n)"> MoreInfo  </a></li>
+      </ul>
+    </div>
   </div>
 </template>
 
@@ -180,9 +234,66 @@ function update(){
   font-size: large;
 }
 
+#statsPie {
+
+}
+
+#search{
+  width: 100%;
+  height: 10%;
+  display: inline-flex;
+}
+#search-input {
+  margin-left: 25px;
+  width: 75%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  height: 20px;
+  align-self: center;
+}
+
+#filterButton {
+  align-self: center;
+  margin-left: 2px;
+  font-size: xx-large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+}
+#filterButton:hover{
+  background: rgba(191, 64, 191);
+}
+
+
+#researchUL {
+  list-style-type: none;
+  color: white;
+  padding: 12px;
+  margin: 5px;
+  height: 400px;
+  overflow: scroll;
+}
+#researchLi{
+  display: grid;
+  grid-template-columns: auto auto auto;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  text-align: center;
+  text-indent: 7px;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 18px;
+  margin-bottom: 15px;
+}
 a{
   color:#007aff;
   text-decoration: underline;
   cursor: pointer;
 }
+
+.vl {
+  border-right: 2px solid black;
+}
+
 </style>

frontend/src/rest/ScientificPublications/ManageResearch.js

@@ -12,6 +12,13 @@ export async function uploadPdf(file){
 
     return restPostFile("/upload/Research", formData);
 }
+export async function uploadBibTex(file){
+    const formData = new FormData();
+    formData.append("file", file[0]);
+
+    return restPostFile("/upload/Research", formData);
+}
+
 export async function postResearch(data){
     return restPost("/research", data)
 }