diff --git a/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSee.razor b/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSee.razor new file mode 100644 index 0000000..06c8b13 --- /dev/null +++ b/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSee.razor @@ -0,0 +1,19 @@ +@page "/test/client/saywhatyouee" +@using QuizModels = QuizExperiment.Models.Client +@layout QuizExperiment.Admin.Client.Shared.Client.Layout + + + +@code { + private QuizModels.ClientSayWhatYouSeeQuestion _currentQuestion = new QuizModels.ClientSayWhatYouSeeQuestion + { + Title = "This is a test Question, it goes on a bit, in fact it goes on for ages and ages and ages", + ImageUrl = "https://placehold.co/600x400" + }; + + private void AnswerQuestion(QuizModels.ClientAnswer answer) + { + Console.WriteLine($"User answered: {answer}"); + } +} \ No newline at end of file diff --git a/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSeeAnswerSummary.razor b/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSeeAnswerSummary.razor new file mode 100644 index 0000000..c1bc7f8 --- /dev/null +++ b/QuizExperiment.Admin/Client/Pages/Tests/Client/SayWhatYouSeeAnswerSummary.razor @@ -0,0 +1,39 @@ +@page "/test/client/answersummary/saywhatyousee" +@using QuizModels = QuizExperiment.Models.Client +@layout QuizExperiment.Admin.Client.Shared.Client.Layout + + + +@code { + QuizModels.ClientSayWhatYouSeeAnswer myAnswer = new QuizModels.ClientSayWhatYouSeeAnswer + { + Answers = new List + { + "Dog" + } + }; + + QuizModels.ClientSayWhatYouSeeQuestion question = new QuizModels.ClientSayWhatYouSeeQuestion + { + Title = "This is a test Question, it goes on a bit, in fact it goes on for ages and ages and ages", + ImageUrl = "https://imgur.com/NkMONh3", + + }; + + QuizModels.ClientSayWhatYouSeeAnswer correctAnswer = new QuizModels.ClientSayWhatYouSeeAnswer + { + Answers = new List + { + "One", + "Two", + "Three" + } + }; + +} \ No newline at end of file diff --git a/QuizExperiment.Admin/Client/Pages/Tests/Present/SayWhatYouSee.razor b/QuizExperiment.Admin/Client/Pages/Tests/Present/SayWhatYouSee.razor new file mode 100644 index 0000000..87d6d47 --- /dev/null +++ b/QuizExperiment.Admin/Client/Pages/Tests/Present/SayWhatYouSee.razor @@ -0,0 +1,21 @@ +@page "/test/present/saywhatyousee" +@using QuizModels = QuizExperiment.Models +@layout QuizExperiment.Admin.Client.Shared.Client.Layout + + + +@code { + + private DateTime QuestionEndTime => DateTime.Now.AddMinutes(10); + private int UserAnswerCount => 0; // Placeholder for user answer count + private QuizModels.SayWhatYouSeeQuestion _currentQuestion = new QuizModels.SayWhatYouSeeQuestion + { + Title = "This is a test Question, it goes on a bit, in fact it goes on for ages and ages and ages", + ImageUrl = "https://placehold.co/600x400" + }; + + private void AnswerQuestion(QuizModels.Client.ClientAnswer answer) + { + Console.WriteLine($"User answered: {answer}"); + } +} \ No newline at end of file diff --git a/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor b/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor index 739bbde..ca39148 100644 --- a/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor +++ b/QuizExperiment.Admin/Client/Shared/Client/QuestionPicker.razor @@ -15,6 +15,10 @@ { } + else if(Question is ClientSayWhatYouSeeQuestion sayWhatYouSeeQuestion) + { + + } else {

Unsupported question type.

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

@Question.Title

+ +
+ + +
+
+ } +} + +@code { + [Parameter] + public ClientSayWhatYouSeeQuestion? Question { get; set; } + + [Parameter] + public EventCallback OnAnswerSubmit { get; set; } + + private string UserAnswer { get; set; } = string.Empty; + + private async Task SubmitAnswer() + { + var answer = new ClientSayWhatYouSeeAnswer + { + Answers = new List { UserAnswer } + }; + await OnAnswerSubmit.InvokeAsync(answer); + } +} diff --git a/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor b/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor index a6dd90e..d4e0edc 100644 --- a/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor +++ b/QuizExperiment.Admin/Client/Shared/Edit/QuestionTypePickerModal.razor @@ -22,6 +22,12 @@ True / False +
+ +
@@ -49,6 +55,10 @@ { await SelectType("trueFalse"); } + private async Task SayWhatYouSeeClicked() + { + await SelectType("sayWhatYouSee"); + } 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 6f97153..45b52f6 100644 --- a/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor +++ b/QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor @@ -83,6 +83,10 @@ { } + else if (_currentQuestion is QuizModels.SayWhatYouSeeQuestion) + { + + } else {
@@ -133,27 +137,30 @@ private void OnAddQuestion(string questionType) { - Question newQuestion; - if (questionType == "trueFalse") + Question newQuestion = questionType switch { - newQuestion = new QuizModels.TrueFalseQuestion() + "trueFalse" => new QuizModels.TrueFalseQuestion() { Timeout = 20, ImageUrl = "", Title = "" - }; - } - else // default to multipleChoice - { - newQuestion = new QuizModels.MultipleChoiceQuestion() + }, + "sayWhatYouSee" => new QuizModels.SayWhatYouSeeQuestion() + { + Timeout = 40, + ImageUrl = "", + Title = "", + // Add any other default properties for SayWhatYouSeeQuestion here + }, + _ => new QuizModels.MultipleChoiceQuestion() { Options = new[] {"","","",""}, Timeout = 20, ImageUrl = "", Title = "", CorrectAnswerIndex = -1 - }; - } + } + }; _questions.Add(newQuestion); _currentQuestion = newQuestion; } @@ -224,13 +231,18 @@ private async Task SaveAndPresent() { + var query_string = ""; + if (!string.IsNullOrWhiteSpace(FolderPath)) + { + query_string = "?path=" + FolderPath; + } if (!AreAllQuestionsValid) { ShowValidationAlertMessage(); return; } await Save(); - NavigationManager.NavigateTo($"/present/{_questionSet?.Id}"); + NavigationManager.NavigateTo($"/present/{_questionSet?.Id}{query_string}"); } private async Task SaveAndContinue() diff --git a/QuizExperiment.Admin/Client/Shared/Edit/SayWhatYouSeeQuestion.razor b/QuizExperiment.Admin/Client/Shared/Edit/SayWhatYouSeeQuestion.razor new file mode 100644 index 0000000..77ffca6 --- /dev/null +++ b/QuizExperiment.Admin/Client/Shared/Edit/SayWhatYouSeeQuestion.razor @@ -0,0 +1,79 @@ +@using QuizModels = QuizExperiment.Models +@using System.Text.Json +@inject HttpClient Http + +@if (Question is not null) +{ + var sayWhatYouSeeQuestion = Question as QuizModels.SayWhatYouSeeQuestion; + if (sayWhatYouSeeQuestion is not null) + { + // Ensure Answers is initialized + if (sayWhatYouSeeQuestion.Answers == null) + { + sayWhatYouSeeQuestion.Answers = new List(); + } + +
+ + + + + + + + + @for (int i = 0; i < sayWhatYouSeeQuestion.Answers.Count; i++) + { + var answer = sayWhatYouSeeQuestion.Answers[i]; + var index = i; // capture the current value of i + + + + + } + +
ANSWER
+ + + +
+ +
+ } +} + +@code { + [Parameter] + public QuizModels.Question? Question { get; set; } + + private void AddAnswer() + { + if (Question is QuizModels.SayWhatYouSeeQuestion swysq) + { + if (swysq.Answers == null) + swysq.Answers = new List(); + swysq.Answers.Add(""); + StateHasChanged(); + } + } + + private void RemoveAnswer(int index) + { + if (Question is QuizModels.SayWhatYouSeeQuestion swysq && swysq.Answers != null && index >= 0 && index < swysq.Answers.Count) + { + swysq.Answers.RemoveAt(index); + StateHasChanged(); + } + } + + private void UpdateAnswer(int index, ChangeEventArgs e) + { + if (Question is QuizModels.SayWhatYouSeeQuestion swysq && swysq.Answers != null && index >= 0 && index < swysq.Answers.Count) + { + swysq.Answers[index] = e.Value?.ToString() ?? string.Empty; + } + } +} diff --git a/QuizExperiment.Admin/Client/Shared/Present/QuestionAnswerChart.razor b/QuizExperiment.Admin/Client/Shared/Present/QuestionAnswerChart.razor index 540bdf6..34aa583 100644 --- a/QuizExperiment.Admin/Client/Shared/Present/QuestionAnswerChart.razor +++ b/QuizExperiment.Admin/Client/Shared/Present/QuestionAnswerChart.razor @@ -14,7 +14,12 @@ var correctAnswerPercentage = ((int)Math.Round(totalAnswers > 0 ? (double)correctAnswerCount / totalAnswers * 100 : 0, 0)).ToString() + "%"; var fastestUserId = UserAnswers?.Where(r => r.Value.Answer == correctAnswer).OrderBy(r => r.Value.TimeTaken).FirstOrDefault(); - var fastestUser = Users[fastestUserId?.Key]; + var fastestUser = ""; + if (fastestUserId != null && fastestUserId?.Key != null && Users.ContainsKey(fastestUserId?.Key)) + { + fastestUser = Users[fastestUserId?.Key]; + } + } @@ -25,19 +30,27 @@
The correct answer is
- + @if (!string.IsNullOrWhiteSpace(correctButtonName)) + { + + } + @if(string.Compare(correctButtonName, correctAnswerText, true) != 0) {
@correctAnswerText
} @{ -
@correctAnswerPercentage of people got the correct answer
- if(fastestUserId != null) + if (fastestUserId != null && fastestUserId?.Key != null) { +
@correctAnswerPercentage of people got the correct answer
🏎️@fastestUser was the fastest!🏁
} - + else + { +
No one got the correct answer
+ } + } diff --git a/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor b/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor index d31302b..4822ae5 100644 --- a/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor +++ b/QuizExperiment.Admin/Client/Shared/Present/QuestionPicker.razor @@ -15,6 +15,10 @@ { } + else if (Question is QuizModels.SayWhatYouSeeQuestion sayWhatYouSeeQuestion) + { + + } else {

Unsupported question type.

diff --git a/QuizExperiment.Admin/Client/Shared/Present/SayWhatYouSeeQuestion.razor b/QuizExperiment.Admin/Client/Shared/Present/SayWhatYouSeeQuestion.razor new file mode 100644 index 0000000..22d9476 --- /dev/null +++ b/QuizExperiment.Admin/Client/Shared/Present/SayWhatYouSeeQuestion.razor @@ -0,0 +1,31 @@ +@using QuizModels = QuizExperiment.Models + +@{ + if(Question != null) + { +
+
+
+
PLAYERS ANSWERED
+
@UserAnswerCount
+
+ +
+
+
@Question.Title
+ +
+
+ } +} + +@code { + [Parameter] + public QuizModels.SayWhatYouSeeQuestion? Question { get; set; } + + [Parameter] + public DateTime QuestionEndTime { get; set; } + + [Parameter] + public int UserAnswerCount { get; set; } +} diff --git a/QuizExperiment.Admin/Client/wwwroot/css/app.css b/QuizExperiment.Admin/Client/wwwroot/css/app.css index 293761f..8bcd1f1 100644 --- a/QuizExperiment.Admin/Client/wwwroot/css/app.css +++ b/QuizExperiment.Admin/Client/wwwroot/css/app.css @@ -1050,8 +1050,17 @@ nav.title-bar { margin-top:75px; } + .swys-container { + margin-top:0px; + } + .multiple-choice-answer-text { font-size: x-small; height: 18px; } + + .img-quiz { + max-width: 360px; + margin-left: 0px; + } } \ No newline at end of file diff --git a/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs b/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs index a8c9b73..768ae58 100644 --- a/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs +++ b/QuizExperiment.Models.Test/Client/ClientQuestionSerializationTests.cs @@ -32,5 +32,44 @@ public void Serialize_ClientQuestion_Sets_QuestionType() Assert.True(doc.RootElement.TryGetProperty("questionType", out _), $"A question is missing the 'questionType' property: {question}"); } + + [Fact] + public void SayWhatYouSeeStringEqualityComparer_IsCaseInsensitive() + { + // Arrange + var comparer = new SayWhatYouSeeStringEqualityComparer(); + var answer1 = "Hello World"; + var answer2 = "hello world"; + + // Act + var areEqual = comparer.Equals(answer1, answer2); + + // Assert + Assert.True(areEqual, "SayWhatYouSeeStringEqualityComparer should treat answers as equal regardless of case."); + } + + [Fact] + public void ClientSayWhatYouSeeAnswer_Validation() + { + + var answer1 = new ClientSayWhatYouSeeAnswer + { + Answers = new List + { + "one" + } + }; + + var answer2 = new ClientSayWhatYouSeeAnswer + { + Answers = new List + { + "One", + "Two" + } + }; + + Assert.True(answer1 == answer2); + } } } diff --git a/QuizExperiment.Models/Client/ClientAnswer.cs b/QuizExperiment.Models/Client/ClientAnswer.cs index 9edb78e..3932ff8 100644 --- a/QuizExperiment.Models/Client/ClientAnswer.cs +++ b/QuizExperiment.Models/Client/ClientAnswer.cs @@ -9,6 +9,7 @@ namespace QuizExperiment.Models.Client { [JsonDerivedType(typeof(ClientMultipleChoiceAnswer), "multipleChoice")] [JsonDerivedType(typeof(ClientTrueFalseAnswer), "trueFalse")] + [JsonDerivedType(typeof(ClientSayWhatYouSeeAnswer), "sayWhatYouSee")] [JsonPolymorphic(TypeDiscriminatorPropertyName = "anwserType")] public abstract class ClientAnswer : IEquatable { diff --git a/QuizExperiment.Models/Client/ClientQuestion.cs b/QuizExperiment.Models/Client/ClientQuestion.cs index 119ceac..4ae2d19 100644 --- a/QuizExperiment.Models/Client/ClientQuestion.cs +++ b/QuizExperiment.Models/Client/ClientQuestion.cs @@ -12,6 +12,7 @@ namespace QuizExperiment.Models.Client /// [JsonDerivedType(typeof(ClientMultipleChoiceQuestion), "multipleChoice")] [JsonDerivedType(typeof(ClientTrueFalseQuestion), "trueFalse")] + [JsonDerivedType(typeof(ClientSayWhatYouSeeQuestion), "sayWhatYouSee")] [JsonPolymorphic(TypeDiscriminatorPropertyName = "questionType")] public abstract class ClientQuestion { diff --git a/QuizExperiment.Models/Client/ClientSayWhatYouSeeAnswer.cs b/QuizExperiment.Models/Client/ClientSayWhatYouSeeAnswer.cs new file mode 100644 index 0000000..6213a3b --- /dev/null +++ b/QuizExperiment.Models/Client/ClientSayWhatYouSeeAnswer.cs @@ -0,0 +1,61 @@ +using System; +using System.Text.Json.Serialization; +using System.Collections.Generic; +using System.Linq; + +namespace QuizExperiment.Models.Client +{ + public class ClientSayWhatYouSeeAnswer : ClientAnswer, IEquatable + { + [JsonPropertyName("answers")] + public List Answers { get; set; } = new List(); + + public override (string description, string index, string buttonName) GetAnswerDetails(ClientQuestion question) + { + var description = Answers[0]; + + if(Answers.Count > 1) + { + var otherAnswers = string.Join(" or ", Answers.Skip(1).Select(a => $"\"{a.ToLowerInvariant()}\"")); + description += $" (also allowed {otherAnswers})"; + } + + return (description, "0", ""); + } + + public override bool Equals(ClientAnswer? other) + { + return Equals(other as ClientSayWhatYouSeeAnswer); + } + + public bool Equals(ClientSayWhatYouSeeAnswer? other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + // Return true if any item in either list matches any item in the other list (case-insensitive) + var comparer = new SayWhatYouSeeStringEqualityComparer(); + return Answers.Any(a => other.Answers.Contains(a, comparer)) || + other.Answers.Any(a => Answers.Contains(a, comparer)); + } + + public static bool operator ==(ClientSayWhatYouSeeAnswer? left, ClientSayWhatYouSeeAnswer? right) + { + if (left is null && right is null) return true; + if (left is null || right is null) return false; + return left.Equals(right); + } + + public static bool operator !=(ClientSayWhatYouSeeAnswer? left, ClientSayWhatYouSeeAnswer? right) + { + return !(left == right); + } + + public override int GetHashCode() + { + // Use case-insensitive hash code + return Answers + .Select(a => a?.ToLowerInvariant().GetHashCode() ?? 0) + .Aggregate(0, (current, hashCode) => current ^ hashCode); + } + } +} \ No newline at end of file diff --git a/QuizExperiment.Models/Client/ClientSayWhatYouSeeQuestion.cs b/QuizExperiment.Models/Client/ClientSayWhatYouSeeQuestion.cs new file mode 100644 index 0000000..49445bd --- /dev/null +++ b/QuizExperiment.Models/Client/ClientSayWhatYouSeeQuestion.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace QuizExperiment.Models.Client +{ + public class ClientSayWhatYouSeeQuestion : ClientQuestion + { + } +} diff --git a/QuizExperiment.Models/Client/SayWhatYouSeeStringEqualityComparer.cs b/QuizExperiment.Models/Client/SayWhatYouSeeStringEqualityComparer.cs new file mode 100644 index 0000000..92037e0 --- /dev/null +++ b/QuizExperiment.Models/Client/SayWhatYouSeeStringEqualityComparer.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace QuizExperiment.Models.Client +{ + public class SayWhatYouSeeStringEqualityComparer : IEqualityComparer + { + public bool Equals(string? x, string? y) + { + return string.Compare(x, y, true) == 0; + } + + public int GetHashCode([DisallowNull] string obj) + { + return obj.ToLowerInvariant().GetHashCode(); + } + } +} diff --git a/QuizExperiment.Models/PolymorphicQuestionConverter.cs b/QuizExperiment.Models/PolymorphicQuestionConverter.cs index 704adb6..790cf28 100644 --- a/QuizExperiment.Models/PolymorphicQuestionConverter.cs +++ b/QuizExperiment.Models/PolymorphicQuestionConverter.cs @@ -19,6 +19,8 @@ public class PolymorphicQuestionConverter : JsonConverter return JsonSerializer.Deserialize(root.GetRawText(), options); if (type == "trueFalse") return JsonSerializer.Deserialize(root.GetRawText(), options); + if (type == "sayWhatYouSee") + return JsonSerializer.Deserialize(root.GetRawText(), options); } // Fallback: treat as MultipleChoiceQuestion (legacy) return JsonSerializer.Deserialize(root.GetRawText(), options); @@ -33,6 +35,8 @@ public override void Write(Utf8JsonWriter writer, Question value, JsonSerializer writer.WriteString("questionType", "multipleChoice"); else if (value is TrueFalseQuestion) writer.WriteString("questionType", "trueFalse"); + else if (value is SayWhatYouSeeQuestion) + writer.WriteString("questionType", "sayWhatYouSee"); // 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 7e6f080..afc1fa3 100644 --- a/QuizExperiment.Models/Question.cs +++ b/QuizExperiment.Models/Question.cs @@ -5,6 +5,7 @@ namespace QuizExperiment.Models { [JsonPolymorphic(TypeDiscriminatorPropertyName = "questionType")] [JsonDerivedType(typeof(MultipleChoiceQuestion), "multipleChoice")] + [JsonDerivedType(typeof(SayWhatYouSeeQuestion), "sayWhatYouSee")] [JsonDerivedType(typeof(TrueFalseQuestion), "trueFalse")] public abstract class Question { diff --git a/QuizExperiment.Models/SayWhatYouSeeQuestion.cs b/QuizExperiment.Models/SayWhatYouSeeQuestion.cs new file mode 100644 index 0000000..51841b8 --- /dev/null +++ b/QuizExperiment.Models/SayWhatYouSeeQuestion.cs @@ -0,0 +1,34 @@ +using QuizExperiment.Models.Client; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.Json.Serialization; +using System.Threading.Tasks; + +namespace QuizExperiment.Models +{ + public class SayWhatYouSeeQuestion : Question + { + public List Answers { get; set; } = new List(); + + public override ClientAnswer GetCorrectAnswer() + { + return new ClientSayWhatYouSeeAnswer { Answers = this.Answers }; + } + public override ClientQuestion ToClientQuestion() + { + return new ClientSayWhatYouSeeQuestion + { + Title = "Say What You See", + ImageUrl = ImageUrl, + }; + } + + [JsonIgnore] + public override bool IsValid => + !string.IsNullOrWhiteSpace(Title) && + !string.IsNullOrWhiteSpace(ImageUrl) && + Answers != null && Answers.Any(r => !string.IsNullOrWhiteSpace(r)); + } +}