One more commit

This commit is contained in:
Vladimir Dubovik
2025-03-13 11:13:36 +03:00
parent 9bfd85ec3d
commit 5946cd3ec0
2 changed files with 6 additions and 17 deletions

View File

@ -29,7 +29,9 @@ struct SearchBarView: View {
.onSubmit { .onSubmit {
self.isFocused = false self.isFocused = false
if (!text.isEmpty) { if (!text.isEmpty) {
//vm.fetchWeekSchedule(group: text) vm.searchingGroup = text
vm.updateArrayOfGroups()
vm.fetchWeekSchedule()
} }
self.text = "" self.text = ""
} }

View File

@ -11,10 +11,10 @@ import SwiftUICore
@MainActor @MainActor
final class ScheduleViewModel: ObservableObject { final class ScheduleViewModel: ObservableObject {
//MARK: Properties //MARK: Properties
@Published var nameGroups: [String] = [] @Published var nameGroups: [String] = []
@Published var numbersNTMLGroups: [String] = [] @Published var numbersNTMLGroups: [String] = []
@Published var classesGroups: [[ClassInfo]] = [] @Published var classesGroups: [[ClassInfo]] = []
@Published var searchingGroup = ""
//Schedule //Schedule
@Published var weekScheduleGroup: Table = Table( @Published var weekScheduleGroup: Table = Table(
@ -35,21 +35,6 @@ final class ScheduleViewModel: ObservableObject {
@Published var isLoading: Bool = false @Published var isLoading: Bool = false
@Published var isNewGroup: 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 //MARK: Methods
func fetchWeekSchedule(isOtherWeek: Bool = false) { func fetchWeekSchedule(isOtherWeek: Bool = false) {
isLoading = true isLoading = true
@ -57,6 +42,7 @@ final class ScheduleViewModel: ObservableObject {
do { do {
var updatedClassesGroups: [[ClassInfo]] = Array(repeating: [], count: 6) // 6 дней (пн-сб) var updatedClassesGroups: [[ClassInfo]] = Array(repeating: [], count: 6) // 6 дней (пн-сб)
// Если другая неделя, запрашиваем расписание по неделе и номеру группу(в HTML формате)
if isOtherWeek { if isOtherWeek {
for groupHTML in numbersNTMLGroups { for groupHTML in numbersNTMLGroups {
let schedule = try await NetworkManager.shared.getScheduleForOtherWeek(self.week, groupHTML) let schedule = try await NetworkManager.shared.getScheduleForOtherWeek(self.week, groupHTML)
@ -197,5 +183,6 @@ final class ScheduleViewModel: ObservableObject {
if let nameVPK3 = vpk3, nameVPK3 != "" { if let nameVPK3 = vpk3, nameVPK3 != "" {
self.nameGroups.append(nameVPK3) self.nameGroups.append(nameVPK3)
} }
self.nameGroups.append(self.searchingGroup)
} }
} }