From 5946cd3ec0b378adac1e68ea454167261027b56b Mon Sep 17 00:00:00 2001 From: Vladimir Dubovik Date: Thu, 13 Mar 2025 11:13:36 +0300 Subject: [PATCH] One more commit --- Schedule ICTIS/Main/Views/SearchBarView.swift | 4 +++- .../ViewModel/ScheduleViewModel.swift | 19 +++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Schedule ICTIS/Main/Views/SearchBarView.swift b/Schedule ICTIS/Main/Views/SearchBarView.swift index e9aeb92..aac7416 100644 --- a/Schedule ICTIS/Main/Views/SearchBarView.swift +++ b/Schedule ICTIS/Main/Views/SearchBarView.swift @@ -29,7 +29,9 @@ struct SearchBarView: View { .onSubmit { self.isFocused = false if (!text.isEmpty) { - //vm.fetchWeekSchedule(group: text) + vm.searchingGroup = text + vm.updateArrayOfGroups() + vm.fetchWeekSchedule() } self.text = "" } diff --git a/Schedule ICTIS/ViewModel/ScheduleViewModel.swift b/Schedule ICTIS/ViewModel/ScheduleViewModel.swift index 0f09a40..204eb16 100644 --- a/Schedule ICTIS/ViewModel/ScheduleViewModel.swift +++ b/Schedule ICTIS/ViewModel/ScheduleViewModel.swift @@ -11,10 +11,10 @@ import SwiftUICore @MainActor final class ScheduleViewModel: ObservableObject { //MARK: Properties - @Published var nameGroups: [String] = [] @Published var numbersNTMLGroups: [String] = [] @Published var classesGroups: [[ClassInfo]] = [] + @Published var searchingGroup = "" //Schedule @Published var weekScheduleGroup: Table = Table( @@ -35,21 +35,6 @@ final class ScheduleViewModel: ObservableObject { @Published var isLoading: Bool = false @Published var isNewGroup: Bool = false - //Groups - @Published var groups: [Choice] = [] - //VPK - @Published var vpks: [[String]] = [] - @Published var vpkHTML: String = "" - @Published var vpk: String = "" - @Published var weekScheduleVPK: Table = Table( - type: "", - name: "", - week: 0, - group: "", - table: [[]], - link: "" - ) - //MARK: Methods func fetchWeekSchedule(isOtherWeek: Bool = false) { isLoading = true @@ -57,6 +42,7 @@ final class ScheduleViewModel: ObservableObject { do { var updatedClassesGroups: [[ClassInfo]] = Array(repeating: [], count: 6) // 6 дней (пн-сб) + // Если другая неделя, запрашиваем расписание по неделе и номеру группу(в HTML формате) if isOtherWeek { for groupHTML in numbersNTMLGroups { let schedule = try await NetworkManager.shared.getScheduleForOtherWeek(self.week, groupHTML) @@ -197,5 +183,6 @@ final class ScheduleViewModel: ObservableObject { if let nameVPK3 = vpk3, nameVPK3 != "" { self.nameGroups.append(nameVPK3) } + self.nameGroups.append(self.searchingGroup) } }