diff --git a/QuizExperiment.Admin/Client/Shared/Client/GuessTheNumberQuestion.razor b/QuizExperiment.Admin/Client/Shared/Client/GuessTheNumberQuestion.razor new file mode 100644 index 0000000..234f953 --- /dev/null +++ b/QuizExperiment.Admin/Client/Shared/Client/GuessTheNumberQuestion.razor @@ -0,0 +1,56 @@ +@using QuizExperiment.Models.Client + +@{ + if(Question != null) + { +
+

@Question.Title

+
+
+

Enter a number between @Question.MinValue and @Question.MaxValue

+ + +
+
+
+ } +} + +@code { + + [Parameter] + public ClientGuessTheNumberQuestion? Question { get; set; } + + [Parameter] + public EventCallback OnAnswerSubmit { get; set; } + + private int? userGuess; + + private bool IsValidGuess() + { + if (!userGuess.HasValue || Question == null) return false; + return userGuess.Value >= Question.MinValue && userGuess.Value <= Question.MaxValue; + } + + private async Task SubmitAnswer() + { + if (!IsValidGuess()) return; + + var answer = new ClientGuessTheNumberAnswer + { + Answer = userGuess!.Value + }; + await OnAnswerSubmit.InvokeAsync(answer); + } + +} diff --git a/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor b/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor index ca39148..ec59ce5 100644 --- a/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor +++ b/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor @@ -19,6 +19,10 @@ { } + else if(Question is ClientGuessTheNumberQuestion guessTheNumberQuestion) + { + + } else {

Unsupported question type.

diff --git a/QuizExperiment.Admin/Client/Shared/Edit/GuessTheNumberQuestion.razor b/QuizExperiment.Admin/Client/Shared/Edit/GuessTheNumberQuestion.razor new file mode 100644 index 0000000..705614b --- /dev/null +++ b/QuizExperiment.Admin/Client/Shared/Edit/GuessTheNumberQuestion.razor @@ -0,0 +1,45 @@ +@using QuizModels = QuizExperiment.Models +@using System.Text.Json +@inject HttpClient Http + +@if (Question is not null) +{ + var guessTheNumberQuestion = Question as QuizModels.GuessTheNumberQuestion; + if (guessTheNumberQuestion is not null) + { + +
+ + + + + + + + + + + + + +
ANSWER RANGE
+ + + + + +
+ + +
+
+ } +} + +@code { + [Parameter] + public QuizModels.Question? Question { get; set; } +} diff --git a/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor b/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor index d4e0edc..d6c150e 100644 --- a/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor +++ b/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor @@ -28,6 +28,12 @@ Type the Answer +
+ +
@@ -59,6 +65,10 @@ { await SelectType("sayWhatYouSee"); } + private async Task GuessTheNumberClicked() + { + await SelectType("guessTheNumber"); + } private async Task SelectType(string type) { IsVisible = false; diff --git a/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor b/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor index 45b52f6..0be2420 100644 --- a/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor +++ b/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor @@ -87,6 +87,10 @@ { } + else if (_currentQuestion is QuizModels.GuessTheNumberQuestion) + { + + } else {
@@ -152,6 +156,15 @@ Title = "", // Add any other default properties for SayWhatYouSeeQuestion here }, + "guessTheNumber" => new QuizModels.GuessTheNumberQuestion() + { + Timeout = 30, + ImageUrl = "", + Title = "", + MinValue = 0, + MaxValue = 100, + CorrectAnswer = 50 + }, _ => new QuizModels.MultipleChoiceQuestion() { Options = new[] {"","","",""}, diff --git a/QuizExperiment.Admin/Client/Shared/Present/GuessTheNumberQuestion.razor b/QuizExperiment.Admin/Client/Shared/Present/GuessTheNumberQuestion.razor new file mode 100644 index 0000000..489a565 --- /dev/null +++ b/QuizExperiment.Admin/Client/Shared/Present/GuessTheNumberQuestion.razor @@ -0,0 +1,44 @@ +@using QuizModels = QuizExperiment.Models + +@{ + if(Question != null) + { +
+
+
+
PLAYERS ANSWERED
+
@UserAnswerCount
+
+ +
+
+
@Question.Title
+ +
+
+

Guess a number between @Question.MinValue and @Question.MaxValue

+

Correct Answer: @Question.CorrectAnswer

+
+
+
+ +
+ } +} + + + + +@code { + + [Parameter] + public QuizModels.GuessTheNumberQuestion? Question { get; set; } + + [Parameter] + public DateTime QuestionEndTime { get; set; } + + [Parameter] + public int UserAnswerCount { get; set; } + + +} diff --git a/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor b/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor index 4822ae5..1ab393f 100644 --- a/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor +++ b/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor @@ -19,6 +19,10 @@ { } + else if (Question is QuizModels.GuessTheNumberQuestion guessTheNumberQuestion) + { + + } else {

Unsupported question type.

diff --git a/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs b/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs index 768ae58..84f1ac5 100644 --- a/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs +++ b/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs @@ -33,6 +33,31 @@ public void Serialize_ClientQuestion_Sets_QuestionType() $"A question is missing the 'questionType' property: {question}"); } + [Fact] + public void Serialize_GuessTheNumberQuestion_Sets_QuestionType() + { + // Arrange + var question = new ClientGuessTheNumberQuestion + { + Title = "Guess the number", + ImageUrl = "https://example.com/image.png", + MinValue = 1, + MaxValue = 100 + }; + + // Serialize as base type to ensure questionType is included + var outputJson = JsonSerializer.Serialize(question); + + // Output + Console.WriteLine("Serialized JSON:\n" + outputJson); + + using var doc = JsonDocument.Parse(outputJson); + + Assert.True(doc.RootElement.TryGetProperty("questionType", out var typeProperty), + $"A question is missing the 'questionType' property: {question}"); + Assert.Equal("guessTheNumber", typeProperty.GetString()); + } + [Fact] public void SayWhatYouSeeStringEqualityComparer_IsCaseInsensitive() { diff --git a/QuizExperiment.Models.Test/JsonSerializationTests.cs b/QuizExperiment.Models.Test/JsonSerializationTests.cs index 8be4650..9802986 100644 --- a/QuizExperiment.Models.Test/JsonSerializationTests.cs +++ b/QuizExperiment.Models.Test/JsonSerializationTests.cs @@ -68,6 +68,15 @@ public void SerializingMultipleQuestionTypes() Title = "The sky is blue.", IsTrue = true, Timeout = 15 + }, + new GuessTheNumberQuestion + { + Title = "Guess the number", + ImageUrl = "https://example.com/image.png", + MinValue = 1, + MaxValue = 100, + CorrectAnswer = 42, + Timeout = 30 } } }; diff --git a/QuizExperiment.Models/Client/ClientAnswer.cs b/QuizExperiment.Models/Client/ClientAnswer.cs index 3932ff8..7bea875 100644 --- a/QuizExperiment.Models/Client/ClientAnswer.cs +++ b/QuizExperiment.Models/Client/ClientAnswer.cs @@ -10,6 +10,7 @@ namespace QuizExperiment.Models.Client [JsonDerivedType(typeof(ClientMultipleChoiceAnswer), "multipleChoice")] [JsonDerivedType(typeof(ClientTrueFalseAnswer), "trueFalse")] [JsonDerivedType(typeof(ClientSayWhatYouSeeAnswer), "sayWhatYouSee")] + [JsonDerivedType(typeof(ClientGuessTheNumberAnswer), "guessTheNumber")] [JsonPolymorphic(TypeDiscriminatorPropertyName = "anwserType")] public abstract class ClientAnswer : IEquatable { diff --git a/QuizExperiment.Models/Client/ClientGuessTheNumberAnswer.cs b/QuizExperiment.Models/Client/ClientGuessTheNumberAnswer.cs new file mode 100644 index 0000000..161a1be --- /dev/null +++ b/QuizExperiment.Models/Client/ClientGuessTheNumberAnswer.cs @@ -0,0 +1,37 @@ +using System; +using System.Text.Json.Serialization; + +namespace QuizExperiment.Models.Client +{ + public class ClientGuessTheNumberAnswer : ClientAnswer, IEquatable + { + [JsonPropertyName("answer")] + public int Answer { get; set; } + + public override (string description, string index, string buttonName) GetAnswerDetails(ClientQuestion question) + { + return question switch + { + ClientGuessTheNumberQuestion _ => (Answer.ToString(), Answer.ToString(), Answer.ToString()), + _ => throw new InvalidOperationException("Invalid question type for guess the number answer.") + }; + } + + public override bool Equals(ClientAnswer? other) + { + return Equals(other as ClientGuessTheNumberAnswer); + } + + public bool Equals(ClientGuessTheNumberAnswer? other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + return Answer == other.Answer; + } + + public override int GetHashCode() + { + return Answer.GetHashCode(); + } + } +} diff --git a/QuizExperiment.Models/Client/ClientGuessTheNumberQuestion.cs b/QuizExperiment.Models/Client/ClientGuessTheNumberQuestion.cs new file mode 100644 index 0000000..c614650 --- /dev/null +++ b/QuizExperiment.Models/Client/ClientGuessTheNumberQuestion.cs @@ -0,0 +1,15 @@ +using System.Text.Json.Serialization; + +namespace QuizExperiment.Models.Client +{ + public class ClientGuessTheNumberQuestion : ClientQuestion + { + public ClientGuessTheNumberQuestion() : base() { } + + [JsonPropertyName("minValue")] + public int MinValue { get; set; } + + [JsonPropertyName("maxValue")] + public int MaxValue { get; set; } + } +} diff --git a/QuizExperiment.Models/Client/ClientQuestion.cs b/QuizExperiment.Models/Client/ClientQuestion.cs index 4ae2d19..c37e6d8 100644 --- a/QuizExperiment.Models/Client/ClientQuestion.cs +++ b/QuizExperiment.Models/Client/ClientQuestion.cs @@ -13,6 +13,7 @@ namespace QuizExperiment.Models.Client [JsonDerivedType(typeof(ClientMultipleChoiceQuestion), "multipleChoice")] [JsonDerivedType(typeof(ClientTrueFalseQuestion), "trueFalse")] [JsonDerivedType(typeof(ClientSayWhatYouSeeQuestion), "sayWhatYouSee")] + [JsonDerivedType(typeof(ClientGuessTheNumberQuestion), "guessTheNumber")] [JsonPolymorphic(TypeDiscriminatorPropertyName = "questionType")] public abstract class ClientQuestion { diff --git a/QuizExperiment.Models/GuessTheNumberQuestion.cs b/QuizExperiment.Models/GuessTheNumberQuestion.cs new file mode 100644 index 0000000..6815f31 --- /dev/null +++ b/QuizExperiment.Models/GuessTheNumberQuestion.cs @@ -0,0 +1,44 @@ +using QuizExperiment.Models.Client; +using System.Text.Json.Serialization; + +namespace QuizExperiment.Models +{ + public class GuessTheNumberQuestion : Question + { + [JsonPropertyName("correctAnswer")] + public int CorrectAnswer { get; set; } + + [JsonPropertyName("minValue")] + public int MinValue { get; set; } + + [JsonPropertyName("maxValue")] + public int MaxValue { get; set; } + + [JsonIgnore] + public override bool IsValid => + !string.IsNullOrWhiteSpace(Title) && + !string.IsNullOrWhiteSpace(ImageUrl) && + MinValue < MaxValue && + CorrectAnswer >= MinValue && + CorrectAnswer <= MaxValue; + + public override ClientAnswer GetCorrectAnswer() + { + return new ClientGuessTheNumberAnswer + { + Answer = CorrectAnswer + }; + } + + public override ClientQuestion ToClientQuestion() + { + return new ClientGuessTheNumberQuestion + { + Title = Title, + ImageUrl = ImageUrl, + MinValue = MinValue, + MaxValue = MaxValue + }; + } + } +} diff --git a/QuizExperiment.Models/PolymorphicQuestionConverter.cs b/QuizExperiment.Models/PolymorphicQuestionConverter.cs index 790cf28..577e5e0 100644 --- a/QuizExperiment.Models/PolymorphicQuestionConverter.cs +++ b/QuizExperiment.Models/PolymorphicQuestionConverter.cs @@ -21,6 +21,8 @@ public class PolymorphicQuestionConverter : JsonConverter return JsonSerializer.Deserialize(root.GetRawText(), options); if (type == "sayWhatYouSee") return JsonSerializer.Deserialize(root.GetRawText(), options); + if (type == "guessTheNumber") + return JsonSerializer.Deserialize(root.GetRawText(), options); } // Fallback: treat as MultipleChoiceQuestion (legacy) return JsonSerializer.Deserialize(root.GetRawText(), options); @@ -37,6 +39,8 @@ public override void Write(Utf8JsonWriter writer, Question value, JsonSerializer writer.WriteString("questionType", "trueFalse"); else if (value is SayWhatYouSeeQuestion) writer.WriteString("questionType", "sayWhatYouSee"); + else if (value is GuessTheNumberQuestion) + writer.WriteString("questionType", "guessTheNumber"); // Write all other properties as named properties var type = value.GetType(); foreach (var prop in type.GetProperties(BindingFlags.Public | BindingFlags.Instance)) diff --git a/QuizExperiment.Models/Question.cs b/QuizExperiment.Models/Question.cs index afc1fa3..5adbbae 100644 --- a/QuizExperiment.Models/Question.cs +++ b/QuizExperiment.Models/Question.cs @@ -7,6 +7,7 @@ namespace QuizExperiment.Models [JsonDerivedType(typeof(MultipleChoiceQuestion), "multipleChoice")] [JsonDerivedType(typeof(SayWhatYouSeeQuestion), "sayWhatYouSee")] [JsonDerivedType(typeof(TrueFalseQuestion), "trueFalse")] + [JsonDerivedType(typeof(GuessTheNumberQuestion), "guessTheNumber")] public abstract class Question { [JsonPropertyName("title")]