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

Done with CoreData

Browse Source
This commit is contained in:
Vladimir Dubovik
2025-01-21 12:11:02 +03:00
parent e6b217aba4
commit b4704bd4fc
9 changed files with 138 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Schedule ICTIS/Main/Views/Sheets/CreateClassView.swift → Schedule ICTIS/Main/Views/Sheets/CreateEditClassView.swift
View File

@ -7,13 +7,13 @@
import SwiftUI
struct CreateClassView: View {
@Binding var isShowingSheet: Bool
struct CreateEditClassView: View {
@Environment(\.dismiss) private var dismiss
@State private var isShowingDatePickerForDate: Bool = false
@ObservedObject var vm: EditClassViewModel
@State private var isIncorrectDate1: Bool = false
@State private var isIncorrectDate2: Bool = false
var provider = ClassProvider.shared
var body: some View {
NavigationView {
ScrollView(.vertical, showsIndicators: false) {
@ -134,6 +134,31 @@ struct CreateClassView: View {
.padding(.bottom, 10)
CommentFieldView(textForComment: $vm._class.comment)
.padding(.bottom, 20)
if !vm.isNew {
Button {
do {
try delete(vm._class)
} catch {
print(error)
}
dismiss()
} label: {
HStack {
Spacer()
Image(systemName: "trash")
Text("Удалить занятие")
.font(.system(size: 17, weight: .medium))
Spacer()
}
.frame(height: 40)
.background(Color.white)
.foregroundColor(Color.red)
.cornerRadius(10)
}
}
Spacer()
}
.padding(.horizontal)
@ -142,56 +167,37 @@ struct CreateClassView: View {
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("Отменить") {
isShowingSheet = false
dismiss()
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button("Сохранить") {
do {
try vm.save()
dismiss()
} catch {
print(error)
}
isShowingSheet = false
}
}
}
.navigationTitle("Новая пара")
.navigationTitle(vm.isNew ? "Новая пара" : "Изменить данные")
.background(Color("background"))
}
}
func checkStartTimeLessThenEndTime(_ startTime: Date, _ endTime: Date) -> Bool {
let calendar = Calendar.current
let firstComponents = calendar.dateComponents([.hour, .minute], from: startTime)
let secondComponents = calendar.dateComponents([.hour, .minute], from: endTime)
guard let startHours = firstComponents.hour, let startMinutes = firstComponents.minute else {
return false
}
guard let endHours = secondComponents.hour, let endMinutes = secondComponents.minute else {
return false
}
print("\(startHours) - \(endHours)")
print("\(startMinutes) - \(endMinutes)")
if Int(startHours) > Int(endHours) {
return false
}
else if startHours == endHours {
if startMinutes < endMinutes {
return true
}
else {
return false
func delete(_ _class: ClassModel) throws {
let context = provider.viewContext
let existingClass = try context.existingObject(with: _class.objectID)
context.delete(existingClass)
Task (priority: .background) {
try await context.perform {
try context.save()
}
}
else {
return true
}
}
}
#Preview {
CreateClassView(isShowingSheet: .constant(true), vm: .init(provider: .shared))
CreateEditClassView(vm: .init(provider: .shared))
}

103
Schedule ICTIS/Main/Views/Sheets/EditClassView.swift
View File

@ -1,103 +0,0 @@
//
// SheetCreateClassView.swift
// Schedule ICTIS
//
// Created by Mironov Egor on 12.12.2024.
//
import SwiftUI
struct EditClassView: View {
@State private var isIncorrectDate1: Bool = false
@State private var isIncorrectDate2: Bool = false
@Binding var isShowingSheet: Bool
let _class: ClassModel
@State private var subject: String = ""
var body: some View {
NavigationStack {
ProfessorAuditoryClassFieldView(text: $subject, nameOfImage: "book", labelForField: "Предмет")
.padding(.bottom, 10)
List {
Section("General") {
LabeledContent {
Text(_class.subject)
} label: {
Text("Предмет")
}
LabeledContent {
Text(_class.auditory)
} label: {
Text("Аудитория")
}
LabeledContent {
Text(_class.day, style: .date)
} label: {
Text("Преподаватель")
}
}
Section("Notes") {
Text(_class.comment)
}
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("Отменить") {
isShowingSheet = false
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button("Сохранить") {
isShowingSheet = false
}
}
}
}
.onAppear {
subject = _class.subject
}
}
func checkStartTimeLessThenEndTime(_ startTime: Date, _ endTime: Date) -> Bool {
let calendar = Calendar.current
let firstComponents = calendar.dateComponents([.hour, .minute], from: startTime)
let secondComponents = calendar.dateComponents([.hour, .minute], from: endTime)
guard let startHours = firstComponents.hour, let startMinutes = firstComponents.minute else {
return false
}
guard let endHours = secondComponents.hour, let endMinutes = secondComponents.minute else {
return false
}
print("\(startHours) - \(endHours)")
print("\(startMinutes) - \(endMinutes)")
if Int(startHours) > Int(endHours) {
return false
}
else if startHours == endHours {
if startMinutes < endMinutes {
return true
}
else {
return false
}
}
else {
return true
}
}
}
#Preview {
NavigationStack {
EditClassView(isShowingSheet: .constant(true), _class: .preview())
}
}