karolina/avh-plan-ios
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setup screen scrolls up when keyboard would block textfields; fixed bug that would prevent a substitution from being shown if it contained a question mark (e.g.: 'INF7?inf999')

Browse Source
This commit is contained in:
Deniz Duezgoeren
2019-10-23 20:20:31 +02:00
parent ede4f0cc0a
commit 1dc8ab5d76
5 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AvH Plan/DataFetcher.swift
+20 -8
View File
@@ -109,17 +109,29 @@ class DataFetcher {
return table.insert(group <- s.group, course <- s.course, additional <- s.additional, date <- s.date, time <- s.time, room <- s.room, teacher <- s.teacher, subst_type <- s.type, group_priority <- Int64(s.groupPriority), date_priority <- Int64(s.datePriority), website_priority <- Int64(s.websitePriority))
}
private func isPersonal(with g: String, and c: String, for s: SubstModel) -> Bool {
if !g.isEmpty && c.isEmpty {
if !s.group.isEmpty {
if g.contains(s.group) || s.group.contains(g) {
private func isPersonal(with group: String, and course: String, for substitution: SubstModel) -> Bool {
if !group.isEmpty && course.isEmpty {
if !substitution.group.isEmpty {
if group.contains(substitution.group) || substitution.group.contains(group) {
return true
}
}
} else if !g.isEmpty && !c.isEmpty {
if s.group != "" && s.course != "" {
if (g.contains(s.group) || s.group.contains(g)) && c.contains(s.course) {
return true
} else if !group.isEmpty && !course.isEmpty {
if substitution.group != "" && substitution.course != "" {
if let qmark = substitution.course.firstIndex(of: "?") {
if group.contains(substitution.group) || substitution.group.contains(group) {
if course.contains(substitution.course[..<qmark]) {
return true
} else if course.contains(substitution.course[substitution.course.index(qmark, offsetBy: 1)...]) {
return true
}
}
} else {
if (group.contains(substitution.group) || substitution.group.contains(group)) && course.contains(substitution.course) {
return true
}
}
}
}