From 66f13688a5cb89f010f5a6f16b9e4230bc905ac0 Mon Sep 17 00:00:00 2001 From: "emre.kartal" Date: Mon, 8 Jan 2024 08:44:10 +0100 Subject: [PATCH] add small correction --- .../ViewModels/CreationBetViewModel.swift | 49 ++++++++++++++----- .../Model/Sources/Model/BetDataManager.swift | 2 +- .../Sources/StubLib/BetStubManager.swift | 2 +- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift b/Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift index f5818cc..f844fa0 100644 --- a/Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift +++ b/Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift @@ -25,23 +25,46 @@ class CreationBetViewModel: ObservableObject { @Published var endBetDateFieldError: String? func create() { + + guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true) else { + return + } + + resetAllFieldErrors() + manager.addBet() } - func checkAndSetError(forLogin checkLogin: Bool, forPassword checkPassword: Bool) -> Bool { - /*var newLoginIdentifierFieldError: String? - var newLoginPasswordFieldError: String? + func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool) -> Bool { + + var newThemeFieldError: String? + var newDescriptionFieldError: String? + var newEndRegisterDateFieldError: String? + var newEndBetDateFieldError: String? + var hasError = false - // Login - if checkLogin, loginIdentifier.isEmpty { - newLoginIdentifierFieldError = "Veuillez saisir votre identifiant." + // Theme + if checkTheme, theme.isEmpty { + newThemeFieldError = "Veuillez saisir le thème." hasError = true } - // Password - if checkPassword, loginPassword.isEmpty { - newLoginPasswordFieldError = "Veuillez saisir votre mot de passe." + // Description + if checkDescription, description.isEmpty { + newDescriptionFieldError = "Veuillez saisir la description." + hasError = true + } + + // End Register Date + if checkEndRegisterDate, endRegisterDate < Date() { + newEndRegisterDateFieldError = "La date de fin des inscriptions doit être ultérieure à la date actuelle." + hasError = true + } + + // End Bet Date + if checkEndBetDate, endBetDate < endRegisterDate { + newEndBetDateFieldError = "La date de fin des paris doit être ultérieure à la date de fin des inscriptions." hasError = true } @@ -51,9 +74,11 @@ class CreationBetViewModel: ObservableObject { } withAnimation { - loginIdentifierFieldError = newLoginIdentifierFieldError - loginPasswordFieldError = newLoginPasswordFieldError - }*/ + themeFieldError = newThemeFieldError + descriptionFieldError = newDescriptionFieldError + endRegisterDateFieldError = newEndRegisterDateFieldError + endBetDateFieldError = newEndBetDateFieldError + } return false } diff --git a/Sources/Model/Sources/Model/BetDataManager.swift b/Sources/Model/Sources/Model/BetDataManager.swift index 4c3c51b..1a3fef2 100644 --- a/Sources/Model/Sources/Model/BetDataManager.swift +++ b/Sources/Model/Sources/Model/BetDataManager.swift @@ -2,7 +2,7 @@ // BetDataManager.swift // // -// Created by étudiant on 29/12/2023. +// Created by Emre on 29/12/2023. // import Foundation diff --git a/Sources/StubLib/Sources/StubLib/BetStubManager.swift b/Sources/StubLib/Sources/StubLib/BetStubManager.swift index b2bf7e1..c9c8347 100644 --- a/Sources/StubLib/Sources/StubLib/BetStubManager.swift +++ b/Sources/StubLib/Sources/StubLib/BetStubManager.swift @@ -2,7 +2,7 @@ // BetStubManager.swift // // -// Created by étudiant on 31/12/2023. +// Created by Emre on 31/12/2023. // import Foundation