💄 Changed Lecture Item

DHBW-Service/Views/Tabs/LecturePlanItem.swift

@@ -14,30 +14,35 @@ struct LecturePlanItem: View {
     
     var body: some View {
         VStack {
+            HStack {
+                Spacer()
                 VStack {
                     Text(event.value(forKey: "summary") as! String)
                         .font(.title3)
                         .frame(maxWidth: .infinity, alignment: .leading)
+                    Text(event.value(forKey: "descr") as! String)
+                        .bold()
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    Divider()
                     HStack {
                         VStack(alignment: .leading) {
                             Text("When")
                             Text("Where")
+                            Text("Who")
                         }
                         VStack(alignment: .leading) {
-                    Text(getDateAsString(date: event.value(forKey: "startDate") as! Date) )
+                            Text(getDateAndTimeAsString(date: event.value(forKey: "startDate") as! Date)
+                                    + " to "
+                                    + getTimeAsString(date: event.value(forKey: "endDate") as! Date))
+                                .bold()
+                            Text(event.value(forKey: "location") as! String)
                                 .bold()
                             Text(event.value(forKey: "location") as! String)
                                 .bold()
                         }.frame(maxWidth: .infinity, alignment: .leading)
                     }
-        }
+                    Divider()
-        .padding()
+                    HStack {
-        .background(
-            RoundedRectangle(cornerRadius: 10)
-                .fill(Color.gray)
-        )
-            Spacer()
-            Text(event.value(forKey: "summary") as! String)
                         Button(action: {
                             event.setValue(!isHidden, forKey: "isHidden")
                             self.isHidden = !isHidden
@@ -55,15 +60,35 @@ struct LecturePlanItem: View {
                         .cornerRadius(15)
                         Spacer()
                     }
+                }
+                .padding()
+                .background(
+                    RoundedRectangle(cornerRadius: 10)
+                        .fill(Color.gray)
+                )
+                Spacer()
+            }
+            .frame(maxWidth: .infinity)
+            Spacer()
+        }
         .onAppear{
             self.isHidden = event.value(forKey: "isHidden") as! Bool
         }
     }
 }
 
-func getDateAsString(date: Date) -> String {
+func getDateAndTimeAsString(date: Date) -> String {
     let formatter = DateFormatter()
     formatter.dateStyle = .short
+    formatter.timeStyle = .short
+    
+    return formatter.string(from: date)
+}
+
+func getTimeAsString(date: Date) -> String {
+    let formatter = DateFormatter()
+    formatter.timeStyle = .short
+    
     return formatter.string(from: date)
 }