Ver Fonte

Merge branch 'BaseProject' into Lablanca

Iñigo Valentin há 9 anos atrás
pai
commit
d1be3a1464
2 ficheiros alterados com 16 adições e 5 exclusões
  1. 6 1
      app/ScheduleViewController.swift
  2. 10 4
      app/Sync.swift

+ 6 - 1
app/ScheduleViewController.swift

@@ -126,7 +126,12 @@ class ScheduleViewController: UIViewController, UIGestureRecognizerDelegate {
 			for r in searchResults as [NSManagedObject] {
 				
 				title = r.value(forKey: "title_\(lang)") as! String
-				text = r.value(forKey: "description_\(lang)") as! String
+				if let tx = r.value(forKey: "description_\(lang)"){
+					text = r.value(forKey: "description_\(lang)") as! String
+				}
+				else{
+					text = ""
+				}
 				start = r.value(forKey: "start")! as! NSDate
 				locationId = r.value(forKey: "place")! as! Int
 				row = RowSchedule.init(s: "rowSchedule\(rowcount)", i: rowcount)

+ 10 - 4
app/Sync.swift

@@ -1663,8 +1663,11 @@ class Sync{
 			
 			//Get host
 			str = str.subStr(start : str.indexOf(target : ",\"")! + 1, end : str.length - 1)
-			let host: Int = Int(str.subStr(start : str.indexOf(target : "\"host\":")! + 8, end : str.indexOf(target : ",\"")! - 2))!
-			row.setValue(host, forKey: "host")
+			let strHost: String = str.subStr(start : str.indexOf(target : "\"host\":")! + 8, end : str.indexOf(target : ",\"")! - 2)
+			if (strHost != "ul"){ //From "null"
+				let host: Int = Int(strHost)!
+				row.setValue(host, forKey: "host")
+			}
 			
 			//Get place
 			str = str.subStr(start : str.indexOf(target : ",\"")! + 1, end : str.length - 1)
@@ -1680,8 +1683,11 @@ class Sync{
 			//Get end
 			str = str.subStr(start : str.indexOf(target : ",\"")! + 1, end : str.length - 1)
 			dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
-			let end = dateFormatter.date(from: str.subStr(start : str.indexOf(target : "\"end\":")! + 7, end : str.length - 2))!
-			row.setValue(end, forKey: "end")
+			let strEnd: String =  str.subStr(start : str.indexOf(target : "\"end\":")! + 7, end : str.length - 2)
+			if (strEnd != "ul"){ //From "null"
+				let end = dateFormatter.date(from: strEnd)!
+				row.setValue(end, forKey: "end")
+			}
 			
 			//Save CoreData
 			do {