Merge pull request #168 from MaRcR11/167-if-edescription-===-etitle-o…

…nly-display-one-of-them

fixed..

client/src/helpers/scheduleDataFormat.ts

@@ -1,16 +1,14 @@
 import { FormattedScheduleData, ScheduleData } from "../global/types";
 
 const scheduleDataFormat = (scheduleData: ScheduleData[]): FormattedScheduleData[] =>
-  scheduleData.map((e) => ({
-    EndTime: new Date(e.end * 1000),
-    StartTime: new Date(e.start * 1000),
-    Subject: `${e.description.replace("VS", "")} (${e.title})`,
+  scheduleData.map(({ end, start, description, title, remarks, instructor, sroom }) => ({
+    EndTime: new Date(end * 1000),
+    StartTime: new Date(start * 1000),
+    Subject: description === title ? description.replace("VS", "") : `${description.replace("VS", "")} (${title})`,
     Location:
-      e.remarks && !e.remarks.includes("Gruppe") && !e.remarks.includes("Prüfung")
-        ? `${e.remarks} (${e.instructor})`
-        : `Berufsakademie ${e.remarks ? `(${e.remarks})` : ""} (${e.sroom ? e.sroom : "Raum unbekannt"}) (${
-            e.instructor
-          })`,
+      remarks && !remarks.includes("Gruppe") && !remarks.includes("Prüfung")
+        ? `${remarks} (${instructor})`
+        : `Berufsakademie ${remarks ? `(${remarks})` : ""} (${sroom ? sroom : "Raum unbekannt"}) (${instructor})`,
   }));
 
 export default scheduleDataFormat;