From db5386b394c1d4fc5ec85da5abea87cfd02a71f2 Mon Sep 17 00:00:00 2001 From: joss Date: Sat, 14 Jun 2025 14:51:23 +0200 Subject: [PATCH 1/4] Added Room data type --- src/data/Room.java | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/data/Room.java diff --git a/src/data/Room.java b/src/data/Room.java new file mode 100644 index 0000000..f6ea1f6 --- /dev/null +++ b/src/data/Room.java @@ -0,0 +1,27 @@ +package hsmw.jotto5.beleg.data; + +/** + * Bildet einen Veranstaltungsraum ab. + */ +public abstract class Room extends DataObject { + + /** + * Die maximale Personenkapazität des Raumes. + * -1 steht für einen unbegrenzt großen Raum. + */ + @WebField(displayAs = "Platzanzahl") + public final String size; + + /** + * Konstruktor. + * + * @param uid Die zu vergebende UID + * @param displayName Der Anzeigename + * @param lastName Die maximale Personenkapazität oder -1 für unbegrenzt + */ + public Room(String uid, String displayName, int size) { + super(uid, displayName); + this.size = size; + } + +} From 84ef4af2c450da33f321aa2ad4c815d7bf259295 Mon Sep 17 00:00:00 2001 From: joss Date: Sat, 14 Jun 2025 17:35:28 +0200 Subject: [PATCH 2/4] Fixed room --- src/data/Room.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/Room.java b/src/data/Room.java index f6ea1f6..15fa531 100644 --- a/src/data/Room.java +++ b/src/data/Room.java @@ -10,7 +10,7 @@ public abstract class Room extends DataObject { * -1 steht für einen unbegrenzt großen Raum. */ @WebField(displayAs = "Platzanzahl") - public final String size; + public final int size; /** * Konstruktor. From 97a0d799d354dc03799e7526dd64b056ee40da32 Mon Sep 17 00:00:00 2001 From: joss Date: Sat, 14 Jun 2025 14:51:23 +0200 Subject: [PATCH 3/4] Added Room data type --- src/data/Room.java | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/data/Room.java diff --git a/src/data/Room.java b/src/data/Room.java new file mode 100644 index 0000000..9de55ca --- /dev/null +++ b/src/data/Room.java @@ -0,0 +1,27 @@ +package hsmw.jotto5.beleg.data; + +/** + * Bildet einen Veranstaltungsraum ab. + */ +public class Room extends DataObject { + + /** + * Die maximale Personenkapazität des Raumes. + * -1 steht für einen unbegrenzt großen Raum. + */ + @WebField(displayAs = "Platzanzahl") + public final int size; + + /** + * Konstruktor. + * + * @param uid Die zu vergebende UID + * @param displayName Der Anzeigename + * @param lastName Die maximale Personenkapazität oder -1 für unbegrenzt + */ + public Room(String uid, String displayName, int size) { + super(uid, displayName); + this.size = size; + } + +} From b9dc7348ceb6ada7f52d3f39fa8349394db3f7e8 Mon Sep 17 00:00:00 2001 From: joss Date: Sat, 14 Jun 2025 17:56:16 +0200 Subject: [PATCH 4/4] Added dummy rooms --- src/data/Model.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/data/Model.java b/src/data/Model.java index 57a5d84..f320c60 100644 --- a/src/data/Model.java +++ b/src/data/Model.java @@ -56,18 +56,24 @@ public class Model { this.add(new Student("students/ltorva", "Linus", "Torvalds", "0006")); this.add(new Student("students/dritch", "Dennis", "Ritchie", "0007")); - // Gruppen + // Gruppen und Beziehungen this.add(new Group("groups/if24ws2-b", "Softwareentwicklung WiSe 24/25 Seminargruppe 2")); this.add(new Group("groups/admins", "Administrator:innen")); this.add(new Group("groups/alumni", "Alumni")); this.add(new Group("groups/leer", "Leere Gruppe")); - this.addRelation("groups/if24ws2-b", "students/jotto5"); this.addRelation("groups/admins", "students/vnachn"); this.addRelation("groups/admins", "students/ltorva"); this.addRelation("groups/alumni", "students/alovel"); this.addRelation("groups/alumni", "students/aturin"); this.addRelation("groups/alumni", "students/ltorva"); + + // Räume (aus dem Intranet geklaut...) + this.add(new Room("rooms/2-002", "2-002", 137)); + this.add(new Room("rooms/2-102", "2-102", 148)); + this.add(new Room("rooms/5-119", "5-119", 209)); + this.add(new Room("rooms/5-120", "5-120", 209)); + this.add(new Room("rooms/online", "Virtueller Online-Raum", -1)); } /**