From 141a7486d28cd3aa8e460ba9dae37cc927a10ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Annika=20Ge=C3=9Fmann?=
<annika.gessmann@student.reutlingen-university.de>
Date: Fri, 17 Jul 2020 11:03:42 +0200
Subject: [PATCH] Group like Cat
---
.../groupManagement/model/Group.java | 28 ++++++-------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
index f7fd5c2..c726c1d 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
@@ -4,32 +4,22 @@ import javax.persistence.*;
import java.sql.Date;
@Entity
-@Table(name = "group")
public class Group {
- private static final int serialVersion = -1230;
-
- @Id
- @GeneratedValue
- @Column(name = "group_id")
private Long id;
- @Column(name = "status")
private String status;
- @Column(name = "erstellDatum")
- private Date datum;
-
+ private Date erstelldatum;
- @Column(name = "modul_id")
- private int modul_id;
+ private int modulid;
protected Group() {
}
- public Group(String status, Date datum, int modul_id) {
- this.datum = datum;
- this.modul_id = modul_id;
+ public Group(String status, Date erstelldatum, int modulid) {
+ this.erstelldatum = erstelldatum;
+ this.modulid = modulid;
this.status = status;
}
@@ -43,19 +33,19 @@ public class Group {
}
public Date getDatum() {
- return datum;
+ return erstelldatum;
}
public void setDatum(Date datum) {
- this.datum = datum;
+ this.erstelldatum = datum;
}
public Integer getModul() {
- return modul_id;
+ return modulid;
}
public void setModul(Integer id) {
- this.modul_id = id;
+ this.modulid = id;
}
public String getStatus() {
--
GitLab