diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java index b3b6196..713bd4e 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java @@ -9,6 +9,8 @@ package ovh.herisson.Clyde.Tables.ScientificPublications; * ******************************************************/ public enum PaperType { - article, - slides, + Article, + Paper, + Book, + BookChapter, } diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java similarity index 93% rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java rename to backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java index 446214f..2787f23 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java @@ -5,7 +5,7 @@ package ovh.herisson.Clyde.Tables.ScientificPublications; * @author Maxime Bartha * @scope Extension Publications scientifiques * - * Article entity + * Research entity * ******************************************************/ import jakarta.persistence.*; @@ -16,14 +16,13 @@ import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import ovh.herisson.Clyde.Tables.User; import java.util.Date; @Getter @Setter @NoArgsConstructor @AllArgsConstructor @Entity -public class Article { +public class Research { @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java similarity index 93% rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java rename to backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java index 6048abe..5d3b123 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java @@ -22,7 +22,7 @@ import org.hibernate.annotations.OnDeleteAction; @Setter @NoArgsConstructor @AllArgsConstructor -public class ArticleCoAuthors { +public class ResearchCoAuthors { @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "Researcher") @@ -31,5 +31,5 @@ public class ArticleCoAuthors { @ManyToOne(fetch = FetchType.EAGER) @OnDelete(action = OnDeleteAction.CASCADE) @JoinColumn(name = "Article") - private Article article; + private Research research; } diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue index 8b558d6..534fd0c 100644 --- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue +++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue @@ -1,5 +1,5 @@