mironisegor/Schedule-ICTIS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit

Browse Source
This commit is contained in:
Vladimir Dubovik 2025-04-03 11:10:21 +03:00
parent 99f2bd8a74
commit 14c229175c
30 changed files with 674 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ClassDataModel.xcdatamodeld/ClassDataModel.xcdatamodel/contents
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24C101" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
<entity name="ClassModel" representedClassName=".ClassModel" syncable="YES">
<entity name="CoreDataClassModel" representedClassName=".CoreDataClassModel" syncable="YES">
<attribute name="auditory" optional="YES" attributeType="String"/>
<attribute name="comment" optional="YES" attributeType="String"/>
<attribute name="day" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
@ -12,4 +12,11 @@
<attribute name="starttime" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="subject" optional="YES" attributeType="String"/>
</entity>
<entity name="JsonClassModel" representedClassName="JsonClassModel" syncable="YES" codeGenerationType="class">
<attribute name="day" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="group" optional="YES" attributeType="String"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="time" optional="YES" attributeType="String"/>
<attribute name="week" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
</entity>
</model>

2
Schedule ICTIS.xcodeproj/xcuserdata/g412.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -8,7 +8,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CF2C0E34-74B0-458B-AE66-E61DEB75A958"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Schedule ICTIS/Main/Views/ProfessorAuditoryClassFieldView.swift"

38
Schedule ICTIS/ContentView.swift
View File

@ -9,8 +9,8 @@ import SwiftUI
struct ContentView: View {
@State private var selectedTab: Int = 1
@StateObject var vm = ScheduleViewModel()
@ObservedObject var vm: ScheduleViewModel
@ObservedObject var networkMonitor: NetworkMonitor
var body: some View {
TabView(selection: $selectedTab) {
Text("Tasks")
@ -20,7 +20,7 @@ struct ContentView: View {
}
.tag(0)
MainView(vm: vm)
MainView(vm: vm, networkMonitor: networkMonitor)
.tabItem {
Image(systemName: "house")
Text("Расписание")
@ -36,39 +36,7 @@ struct ContentView: View {
}
.accentColor(Color("blueColor"))
.onAppear {
fillDictForVm()
vm.fetchWeekSchedule()
}
}
func fillDictForVm() {
let group1 = UserDefaults.standard.string(forKey: "group")
let group2 = UserDefaults.standard.string(forKey: "group2")
let group3 = UserDefaults.standard.string(forKey: "group3")
let vpk1 = UserDefaults.standard.string(forKey: "vpk1")
let vpk2 = UserDefaults.standard.string(forKey: "vpk2")
let vpk3 = UserDefaults.standard.string(forKey: "vpk3")
if let nameGroup1 = group1, nameGroup1 != "" {
vm.nameToHtml[nameGroup1] = ""
}
if let nameGroup2 = group2, nameGroup2 != "" {
vm.nameToHtml[nameGroup2] = ""
}
if let nameGroup3 = group3, nameGroup3 != "" {
vm.nameToHtml[nameGroup3] = ""
}
if let nameVpk1 = vpk1, nameVpk1 != "" {
vm.nameToHtml[nameVpk1] = ""
}
if let nameVpk2 = vpk2, nameVpk2 != "" {
vm.nameToHtml[nameVpk2] = ""
}
if let nameVpk3 = vpk3, nameVpk3 != "" {
vm.nameToHtml[nameVpk3] = ""
}
}
}
#Preview {
ContentView()
}

2
Schedule ICTIS/Main/Views/CreatedClassView.swift
View File

@ -8,7 +8,7 @@
import SwiftUI
struct CreatedClassView: View {
@ObservedObject var _class: ClassModel
@ObservedObject var _class: CoreDataClassModel
var provider = ClassProvider.shared
var body: some View {
let existingCopy = try? provider.viewContext.existingObject(with: _class.objectID)

50
Schedule ICTIS/Main/Views/FilterGroupsView.swift Normal file
View File

@ -0,0 +1,50 @@
//
// FilterGroupsView.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 21.03.2025.
//
import SwiftUI
struct FilterGroupsView: View {
@ObservedObject var vm: ScheduleViewModel
var body: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 12) {
ForEach(vm.filteringGroups, id: \.self) { group in
VStack {
Text(group)
.foregroundColor(Color("customGray3"))
.font(.custom("Montserrat-Medium", fixedSize: 14))
.padding(.horizontal, 15)
.padding(.vertical, 7)
}
.background(Color.white)
.overlay (
Group {
if vm.showOnlyChoosenGroup == group {
RoundedRectangle(cornerRadius: 20)
.stroke(Color("blueColor"), lineWidth: 3)
}
}
)
.cornerRadius(20)
.onTapGesture {
vm.showOnlyChoosenGroup = group
}
}
}
.padding(.horizontal)
}
.onAppear {
vm.updateFilteringGroups()
}
.padding(.bottom, 10)
}
}
#Preview {
@Previewable @ObservedObject var vm = ScheduleViewModel()
FilterGroupsView(vm: vm)
}

11
Schedule ICTIS/Main/Views/MainView.swift
View File

@ -11,9 +11,9 @@ struct MainView: View {
@State private var searchText: String = ""
@State private var isShowingMonthSlider: Bool = false
@ObservedObject var vm: ScheduleViewModel
@ObservedObject var networkMonitor: NetworkMonitor
@FocusState private var isFocusedSearchBar: Bool
@State private var isScrolling: Bool = false
var body: some View {
VStack {
SearchBarView(text: $searchText, isFocused: _isFocusedSearchBar, vm: vm, isShowingMonthSlider: $isShowingMonthSlider)
@ -23,11 +23,12 @@ struct MainView: View {
}
}
CurrentDateView()
FilterGroupsView(vm: vm)
if vm.isLoading {
LoadingScheduleView()
}
else {
ScheduleView(vm: vm, isScrolling: $isScrolling)
ScheduleView(vm: vm, networkMonitor: networkMonitor, isScrolling: $isScrolling)
}
}
.alert(isPresented: $vm.isShowingAlertForIncorrectGroup, error: vm.errorInNetwork) { error in
@ -87,12 +88,10 @@ struct MainView: View {
else {
MonthTabView(vm: vm)
.transition(.opacity)
.animation(.easeInOut(duration: 0.25), value: isShowingMonthSlider)
.animation(.linear(duration: 0.5), value: isShowingMonthSlider)
}
}
.padding(.horizontal)
}
}
#Preview {
ContentView()
}

357
Schedule ICTIS/Main/Views/ScheduleView.swift
View File

@ -1,131 +1,254 @@
//
// ScheduleView.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 05.12.2024.
// ктбо2-6
import SwiftUI
import CoreData
struct ScheduleView: View {
@ObservedObject var vm: ScheduleViewModel
@FetchRequest(fetchRequest: ClassModel.all()) private var classes // Делаем запрос в CoreData и получаем список сохраненных пар
@State private var selectedClass: ClassModel? = nil
@ObservedObject var networkMonitor: NetworkMonitor
@FetchRequest(fetchRequest: CoreDataClassModel.all()) private var classes // Список пар добавленных пользователем
@FetchRequest(fetchRequest: JsonClassModel.all()) private var subjects // Список пар сохраненных в CoreData
@State private var selectedClass: CoreDataClassModel? = nil
@State private var lastOffset: CGFloat = 0
@State private var scrollTimer: Timer? = nil
@State private var isShowingMyPairs = false
@Binding var isScrolling: Bool
var provider = ClassProvider.shared
var body: some View {
if vm.isLoading {
LoadingScheduleView()
}
else {
if vm.errorInNetwork != .invalidResponse {
ZStack (alignment: .top) {
ScrollView(.vertical, showsIndicators: false) {
VStack (spacing: 30) {
VStack (alignment: .leading, spacing: 10) {
ForEach(0..<vm.classesGroups.count, id: \.self) { dayIndex in
if dayIndex == vm.selectedIndex {
ForEach(vm.classesGroups[dayIndex]) { info in
VStack (alignment: .trailing) {
Text(info.group)
.font(.custom("Montserrat-Regular", fixedSize: 11))
.foregroundColor(Color("grayForNameGroup"))
HStack(spacing: 15) {
VStack {
Text(convertTimeString(info.time)[0])
.font(.custom("Montserrat-Regular", fixedSize: 15))
.padding(.bottom, 1)
Text(convertTimeString(info.time)[1])
.font(.custom("Montserrat-Regular", fixedSize: 15))
.padding(.top, 1)
}
.frame(width: 48)
.padding(.top, 7)
.padding(.bottom, 7)
.padding(.leading, 10)
Rectangle()
.frame(width: 2)
.frame(maxHeight: UIScreen.main.bounds.height - 18)
.padding(.top, 7)
.padding(.bottom, 7)
.foregroundColor(getColorForClass(info.subject))
Text(info.subject)
.font(.custom("Montserrat-Medium", fixedSize: 16))
.lineSpacing(3)
.padding(.top, 9)
.padding(.bottom, 9)
Spacer()
}
.frame(maxWidth: UIScreen.main.bounds.width - 40, maxHeight: 230)
.background(Color.white)
.cornerRadius(20)
.shadow(color: .black.opacity(0.25), radius: 4, x: 2, y: 2)
}
}
}
}
}
if classes.contains(where: { daysAreEqual($0.day, vm.selectedDay) }) {
VStack(alignment: .leading, spacing: 20) {
Text("Мои пары")
.font(.custom("Montserrat-Bold", fixedSize: 20))
ForEach(classes) { _class in
if daysAreEqual(_class.day, vm.selectedDay) {
CreatedClassView(_class: _class)
.onTapGesture {
selectedClass = _class
}
}
}
}
}
}
.frame(width: UIScreen.main.bounds.width)
.padding(.bottom, 100)
.padding(.top, 10)
.background(GeometryReader { geometry in
Color.clear.preference(key: ViewOffsetKey.self, value: geometry.frame(in: .global).minY)
})
}
.onPreferenceChange(ViewOffsetKey.self) { offset in
if offset != lastOffset {
// Скролл происходит
isScrolling = true
// Останавливаем предыдущий таймер
scrollTimer?.invalidate()
// Запускаем новый таймер
scrollTimer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: false) { _ in
// Скролл остановился
isScrolling = false
}
}
lastOffset = offset
}
.onDisappear {
scrollTimer?.invalidate()
}
VStack {
LinearGradient(gradient: Gradient(colors: [Color("background").opacity(0.95), Color.white.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
}
.frame(width: UIScreen.main.bounds.width, height: 15)
}
//Sheet будет открываться, когда selectedClass будет становиться не nil
.sheet(item: $selectedClass,
onDismiss: {
selectedClass = nil
},
content: { _class in
CreateEditClassView(vm: .init(provider: provider, _class: _class), day: vm.selectedDay)
})
private var hasSubjectsToShow: Bool {
subjects.contains { subject in
subject.week == vm.week
}
}
private var hasClassesToShow: Bool {
classes.contains { _class in
_class.day == vm.selectedDay
}
}
var body: some View {
ZStack(alignment: .top) {
if networkMonitor.isConnected {
onlineContent
} else {
offlineContent
}
else {
gradientOverlay
}
.onAppear {
deleteClassesFormCoreDataIfMonday()
if networkMonitor.isConnected {
checkSavingOncePerDay()
}
}
.sheet(item: $selectedClass, onDismiss: { selectedClass = nil }) { _class in
CreateEditClassView(vm: .init(provider: provider, _class: _class), day: vm.selectedDay)
}
}
// Онлайн-контент (с интернетом)
private var onlineContent: some View {
Group {
if vm.errorInNetwork == .timeout {
NetworkErrorView()
} else if vm.isLoading {
LoadingScheduleView()
} else if vm.errorInNetwork != .invalidResponse {
scheduleScrollView(isOnline: true)
} else {
NoScheduleView()
}
}
.onAppear {
if vm.classesGroups.isEmpty {
vm.fetchWeekSchedule()
}
}
}
// Оффлайн-контент (без интернета)
private var offlineContent: some View {
scheduleScrollView(isOnline: false)
}
// Общий ScrollView для расписания
private func scheduleScrollView(isOnline: Bool) -> some View {
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 30) {
subjectsSection(isOnline: isOnline)
myPairsSection
}
.frame(width: UIScreen.main.bounds.width)
.padding(.bottom, 100)
.padding(.top, 10)
.background(GeometryReader { geometry in
Color.clear.preference(key: ViewOffsetKey.self, value: geometry.frame(in: .global).minY)
})
}
.onPreferenceChange(ViewOffsetKey.self) { offset in
if offset != lastOffset {
isScrolling = true
scrollTimer?.invalidate()
scrollTimer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: false) { _ in
isScrolling = false
}
}
lastOffset = offset
}
.onDisappear {
scrollTimer?.invalidate()
}
}
// Секция с парами
private func subjectsSection(isOnline: Bool) -> some View {
VStack(alignment: .leading, spacing: 10) {
if isOnline {
ForEach(0..<vm.classesGroups.count, id: \.self) { dayIndex in
if dayIndex == vm.selectedIndex {
ForEach(vm.classesGroups[dayIndex]) { info in
if vm.showOnlyChoosenGroup == "Все" || info.group == vm.showOnlyChoosenGroup {
SubjectView(info: ClassInfo(subject: info.subject, group: info.group, time: info.time), vm: vm)
}
}
}
}
} else {
let filteredSubjects = subjects.filter { $0.day == Int16(vm.selectedIndex) }
if (filteredSubjects.isEmpty || vm.week != 0) && !hasClassesToShow {
NetworkErrorView()
} else {
ForEach(filteredSubjects, id: \.self) { subject in
if (vm.showOnlyChoosenGroup == "Все" || subject.group == vm.showOnlyChoosenGroup) && vm.week == 0 {
SubjectView(info: ClassInfo(subject: subject.name!, group: subject.group!, time: subject.time!), vm: vm)
}
}
}
}
}
}
// Секция "Мои пары"
private var myPairsSection: some View {
Group {
if classes.contains(where: { daysAreEqual($0.day, vm.selectedDay) }) {
VStack(alignment: .leading, spacing: 20) {
Text("Мои пары")
.font(.custom("Montserrat-Bold", fixedSize: 20))
ForEach(classes) { _class in
if daysAreEqual(_class.day, vm.selectedDay) {
CreatedClassView(_class: _class)
.onTapGesture {
selectedClass = _class
}
}
}
}
}
}
}
// Градиентный оверлей
private var gradientOverlay: some View {
VStack {
LinearGradient(
gradient: Gradient(colors: [Color("background").opacity(0.95), Color.white.opacity(0.1)]),
startPoint: .top,
endPoint: .bottom
)
}
.frame(width: UIScreen.main.bounds.width, height: 15)
}
}
extension ScheduleView {
private func deleteClassesFormCoreDataIfMonday() {
let today = Date()
let calendar = Calendar.current
let weekday = calendar.component(.weekday, from: today)
if weekday == 6 {
for _class in classes {
if _class.day < today {
do {
try provider.delete(_class, in: provider.viewContext)
} catch {
print("❌ - Ошибка при удалении: \(error)")
}
}
}
}
}
func saveGroupsToMemory() {
var indexOfTheDay: Int16 = 0
let context = provider.newContext // Создаем новый контекст
context.perform {
for dayIndex in 0..<self.vm.classesGroups.count {
let classesForDay = self.vm.classesGroups[dayIndex]
// Проходим по всем занятиям текущего дня
for classInfo in classesForDay {
let newClass = JsonClassModel(context: context)
// Заполняем атрибуты
newClass.name = classInfo.subject
newClass.group = classInfo.group
newClass.time = classInfo.time
newClass.day = indexOfTheDay
newClass.week = Int16(vm.week)
}
indexOfTheDay += 1
}
// Сохраняем изменения в CoreData
do {
try self.provider.persist(in: context)
print("✅ Успешно сохранено в CoreData")
} catch {
print("❌ Ошибка при сохранении в CoreData: \(error)")
}
}
}
@MainActor
func deleteAllJsonClassModelsSync() throws {
let context = provider.viewContext
let fetchRequest: NSFetchRequest<NSFetchRequestResult> = JsonClassModel.fetchRequest()
let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest)
try context.execute(deleteRequest)
try context.save()
print("✅ Все объекты JsonClassModel успешно удалены")
}
func checkSavingOncePerDay() {
let today = Date()
let calendar = Calendar.current
let todayStart = calendar.startOfDay(for: today) // Начало текущего дня
// Получаем дату последнего выполнения из UserDefaults
let lastCheckDate = UserDefaults.standard.object(forKey: "LastSaving") as? Date ?? .distantPast
let lastCheckStart = calendar.startOfDay(for: lastCheckDate)
print("Дата последнего сохранения расписания в CoreData: \(lastCheckDate)")
// Проверяем, был ли уже выполнен код сегодня
if lastCheckStart < todayStart && networkMonitor.isConnected {
print("✅ Интернет есть, сохранение пар в CoreData")
vm.fillDictForVm()
vm.fetchWeekSchedule()
do {
try deleteAllJsonClassModelsSync()
} catch {
print("Ошибка при удалении: \(error)")
return
}
saveGroupsToMemory()
// Сохраняем текущую дату как дату последнего выполнения
UserDefaults.standard.set(today, forKey: "LastSaving")
}
}
}
@ -136,7 +259,3 @@ struct ViewOffsetKey: PreferenceKey {
value += nextValue()
}
}
#Preview {
ContentView()
}

5
Schedule ICTIS/Main/Views/SearchBarView.swift
View File

@ -31,9 +31,11 @@ struct SearchBarView: View {
if (!text.isEmpty) {
vm.nameToHtml[vm.searchingGroup] = nil
vm.removeFromSchedule(group: vm.searchingGroup)
text = transformStringToFormat(text)
vm.searchingGroup = text
vm.nameToHtml[text] = ""
vm.fetchWeekSchedule()
vm.updateFilteringGroups()
}
self.text = ""
}
@ -88,6 +90,3 @@ struct SearchBarView: View {
}
}
#Preview {
ContentView()
}

61
Schedule ICTIS/Main/Views/SubjectView.swift Normal file
View File

@ -0,0 +1,61 @@
//
// SubjectView.swift
// Schedule ICTIS
//
// Created by Egor Mironov on 02.04.2025.
//
import SwiftUI
struct SubjectView: View {
let info: ClassInfo
@ObservedObject var vm: ScheduleViewModel
@State private var onlyOneGroup: Bool = false
var body: some View {
VStack(alignment: .trailing) {
if !onlyOneGroup {
Text(info.group)
.font(.custom("Montserrat-Regular", fixedSize: 11))
.foregroundColor(Color("grayForNameGroup"))
}
HStack(spacing: 15) {
VStack {
Text(convertTimeString(info.time)[0])
.font(.custom("Montserrat-Regular", fixedSize: 15))
.padding(.bottom, 1)
Text(convertTimeString(info.time)[1])
.font(.custom("Montserrat-Regular", fixedSize: 15))
.padding(.top, 1)
}
.frame(width: 48)
.padding(.top, 7)
.padding(.bottom, 7)
.padding(.leading, 10)
Rectangle()
.frame(width: 2)
.frame(maxHeight: UIScreen.main.bounds.height - 18)
.padding(.top, 7)
.padding(.bottom, 7)
.foregroundColor(getColorForClass(info.subject))
Text(info.subject)
.font(.custom("Montserrat-Medium", fixedSize: 16))
.lineSpacing(3)
.padding(.top, 9)
.padding(.bottom, 9)
Spacer()
}
.frame(maxWidth: UIScreen.main.bounds.width - 40, maxHeight: 230)
.background(Color.white)
.cornerRadius(20)
.shadow(color: .black.opacity(0.25), radius: 4, x: 2, y: 2)
}
.onAppear {
onlyOneGroup = (vm.showOnlyChoosenGroup != vm.filteringGroups[0])
}
.padding(.bottom, onlyOneGroup ? 17 : 0)
.onChange(of: vm.showOnlyChoosenGroup) { oldValue, newValue in
onlyOneGroup = (newValue != vm.filteringGroups[0])
}
}
}

19
Schedule ICTIS/Main/Views/TabViews/MonthTabView.swift
View File

@ -15,31 +15,31 @@ struct MonthTabView: View {
@ObservedObject var vm: ScheduleViewModel
var body: some View {
VStack {
HStack (spacing: 34) {
HStack (spacing: 33) {
ForEach(MockData.daysOfWeek.indices, id: \.self) { index in
Text(MockData.daysOfWeek[index])
.font(.custom("Montserrat-SemiBold", fixedSize: 15))
.foregroundColor(MockData.daysOfWeek[index] == "Вс" ? Color(.red) : Color("customGray2"))
.padding(.top, 13)
.foregroundColor(.gray)
}
}
.padding(.top, 14)
TabView(selection: $currentMonthIndex) {
ForEach(monthSlider.indices, id: \.self) { index in
let month = monthSlider[index]
MonthView(month)
.tag(index)
.transition(.slide)
}
}
.padding(.top, -25)
.padding(.bottom, -10)
.padding(.horizontal, -15)
.tabViewStyle(.page(indexDisplayMode: .never))
//.animation(.easeIn(duration: 0.3), value: currentMonthIndex)
}
.onAppear(perform: {
.frame(height: 220)
.padding(.top, 26)
.padding(.bottom, 20)
.onAppear {
updateMonthScreenViewForNewGroup()
})
}
.onChange(of: currentMonthIndex, initial: false) { oldValue, newValue in
if newValue == 0 || newValue == (monthSlider.count - 1) {
createMonth = true
@ -82,6 +82,3 @@ struct MonthTabView: View {
}
#Preview {
ContentView()
}

4
Schedule ICTIS/Main/Views/TabViews/WeekTabView.swift
View File

@ -44,7 +44,3 @@ struct WeekTabView: View {
}
}
}
#Preview {
ContentView()
}

28
Schedule ICTIS/Model/ClassModel.swift → Schedule ICTIS/Model/CoreDataClassModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
import CoreData
final class ClassModel: NSManagedObject, Identifiable {
final class CoreDataClassModel: NSManagedObject, Identifiable {
@NSManaged var auditory: String
@NSManaged var professor: String
@NSManaged var subject: String
@ -47,29 +47,29 @@ final class ClassModel: NSManagedObject, Identifiable {
}
// Расширение для загрузки данных из памяти
extension ClassModel {
extension CoreDataClassModel {
// Получаем все данные из памяти
private static var classesFetchRequest: NSFetchRequest<ClassModel> {
NSFetchRequest(entityName: "ClassModel")
private static var classesFetchRequest: NSFetchRequest<CoreDataClassModel> {
NSFetchRequest(entityName: "CoreDataClassModel")
}
// Получаем все данные и сортируем их по дню
// Этот метод будет использоваться на View(ScheduleView), где отображаются пары
static func all() -> NSFetchRequest<ClassModel> {
let request: NSFetchRequest<ClassModel> = classesFetchRequest
static func all() -> NSFetchRequest<CoreDataClassModel> {
let request: NSFetchRequest<CoreDataClassModel> = classesFetchRequest
request.sortDescriptors = [
NSSortDescriptor(keyPath: \ClassModel.day, ascending: true)
NSSortDescriptor(keyPath: \CoreDataClassModel.day, ascending: true)
]
return request
}
}
extension ClassModel {
extension CoreDataClassModel {
@discardableResult
static func makePreview(count: Int, in context: NSManagedObjectContext) -> [ClassModel] {
var classes = [ClassModel]()
static func makePreview(count: Int, in context: NSManagedObjectContext) -> [CoreDataClassModel] {
var classes = [CoreDataClassModel]()
for i in 0..<count {
let _class = ClassModel(context: context)
let _class = CoreDataClassModel(context: context)
_class.subject = "Предмет \(i)"
_class.auditory = "Аудитория \(i)"
_class.professor = "Преподаватель \(i)"
@ -81,11 +81,11 @@ extension ClassModel {
return classes
}
static func preview(context: NSManagedObjectContext = ClassProvider.shared.viewContext) -> ClassModel {
static func preview(context: NSManagedObjectContext = ClassProvider.shared.viewContext) -> CoreDataClassModel {
return makePreview(count: 1, in: context)[0]
}
static func empty(context: NSManagedObjectContext = ClassProvider.shared.viewContext) -> ClassModel {
return ClassModel(context: context)
static func empty(context: NSManagedObjectContext = ClassProvider.shared.viewContext) -> CoreDataClassModel {
return CoreDataClassModel(context: context)
}
}

4
Schedule ICTIS/Model/GroupsModel.swift
View File

@ -9,11 +9,11 @@ import Foundation
// MARK: - Welcome
struct Welcome: Decodable {
let choices: [Choice]
let choices: [Subject]
}
// MARK: - Choice
struct Choice: Decodable, Identifiable {
struct Subject: Decodable, Identifiable {
let name: String
let id: String
let group: String

46
Schedule ICTIS/Model/JsonClassModel.swift Normal file
View File

@ -0,0 +1,46 @@
//
// JsonClassModel.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 27.03.2025.
//
import Foundation
import CoreData
final class JsonDataClassModel: NSManagedObject, Identifiable {
@NSManaged var name: String
@NSManaged var group: String
@NSManaged var time: String
@NSManaged var day: Int16
// Здесь мы выполняем дополнительную инициализацию, назначая значения по умолчанию
// Этот метод вызывается всякий раз, когда объект Core Data вставляется в контекст
override func awakeFromInsert() {
super.awakeFromInsert()
setPrimitiveValue("", forKey: "name")
setPrimitiveValue("", forKey: "group")
setPrimitiveValue("", forKey: "time")
setPrimitiveValue(0, forKey: "day")
setPrimitiveValue(0, forKey: "week")
}
}
// Расширение для загрузки данных из памяти
extension JsonClassModel {
// Получаем все данные из памяти
private static var subjectsFetchRequest: NSFetchRequest<JsonClassModel> {
NSFetchRequest(entityName: "JsonClassModel")
}
// Получаем все данные и сортируем их по дню
// Этот метод будет использоваться на View(ScheduleView), где отображаются пары
static func all() -> NSFetchRequest<JsonClassModel> {
let request: NSFetchRequest<JsonClassModel> = subjectsFetchRequest
request.sortDescriptors = [
NSSortDescriptor(keyPath: \JsonClassModel.time, ascending: true)
]
return request
}
}

31
Schedule ICTIS/NetworkErrorView.swift Normal file
View File

@ -0,0 +1,31 @@
//
// NetworkErrorView.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 26.03.2025.
//
import SwiftUI
struct NetworkErrorView: View {
var body: some View {
VStack {
Spacer()
VStack {
Image(systemName: "wifi.slash")
.font(.system(size: 60, weight: .light))
.frame(width: 70, height: 70)
Text("Восстановите подключение к интернету чтобы мы могли загрузить расписание")
.font(.custom("Montserrat-Medium", fixedSize: 15))
.padding(.top, 5)
}
.padding(.horizontal, 30)
.padding(.top, UIScreen.main.bounds.height/8)
Spacer()
}
}
}
#Preview {
NetworkErrorView()
}

23
Schedule ICTIS/Provider/ClassProvider.swift
View File

@ -49,11 +49,11 @@ final class ClassProvider {
}
}
func exists(_ lesson: ClassModel, in context: NSManagedObjectContext) -> ClassModel? {
try? context.existingObject(with: lesson.objectID) as? ClassModel
func exists(_ lesson: CoreDataClassModel, in context: NSManagedObjectContext) -> CoreDataClassModel? {
try? context.existingObject(with: lesson.objectID) as? CoreDataClassModel
}
func delete(_ lesson: ClassModel, in context: NSManagedObjectContext) throws {
func delete(_ lesson: CoreDataClassModel, in context: NSManagedObjectContext) throws {
if let existingClass = exists(lesson, in: context) {
context.delete(existingClass)
Task(priority: .background) {
@ -76,3 +76,20 @@ extension EnvironmentValues {
return ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"
}
}
extension ClassProvider {
func exists(_ jsonClass: JsonClassModel, in context: NSManagedObjectContext) -> JsonClassModel? {
try? context.existingObject(with: jsonClass.objectID) as? JsonClassModel
}
func delete(_ jsonClass: JsonClassModel, in context: NSManagedObjectContext) throws {
if let existingJsonClass = exists(jsonClass, in: context) {
context.delete(existingJsonClass)
Task(priority: .background) {
try await context.perform {
try context.save()
}
}
}
}
}

8
Schedule ICTIS/Schedule_ICTISApp.swift
View File

@ -9,10 +9,16 @@ import SwiftUI
@main
struct Schedule_ICTISApp: App {
@StateObject private var networkMonitor = NetworkMonitor()
@StateObject var vm = ScheduleViewModel()
var provider = ClassProvider.shared
var body: some Scene {
WindowGroup {
ContentView()
ContentView(vm: vm, networkMonitor: networkMonitor)
.environment(\.managedObjectContext, ClassProvider.shared.viewContext)
.onAppear {
vm.fillDictForVm()
}
}
}
}

1
Schedule ICTIS/Settings/ListOfGroupsView.swift
View File

@ -44,6 +44,7 @@ struct ListOfGroupsView: View {
}
vm.nameToHtml[item.name] = ""
vm.fetchWeekSchedule()
vm.updateFilteringGroups()
dismiss()
}
}

7
Schedule ICTIS/Settings/SelectingGroupView.swift
View File

@ -49,17 +49,17 @@ struct SelectingGroupView: View {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
if vm.errorInNetwork == .noError {
vm.errorInNetwork = nil
text = transformStringToFormat(text)
if firstFavGroup == "" {
UserDefaults.standard.set(text, forKey: "group")
vm.nameToHtml[text] = ""
} else if secondFavGroup == "" {
UserDefaults.standard.set(text, forKey: "group2")
vm.nameToHtml[text] = ""
} else {
UserDefaults.standard.set(text, forKey: "group3")
vm.nameToHtml[text] = ""
}
vm.nameToHtml[text] = ""
vm.fetchWeekSchedule()
vm.updateFilteringGroups()
self.isLoading = false
self.text = ""
dismiss()
@ -126,6 +126,7 @@ struct SelectingGroupView: View {
UserDefaults.standard.set(item.name, forKey: "group3")
vm.nameToHtml[item.name] = ""
}
vm.updateFilteringGroups()
vm.fetchWeekSchedule()
dismiss()
}

2
Schedule ICTIS/Settings/SelectingVPKView.swift
View File

@ -56,7 +56,9 @@ struct SelectingVPKView: View {
} else {
UserDefaults.standard.set(text, forKey: "vpk3")
}
text = transformStringToFormat(text)
vm.nameToHtml[text] = ""
vm.updateFilteringGroups()
vm.fetchWeekSchedule()
self.isLoading = false
self.text = ""

4
Schedule ICTIS/TabBar/TabBarView.swift
View File

@ -58,7 +58,3 @@ struct TabBarView: View {
}
}
}
#Preview {
ContentView()
}

4
Schedule ICTIS/Utilities/Extensions/Date+Extensions.swift
View File

@ -87,9 +87,11 @@ extension Date {
func createPreviousMonth() -> [MonthWeek] {
let calendar = Calendar.current
let startOfFirstDate = calendar.startOfDay(for: self)
guard let previousDate = calendar.date(byAdding: .month, value: -1, to: startOfFirstDate) else {
guard let previousDate = calendar.date(byAdding: .weekOfMonth, value: -5, to: startOfFirstDate) else {
return []
}
print("Start of first date \(startOfFirstDate)")
print("Previous date \(previousDate)")
return fetchMonth(previousDate)
}

38
Schedule ICTIS/Utilities/Extensions/View+Extensions.swift
View File

@ -8,6 +8,36 @@
import SwiftUI
extension View {
func transformStringToFormat(_ input: String) -> String {
var result = input
// Условие 1: начинается с "кт"
if result.lowercased().hasPrefix("кт") {
result = result.lowercased()
let firstTwo = String(result.prefix(2)).uppercased()
let rest = String(result.dropFirst(2))
result = firstTwo + rest
return result
}
// Условие 2: содержит "впк"
if result.lowercased().contains("впк") {
result = result.lowercased()
result = result.replacingOccurrences(of: "впк", with: "ВПК")
return result
}
// Условие 3: содержит "мвпк"
if result.lowercased().contains("мвпк") {
result = result.lowercased()
result = result.replacingOccurrences(of: "впк", with: "ВПК")
return result
}
return result
}
func isSameDate(_ date1: Date, _ date2: Date) -> Bool {
return Calendar.current.isDate(date1, inSameDayAs: date2)
}
@ -270,13 +300,17 @@ extension MonthTabView {
let currentMonth = Date().fetchMonth(vm.selectedDay)
if let firstDate = currentMonth.first?.week[0].date {
monthSlider.append(firstDate.createPreviousMonth())
let temp = firstDate.createPreviousMonth()
print("First date - \(firstDate)")
print(temp)
monthSlider.append(temp)
}
monthSlider.append(currentMonth)
if let lastDate = currentMonth.last?.week[6].date {
monthSlider.append(lastDate.createNextMonth())
let temp = lastDate.createNextMonth()
monthSlider.append(temp)
}
}
}

10
Schedule ICTIS/Utilities/Network/NetworkError.swift
View File

@ -11,8 +11,8 @@ enum NetworkError: String, Error, LocalizedError {
case invalidUrl
case invalidResponse
case invalidData
case noNetwork
case noError
case timeout
var errorDescription: String? {
switch self {
@ -22,8 +22,8 @@ enum NetworkError: String, Error, LocalizedError {
"InvalidResponse"
case .invalidData:
"Проверьте номер группы"
case .noNetwork:
"No network connection"
case .timeout:
"Ошибка сети"
case .noError:
"Нет ошибки"
}
@ -37,8 +37,8 @@ enum NetworkError: String, Error, LocalizedError {
"Для этой недели расписания еще нет"
case .invalidData:
"Похоже такой группы не существует"
case .noNetwork:
"Проверьте подключение к интернету и попробуйте заново"
case .timeout:
"Проверьте соединение с интернетом"
case .noError:
"Ошибки нет"
}

11
Schedule ICTIS/Utilities/Network/NetworkManager.swift
View File

@ -14,9 +14,14 @@ final class NetworkManager {
private let decoder = JSONDecoder()
private let urlForGroup = "https://webictis.sfedu.ru/schedule-api/?query="
private let urlForWeek = "https://webictis.sfedu.ru/schedule-api/?group="
private let customSession: URLSession // Кастомная сессия для ограничения времени ответа от сервера
//MARK: Initializer
private init() {
let configuration = URLSessionConfiguration.default
configuration.timeoutIntervalForRequest = 3 // Таймаут запроса 10 секунд
configuration.timeoutIntervalForResource = 3 // Таймаут ресурса 15 секунд
self.customSession = URLSession(configuration: configuration)
decoder.dateDecodingStrategy = .iso8601
}
@ -32,7 +37,7 @@ final class NetworkManager {
func getSchedule(_ group: String) async throws -> Schedule {
let newUrlForGroup = makeUrlForGroup(group)
guard let url = URL(string: newUrlForGroup) else { throw NetworkError.invalidUrl }
let (data, response) = try await URLSession.shared.data(from: url)
let (data, response) = try await customSession.data(from: url)
guard let response = response as? HTTPURLResponse, response.statusCode == 200 else { throw NetworkError.invalidResponse }
do {
@ -47,7 +52,7 @@ final class NetworkManager {
let newUrlForWeek = makeUrlForWeek(numOfWeek, htmlNameOfGroup)
print(newUrlForWeek)
guard let url = URL(string: newUrlForWeek) else { throw NetworkError.invalidUrl }
let (data, response) = try await URLSession.shared.data(from: url)
let (data, response) = try await customSession.data(from: url)
guard let response = response as? HTTPURLResponse, response.statusCode == 200 else { throw NetworkError.invalidResponse }
do {
@ -61,7 +66,7 @@ final class NetworkManager {
func getGroups(group: String) async throws -> Welcome {
let newUrlForGroups = makeUrlForGroup(group)
guard let url = URL(string: newUrlForGroups) else { throw NetworkError.invalidUrl }
let (data, response) = try await URLSession.shared.data(from: url)
let (data, response) = try await customSession.data(from: url)
guard let response = response as? HTTPURLResponse, response.statusCode == 200 else { throw NetworkError.invalidResponse }
do {

37
Schedule ICTIS/Utilities/Network/NetworkMonitor.swift Normal file
View File

@ -0,0 +1,37 @@
//
// NetworkMonitor.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 27.03.2025.
//
import Network
import SwiftUI
class NetworkMonitor: ObservableObject {
@Published var isConnected: Bool = false
private let monitor = NWPathMonitor()
private let queue = DispatchQueue(label: "NetworkMonitorQueue")
init() {
startMonitoring()
}
func startMonitoring() {
monitor.pathUpdateHandler = { [weak self] path in
DispatchQueue.main.async {
self?.isConnected = path.status == .satisfied
print(self?.isConnected == true ? "✅ Интернет подключен!" : "❌ Нет подключения к интернету.")
}
}
monitor.start(queue: queue)
}
func stopMonitoring() {
monitor.cancel()
}
deinit {
stopMonitoring()
}
}

8
Schedule ICTIS/ViewModel/EditClassViewModel.swift
View File

@ -2,14 +2,14 @@
// EditClassViewModel.swift
// Schedule ICTIS
//
// Created by G412 on 18.12.2024.
// Created by Egor Mironov on 18.12.2024.
//
import Foundation
import CoreData
final class EditClassViewModel: ObservableObject {
@Published var _class: ClassModel
@Published var _class: CoreDataClassModel
let isNew: Bool
@ -17,7 +17,7 @@ final class EditClassViewModel: ObservableObject {
private let context: NSManagedObjectContext
init(provider: ClassProvider, _class: ClassModel? = nil) {
init(provider: ClassProvider, _class: CoreDataClassModel? = nil) {
self.provider = provider
self.context = provider.newContext
@ -27,7 +27,7 @@ final class EditClassViewModel: ObservableObject {
self.isNew = false
}
else {
self._class = ClassModel(context: self.context)
self._class = CoreDataClassModel(context: self.context)
self.isNew = true
}
}

35
Schedule ICTIS/ViewModel/SaveScheduleViewModel.swift Normal file
View File

@ -0,0 +1,35 @@
//
// SaveScheduleViewModel.swift
// Schedule ICTIS
//
// Created by Egor Mironov on 02.04.2025.
//
import Foundation
import CoreData
final class SaveScheduleViewModel: ObservableObject {
@Published var subject: JsonClassModel
private let provider: ClassProvider
private let context: NSManagedObjectContext
init(provider: ClassProvider, subject: JsonClassModel? = nil) {
self.provider = provider
self.context = provider.newContext
if let subject,
let existingClassCopy = provider.exists(subject, in: context) {
self.subject = existingClassCopy
}
else {
self.subject = JsonClassModel(context: self.context)
}
}
func save() throws {
try provider.persist(in: context)
}
}

44
Schedule ICTIS/ViewModel/ScheduleViewModel.swift
View File

@ -14,6 +14,8 @@ final class ScheduleViewModel: ObservableObject {
@Published var nameToHtml: [String : String] = [:]
@Published var classesGroups: [[ClassInfo]] = []
@Published var searchingGroup = ""
@Published var filteringGroups: [String] = ["Все"]
@Published var showOnlyChoosenGroup: String = "Все"
//Schedule
@Published var weekScheduleGroup: Table = Table(
@ -25,7 +27,7 @@ final class ScheduleViewModel: ObservableObject {
link: ""
)
@Published var selectedDay: Date = .init()
@Published var selectedIndex: Int = 1
@Published var selectedIndex: Int = 0
@Published var week: Int = 0
@Published var isFirstStartOffApp = true
@ -92,7 +94,10 @@ final class ScheduleViewModel: ObservableObject {
// Сортируем по времени
self.sortClassesByTime()
} catch {
if let error = error as? NetworkError {
if let urlError = error as? URLError, urlError.code == .timedOut {
errorInNetwork = .timeout
print("Ошибка: превышено время ожидания ответа от сервера")
} else if let error = error as? NetworkError {
switch error {
case .invalidResponse:
errorInNetwork = .invalidResponse
@ -102,9 +107,9 @@ final class ScheduleViewModel: ObservableObject {
default:
print("Неизвестная ошибка: \(error)")
}
isLoading = false
print("Есть ошибка: \(error)")
}
isLoading = false
}
}
}
@ -172,4 +177,37 @@ final class ScheduleViewModel: ObservableObject {
}
}
}
func updateFilteringGroups() {
self.filteringGroups = ["Все"]
let keys = self.nameToHtml.keys
self.filteringGroups.append(contentsOf: keys)
}
func fillDictForVm() {
let group1 = UserDefaults.standard.string(forKey: "group")
let group2 = UserDefaults.standard.string(forKey: "group2")
let group3 = UserDefaults.standard.string(forKey: "group3")
let vpk1 = UserDefaults.standard.string(forKey: "vpk1")
let vpk2 = UserDefaults.standard.string(forKey: "vpk2")
let vpk3 = UserDefaults.standard.string(forKey: "vpk3")
if let nameGroup1 = group1, nameGroup1 != "" {
nameToHtml[nameGroup1] = ""
}
if let nameGroup2 = group2, nameGroup2 != "" {
nameToHtml[nameGroup2] = ""
}
if let nameGroup3 = group3, nameGroup3 != "" {
nameToHtml[nameGroup3] = ""
}
if let nameVpk1 = vpk1, nameVpk1 != "" {
nameToHtml[nameVpk1] = ""
}
if let nameVpk2 = vpk2, nameVpk2 != "" {
nameToHtml[nameVpk2] = ""
}
if let nameVpk3 = vpk3, nameVpk3 != "" {
nameToHtml[nameVpk3] = ""
}
}
}

2
Schedule ICTIS/ViewModel/SearchGroupsViewModel.swift
View File

@ -9,7 +9,7 @@ import Foundation
@MainActor
final class SearchGroupsViewModel: ObservableObject {
@Published var groups: [Choice] = []
@Published var groups: [Subject] = []
func fetchGroups(group: String) {
Task {