From fc8349d30c219ae677ccb57fbaba3774991b090e Mon Sep 17 00:00:00 2001
From: Deniz Duezgoeren <k.duezgoeren@gmail.com>
Date: Fri, 18 Oct 2019 21:49:05 +0200
Subject: [PATCH] Added line break recognition to info table, added new card
 displayed when the general plan is empty

---
 AvH Plan/DataFetcher.swift            | 11 +++++++++--
 AvH Plan/de.lproj/Localizable.strings |  1 +
 AvH Plan/en.lproj/Localizable.strings |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/AvH Plan/DataFetcher.swift b/AvH Plan/DataFetcher.swift
index 041d584..194fd6b 100644
--- a/AvH Plan/DataFetcher.swift	
+++ b/AvH Plan/DataFetcher.swift	
@@ -167,6 +167,7 @@ class DataFetcher {
             foodUrl = "https://djd4rkn355.github.io/food_test.html"
         }
         
+        var isPlanEmpty = true
         var isPersonalEmpty = true
         var personalPlanCount = 0
         var mWebsitePriority = 0
@@ -188,6 +189,7 @@ class DataFetcher {
             let coursePreference = prefs.string(forKey: "courses")
             
             for i in (0..<rows.size()) {
+                isPlanEmpty = false
                 let cols = try rows.get(i).select("th")
                 
                 let mGroup = try cols.get(0).text()
@@ -228,6 +230,11 @@ class DataFetcher {
             
             prefs.set(personalPlanCount, forKey: "personalPlanCount")
             
+            if isPlanEmpty {
+                let emptySubstitution = SubstModel(group: "", course: NSLocalizedString("plan_empty", comment: ""), additional: "", date: "", time: "", room: "", teacher: "", type: "", groupPriority: 0, datePriority: 0, websitePriority: 0)
+                substitutionList.append(emptySubstitution)
+            }
+            
             if isPersonalEmpty {
                 let emptySubstitution = SubstModel(group: "", course: NSLocalizedString("personal_plan_empty", comment: ""), additional: "", date: "", time: "", room: "", teacher: "", type: "", groupPriority: 0, datePriority: 0, websitePriority: 0)
                 personalList.append(emptySubstitution)
@@ -238,10 +245,10 @@ class DataFetcher {
             
             let lastUpdated = try substitutionsDocument.select("h1").get(0).text()
             infoString = "\(NSLocalizedString("last_updated", comment: ""))\(lastUpdated)."
-            let informationTableElements = try substitutionsDocument.select("p")
+            let informationTableElements = try substitutionsDocument.select("h6")
             
             for item in informationTableElements {
-                infoString += "\n\n\(try item.text())"
+                infoString += "\n\n\(try item.html().replacingOccurrences(of: "<br>", with: "\n"))"
             }
             
             // start food fetch
diff --git a/AvH Plan/de.lproj/Localizable.strings b/AvH Plan/de.lproj/Localizable.strings
index 69620bc..5054b3f 100644
--- a/AvH Plan/de.lproj/Localizable.strings	
+++ b/AvH Plan/de.lproj/Localizable.strings	
@@ -65,6 +65,7 @@
 "pinkA" = "Pink (Android)";
 "brownA" = "Braun (Android)";
 
+"plan_empty" = "Der Vertretungsplan ist leer";
 "personal_plan_empty" = "Dein Plan ist leer :(";
 
 // titles
diff --git a/AvH Plan/en.lproj/Localizable.strings b/AvH Plan/en.lproj/Localizable.strings
index 0282c5c..0fb48c6 100644
--- a/AvH Plan/en.lproj/Localizable.strings	
+++ b/AvH Plan/en.lproj/Localizable.strings	
@@ -66,6 +66,7 @@
 "pinkA" = "Pink (Android)";
 "brownA" = "Brown (Android)";
 
+"plan_empty" = "The substitution plan is empty";
 "personal_plan_empty" = "Your plan is empty :(";
 
 // titles