diff --git a/WSIST/WSIST.Engine/Feedback.cs b/WSIST/WSIST.Engine/Feedback.cs new file mode 100644 index 0000000..76fd13a --- /dev/null +++ b/WSIST/WSIST.Engine/Feedback.cs @@ -0,0 +1,29 @@ +namespace WSIST.Engine; + +public class Feedback +{ + public int Id { get; set; } + public int UserId { get; set; } + public User? User { get; set; } + public required string Message { get; set; } + public FeedbackCategory Category { get; set; } + public FeedbackStatus Status { get; set; } = FeedbackStatus.Open; + + // Default so a Feedback created without an explicit timestamp never persists + // DateTime.MinValue (0001-01-01) — mirrors User.CreatedAt. + public DateTime CreatedAt { get; set; } = DateTime.UtcNow; + + public enum FeedbackCategory + { + Bug = 0, + Feature = 1, + Other = 2, + } + + public enum FeedbackStatus + { + Open = 0, + Reviewed = 1, + Closed = 2, + } +} diff --git a/WSIST/WSIST.Engine/FeedbackManagement.cs b/WSIST/WSIST.Engine/FeedbackManagement.cs new file mode 100644 index 0000000..5e6ccad --- /dev/null +++ b/WSIST/WSIST.Engine/FeedbackManagement.cs @@ -0,0 +1,110 @@ +using Microsoft.EntityFrameworkCore; + +namespace WSIST.Engine; + +public class FeedbackManagement +{ + private readonly WsistContext context; + + public FeedbackManagement(WsistContext context) + { + this.context = context; + } + + public Feedback Submit(int userId, string message, Feedback.FeedbackCategory category) + { + var trimmed = message?.Trim() ?? string.Empty; + if (trimmed.Length == 0) + throw new ArgumentException("Feedback message cannot be empty.", nameof(message)); + + // Defensively cap to the column length so an over-long message surfaces + // as a validation error rather than a DbUpdateException at SaveChanges. + if (trimmed.Length > 4000) + throw new ArgumentException( + "Feedback message is too long (4000 characters max).", + nameof(message) + ); + + if (!Enum.IsDefined(category)) + throw new ArgumentException("Unknown feedback category.", nameof(category)); + + var feedback = new Feedback + { + UserId = userId, + Message = trimmed, + Category = category, + Status = Feedback.FeedbackStatus.Open, + CreatedAt = DateTime.UtcNow, + }; + context.Feedbacks.Add(feedback); + context.SaveChanges(); + return feedback; + } + + // A user's own submissions (newest first) for their feedback history. + public List GetForUser(int userId) + { + return context + .Feedbacks.AsNoTracking() + .Where(f => f.UserId == userId) + .OrderByDescending(f => f.CreatedAt) + .ThenByDescending(f => f.Id) + .Select(f => new FeedbackView( + f.Id, + f.Message, + f.Category, + f.Status, + f.CreatedAt, + f.User != null ? f.User.DisplayName : "(unknown)", + f.User != null ? f.User.Email : "" + )) + .ToList(); + } + + // Admin-only listing. Authorization (is the caller the owner?) is enforced + // by the page that calls this — the engine intentionally has no notion of + // who the admin is, so it stays config-driven in the web layer. + public List GetAll() + { + return context + .Feedbacks.AsNoTracking() + .OrderByDescending(f => f.CreatedAt) + // Tie-break on Id so equal timestamps order stably. + .ThenByDescending(f => f.Id) + .Select(f => new FeedbackView( + f.Id, + f.Message, + f.Category, + f.Status, + f.CreatedAt, + f.User != null ? f.User.DisplayName : "(unknown)", + f.User != null ? f.User.Email : "" + )) + .ToList(); + } + + // Update a submission's workflow status (Open/Reviewed/Closed). Admin-only; + // the calling page enforces that. Returns false if the row no longer exists. + public bool UpdateStatus(int feedbackId, Feedback.FeedbackStatus status) + { + if (!Enum.IsDefined(status)) + throw new ArgumentException("Unknown feedback status.", nameof(status)); + + var feedback = context.Feedbacks.Find(feedbackId); + if (feedback is null) + return false; + feedback.Status = status; + context.SaveChanges(); + return true; + } + + public record FeedbackView( + int Id, + string Message, + Feedback.FeedbackCategory Category, + Feedback.FeedbackStatus Status, + DateTime CreatedAt, + string SubmittedByName, + string SubmittedByEmail + ); +} diff --git a/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.Designer.cs b/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.Designer.cs new file mode 100644 index 0000000..c9f2f39 --- /dev/null +++ b/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.Designer.cs @@ -0,0 +1,246 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using WSIST.Engine; + +#nullable disable + +namespace WSIST.Engine.Migrations +{ + [DbContext(typeof(WsistContext))] + [Migration("20260617062848_AddFeedbackTable")] + partial class AddFeedbackTable + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.17") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); + + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("Category") + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CreatedAt"); + + b.HasIndex("UserId"); + + b.ToTable("Feedbacks", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.Subject", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("IsSystem") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)") + .UseCollation("utf8mb4_general_ci"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId", "Name") + .IsUnique(); + + b.ToTable("Subjects", (string)null); + + b.HasData( + new + { + Id = -6, + IsSystem = true, + Name = "Math" + }, + new + { + Id = -5, + IsSystem = true, + Name = "English" + }, + new + { + Id = -4, + IsSystem = true, + Name = "French" + }, + new + { + Id = -3, + IsSystem = true, + Name = "German" + }, + new + { + Id = -2, + IsSystem = true, + Name = "Chemistry" + }, + new + { + Id = -1, + IsSystem = true, + Name = "Other" + }); + }); + + modelBuilder.Entity("WSIST.Engine.Test", b => + { + b.Property("Id") + .HasColumnType("char(36)"); + + b.Property("DueDate") + .HasColumnType("date"); + + b.Property("Grade") + .HasColumnType("double"); + + b.Property("Subject") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("varchar(255)"); + + b.Property("Understanding") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Volume") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Subject"); + + b.HasIndex("UserId"); + + b.ToTable("Tests", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("GoogleId") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.HasKey("Id"); + + b.HasIndex("Email") + .IsUnique(); + + b.ToTable("Users", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.HasOne("WSIST.Engine.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.Subject", b => + { + b.HasOne("WSIST.Engine.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.Test", b => + { + b.HasOne("WSIST.Engine.Subject", null) + .WithMany() + .HasForeignKey("Subject") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("WSIST.Engine.User", "User") + .WithMany("Tests") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.User", b => + { + b.Navigation("Tests"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.cs b/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.cs new file mode 100644 index 0000000..d675ade --- /dev/null +++ b/WSIST/WSIST.Engine/Migrations/20260617062848_AddFeedbackTable.cs @@ -0,0 +1,58 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace WSIST.Engine.Migrations +{ + /// + public partial class AddFeedbackTable : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Feedbacks", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + UserId = table.Column(type: "int", nullable: false), + Message = table.Column(type: "varchar(4000)", maxLength: 4000, nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Category = table.Column(type: "int", nullable: false), + Status = table.Column(type: "int", nullable: false), + CreatedAt = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Feedbacks", x => x.Id); + table.ForeignKey( + name: "FK_Feedbacks_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_Feedbacks_CreatedAt", + table: "Feedbacks", + column: "CreatedAt"); + + migrationBuilder.CreateIndex( + name: "IX_Feedbacks_UserId", + table: "Feedbacks", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Feedbacks"); + } + } +} diff --git a/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.Designer.cs b/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.Designer.cs new file mode 100644 index 0000000..ca6af24 --- /dev/null +++ b/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.Designer.cs @@ -0,0 +1,250 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using WSIST.Engine; + +#nullable disable + +namespace WSIST.Engine.Migrations +{ + [DbContext(typeof(WsistContext))] + [Migration("20260617064345_AddUserPreferredLanguage")] + partial class AddUserPreferredLanguage + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.17") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); + + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("Category") + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CreatedAt"); + + b.HasIndex("UserId"); + + b.ToTable("Feedbacks", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.Subject", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("IsSystem") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)") + .UseCollation("utf8mb4_general_ci"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId", "Name") + .IsUnique(); + + b.ToTable("Subjects", (string)null); + + b.HasData( + new + { + Id = -6, + IsSystem = true, + Name = "Math" + }, + new + { + Id = -5, + IsSystem = true, + Name = "English" + }, + new + { + Id = -4, + IsSystem = true, + Name = "French" + }, + new + { + Id = -3, + IsSystem = true, + Name = "German" + }, + new + { + Id = -2, + IsSystem = true, + Name = "Chemistry" + }, + new + { + Id = -1, + IsSystem = true, + Name = "Other" + }); + }); + + modelBuilder.Entity("WSIST.Engine.Test", b => + { + b.Property("Id") + .HasColumnType("char(36)"); + + b.Property("DueDate") + .HasColumnType("date"); + + b.Property("Grade") + .HasColumnType("double"); + + b.Property("Subject") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("varchar(255)"); + + b.Property("Understanding") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Volume") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("Subject"); + + b.HasIndex("UserId"); + + b.ToTable("Tests", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("GoogleId") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("PreferredLanguage") + .HasMaxLength(5) + .HasColumnType("varchar(5)"); + + b.HasKey("Id"); + + b.HasIndex("Email") + .IsUnique(); + + b.ToTable("Users", (string)null); + }); + + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.HasOne("WSIST.Engine.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.Subject", b => + { + b.HasOne("WSIST.Engine.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.Test", b => + { + b.HasOne("WSIST.Engine.Subject", null) + .WithMany() + .HasForeignKey("Subject") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("WSIST.Engine.User", "User") + .WithMany("Tests") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WSIST.Engine.User", b => + { + b.Navigation("Tests"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.cs b/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.cs new file mode 100644 index 0000000..79f22e8 --- /dev/null +++ b/WSIST/WSIST.Engine/Migrations/20260617064345_AddUserPreferredLanguage.cs @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace WSIST.Engine.Migrations +{ + /// + public partial class AddUserPreferredLanguage : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "PreferredLanguage", + table: "Users", + type: "varchar(5)", + maxLength: 5, + nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PreferredLanguage", + table: "Users"); + } + } +} diff --git a/WSIST/WSIST.Engine/Migrations/WsistContextModelSnapshot.cs b/WSIST/WSIST.Engine/Migrations/WsistContextModelSnapshot.cs index 673854f..6cb7140 100644 --- a/WSIST/WSIST.Engine/Migrations/WsistContextModelSnapshot.cs +++ b/WSIST/WSIST.Engine/Migrations/WsistContextModelSnapshot.cs @@ -22,6 +22,40 @@ protected override void BuildModel(ModelBuilder modelBuilder) MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("Category") + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("varchar(4000)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CreatedAt"); + + b.HasIndex("UserId"); + + b.ToTable("Feedbacks", (string)null); + }); + modelBuilder.Entity("WSIST.Engine.Subject", b => { b.Property("Id") @@ -153,6 +187,10 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasMaxLength(100) .HasColumnType("varchar(100)"); + b.Property("PreferredLanguage") + .HasMaxLength(5) + .HasColumnType("varchar(5)"); + b.HasKey("Id"); b.HasIndex("Email") @@ -161,6 +199,17 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Users", (string)null); }); + modelBuilder.Entity("WSIST.Engine.Feedback", b => + { + b.HasOne("WSIST.Engine.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("WSIST.Engine.Subject", b => { b.HasOne("WSIST.Engine.User", "User") diff --git a/WSIST/WSIST.Engine/TestExporter.cs b/WSIST/WSIST.Engine/TestExporter.cs new file mode 100644 index 0000000..7f739e5 --- /dev/null +++ b/WSIST/WSIST.Engine/TestExporter.cs @@ -0,0 +1,78 @@ +using System.Globalization; +using System.Text; + +namespace WSIST.Engine; + +/// +/// One row of a user's data export. Holds typed values so JSON keeps real +/// types (ISO date, numeric grade) while CSV formats them itself. +/// +public record TestExportRow( + string Title, + string Subject, + DateOnly DueDate, + string Volume, + string Understanding, + double? Grade +); + +public static class TestExporter +{ + private static readonly string[] Header = + [ + "Title", + "Subject", + "DueDate", + "Volume", + "Understanding", + "Grade", + ]; + + /// + /// Serialises export rows to RFC 4180 CSV (CRLF line endings, quoted + /// fields where needed) with formula-injection mitigation on the free-text + /// columns. + /// + public static string ToCsv(IReadOnlyList rows) + { + var sb = new StringBuilder(); + sb.Append(string.Join(',', Header.Select(Field))).Append("\r\n"); + + foreach (var r in rows) + { + sb.Append(Field(r.Title)) + .Append(',') + .Append(Field(r.Subject)) + .Append(',') + .Append(r.DueDate.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)) + .Append(',') + .Append(Field(r.Volume)) + .Append(',') + .Append(Field(r.Understanding)) + .Append(',') + .Append(r.Grade?.ToString(CultureInfo.InvariantCulture) ?? "") + .Append("\r\n"); + } + + return sb.ToString(); + } + + private static string Field(string value) + { + var v = value ?? ""; + + // Formula-injection mitigation: a cell beginning with =, +, -, @, or a + // control character can be executed by spreadsheet apps. Prefix with a + // single quote so it is treated as literal text. Titles and custom + // subject names are user-controlled, so this matters. + if (v.Length > 0 && v[0] is '=' or '+' or '-' or '@' or '\t' or '\r') + v = "'" + v; + + // RFC 4180: quote fields containing the delimiter, a quote, or a newline, + // doubling any embedded quotes. + if (v.Contains('"') || v.Contains(',') || v.Contains('\n') || v.Contains('\r')) + v = "\"" + v.Replace("\"", "\"\"") + "\""; + + return v; + } +} diff --git a/WSIST/WSIST.Engine/TestManagement.cs b/WSIST/WSIST.Engine/TestManagement.cs index f79ba66..92298c1 100644 --- a/WSIST/WSIST.Engine/TestManagement.cs +++ b/WSIST/WSIST.Engine/TestManagement.cs @@ -1,3 +1,5 @@ +using Microsoft.EntityFrameworkCore; + namespace WSIST.Engine; public class TestManagement @@ -185,6 +187,30 @@ public void UpdateDisplayName(int userId, string displayName) context.SaveChanges(); } + public void UpdatePreferredLanguage(int userId, string? language) + { + var user = context.Users.Find(userId); + if (user is null) + return; + user.PreferredLanguage = language; + context.SaveChanges(); + } + + // Used by the request-localization provider to resolve a signed-in user's + // stored language without materializing the whole User entity. Async so the + // provider (which runs first on every authenticated request) never blocks on + // database I/O. + public Task GetPreferredLanguageByEmailAsync( + string email, + CancellationToken cancellationToken = default + ) + { + return context + .Users.Where(u => u.Email == email) + .Select(u => u.PreferredLanguage) + .FirstOrDefaultAsync(cancellationToken); + } + public User GetOrCreateUser(string email, string displayName, string googleId) { if (string.IsNullOrWhiteSpace(email)) @@ -257,4 +283,32 @@ public List GetGradeAverages(int userId) .OrderBy(x => x.SubjectName) .ToList(); } + + /// + /// Every test belonging to the user — past and future, graded or not — + /// shaped for a data-portability export with subject names resolved and + /// enum values rendered to readable text. Strictly scoped to + /// : another user's rows can never appear. + /// + public List GetTestExport(int userId) + { + var subjects = context + .Subjects.Where(s => s.IsSystem || s.UserId == userId) + .ToDictionary(s => s.Id, s => s.Name); + + return context + .Tests.Where(t => t.UserId == userId) + .AsEnumerable() + .OrderBy(t => t.DueDate) + .ThenBy(t => t.Title) + .Select(t => new TestExportRow( + t.Title, + subjects.TryGetValue(t.Subject, out var name) ? name : t.Subject.ToString(), + t.DueDate, + Test.VolumeHelper(t.Volume), + Test.UnderstandingHelper(t.Understanding), + t.Grade + )) + .ToList(); + } } diff --git a/WSIST/WSIST.Engine/User.cs b/WSIST/WSIST.Engine/User.cs index c35262e..11a1eda 100644 --- a/WSIST/WSIST.Engine/User.cs +++ b/WSIST/WSIST.Engine/User.cs @@ -7,6 +7,11 @@ public class User public string DisplayName { get; set; } = string.Empty; public string GoogleId { get; set; } = string.Empty; + // Two-letter culture code ("en"/"de") for the UI language. Null until the + // user explicitly picks one — while null the language is derived from the + // browser's Accept-Language header on each request. + public string? PreferredLanguage { get; set; } + // Default so a User created without an explicit timestamp never persists // DateTime.MinValue (0001-01-01). public DateTime CreatedAt { get; set; } = DateTime.UtcNow; diff --git a/WSIST/WSIST.Engine/WsistContext.cs b/WSIST/WSIST.Engine/WsistContext.cs index 5357ee2..c30c2bd 100644 --- a/WSIST/WSIST.Engine/WsistContext.cs +++ b/WSIST/WSIST.Engine/WsistContext.cs @@ -10,6 +10,7 @@ public WsistContext(DbContextOptions options) public DbSet Tests { get; set; } public DbSet Users { get; set; } public DbSet Subjects { get; set; } + public DbSet Feedbacks { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -111,6 +112,27 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) ); }); + modelBuilder.Entity(entity => + { + entity.ToTable("Feedbacks"); + entity.HasKey(e => e.Id); + entity.Property(e => e.Id).ValueGeneratedOnAdd(); + entity.Property(e => e.Message).HasMaxLength(4000).IsRequired(); + // Store enums as ints, consistent with Test.Volume/Understanding. + entity.Property(e => e.Category).HasConversion(); + entity.Property(e => e.Status).HasConversion(); + + // Deleting a user removes their feedback too (they own the rows). + entity + .HasOne(f => f.User) + .WithMany() + .HasForeignKey(f => f.UserId) + .OnDelete(DeleteBehavior.Cascade); + + // The admin listing orders newest-first; index the sort column. + entity.HasIndex(e => e.CreatedAt); + }); + modelBuilder.Entity(entity => { entity.ToTable("Users"); @@ -118,6 +140,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasIndex(e => e.Email).IsUnique(); entity.Property(e => e.GoogleId).HasMaxLength(100); entity.Property(e => e.DisplayName).HasMaxLength(100); + entity.Property(e => e.PreferredLanguage).HasMaxLength(5); }); } } diff --git a/WSIST/WSIST.UnitTests/UnitTests.cs b/WSIST/WSIST.UnitTests/UnitTests.cs index c889b12..a71ecf7 100644 --- a/WSIST/WSIST.UnitTests/UnitTests.cs +++ b/WSIST/WSIST.UnitTests/UnitTests.cs @@ -540,4 +540,277 @@ public void AddCustomSubject_AllowsSameNameForDifferentUsers() //assert Assert.That(created.UserId, Is.EqualTo(otherUser.Id)); } + + [Test] + public void GetTestExport_OnlyIncludesRequestingUsersTests() + { + //arrange + using var context = CreateContext(); + var owner = SeedUser(context); + var other = new User + { + Email = "other@example.com", + DisplayName = "Other", + GoogleId = "google-456", + CreatedAt = DateTime.UtcNow, + }; + context.Users.Add(other); + context.SaveChanges(); + var subjectId = SeedSystemSubject(context); + var manager = new TestManagement(context); + manager.NewTestMaker( + "Owner Test", + subjectId, + new DateOnly(2026, 12, 01), + Test.TestVolume.Medium, + Test.PersonalUnderstanding.Medium, + null, + owner.Id + ); + manager.NewTestMaker( + "Other Test", + subjectId, + new DateOnly(2026, 12, 01), + Test.TestVolume.Medium, + Test.PersonalUnderstanding.Medium, + null, + other.Id + ); + + //act + var export = manager.GetTestExport(owner.Id); + + //assert — the export is strictly scoped to the requesting user + Assert.That(export.Any(r => r.Title == "Owner Test")); + Assert.That(export.Any(r => r.Title == "Other Test"), Is.False); + } + + [Test] + public void GetTestExport_IncludesPastGradedTestsWithResolvedSubjectName() + { + //arrange + using var context = CreateContext(); + var user = SeedUser(context); + var subjectId = SeedSystemSubject(context, "Math"); + var manager = new TestManagement(context); + manager.NewTestMaker( + "Past Exam", + subjectId, + new DateOnly(2025, 01, 01), + Test.TestVolume.High, + Test.PersonalUnderstanding.Low, + 5.5, + user.Id + ); + + //act + var export = manager.GetTestExport(user.Id); + + //assert + var row = export.Single(r => r.Title == "Past Exam"); + Assert.That(row.Subject, Is.EqualTo("Math")); + Assert.That(row.Grade, Is.EqualTo(5.5)); + Assert.That(row.Volume, Is.EqualTo("High")); + } + + [Test] + public void ToCsv_WritesHeaderAndFormatsValues() + { + var rows = new List + { + new("Exam", "Math", new DateOnly(2026, 03, 01), "High", "Low", 5.5), + }; + + var csv = TestExporter.ToCsv(rows); + + Assert.That(csv, Does.StartWith("Title,Subject,DueDate,Volume,Understanding,Grade")); + Assert.That(csv, Does.Contain("2026-03-01")); + Assert.That(csv, Does.Contain("5.5")); + } + + [Test] + public void ToCsv_EscapesDelimitersAndQuotes() + { + var rows = new List + { + new("Title, comma", "Sub \"quote\"", new DateOnly(2026, 03, 01), "High", "Low", null), + }; + + var csv = TestExporter.ToCsv(rows); + + Assert.That(csv, Does.Contain("\"Title, comma\"")); + Assert.That(csv, Does.Contain("\"Sub \"\"quote\"\"\"")); + } + + [Test] + public void ToCsv_MitigatesFormulaInjection() + { + var rows = new List + { + new("=SUM(A1:A2)", "Math", new DateOnly(2026, 03, 01), "High", "Low", null), + }; + + var csv = TestExporter.ToCsv(rows); + + //a leading '=' must be neutralised so spreadsheets treat it as text + Assert.That(csv, Does.Contain("'=SUM(A1:A2)")); + } + + [Test] + public void SubmitFeedback_PersistsTrimmedOpenRow() + { + //arrange + using var context = CreateContext(); + var user = SeedUser(context); + var feedback = new FeedbackManagement(context); + + //act + var saved = feedback.Submit( + user.Id, + " Please add dark mode ", + Feedback.FeedbackCategory.Feature + ); + + //assert + Assert.That(saved.Id, Is.GreaterThan(0)); + var row = context.Feedbacks.Single(); + Assert.That(row.Message, Is.EqualTo("Please add dark mode")); + Assert.That(row.Category, Is.EqualTo(Feedback.FeedbackCategory.Feature)); + Assert.That(row.Status, Is.EqualTo(Feedback.FeedbackStatus.Open)); + Assert.That(row.UserId, Is.EqualTo(user.Id)); + } + + [Test] + public void SubmitFeedback_EmptyMessage_Throws() + { + using var context = CreateContext(); + var user = SeedUser(context); + var feedback = new FeedbackManagement(context); + + Assert.Throws(() => + feedback.Submit(user.Id, " ", Feedback.FeedbackCategory.Bug) + ); + Assert.That(context.Feedbacks.Any(), Is.False); + } + + [Test] + public void SubmitFeedback_TooLongMessage_Throws() + { + using var context = CreateContext(); + var user = SeedUser(context); + var feedback = new FeedbackManagement(context); + + var tooLong = new string('x', 4001); + Assert.Throws(() => + feedback.Submit(user.Id, tooLong, Feedback.FeedbackCategory.Bug) + ); + } + + [Test] + public void SubmitFeedback_UndefinedCategory_Throws() + { + using var context = CreateContext(); + var user = SeedUser(context); + var feedback = new FeedbackManagement(context); + + Assert.Throws(() => + feedback.Submit(user.Id, "Valid message", (Feedback.FeedbackCategory)99) + ); + } + + [Test] + public void GetAllFeedback_ReturnsNewestFirstWithSubmitterInfo() + { + //arrange + using var context = CreateContext(); + var user = SeedUser(context); + // Insert directly with explicit timestamps so ordering is deterministic + // (Submit stamps DateTime.UtcNow, which two quick calls could tie on). + context.Feedbacks.Add( + new Feedback + { + UserId = user.Id, + Message = "older", + Category = Feedback.FeedbackCategory.Bug, + CreatedAt = new DateTime(2026, 01, 01, 0, 0, 0, DateTimeKind.Utc), + } + ); + context.Feedbacks.Add( + new Feedback + { + UserId = user.Id, + Message = "newer", + Category = Feedback.FeedbackCategory.Feature, + CreatedAt = new DateTime(2026, 02, 01, 0, 0, 0, DateTimeKind.Utc), + } + ); + context.SaveChanges(); + var feedback = new FeedbackManagement(context); + + //act + var all = feedback.GetAll(); + + //assert — newest first, submitter name/email resolved + Assert.That(all, Has.Count.EqualTo(2)); + Assert.That(all[0].Message, Is.EqualTo("newer")); + Assert.That(all[1].Message, Is.EqualTo("older")); + Assert.That(all[0].SubmittedByName, Is.EqualTo("Test User")); + Assert.That(all[0].SubmittedByEmail, Is.EqualTo("test@example.com")); + } + + [Test] + public void UpdateStatus_ChangesStatusAndPersists() + { + //arrange + using var context = CreateContext(); + var user = SeedUser(context); + var feedback = new FeedbackManagement(context); + var saved = feedback.Submit(user.Id, "A bug", Feedback.FeedbackCategory.Bug); + Assert.That(saved.Status, Is.EqualTo(Feedback.FeedbackStatus.Open)); + + //act + var ok = feedback.UpdateStatus(saved.Id, Feedback.FeedbackStatus.Reviewed); + + //assert + Assert.That(ok, Is.True); + Assert.That( + context.Feedbacks.Single().Status, + Is.EqualTo(Feedback.FeedbackStatus.Reviewed) + ); + } + + [Test] + public void UpdateStatus_ReturnsFalseForMissingRow() + { + using var context = CreateContext(); + var feedback = new FeedbackManagement(context); + Assert.That(feedback.UpdateStatus(999, Feedback.FeedbackStatus.Closed), Is.False); + } + + [Test] + public void GetForUser_ReturnsOnlyTheUsersOwnFeedback() + { + //arrange + using var context = CreateContext(); + var user = SeedUser(context); + var other = new User + { + Email = "other@example.com", + DisplayName = "Other", + GoogleId = "google-456", + CreatedAt = DateTime.UtcNow, + }; + context.Users.Add(other); + context.SaveChanges(); + var feedback = new FeedbackManagement(context); + feedback.Submit(user.Id, "Mine", Feedback.FeedbackCategory.Bug); + feedback.Submit(other.Id, "Theirs", Feedback.FeedbackCategory.Other); + + //act + var mine = feedback.GetForUser(user.Id); + + //assert — strictly scoped to the requesting user + Assert.That(mine, Has.Count.EqualTo(1)); + Assert.That(mine[0].Message, Is.EqualTo("Mine")); + } } diff --git a/WSIST/WSIST.Web/Components/App.razor b/WSIST/WSIST.Web/Components/App.razor index c006301..209c3c8 100644 --- a/WSIST/WSIST.Web/Components/App.razor +++ b/WSIST/WSIST.Web/Components/App.razor @@ -1,5 +1,6 @@ - - +@using System.Globalization + + diff --git a/WSIST/WSIST.Web/Components/LanguageToggle.razor b/WSIST/WSIST.Web/Components/LanguageToggle.razor new file mode 100644 index 0000000..63d6dae --- /dev/null +++ b/WSIST/WSIST.Web/Components/LanguageToggle.razor @@ -0,0 +1,24 @@ +@using System.Globalization +@inject NavigationManager Nav +@inject IStringLocalizer Localizer + +@* EN / DE switch. Each link is a full (non-enhanced) navigation to the + set-language endpoint, which writes the culture cookie + saves the + preference, then redirects back to the current page. *@ +
+ EN + + DE +
+ +@code { + private bool IsGerman => CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "de"; + + // Local relative path (with leading slash) for the round-trip redirect. + private string CurrentPath => + Uri.EscapeDataString("/" + Nav.ToBaseRelativePath(Nav.Uri)); +} diff --git a/WSIST/WSIST.Web/Components/Pages/AuthenticatedComponentBase.cs b/WSIST/WSIST.Web/Components/Pages/AuthenticatedComponentBase.cs index 1f92567..e7c1a83 100644 --- a/WSIST/WSIST.Web/Components/Pages/AuthenticatedComponentBase.cs +++ b/WSIST/WSIST.Web/Components/Pages/AuthenticatedComponentBase.cs @@ -13,6 +13,11 @@ NavigationManager navigation { protected int CurrentUserId { get; private set; } + // The authenticated user's email claim, exposed so pages can do + // owner/admin gating (e.g. the feedback listing) without re-reading the + // auth state themselves. + protected string? CurrentUserEmail { get; private set; } + protected override async Task OnInitializedAsync() { var authState = await authStateProvider.GetAuthenticationStateAsync(); @@ -40,6 +45,7 @@ protected override async Task OnInitializedAsync() { var dbUser = management.GetOrCreateUser(email, name, googleId); CurrentUserId = dbUser.Id; + CurrentUserEmail = dbUser.Email; } catch (Exception) { diff --git a/WSIST/WSIST.Web/Components/Pages/Error.razor b/WSIST/WSIST.Web/Components/Pages/Error.razor index 48a6207..de27013 100644 --- a/WSIST/WSIST.Web/Components/Pages/Error.razor +++ b/WSIST/WSIST.Web/Components/Pages/Error.razor @@ -1,13 +1,14 @@ @page "/Error" @layout EmptyLayout @using WSIST.Web.Components.Layout -Error – WSIST +@inject IStringLocalizer Localizer +@Localizer["Error_Title"] – WSIST
-

Something went wrong

-

An unexpected error occurred. If this keeps happening, try logging out and back in.

- ← Back to home +

@Localizer["Error_Title"]

+

@Localizer["Error_Sub"]

+ ← @Localizer["Common_BackToHome"]
diff --git a/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor b/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor new file mode 100644 index 0000000..eda0f9e --- /dev/null +++ b/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor @@ -0,0 +1,122 @@ +@page "/feedback" +@rendermode @(new InteractiveServerRenderMode(prerender: false)) +@inherits AuthenticatedComponentBase +@using WSIST.Engine +WSIST — @localizer["Feedback_Title"] + +
+
+ + WSIST logo + WSIST + + + ← @localizer["Common_Back"] + @localizer["Common_Logout"] +
+ +
+
+

@localizer["Feedback_Title"]

+

@localizer["Feedback_Subtitle"]

+
+ +
+

@localizer["Feedback_Submit"]

+
+ +
+
+ +
+

@localizer["Feedback_YourSubmissions"]

+
+ @if (myFeedback.Count == 0) + { + + } + else + { + @foreach (var item in myFeedback) + { + + } + } +
+
+ + @if (isAdmin) + { +
+

@localizer["Feedback_AdminTitle"]

+
+ @if (allFeedback.Count == 0) + { + + } + else + { + @foreach (var item in allFeedback) + { + + } + } +
+
+ } +
+
diff --git a/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor.cs b/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor.cs new file mode 100644 index 0000000..e5e1ed8 --- /dev/null +++ b/WSIST/WSIST.Web/Components/Pages/FeedbackPage.razor.cs @@ -0,0 +1,98 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Localization; +using WSIST.Engine; + +namespace WSIST.Web.Components.Pages; + +public partial class FeedbackPage( + TestManagement management, + FeedbackManagement feedbackManagement, + AuthenticationStateProvider authStateProvider, + NavigationManager navigation, + IConfiguration configuration, + IStringLocalizer localizer +) : AuthenticatedComponentBase(management, authStateProvider, navigation) +{ + private Feedback.FeedbackCategory category = Feedback.FeedbackCategory.Bug; + private string message = string.Empty; + private bool isSubmitting; + private string? submitError; + private string? submitMessage; + + private bool isAdmin; + private List allFeedback = []; + private List myFeedback = []; + + protected override Task OnAuthenticatedAsync() + { + // The feedback listing is gated to the configured admin account only. + // An unset/blank Admin:Email means nobody is admin (safe default). + var adminEmail = configuration["Admin:Email"]; + isAdmin = + !string.IsNullOrWhiteSpace(adminEmail) + && string.Equals(adminEmail, CurrentUserEmail, StringComparison.OrdinalIgnoreCase); + + // Every user sees their own submission history. + myFeedback = feedbackManagement.GetForUser(CurrentUserId); + if (isAdmin) + allFeedback = feedbackManagement.GetAll(); + + return Task.CompletedTask; + } + + private void SubmitFeedback() + { + submitError = null; + submitMessage = null; + + if (isSubmitting) + return; + isSubmitting = true; + try + { + feedbackManagement.Submit(CurrentUserId, message, category); + } + catch (ArgumentException) + { + // An empty message is the common case (length is capped client-side + // and the category comes from a fixed dropdown); map it to a clear + // localized message and fall back to a generic one for any other + // engine validation failure rather than surfacing English text. + submitError = string.IsNullOrWhiteSpace(message) + ? localizer["Feedback_EmptyError"] + : localizer["Feedback_SubmitValidationError"]; + return; + } + finally + { + isSubmitting = false; + } + + message = string.Empty; + category = Feedback.FeedbackCategory.Bug; + submitMessage = localizer["Feedback_Thanks"]; + + // Reflect the new row immediately in the user's own history (and the + // admin's full listing). + myFeedback = feedbackManagement.GetForUser(CurrentUserId); + if (isAdmin) + allFeedback = feedbackManagement.GetAll(); + + StateHasChanged(); + } + + // Admin-only: change a submission's status from the listing. + private void ChangeStatus(int feedbackId, ChangeEventArgs e) + { + if (!isAdmin) + return; + if (Enum.TryParse(e.Value?.ToString(), out var status)) + { + feedbackManagement.UpdateStatus(feedbackId, status); + allFeedback = feedbackManagement.GetAll(); + myFeedback = feedbackManagement.GetForUser(CurrentUserId); + StateHasChanged(); + } + } +} diff --git a/WSIST/WSIST.Web/Components/Pages/Home.razor b/WSIST/WSIST.Web/Components/Pages/Home.razor index 93c1356..9fc518b 100644 --- a/WSIST/WSIST.Web/Components/Pages/Home.razor +++ b/WSIST/WSIST.Web/Components/Pages/Home.razor @@ -11,30 +11,31 @@ WSIST - Settings - Study → - Logout + + @localizer["Common_Settings"] + @localizer["Common_Study"] → + @localizer["Common_Logout"]
-

Your tests

-

Upcoming exams and assessments.

+

@localizer["Home_Title"]

+

@localizer["Home_Subtitle"]

- +
@if (MissingGrades.Any()) {
- ⏳ Enter missing grades + ⏳ @localizer["Home_EnterMissingGrades"]
@foreach (var test in MissingGrades) { @@ -53,15 +54,15 @@ var days = topRecommendation.DueDate.DayNumber - DateOnly.FromDateTime(DateTime.Today).DayNumber;
-
Study today
+
@localizer["Home_StudyToday"]
@topRecommendation.Title
- @(subjects.FirstOrDefault(s => s.Id == topRecommendation.Subject)?.Name ?? "Unknown") · in @days day@(days == 1 ? "" : "s") · @score/40 pts + @(subjects.FirstOrDefault(s => s.Id == topRecommendation.Subject)?.Name ?? localizer["Common_Unknown"].Value) · @(days == 1 ? localizer["Common_InOneDay"] : localizer["Common_InDaysFmt", days]) · @score/40 @localizer["Common_Points"]
- Full plan → + @localizer["Home_FullPlan"] →
@@ -75,8 +76,8 @@ {

📋

-

No upcoming tests

-

Add your first test to get started.

+

@localizer["Home_NoUpcomingTitle"]

+

@localizer["Home_NoUpcomingSub"]

} else @@ -84,11 +85,11 @@ - - - - - + + + + + @@ -97,13 +98,13 @@ { - + - - + + } @@ -118,7 +119,7 @@ @if (subjectAverages.Any()) {
-

Grades

+

@localizer["Home_Grades"]

@foreach (var (subject, avg) in subjectAverages.OrderBy(x => x.Value)) { @@ -138,7 +139,7 @@ @if (gradeHistory.Any()) {
-

Grade trends

+

@localizer["Home_GradeTrends"]

@foreach (var (subjectId, history) in gradeHistory) { @@ -184,7 +185,7 @@ }
- @history.Count test@(history.Count == 1 ? "" : "s") + @(history.Count == 1 ? localizer["Home_TestCountOne"] : localizer["Home_TestCountFmt", history.Count]) @(trend >= 0 ? "↑" : "↓") @Math.Abs(trend).ToString("F1") @@ -200,16 +201,16 @@
-

@(Mode == Modes.AddTest ? "Add test" : "Edit test")

+

@(Mode == Modes.AddTest ? localizer["Modal_AddTest"] : localizer["Modal_EditTest"])

- - + +
- + @if (!addingSubject) { } else {
- - - + +
@if (subjectError is not null) { @@ -237,37 +238,37 @@ }
- +
- +
- +
- +
- +
diff --git a/WSIST/WSIST.Web/Components/Pages/Home.razor.cs b/WSIST/WSIST.Web/Components/Pages/Home.razor.cs index 4cb90ca..2adf9d7 100644 --- a/WSIST/WSIST.Web/Components/Pages/Home.razor.cs +++ b/WSIST/WSIST.Web/Components/Pages/Home.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Localization; using WSIST.Engine; namespace WSIST.Web.Components.Pages; @@ -8,7 +9,8 @@ public partial class Home( TestManagement management, AuthenticationStateProvider authStateProvider, NavigationManager navigation, - PriorityCalculator calculator + PriorityCalculator calculator, + IStringLocalizer localizer ) : AuthenticatedComponentBase(management, authStateProvider, navigation) { private List allTests = []; @@ -154,12 +156,12 @@ private void ConfirmAddSubject() } catch (ArgumentException) { - subjectError = "Subject name cannot be empty."; + subjectError = localizer["Subject_EmptyError"]; return; } catch (SubjectAlreadyExistsException) { - subjectError = "A subject with that name already exists."; + subjectError = localizer["Subject_DuplicateError"]; return; } diff --git a/WSIST/WSIST.Web/Components/Pages/Login.razor b/WSIST/WSIST.Web/Components/Pages/Login.razor index eb5f65d..326b2ad 100644 --- a/WSIST/WSIST.Web/Components/Pages/Login.razor +++ b/WSIST/WSIST.Web/Components/Pages/Login.razor @@ -1,7 +1,8 @@ @page "/login-page" @layout EmptyLayout @using WSIST.Web.Components.Layout -WSIST — What should I study today? +@inject IStringLocalizer Localizer +WSIST — @Localizer["Landing_HeroLine1"] @Localizer["Landing_HeroLine2Pre"]@Localizer["Landing_HeroLine2Em"]
@@ -10,13 +11,14 @@
- The score - Try it - How it works - Sign in + @Localizer["Landing_NavScore"] + @Localizer["Landing_NavTry"] + @Localizer["Landing_NavHow"] + + @Localizer["Common_SignIn"]
@@ -25,54 +27,52 @@
-

Free for students · Built in Zürich

+

@Localizer["Landing_HeroEyebrow"]

- What should - I study today? + @Localizer["Landing_HeroLine1"] + @Localizer["Landing_HeroLine2Pre"]@Localizer["Landing_HeroLine2Em"]

- Five subjects, three tests next week, one free evening. WSIST scores every - upcoming test — urgency, volume, how well you get it, where your grades - stand — and tells you exactly where tonight goes. + @Localizer["Landing_HeroSub"]

- Continue with Google + @Localizer["Common_ContinueWithGoogle"] - See the score ↓ + @Localizer["Landing_SeeScore"] ↓
-

Free · no ads · your tests stay yours

+

@Localizer["Landing_HeroNoteBold"] @Localizer["Landing_HeroNoteRest"]

@@ -235,23 +232,23 @@
-

The routine

-

Twenty seconds in, one answer out.

+

@Localizer["Landing_HowEyebrow"]

+

@Localizer["Landing_HowTitlePre"]@Localizer["Landing_HowTitleEm"]@Localizer["Landing_HowTitlePost"]

-

Add the test.

-

Title, subject, date, how big it is, how well you get it. Twenty seconds, once per test.

+

@Localizer["Landing_Step1Title"]

+

@Localizer["Landing_Step1Desc"]

@@ -260,14 +257,14 @@
-

Say how much time you have.

-

One input. “How many hours can you study today?” is the only question WSIST ever asks you back.

+

@Localizer["Landing_Step2Title"]

+

@Localizer["Landing_Step2Desc"]

@@ -275,13 +272,13 @@
-

Study the top of the list.

-

Every test ranked out of 40, with the reasons spelled out — so you trust the order instead of second-guessing it.

+

@Localizer["Landing_Step3Title"]

+

@Localizer["Landing_Step3Desc"]

@@ -292,33 +289,33 @@
-

Also in the box

-

The quiet parts.

+

@Localizer["Landing_FeatEyebrow"]

+

@Localizer["Landing_FeatTitle"]

-

Grade overview per subject

-

Your averages on the dashboard, always current — so a slipping subject shows up before the report card does.

+

@Localizer["Landing_Feat1Title"]

+

@Localizer["Landing_Feat1Desc"]

-

Your subjects, not a preset

-

Add the subjects your school actually teaches. Wirtschaft, Werkstatt, whatever — WSIST doesn't care, it just scores.

+

@Localizer["Landing_Feat2Title"]

+

@Localizer["Landing_Feat2Desc"]

-

Every rank explains itself

-

Tap any card for its score breakdown. You always see why a test sits where it sits.

+

@Localizer["Landing_Feat3Title"]

+

@Localizer["Landing_Feat3Desc"]

-

Sign in with Google

-

Nothing new to remember. Your school account works fine.

+

@Localizer["Landing_Feat4Title"]

+

@Localizer["Landing_Feat4Desc"]

-

Private by default

-

Your tests and grades are visible to you alone, and you can delete them anytime. No ads, ever.

+

@Localizer["Landing_Feat5Title"]

+

@Localizer["Landing_Feat5Desc"]

-

“WSIST sagt” Soon

-

A daily study briefing in Swiss German, plus an Android app. In the works between exam weeks.

+

@Localizer["Landing_WsistSays"] @Localizer["Landing_Soon"]

+

@Localizer["Landing_Feat6Desc"]

@@ -328,22 +325,22 @@
- Built between apprenticeship shifts and exam weeks — by a student who needed it to exist. + @Localizer["Landing_ManifestoPre"]@Localizer["Landing_ManifestoBold"]
- Tim · Informatik-Lehrling · Zürich + @Localizer["Landing_ManifestoAttribution"]
-

Your next test is coming either way.

+

@Localizer["Landing_CtaTitlePre"]@Localizer["Landing_CtaTitleEm"]

- Continue with Google + @Localizer["Common_ContinueWithGoogle"] - Free · works in any browser + @Localizer["Landing_CtaSmall"]
@@ -351,13 +348,13 @@
diff --git a/WSIST/WSIST.Web/Components/Pages/NotFound.razor b/WSIST/WSIST.Web/Components/Pages/NotFound.razor index 1db5c8f..9d7e595 100644 --- a/WSIST/WSIST.Web/Components/Pages/NotFound.razor +++ b/WSIST/WSIST.Web/Components/Pages/NotFound.razor @@ -1,13 +1,14 @@ @page "/not-found" @layout EmptyLayout @using WSIST.Web.Components.Layout -Page not found – WSIST +@inject IStringLocalizer Localizer +@Localizer["NotFound_Title"] – WSIST
-

Page not found

-

The page you're looking for doesn't exist or has been moved.

- ← Back to home +

@Localizer["NotFound_Title"]

+

@Localizer["NotFound_Sub"]

+ ← @Localizer["Common_BackToHome"]
diff --git a/WSIST/WSIST.Web/Components/Pages/Privacy.razor b/WSIST/WSIST.Web/Components/Pages/Privacy.razor index 16cb261..a3b0c99 100644 --- a/WSIST/WSIST.Web/Components/Pages/Privacy.razor +++ b/WSIST/WSIST.Web/Components/Pages/Privacy.razor @@ -1,7 +1,8 @@ @page "/privacy" @layout EmptyLayout @using WSIST.Web.Components.Layout -Privacy Policy – WSIST +@inject IStringLocalizer Localizer +@Localizer["Privacy_Title"] – WSIST
- ← Back +
+ + ← @Localizer["Common_Back"] +
-

Privacy Policy

-

Last updated: @(new DateTime(2026, 6, 1).ToString("MMMM d, yyyy"))

- -

1. Who we are

-

WSIST ("What Should I Study Today") is a personal study planning application developed and operated by Tim Hug, based in Switzerland. This privacy policy explains what personal data we collect, how we use it, and what rights you have.

-

Contact: privacy@wsist.forch.me

- -

2. Data we collect

-

When you sign in with Google, we receive and store the following data from Google's OAuth service:

-
    -
  • Email address — used to identify your account
    • -
  • Display name — shown in the application
    • -
  • Google user ID — used to link your Google account to your WSIST account
    • -
-

We also store data you create while using the application:

-
    -
  • Test entries (title, subject, due date, volume, understanding level, grade)
    • -
  • Custom subjects you create
    • -
  • Your display name if you update it in settings
    • -
  • Your account creation timestamp
    • -
-

We do not collect location data, device identifiers, or any data beyond what is listed above.

- -

3. How we use your data

-

Your data is used solely to provide the WSIST service:

-
    -
  • Authenticating you when you log in
    • -
  • Storing and displaying your test entries
    • -
  • Calculating study recommendations and priority scores
    • -
  • Showing your grade overview
    • -
-

We do not sell your data, share it with advertisers, or use it for any purpose other than providing the service.

- -

4. Legal basis for processing (GDPR / Swiss nDSG)

-

We process your personal data on the basis of contract performance (Art. 6(1)(b) GDPR) — processing is necessary to provide the service you have requested. By creating an account and using WSIST, you enter into a contract with us for the provision of the application.

- -

5. Third-party services

-

Google OAuth: Login is handled via Google's OAuth 2.0 service. When you authenticate, Google shares your profile data with us as described in section 2. Google's own privacy policy applies to the authentication process: policies.google.com/privacy.

-

Railway: The application is hosted on Railway (railway.app). Your data is stored on a MySQL database on their infrastructure. Railway's privacy policy applies to hosting: railway.app/legal/privacy.

-

Cloudflare: The application is served behind Cloudflare's CDN. Cloudflare may process connection metadata (IP address, request headers) as part of its service. Cloudflare's privacy policy: cloudflare.com/privacypolicy.

- -

6. Data retention

-

Your data is retained for as long as you have an active account. If you wish to delete your account and all associated data, contact us at privacy@wsist.forch.me and we will delete it within 30 days.

- -

7. Your rights

-

Under the GDPR and Swiss nDSG, you have the following rights:

-
    -
  • Access: You can request a copy of all personal data we hold about you.
    • -
  • Rectification: You can correct inaccurate data via the Settings page or by contacting us.
    • -
  • Erasure: You can request deletion of your account and all associated data.
    • -
  • Portability: You can request your data in a machine-readable format.
    • -
  • Objection: You can object to processing in certain circumstances.
    • -
-

To exercise any of these rights, contact us at privacy@wsist.forch.me. We will respond within 30 days.

- -

8. Cookies and sessions

-

WSIST uses a single authentication cookie (`.AspNetCore.Cookies`) to maintain your login session. This cookie is strictly necessary for the application to function and does not track you across other websites. No analytics, advertising, or third-party tracking cookies are used.

- -

9. Security

-

Your data is transmitted over HTTPS. Passwords are never stored — authentication is handled entirely by Google. Database access is restricted to the application only.

- -

10. Changes to this policy

-

If we make material changes to this policy, we will update the "last updated" date at the top of this page. Continued use of WSIST after changes constitutes acceptance of the updated policy.

- -

11. Contact

-

Questions about this privacy policy? Contact us at privacy@wsist.forch.me.

+

@Localizer["Privacy_Title"]

+

@Localizer["Legal_LastUpdated"] @(new DateTime(2026, 6, 1).ToString("MMMM d, yyyy"))

+ + @* Section bodies are static, developer-authored HTML stored in the + resource files; rendered as markup so inline emphasis and links + survive translation. No user input is involved. *@ + @((MarkupString)Localizer["Privacy_Sec1"].Value) + @((MarkupString)Localizer["Privacy_Sec2"].Value) + @((MarkupString)Localizer["Privacy_Sec3"].Value) + @((MarkupString)Localizer["Privacy_Sec4"].Value) + @((MarkupString)Localizer["Privacy_Sec5"].Value) + @((MarkupString)Localizer["Privacy_Sec6"].Value) + @((MarkupString)Localizer["Privacy_Sec7"].Value) + @((MarkupString)Localizer["Privacy_Sec8"].Value) + @((MarkupString)Localizer["Privacy_Sec9"].Value) + @((MarkupString)Localizer["Privacy_Sec10"].Value) + @((MarkupString)Localizer["Privacy_Sec11"].Value)
diff --git a/WSIST/WSIST.Web/Components/Pages/Settings.razor b/WSIST/WSIST.Web/Components/Pages/Settings.razor index 5d0bef0..3909d4e 100644 --- a/WSIST/WSIST.Web/Components/Pages/Settings.razor +++ b/WSIST/WSIST.Web/Components/Pages/Settings.razor @@ -1,35 +1,36 @@ @page "/settings" @rendermode @(new InteractiveServerRenderMode(prerender: false)) @inherits AuthenticatedComponentBase -WSIST — Settings +WSIST — @localizer["Settings_Title"]
-
+ WSIST logo WSIST -
- ← Back - Logout + + + ← @localizer["Common_Back"] + @localizer["Common_Logout"]
-

Settings

-

Manage your profile and subjects.

+

@localizer["Settings_Title"]

+

@localizer["Settings_Subtitle"]

@if (currentUser is not null) {
-

Profile

+

@localizer["Settings_Profile"]

- Display name + @localizer["Settings_DisplayName"]
- +
@if (saveMessage is not null) { @@ -38,18 +39,18 @@
- Email + @localizer["Settings_Email"] @currentUser.Email
- Member since + @localizer["Settings_MemberSince"] @currentUser.CreatedAt.ToString("MMMM yyyy")
-

Subjects

+

@localizer["Settings_Subjects"]

@foreach (var subject in subjects) { @@ -57,18 +58,18 @@ @subject.Name @if (subject.IsSystem) { - system + @localizer["Settings_SystemBadge"] } else { - + }
}
- - + +
@if (subjectError is not null) { @@ -79,35 +80,70 @@
-

Account

+

@localizer["Settings_Data"]

+
+
+
+ @localizer["Settings_ExportTitle"] +

+ @localizer["Settings_ExportSub"] +

+
+
+ CSV + JSON +
+
+
+
+ +
+

@localizer["Settings_Feedback"]

+
+
+
+ @localizer["Settings_FeedbackTitle"] +

+ @localizer["Settings_FeedbackSub"] +

+
+ @localizer["Common_Open"] +
+
+
+ +
+

@localizer["Settings_Account"]

@if (!showDeleteConfirm) {
- Delete account + @localizer["Settings_DeleteAccount"]

- Permanently removes your account and all test data. + @localizer["Settings_DeleteAccountSub"]

} else {
-

Are you sure?

+

@localizer["Settings_AreYouSure"]

- This will permanently delete your account, all @allTests.Count test@(allTests.Count == 1 ? "" : "s"), and all custom subjects. This cannot be undone. + @(allTests.Count == 1 + ? localizer["Settings_DeleteConfirmOne"] + : localizer["Settings_DeleteConfirmFmt", allTests.Count])

diff --git a/WSIST/WSIST.Web/Components/Pages/Settings.razor.cs b/WSIST/WSIST.Web/Components/Pages/Settings.razor.cs index f96bf8b..158160a 100644 --- a/WSIST/WSIST.Web/Components/Pages/Settings.razor.cs +++ b/WSIST/WSIST.Web/Components/Pages/Settings.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Localization; using WSIST.Engine; namespace WSIST.Web.Components.Pages; @@ -7,7 +8,8 @@ namespace WSIST.Web.Components.Pages; public partial class Settings( TestManagement management, AuthenticationStateProvider authStateProvider, - NavigationManager navigation + NavigationManager navigation, + IStringLocalizer localizer ) : AuthenticatedComponentBase(management, authStateProvider, navigation) { private User? currentUser; @@ -35,7 +37,7 @@ private void SaveDisplayName() return; management.UpdateDisplayName(CurrentUserId, editedDisplayName); currentUser = management.GetUser(CurrentUserId); - saveMessage = "Saved."; + saveMessage = localizer["Settings_Saved"]; StateHasChanged(); } @@ -51,12 +53,12 @@ private void AddSubject() } catch (ArgumentException) { - subjectError = "Subject name cannot be empty."; + subjectError = localizer["Subject_EmptyError"]; return; } catch (SubjectAlreadyExistsException) { - subjectError = "A subject with that name already exists."; + subjectError = localizer["Subject_DuplicateError"]; return; } @@ -70,8 +72,7 @@ private void DeleteSubject(int subjectId) subjectError = null; if (!management.RemoveCustomSubject(subjectId, CurrentUserId)) { - subjectError = - "Cannot delete a subject that still has tests. Delete or reassign those tests first."; + subjectError = localizer["Settings_SubjectInUseError"]; StateHasChanged(); return; } diff --git a/WSIST/WSIST.Web/Components/Pages/Study.razor b/WSIST/WSIST.Web/Components/Pages/Study.razor index f26b2cd..d287675 100644 --- a/WSIST/WSIST.Web/Components/Pages/Study.razor +++ b/WSIST/WSIST.Web/Components/Pages/Study.razor @@ -6,36 +6,37 @@
-
+ WSIST logo WSIST -
- ← Back - Logout + + + ← @localizer["Common_Back"] + @localizer["Common_Logout"]
-

What should I study?

-

Tell us how much time you have — we'll figure out the rest.

+

@localizer["Study_Title"]

+

@localizer["Study_Subtitle"]

@if (!weeklyMode) {
- +
- +
@@ -45,14 +46,14 @@ {

🎉

-

You're all caught up

-

No upcoming tests — enjoy your free time.

+

@localizer["Study_CaughtUpTitle"]

+

@localizer["Study_CaughtUpSub"]

} else {
-

Study these today

+

@localizer["Study_StudyTheseToday"]

@foreach (var test in recommendations) { var score = calculator.CalculateTotalScore(test, allTests); @@ -62,7 +63,7 @@

@test.Title

- @(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? "Unknown") · in @days day@(days == 1 ? "" : "s") + @(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? localizer["Common_Unknown"].Value) · @(days == 1 ? localizer["Common_InOneDay"] : localizer["Common_InDaysFmt", days])

@score/40 @@ -75,16 +76,16 @@ @if (studiedTestId == test.Id) {
- How's your understanding now? + @localizer["Study_HowUnderstanding"]
- - + +
} @@ -92,7 +93,7 @@ {
} @@ -105,7 +106,7 @@ else {
- +
@foreach (var day in weeklyHours.Keys) { @@ -118,7 +119,7 @@ }
@@ -132,7 +133,7 @@ @DayLabel(date) @if (!tests.Any()) { - Day off + @localizer["Study_DayOff"] }
@if (tests.Any()) @@ -146,8 +147,8 @@
@test.Title - @(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? "Unknown") - · @days day@(days == 1 ? "" : "s") away + @(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? localizer["Common_Unknown"].Value) + · @(days == 1 ? localizer["Study_OneDayAway"] : localizer["Study_DaysAwayFmt", days])
@score/40 diff --git a/WSIST/WSIST.Web/Components/Pages/Study.razor.cs b/WSIST/WSIST.Web/Components/Pages/Study.razor.cs index ed24ac5..9273aef 100644 --- a/WSIST/WSIST.Web/Components/Pages/Study.razor.cs +++ b/WSIST/WSIST.Web/Components/Pages/Study.razor.cs @@ -1,6 +1,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Localization; using WSIST.Engine; namespace WSIST.Web.Components.Pages; @@ -9,7 +10,8 @@ public partial class Study( TestManagement management, AuthenticationStateProvider authStateProvider, NavigationManager navigation, - PriorityCalculator calculator + PriorityCalculator calculator, + IStringLocalizer localizer ) : AuthenticatedComponentBase(management, authStateProvider, navigation) { private List allTests = []; @@ -52,10 +54,10 @@ private void CalculateWeekly() weeklyCalculated = true; } - private static string DayLabel(DateOnly date) + private string DayLabel(DateOnly date) { var today = DateOnly.FromDateTime(DateTime.Today); - return date == today ? "Today" : date.ToString("ddd d MMM"); + return date == today ? localizer["Study_Today"] : date.ToString("ddd d MMM"); } private void OpenStudiedPrompt(Test test) @@ -97,7 +99,7 @@ private string GetScoreBreakdown(Test test) var understanding = calculator.CalculateUnderstandingScore(test.Understanding); var grade = calculator.CalculateGradeScore(test.Subject, allTests); - return $"Urgency: {urgency}/10 · Volume: {volume}/12 · Understanding: {understanding}/12 · Grade: {grade}/6"; + return $"{localizer["Score_Urgency"]}: {urgency}/10 · {localizer["Score_Volume"]}: {volume}/12 · {localizer["Score_Understanding"]}: {understanding}/12 · {localizer["Score_Grade"]}: {grade}/6"; } private string GetBecauseText(Test test) @@ -112,15 +114,18 @@ private string GetBecauseText(Test test) var subjectName = subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? test.Subject.ToString(); + var understandingWord = localizer[$"Level_{test.Understanding}"].Value.ToLowerInvariant(); + var volumeWord = localizer[$"Level_{test.Volume}"].Value.ToLowerInvariant(); + var parts = new List { - $"you have {Test.UnderstandingHelper(test.Understanding).ToLower()} understanding", - $"the test has {Test.VolumeHelper(test.Volume).ToLower()} volume", - $"it's in {days} day{(days == 1 ? "" : "s")}", + localizer["Because_Understanding", understandingWord], + localizer["Because_Volume", volumeWord], + days == 1 ? localizer["Because_InOneDay"] : localizer["Because_InDaysFmt", days], }; if (avgGrade > 0) - parts.Add($"your average grade in {subjectName} is {avgGrade:F1}"); + parts.Add(localizer["Because_AvgGradeFmt", subjectName, avgGrade.ToString("F1")]); return string.Join(", ", parts); } diff --git a/WSIST/WSIST.Web/Components/Pages/Terms.razor b/WSIST/WSIST.Web/Components/Pages/Terms.razor index 1fdc7ce..9a527d5 100644 --- a/WSIST/WSIST.Web/Components/Pages/Terms.razor +++ b/WSIST/WSIST.Web/Components/Pages/Terms.razor @@ -1,7 +1,8 @@ @page "/terms" @layout EmptyLayout @using WSIST.Web.Components.Layout -Terms of Use – WSIST +@inject IStringLocalizer Localizer +@Localizer["Terms_Title"] – WSIST
- ← Back +
+ + ← @Localizer["Common_Back"] +
-

Terms of Use

-

Last updated: @(new DateTime(2026, 6, 1).ToString("MMMM d, yyyy"))

- -

1. Acceptance of terms

-

By accessing or using WSIST ("What Should I Study Today") at wsist.forch.me, you agree to be bound by these Terms of Use. If you do not agree, do not use the service.

- -

2. Description of service

-

WSIST is a personal study planning tool that helps students track upcoming tests, estimate their preparedness, and determine what to study on a given day. The service is provided free of charge for personal, non-commercial use.

- -

3. Account and access

-

Access to WSIST requires a Google account. By signing in, you authorise WSIST to receive your name and email address from Google as described in our Privacy Policy. You are responsible for keeping your Google account secure.

-

One account per person. You may not share your account with others or create accounts on behalf of third parties.

- -

4. Acceptable use

-

You agree not to:

-
    -
  • Use WSIST for any unlawful purpose
    • -
  • Attempt to access other users' data
    • -
  • Attempt to reverse-engineer, disrupt, or overload the service
    • -
  • Use automated tools to scrape or extract data from the service
    • -
- -

5. Your content

-

You own the data you enter into WSIST (test entries, subjects, grades). We do not claim any ownership over it. You grant us a limited licence to store and process it solely for the purpose of providing the service to you.

- -

6. Service availability

-

WSIST is a personal project and is provided on an "as is" and "as available" basis. We make no guarantees about uptime, data preservation, or continued availability. We may modify or discontinue the service at any time without notice.

- -

7. Disclaimer of warranties

-

To the fullest extent permitted by law, WSIST is provided without warranties of any kind, express or implied. We do not warrant that the service will be error-free, uninterrupted, or that the study recommendations it produces will lead to any particular academic outcome.

- -

8. Limitation of liability

-

To the fullest extent permitted by applicable law, Tim Hug and the WSIST project shall not be liable for any indirect, incidental, or consequential damages arising from your use of or inability to use the service.

- -

9. Changes to terms

-

We may update these terms at any time. The "last updated" date at the top of this page will reflect any changes. Continued use of WSIST after changes are posted constitutes acceptance of the updated terms.

- -

10. Governing law

-

These terms are governed by the laws of Switzerland, without regard to conflict of law principles. Any disputes arising from these terms shall be subject to the exclusive jurisdiction of the courts of the Canton of Zurich, Switzerland.

- -

11. Contact

-

Questions about these terms? Contact us at privacy@wsist.forch.me.

+

@Localizer["Terms_Title"]

+

@Localizer["Legal_LastUpdated"] @(new DateTime(2026, 6, 1).ToString("MMMM d, yyyy"))

+ + @* Section bodies are static, developer-authored HTML stored in the + resource files; rendered as markup so inline emphasis and links + survive translation. No user input is involved. *@ + @((MarkupString)Localizer["Terms_Sec1"].Value) + @((MarkupString)Localizer["Terms_Sec2"].Value) + @((MarkupString)Localizer["Terms_Sec3"].Value) + @((MarkupString)Localizer["Terms_Sec4"].Value) + @((MarkupString)Localizer["Terms_Sec5"].Value) + @((MarkupString)Localizer["Terms_Sec6"].Value) + @((MarkupString)Localizer["Terms_Sec7"].Value) + @((MarkupString)Localizer["Terms_Sec8"].Value) + @((MarkupString)Localizer["Terms_Sec9"].Value) + @((MarkupString)Localizer["Terms_Sec10"].Value) + @((MarkupString)Localizer["Terms_Sec11"].Value)
diff --git a/WSIST/WSIST.Web/Components/_Imports.razor b/WSIST/WSIST.Web/Components/_Imports.razor index 1e8270c..28ef384 100644 --- a/WSIST/WSIST.Web/Components/_Imports.razor +++ b/WSIST/WSIST.Web/Components/_Imports.razor @@ -9,4 +9,5 @@ @using WSIST.Web @using WSIST.Web.Components @using Microsoft.AspNetCore.Authorization -@using Microsoft.AspNetCore.Components.Authorization \ No newline at end of file +@using Microsoft.AspNetCore.Components.Authorization +@using Microsoft.Extensions.Localization \ No newline at end of file diff --git a/WSIST/WSIST.Web/DbRequestCultureProvider.cs b/WSIST/WSIST.Web/DbRequestCultureProvider.cs new file mode 100644 index 0000000..c239dd1 --- /dev/null +++ b/WSIST/WSIST.Web/DbRequestCultureProvider.cs @@ -0,0 +1,39 @@ +using System.Security.Claims; +using Microsoft.AspNetCore.Localization; +using WSIST.Engine; + +namespace WSIST.Web; + +// Resolves the UI language for a signed-in user from their stored +// PreferredLanguage. Runs ahead of the cookie and Accept-Language providers, so +// a saved preference wins and persists across logout/login (and across devices). +// While PreferredLanguage is null this returns null and the next provider +// (cookie, then Accept-Language) decides — that's how a first-time user defaults +// to their browser language. +public sealed class DbRequestCultureProvider : RequestCultureProvider +{ + public override async Task DetermineProviderCultureResult( + HttpContext httpContext + ) + { + if (httpContext.User?.Identity?.IsAuthenticated != true) + return null; + + var email = httpContext.User.FindFirst(ClaimTypes.Email)?.Value; + if (string.IsNullOrEmpty(email)) + return null; + + var management = httpContext.RequestServices.GetService(); + if (management is null) + return null; + + var lang = await management.GetPreferredLanguageByEmailAsync( + email, + httpContext.RequestAborted + ); + if (string.IsNullOrEmpty(lang)) + return null; + + return new ProviderCultureResult(lang); + } +} diff --git a/WSIST/WSIST.Web/Program.cs b/WSIST/WSIST.Web/Program.cs index 9c3a1e4..352899a 100644 --- a/WSIST/WSIST.Web/Program.cs +++ b/WSIST/WSIST.Web/Program.cs @@ -1,15 +1,36 @@ +using System.Globalization; using System.Security.Claims; +using System.Text; +using System.Text.Json; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.Google; using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using WSIST.Engine; +using WSIST.Web; using WSIST.Web.Components; var builder = WebApplication.CreateBuilder(args); builder.Services.AddRazorComponents().AddInteractiveServerComponents(); +builder.Services.AddLocalization(options => options.ResourcesPath = "Resources"); + +// UI text can be English or German; data formatting (dates, grade decimals) is +// pinned to English so switching language never changes how a "5.5" grade is +// parsed or shown. Hence one supported *culture* (en) but two supported *UI +// cultures* (en, de) — only the UI culture, which IStringLocalizer reads, flips. +var supportedUICultures = new[] { new CultureInfo("en"), new CultureInfo("de") }; +builder.Services.Configure(options => +{ + options.DefaultRequestCulture = new RequestCulture("en"); + options.SupportedCultures = new[] { new CultureInfo("en") }; + options.SupportedUICultures = supportedUICultures; + // A signed-in user's saved preference wins; otherwise the cookie (set by the + // toggle), then the browser's Accept-Language header, then English. + options.RequestCultureProviders.Insert(0, new DbRequestCultureProvider()); +}); builder.Services.Configure(options => { options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; @@ -48,6 +69,7 @@ }); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddHttpContextAccessor(); builder.Services.AddCascadingAuthenticationState(); @@ -62,13 +84,16 @@ app.UseForwardedHeaders(); app.UseAuthentication(); app.UseAuthorization(); + +// After authentication so the DB culture provider can read the signed-in user. +app.UseRequestLocalization(); app.UseAntiforgery(); app.Use( async (context, next) => { var isAuthenticated = context.User?.Identity?.IsAuthenticated ?? false; - var protectedPaths = new[] { "/", "/study", "/settings" }; + var protectedPaths = new[] { "/", "/study", "/settings", "/feedback" }; if ( protectedPaths.Contains(context.Request.Path.Value, StringComparer.OrdinalIgnoreCase) && !isAuthenticated @@ -129,6 +154,105 @@ ) .RequireAuthorization(); +app.MapGet( + "/api/export", + (HttpContext ctx, TestManagement management, string? format) => + { + if (!ctx.User.Identity?.IsAuthenticated ?? true) + return Results.Unauthorized(); + + var email = ctx.User.FindFirst(ClaimTypes.Email)?.Value; + if (email is null) + return Results.Unauthorized(); + + // Resolve the user from their own authenticated claims and scope the + // export strictly to that id. The caller cannot supply a user id, so + // one user's export can never contain another user's rows. This + // endpoint exists for nDSG / GDPR data portability. + var user = management.GetOrCreateUser( + email, + ctx.User.FindFirst(ClaimTypes.Name)?.Value ?? "Unknown", + ctx.User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "" + ); + + var rows = management.GetTestExport(user.Id); + + if (string.Equals(format, "json", StringComparison.OrdinalIgnoreCase)) + { + var json = JsonSerializer.Serialize( + rows, + new JsonSerializerOptions { WriteIndented = true } + ); + return Results.File( + Encoding.UTF8.GetBytes(json), + "application/json", + "wsist-tests.json" + ); + } + + // Default to CSV. Prepend a UTF-8 BOM so spreadsheet apps (Excel) + // render accented characters — relevant for German subject names. + var csv = TestExporter.ToCsv(rows); + var csvBytes = Encoding + .UTF8.GetPreamble() + .Concat(Encoding.UTF8.GetBytes(csv)) + .ToArray(); + return Results.File(csvBytes, "text/csv", "wsist-tests.csv"); + } + ) + .RequireAuthorization(); + +app.MapGet( + "/set-language/{culture}", + (string culture, string? redirectUri, HttpContext ctx, TestManagement management) => + { + // Only ever honour the two languages we ship; anything else is English. + var lang = culture == "de" ? "de" : "en"; + + // Persist the choice: a cookie (covers anonymous visitors and the + // immediate post-redirect render) and, for signed-in users, the + // durable DB preference that survives logout/login. + ctx.Response.Cookies.Append( + CookieRequestCultureProvider.DefaultCookieName, + CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(lang)), + new CookieOptions + { + Expires = DateTimeOffset.UtcNow.AddYears(1), + IsEssential = true, + Path = "/", + SameSite = SameSiteMode.Lax, + Secure = true, + } + ); + + if (ctx.User.Identity?.IsAuthenticated == true) + { + var email = ctx.User.FindFirst(ClaimTypes.Email)?.Value; + if (email is not null) + { + var user = management.GetOrCreateUser( + email, + ctx.User.FindFirst(ClaimTypes.Name)?.Value ?? "Unknown", + ctx.User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "" + ); + management.UpdatePreferredLanguage(user.Id, lang); + } + } + + // Only redirect to a local relative path — never an absolute or + // protocol-relative URL — so this can't be used as an open redirect. + var target = + !string.IsNullOrEmpty(redirectUri) + && Uri.IsWellFormedUriString(redirectUri, UriKind.Relative) + && redirectUri.StartsWith('/') + && !redirectUri.StartsWith("//") + ? redirectUri + : "/"; + return Results.LocalRedirect(target); + } + ) + .AllowAnonymous(); + using (var scope = app.Services.CreateScope()) { var db = scope.ServiceProvider.GetRequiredService(); diff --git a/WSIST/WSIST.Web/Resources/SharedResource.de.resx b/WSIST/WSIST.Web/Resources/SharedResource.de.resx new file mode 100644 index 0000000..a797e0e --- /dev/null +++ b/WSIST/WSIST.Web/Resources/SharedResource.de.resx @@ -0,0 +1,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Zurück + Abmelden + Abbrechen + Speichern + Hinzufügen + Löschen + Bearbeiten + Entfernen + Öffnen + Unbekannt + Einstellungen + Lernen + Zur Startseite + Mit Google anmelden + Pkt. + in 1 Tag + in {0} Tagen + + + Sehr niedrig + Niedrig + Mittel + Durchschnittlich + Hoch + Sehr hoch + + + Der Fachname darf nicht leer sein. + Ein Fach mit diesem Namen existiert bereits. + + + Deine Prüfungen + Anstehende Prüfungen und Tests. + Vergangene anzeigen + Vergangene ausblenden + Prüfung hinzufügen + Fehlende Noten eintragen + Heute lernen + Ganzer Plan + Keine anstehenden Prüfungen + Füge deine erste Prüfung hinzu, um loszulegen. + Titel + Fach + Datum + Umfang + Verständnis + Noten + Notenverlauf + 1 Prüfung + {0} Prüfungen + + + Prüfung hinzufügen + Prüfung bearbeiten + Titel + z. B. Mathe-Prüfung + Fach + + Neues Fach hinzufügen + Name des neuen Fachs + Fälligkeitsdatum + Umfang + Verständnis + Note + (verfügbar nach dem Prüfungsdatum) + Änderungen speichern + + + Was soll ich lernen? + Sag uns, wie viel Zeit du hast — den Rest übernehmen wir. + Heute + Diese Woche + Heute verfügbare Stunden + Berechnen + Alles erledigt + Keine anstehenden Prüfungen — genieße deine freie Zeit. + Lerne diese heute + Wie ist dein Verständnis jetzt? + Gelernt + Pro Tag verfügbare Stunden + Meine Woche planen + Freier Tag + noch 1 Tag + noch {0} Tage + Dringlichkeit + Umfang + Verständnis + Note + dein Verständnis ist {0} + der Umfang ist {0} + sie ist in 1 Tag + sie ist in {0} Tagen + dein Notendurchschnitt in {0} ist {1} + + + Einstellungen + Verwalte dein Profil und deine Fächer. + Profil + Anzeigename + Gespeichert. + E-Mail + Mitglied seit + Fächer + System + Name des neuen Fachs + Ein Fach mit zugeordneten Prüfungen kann nicht gelöscht werden. Lösche oder verschiebe diese Prüfungen zuerst. + Daten + Meine Daten exportieren + Lade alle deine Prüfungen und Noten herunter, einschließlich vergangener benoteter Prüfungen. + Feedback + Feedback & Funktionswünsche + Melde einen Fehler oder schlage eine Verbesserung vor. + Konto + Konto löschen + Entfernt dein Konto und alle Prüfungsdaten dauerhaft. + Bist du sicher? + Dadurch werden dein Konto, 1 Prüfung und alle eigenen Fächer dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden. + Dadurch werden dein Konto, alle {0} Prüfungen und alle eigenen Fächer dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden. + Ja, alles löschen + Wird gelöscht… + Sprache + + + Feedback + Fehler gefunden oder eine Idee? Lass es mich wissen. + Feedback einreichen + Kategorie + Fehler + Funktionswunsch + Sonstiges + Nachricht + Beschreibe den Fehler oder deine Idee… + Feedback senden + Wird gesendet… + Danke — dein Feedback wurde übermittelt. + Alle Einsendungen (Admin) + Noch kein Feedback eingegangen. + Die Feedback-Nachricht darf nicht leer sein. + Dein Feedback konnte nicht übermittelt werden. Bitte überprüfe deine Nachricht und versuche es erneut. + Dein Feedback + Du hast noch kein Feedback eingereicht. + Status + Offen + Geprüft + Geschlossen + + + Anmelden + Datenschutz + Nutzungsbedingungen + Mathe + Französisch + Chemie + Deutsch + Englisch + + + was soll ich heute lernen + Die Punktzahl + Ausprobieren + So funktioniert's + Kostenlos für Schüler · Entwickelt in Zürich + Was soll ich + heute + lernen? + Fünf Fächer, drei Prüfungen nächste Woche, ein freier Abend. WSIST bewertet jede anstehende Prüfung — Dringlichkeit, Umfang, wie gut du sie verstehst, wie deine Noten stehen — und sagt dir genau, was heute Abend dran ist. + Punktzahl ansehen + Kostenlos + · keine Werbung · deine Prüfungen bleiben deine + Heutige Wahl + Weil: + du verstehst es kaum, die Prüfung hat sehr viel Stoff, sie ist in 2 Tagen. + mittleres Verständnis, viel Stoff, dein Schnitt in Französisch ist 4.1. + durchschnittliches Verständnis, mittlerer Stoff, sie ist in 9 Tagen. + Die höchste Punktzahl wird zuerst gelernt + Die Engine + Deine Prüfungen, + bewertet. + Die Schule benotet dich das ganze Jahr. WSIST dreht den Spieß um — jede anstehende Prüfung erhält eine Prioritätspunktzahl von 40, aus vier Faktoren. Kein Bauchgefühl, kein schlechtes Gewissen. Nur Mathematik. + Morgen schlägt nächsten Monat. Die verbleibenden Tage geben den Takt vor. + Pkt. max + Drei Kapitel wiegen mehr als ein Arbeitsblatt. + sehr wenig +2 → sehr viel +12 + Je weniger es sitzt, desto weiter steigt sie. + sehr hoch +2 → sehr niedrig +12 + Notendruck + Fächer, in denen dein Schnitt abrutscht, bekommen einen Schub. + Demo ohne Anmeldung + Lass den + echten + Algorithmus laufen. + Diese Regler speisen dieselben Bewertungsregeln, die produktiv auf wsist.forch.me laufen. Bewege sie und sieh zu, wie eine Prüfung in deiner Liste nach oben klettert. + Tage bis zur Prüfung + heute + in 5 Wochen + Prüfungsumfang + ein Arbeitsblatt + drei Kapitel + Dein Verständnis + was ist das überhaupt + könnte es unterrichten + Dein Schnitt in diesem Fach + 6.0 — Schweizer Skala + Prioritätspunktzahl + / 40 Pkt. + dringlichkeit + umfang + verständnis + notendruck + Dieselbe Rechnung wie in der echten App + Lass alles stehen — das ist für heute Abend. + Der Ablauf + Zwanzig Sekunden rein, + eine Antwort + raus. + Prüfung hinzufügen. + Titel, Fach, Datum, wie umfangreich sie ist, wie gut du sie verstehst. Zwanzig Sekunden, einmal pro Prüfung. + Prüfungstitel + Fach · Fälligkeitsdatum + Sag, wie viel Zeit du hast. + Ein Eingabefeld. „Wie viele Stunden kannst du heute lernen?“ ist die einzige Frage, die WSIST dir je zurückstellt. + Wie viele Stunden kannst du heute lernen? + Lerne, was oben auf der Liste steht. + Jede Prüfung von 40 bewertet, mit ausformulierten Gründen — damit du der Reihenfolge vertraust, statt sie zu hinterfragen. + Außerdem dabei + Die leisen Teile. + Notenübersicht pro Fach + Deine Schnitte auf dem Dashboard, immer aktuell — so fällt ein abrutschendes Fach auf, bevor es das Zeugnis tut. + Deine Fächer, keine Vorgabe + Füge die Fächer hinzu, die deine Schule tatsächlich unterrichtet. Wirtschaft, Werkstatt, was auch immer — WSIST ist das egal, es bewertet einfach. + Jeder Rang erklärt sich selbst + Tippe auf eine Karte für die Aufschlüsselung der Punktzahl. Du siehst immer, warum eine Prüfung dort steht, wo sie steht. + Mit Google anmelden + Nichts Neues zu merken. Dein Schulkonto funktioniert problemlos. + Privat von Haus aus + Deine Prüfungen und Noten sind nur für dich sichtbar, und du kannst sie jederzeit löschen. Keine Werbung, niemals. + „WSIST sagt“ + Bald + Tim · Informatik-Lehrling · Zürich + Ein tägliches Lern-Briefing auf Schweizerdeutsch, dazu eine Android-App. Entsteht zwischen den Prüfungswochen. + Entstanden zwischen Lehrlingsschichten und Prüfungswochen — von einem Schüler, der + wollte, dass es existiert. + Deine nächste Prüfung kommt + so oder so. + Kostenlos · läuft in jedem Browser + Erstellt in Zürich · © 2026 Tim Hug + + + Zuletzt aktualisiert: + + + Datenschutzerklärung + <h2>1. Wer wir sind</h2> +<p>WSIST („What Should I Study Today“) ist eine persönliche Lernplanungs-Anwendung, entwickelt und betrieben von Tim Hug mit Sitz in der Schweiz. Diese Datenschutzerklärung erläutert, welche personenbezogenen Daten wir erheben, wie wir sie verwenden und welche Rechte du hast.</p> +<p>Kontakt: <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a></p> + <h2>2. Daten, die wir erheben</h2> +<p>Wenn du dich mit Google anmeldest, erhalten und speichern wir die folgenden Daten aus Googles OAuth-Dienst:</p> +<ul> +<li><strong>E-Mail-Adresse</strong> — zur Identifikation deines Kontos</li> +<li><strong>Anzeigename</strong> — in der Anwendung angezeigt</li> +<li><strong>Google-Benutzer-ID</strong> — zur Verknüpfung deines Google-Kontos mit deinem WSIST-Konto</li> +</ul> +<p>Wir speichern außerdem Daten, die du bei der Nutzung der Anwendung erstellst:</p> +<ul> +<li>Prüfungseinträge (Titel, Fach, Fälligkeitsdatum, Umfang, Verständnisgrad, Note)</li> +<li>Von dir erstellte eigene Fächer</li> +<li>Deinen Anzeigenamen, falls du ihn in den Einstellungen änderst</li> +<li>Den Zeitstempel der Kontoerstellung</li> +</ul> +<p>Wir erheben keine Standortdaten, Gerätekennungen oder Daten, die über das oben Genannte hinausgehen.</p> + <h2>3. Wie wir deine Daten verwenden</h2> +<p>Deine Daten werden ausschließlich zur Bereitstellung des WSIST-Dienstes verwendet:</p> +<ul> +<li>Deine Authentifizierung beim Anmelden</li> +<li>Speicherung und Anzeige deiner Prüfungseinträge</li> +<li>Berechnung von Lernempfehlungen und Prioritätspunktzahlen</li> +<li>Anzeige deiner Notenübersicht</li> +</ul> +<p>Wir verkaufen deine Daten nicht, geben sie nicht an Werbetreibende weiter und verwenden sie für keinen anderen Zweck als die Bereitstellung des Dienstes.</p> + <h2>4. Rechtsgrundlage der Verarbeitung (DSGVO / Schweizer nDSG)</h2> +<p>Wir verarbeiten deine personenbezogenen Daten auf Grundlage der <strong>Vertragserfüllung</strong> (Art. 6 Abs. 1 lit. b DSGVO) — die Verarbeitung ist erforderlich, um den von dir angeforderten Dienst bereitzustellen. Mit der Erstellung eines Kontos und der Nutzung von WSIST schließt du mit uns einen Vertrag über die Bereitstellung der Anwendung.</p> + <h2>5. Dienste von Drittanbietern</h2> +<p><strong>Google OAuth:</strong> Die Anmeldung erfolgt über Googles OAuth-2.0-Dienst. Bei der Authentifizierung teilt Google deine Profildaten mit uns, wie in Abschnitt 2 beschrieben. Für den Authentifizierungsvorgang gilt Googles eigene Datenschutzerklärung: <a href="https://policies.google.com/privacy" target="_blank" rel="noopener">policies.google.com/privacy</a>.</p> +<p><strong>Railway:</strong> Die Anwendung wird bei Railway (railway.app) gehostet. Deine Daten werden in einer MySQL-Datenbank auf deren Infrastruktur gespeichert. Für das Hosting gilt die Datenschutzerklärung von Railway: <a href="https://railway.app/legal/privacy" target="_blank" rel="noopener">railway.app/legal/privacy</a>.</p> +<p><strong>Cloudflare:</strong> Die Anwendung wird über das CDN von Cloudflare ausgeliefert. Cloudflare verarbeitet im Rahmen seines Dienstes möglicherweise Verbindungsmetadaten (IP-Adresse, Anfrage-Header). Datenschutzerklärung von Cloudflare: <a href="https://www.cloudflare.com/privacypolicy/" target="_blank" rel="noopener">cloudflare.com/privacypolicy</a>.</p> + <h2>6. Speicherdauer</h2> +<p>Deine Daten werden so lange gespeichert, wie du ein aktives Konto hast. Wenn du dein Konto und alle zugehörigen Daten löschen möchtest, kontaktiere uns unter <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>, und wir löschen sie innerhalb von 30 Tagen.</p> + <h2>7. Deine Rechte</h2> +<p>Nach DSGVO und Schweizer nDSG hast du die folgenden Rechte:</p> +<ul> +<li><strong>Auskunft:</strong> Du kannst eine Kopie aller personenbezogenen Daten anfordern, die wir über dich gespeichert haben.</li> +<li><strong>Berichtigung:</strong> Du kannst unrichtige Daten über die Einstellungsseite oder durch Kontaktaufnahme mit uns korrigieren.</li> +<li><strong>Löschung:</strong> Du kannst die Löschung deines Kontos und aller zugehörigen Daten verlangen.</li> +<li><strong>Datenübertragbarkeit:</strong> Du kannst deine Daten in einem maschinenlesbaren Format anfordern.</li> +<li><strong>Widerspruch:</strong> Du kannst der Verarbeitung unter bestimmten Umständen widersprechen.</li> +</ul> +<p>Um eines dieser Rechte auszuüben, kontaktiere uns unter <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>. Wir antworten innerhalb von 30 Tagen.</p> + <h2>8. Cookies und Sitzungen</h2> +<p>WSIST verwendet ein einziges Authentifizierungs-Cookie (.AspNetCore.Cookies), um deine Anmeldesitzung aufrechtzuerhalten. Dieses Cookie ist für die Funktion der Anwendung zwingend erforderlich und verfolgt dich nicht über andere Websites hinweg. Es werden keine Analyse-, Werbe- oder Tracking-Cookies von Dritten verwendet.</p> + <h2>9. Sicherheit</h2> +<p>Deine Daten werden über HTTPS übertragen. Passwörter werden niemals gespeichert — die Authentifizierung erfolgt vollständig über Google. Der Datenbankzugriff ist ausschließlich der Anwendung vorbehalten.</p> + <h2>10. Änderungen dieser Erklärung</h2> +<p>Wenn wir wesentliche Änderungen an dieser Erklärung vornehmen, aktualisieren wir das Datum „Zuletzt aktualisiert“ oben auf dieser Seite. Die fortgesetzte Nutzung von WSIST nach Änderungen gilt als Annahme der aktualisierten Erklärung.</p> + <h2>11. Kontakt</h2> +<p>Fragen zu dieser Datenschutzerklärung? Kontaktiere uns unter <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>.</p> + + + Nutzungsbedingungen + <h2>1. Annahme der Bedingungen</h2> +<p>Durch den Zugriff auf oder die Nutzung von WSIST („What Should I Study Today“) unter wsist.forch.me erklärst du dich mit diesen Nutzungsbedingungen einverstanden. Wenn du nicht einverstanden bist, nutze den Dienst nicht.</p> + <h2>2. Beschreibung des Dienstes</h2> +<p>WSIST ist ein persönliches Lernplanungs-Werkzeug, das Schülern hilft, anstehende Prüfungen zu verfolgen, ihren Vorbereitungsstand einzuschätzen und zu bestimmen, was an einem bestimmten Tag zu lernen ist. Der Dienst wird kostenlos für den persönlichen, nicht-kommerziellen Gebrauch bereitgestellt.</p> + <h2>3. Konto und Zugang</h2> +<p>Der Zugang zu WSIST erfordert ein Google-Konto. Mit der Anmeldung autorisierst du WSIST, deinen Namen und deine E-Mail-Adresse von Google zu erhalten, wie in unserer <a href="/privacy">Datenschutzerklärung</a> beschrieben. Du bist dafür verantwortlich, dein Google-Konto sicher zu halten.</p> +<p>Ein Konto pro Person. Du darfst dein Konto nicht mit anderen teilen oder Konten im Namen Dritter erstellen.</p> + <h2>4. Zulässige Nutzung</h2> +<p>Du verpflichtest dich, Folgendes zu unterlassen:</p> +<ul> +<li>WSIST für rechtswidrige Zwecke zu nutzen</li> +<li>Zu versuchen, auf Daten anderer Nutzer zuzugreifen</li> +<li>Zu versuchen, den Dienst zurückzuentwickeln, zu stören oder zu überlasten</li> +<li>Automatisierte Werkzeuge zu verwenden, um Daten aus dem Dienst auszulesen oder zu extrahieren</li> +</ul> + <h2>5. Deine Inhalte</h2> +<p>Die Daten, die du in WSIST eingibst (Prüfungseinträge, Fächer, Noten), gehören dir. Wir erheben keinen Anspruch auf Eigentum daran. Du gewährst uns eine eingeschränkte Lizenz, sie ausschließlich zum Zweck der Bereitstellung des Dienstes für dich zu speichern und zu verarbeiten.</p> + <h2>6. Verfügbarkeit des Dienstes</h2> +<p>WSIST ist ein persönliches Projekt und wird „wie besehen“ und „nach Verfügbarkeit“ bereitgestellt. Wir geben keine Garantien für Verfügbarkeit, Datenerhalt oder fortlaufenden Betrieb. Wir können den Dienst jederzeit ohne Vorankündigung ändern oder einstellen.</p> + <h2>7. Gewährleistungsausschluss</h2> +<p>Soweit gesetzlich zulässig, wird WSIST ohne jegliche ausdrückliche oder stillschweigende Gewährleistung bereitgestellt. Wir gewährleisten nicht, dass der Dienst fehlerfrei oder ununterbrochen ist oder dass die von ihm erstellten Lernempfehlungen zu einem bestimmten schulischen Ergebnis führen.</p> + <h2>8. Haftungsbeschränkung</h2> +<p>Soweit nach geltendem Recht zulässig, haften Tim Hug und das WSIST-Projekt nicht für indirekte, beiläufig entstandene oder Folgeschäden, die sich aus deiner Nutzung oder Nichtnutzung des Dienstes ergeben.</p> + <h2>9. Änderungen der Bedingungen</h2> +<p>Wir können diese Bedingungen jederzeit aktualisieren. Das Datum „Zuletzt aktualisiert“ oben auf dieser Seite spiegelt etwaige Änderungen wider. Die fortgesetzte Nutzung von WSIST nach Veröffentlichung von Änderungen gilt als Annahme der aktualisierten Bedingungen.</p> + <h2>10. Anwendbares Recht</h2> +<p>Diese Bedingungen unterliegen dem Recht der Schweiz, unter Ausschluss der Kollisionsnormen. Für alle Streitigkeiten aus diesen Bedingungen sind ausschließlich die Gerichte des Kantons Zürich, Schweiz, zuständig.</p> + <h2>11. Kontakt</h2> +<p>Fragen zu diesen Bedingungen? Kontaktiere uns unter <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>.</p> + + + Seite nicht gefunden + Die gesuchte Seite existiert nicht oder wurde verschoben. + Etwas ist schiefgelaufen + Ein unerwarteter Fehler ist aufgetreten. Falls das weiterhin passiert, melde dich ab und wieder an. + diff --git a/WSIST/WSIST.Web/Resources/SharedResource.resx b/WSIST/WSIST.Web/Resources/SharedResource.resx new file mode 100644 index 0000000..31a0d75 --- /dev/null +++ b/WSIST/WSIST.Web/Resources/SharedResource.resx @@ -0,0 +1,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Back + Logout + Cancel + Save + Add + Delete + Edit + Remove + Open + Unknown + Settings + Study + Back to home + Continue with Google + pts + in 1 day + in {0} days + + + Very Low + Low + Medium + Average + High + Very High + + + Subject name cannot be empty. + A subject with that name already exists. + + + Your tests + Upcoming exams and assessments. + Show past + Hide past + Add test + Enter missing grades + Study today + Full plan + No upcoming tests + Add your first test to get started. + Title + Subject + Date + Volume + Understanding + Grades + Grade trends + 1 test + {0} tests + + + Add test + Edit test + Title + e.g. Maths Exam + Subject + + Add new subject + New subject name + Due date + Volume + Understanding + Grade + (available after test date) + Save changes + + + What should I study? + Tell us how much time you have — we'll figure out the rest. + Today + This week + Hours available today + Calculate + You're all caught up + No upcoming tests — enjoy your free time. + Study these today + How's your understanding now? + Studied it + Hours available each day + Plan my week + Day off + 1 day away + {0} days away + Urgency + Volume + Understanding + Grade + you have {0} understanding + the test has {0} volume + it's in 1 day + it's in {0} days + your average grade in {0} is {1} + + + Settings + Manage your profile and subjects. + Profile + Display name + Saved. + Email + Member since + Subjects + system + New subject name + Cannot delete a subject that still has tests. Delete or reassign those tests first. + Data + Export my data + Download all your tests and grades, including past graded ones. + Feedback + Feedback & feature requests + Report a bug or suggest an improvement. + Account + Delete account + Permanently removes your account and all test data. + Are you sure? + This will permanently delete your account, 1 test, and all custom subjects. This cannot be undone. + This will permanently delete your account, all {0} tests, and all custom subjects. This cannot be undone. + Yes, delete everything + Deleting… + Language + + + Feedback + Found a bug or have an idea? Let me know. + Submit feedback + Category + Bug + Feature request + Other + Message + Describe the bug or your idea… + Send feedback + Sending… + Thanks — your feedback was submitted. + All submissions (admin) + No feedback submitted yet. + Feedback message cannot be empty. + Your feedback couldn't be submitted. Please check your message and try again. + Your feedback + You haven't submitted any feedback yet. + Status + Open + Reviewed + Closed + + + Sign in + Privacy + Terms + Math + French + Chemistry + German + English + + + what should I study today + The score + Try it + How it works + Free for students · Built in Zürich + What should + I study + today? + Five subjects, three tests next week, one free evening. WSIST scores every upcoming test — urgency, volume, how well you get it, where your grades stand — and tells you exactly where tonight goes. + See the score + Free + · no ads · your tests stay yours + Tonight's pick + Because: + you have low understanding, the test has very high volume, it's in 2 days. + medium understanding, high volume, your avg in French is 4.1. + average understanding, medium volume, it's in 9 days. + The highest score studies first + The engine + Your tests, + graded. + School grades you all year. WSIST turns the table — every upcoming test earns a priority score out of 40, built from four factors. No vibes, no guilt. Just arithmetic. + Tomorrow beats next month. Days left set the clock. + pts max + Three chapters outweigh one worksheet. + very low +2 → very high +12 + The less it clicks, the higher it climbs. + very high +2 → very low +12 + Grade pull + Subjects where your average slips get a push. + No-signup demo + Run the + real + algorithm. + These sliders feed the same scoring rules that run in production at wsist.forch.me. Move them and watch a test climb your list. + Days until the test + today + 5 weeks out + Test volume + one worksheet + three chapters + Your understanding + what even is this + could teach it + Your average in this subject + 6.0 — Swiss scale + Priority score + / 40 pts + urgency + volume + understanding + grade pull + Same maths as the production engine + Drop everything — this is tonight. + The routine + Twenty seconds in, + one answer + out. + Add the test. + Title, subject, date, how big it is, how well you get it. Twenty seconds, once per test. + Test title + Subject · Due date + Say how much time you have. + One input. “How many hours can you study today?” is the only question WSIST ever asks you back. + How many hours can you study today? + Study the top of the list. + Every test ranked out of 40, with the reasons spelled out — so you trust the order instead of second-guessing it. + Also in the box + The quiet parts. + Grade overview per subject + Your averages on the dashboard, always current — so a slipping subject shows up before the report card does. + Your subjects, not a preset + Add the subjects your school actually teaches. Wirtschaft, Werkstatt, whatever — WSIST doesn't care, it just scores. + Every rank explains itself + Tap any card for its score breakdown. You always see why a test sits where it sits. + Sign in with Google + Nothing new to remember. Your school account works fine. + Private by default + Your tests and grades are visible to you alone, and you can delete them anytime. No ads, ever. + “WSIST says” + Soon + Tim · Computer Science Apprentice · Zürich + A daily study briefing in Swiss German, plus an Android app. In the works between exam weeks. + Built between apprenticeship shifts and exam weeks — by a student who + needed it to exist. + Your next test is coming + either way. + Free · works in any browser + Made in Zürich · © 2026 Tim Hug + + + Last updated: + + + Privacy Policy + <h2>1. Who we are</h2> +<p>WSIST ("What Should I Study Today") is a personal study planning application developed and operated by Tim Hug, based in Switzerland. This privacy policy explains what personal data we collect, how we use it, and what rights you have.</p> +<p>Contact: <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a></p> + <h2>2. Data we collect</h2> +<p>When you sign in with Google, we receive and store the following data from Google's OAuth service:</p> +<ul> +<li><strong>Email address</strong> — used to identify your account</li> +<li><strong>Display name</strong> — shown in the application</li> +<li><strong>Google user ID</strong> — used to link your Google account to your WSIST account</li> +</ul> +<p>We also store data you create while using the application:</p> +<ul> +<li>Test entries (title, subject, due date, volume, understanding level, grade)</li> +<li>Custom subjects you create</li> +<li>Your display name if you update it in settings</li> +<li>Your account creation timestamp</li> +</ul> +<p>We do not collect location data, device identifiers, or any data beyond what is listed above.</p> + <h2>3. How we use your data</h2> +<p>Your data is used solely to provide the WSIST service:</p> +<ul> +<li>Authenticating you when you log in</li> +<li>Storing and displaying your test entries</li> +<li>Calculating study recommendations and priority scores</li> +<li>Showing your grade overview</li> +</ul> +<p>We do not sell your data, share it with advertisers, or use it for any purpose other than providing the service.</p> + <h2>4. Legal basis for processing (GDPR / Swiss nDSG)</h2> +<p>We process your personal data on the basis of <strong>contract performance</strong> (Art. 6(1)(b) GDPR) — processing is necessary to provide the service you have requested. By creating an account and using WSIST, you enter into a contract with us for the provision of the application.</p> + <h2>5. Third-party services</h2> +<p><strong>Google OAuth:</strong> Login is handled via Google's OAuth 2.0 service. When you authenticate, Google shares your profile data with us as described in section 2. Google's own privacy policy applies to the authentication process: <a href="https://policies.google.com/privacy" target="_blank" rel="noopener">policies.google.com/privacy</a>.</p> +<p><strong>Railway:</strong> The application is hosted on Railway (railway.app). Your data is stored on a MySQL database on their infrastructure. Railway's privacy policy applies to hosting: <a href="https://railway.app/legal/privacy" target="_blank" rel="noopener">railway.app/legal/privacy</a>.</p> +<p><strong>Cloudflare:</strong> The application is served behind Cloudflare's CDN. Cloudflare may process connection metadata (IP address, request headers) as part of its service. Cloudflare's privacy policy: <a href="https://www.cloudflare.com/privacypolicy/" target="_blank" rel="noopener">cloudflare.com/privacypolicy</a>.</p> + <h2>6. Data retention</h2> +<p>Your data is retained for as long as you have an active account. If you wish to delete your account and all associated data, contact us at <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a> and we will delete it within 30 days.</p> + <h2>7. Your rights</h2> +<p>Under the GDPR and Swiss nDSG, you have the following rights:</p> +<ul> +<li><strong>Access:</strong> You can request a copy of all personal data we hold about you.</li> +<li><strong>Rectification:</strong> You can correct inaccurate data via the Settings page or by contacting us.</li> +<li><strong>Erasure:</strong> You can request deletion of your account and all associated data.</li> +<li><strong>Portability:</strong> You can request your data in a machine-readable format.</li> +<li><strong>Objection:</strong> You can object to processing in certain circumstances.</li> +</ul> +<p>To exercise any of these rights, contact us at <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>. We will respond within 30 days.</p> + <h2>8. Cookies and sessions</h2> +<p>WSIST uses a single authentication cookie (.AspNetCore.Cookies) to maintain your login session. This cookie is strictly necessary for the application to function and does not track you across other websites. No analytics, advertising, or third-party tracking cookies are used.</p> + <h2>9. Security</h2> +<p>Your data is transmitted over HTTPS. Passwords are never stored — authentication is handled entirely by Google. Database access is restricted to the application only.</p> + <h2>10. Changes to this policy</h2> +<p>If we make material changes to this policy, we will update the "last updated" date at the top of this page. Continued use of WSIST after changes constitutes acceptance of the updated policy.</p> + <h2>11. Contact</h2> +<p>Questions about this privacy policy? Contact us at <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>.</p> + + + Terms of Use + <h2>1. Acceptance of terms</h2> +<p>By accessing or using WSIST ("What Should I Study Today") at wsist.forch.me, you agree to be bound by these Terms of Use. If you do not agree, do not use the service.</p> + <h2>2. Description of service</h2> +<p>WSIST is a personal study planning tool that helps students track upcoming tests, estimate their preparedness, and determine what to study on a given day. The service is provided free of charge for personal, non-commercial use.</p> + <h2>3. Account and access</h2> +<p>Access to WSIST requires a Google account. By signing in, you authorise WSIST to receive your name and email address from Google as described in our <a href="/privacy">Privacy Policy</a>. You are responsible for keeping your Google account secure.</p> +<p>One account per person. You may not share your account with others or create accounts on behalf of third parties.</p> + <h2>4. Acceptable use</h2> +<p>You agree not to:</p> +<ul> +<li>Use WSIST for any unlawful purpose</li> +<li>Attempt to access other users' data</li> +<li>Attempt to reverse-engineer, disrupt, or overload the service</li> +<li>Use automated tools to scrape or extract data from the service</li> +</ul> + <h2>5. Your content</h2> +<p>You own the data you enter into WSIST (test entries, subjects, grades). We do not claim any ownership over it. You grant us a limited licence to store and process it solely for the purpose of providing the service to you.</p> + <h2>6. Service availability</h2> +<p>WSIST is a personal project and is provided on an "as is" and "as available" basis. We make no guarantees about uptime, data preservation, or continued availability. We may modify or discontinue the service at any time without notice.</p> + <h2>7. Disclaimer of warranties</h2> +<p>To the fullest extent permitted by law, WSIST is provided without warranties of any kind, express or implied. We do not warrant that the service will be error-free, uninterrupted, or that the study recommendations it produces will lead to any particular academic outcome.</p> + <h2>8. Limitation of liability</h2> +<p>To the fullest extent permitted by applicable law, Tim Hug and the WSIST project shall not be liable for any indirect, incidental, or consequential damages arising from your use of or inability to use the service.</p> + <h2>9. Changes to terms</h2> +<p>We may update these terms at any time. The "last updated" date at the top of this page will reflect any changes. Continued use of WSIST after changes are posted constitutes acceptance of the updated terms.</p> + <h2>10. Governing law</h2> +<p>These terms are governed by the laws of Switzerland, without regard to conflict of law principles. Any disputes arising from these terms shall be subject to the exclusive jurisdiction of the courts of the Canton of Zurich, Switzerland.</p> + <h2>11. Contact</h2> +<p>Questions about these terms? Contact us at <a href="mailto:privacy@wsist.forch.me">privacy@wsist.forch.me</a>.</p> + + + Page not found + The page you're looking for doesn't exist or has been moved. + Something went wrong + An unexpected error occurred. If this keeps happening, try logging out and back in. + diff --git a/WSIST/WSIST.Web/SharedResource.cs b/WSIST/WSIST.Web/SharedResource.cs new file mode 100644 index 0000000..f6e68dd --- /dev/null +++ b/WSIST/WSIST.Web/SharedResource.cs @@ -0,0 +1,9 @@ +namespace WSIST.Web; + +// Marker type for the single shared localization resource. All UI strings live +// in Resources/SharedResource.resx (English) and Resources/SharedResource.de.resx +// (German). Pages inject IStringLocalizer and look strings up by +// key. A single shared resource (rather than one resx per component) keeps the +// German terminology consistent across pages and makes it easy to scan one file +// for any missing/untranslated key. +public sealed class SharedResource { } diff --git a/WSIST/WSIST.Web/appsettings.json b/WSIST/WSIST.Web/appsettings.json index 10f68b8..f1b1aa0 100644 --- a/WSIST/WSIST.Web/appsettings.json +++ b/WSIST/WSIST.Web/appsettings.json @@ -5,5 +5,9 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "Admin": { + "Comment": "Email of the account allowed to view the feedback listing. Set per environment via the Admin__Email environment variable (or appsettings.Development.json locally). Blank means nobody is admin.", + "Email": "" + } } diff --git a/WSIST/WSIST.Web/wwwroot/app.css b/WSIST/WSIST.Web/wwwroot/app.css index 6737515..0bcea0d 100644 --- a/WSIST/WSIST.Web/wwwroot/app.css +++ b/WSIST/WSIST.Web/wwwroot/app.css @@ -124,6 +124,8 @@ main { align-items: center; gap: 9px; margin-right: auto; + text-decoration: none; + color: inherit; } .nav-brand span { @@ -1046,6 +1048,146 @@ h1:focus { border-top: 1px solid var(--border); } +/* ── Language toggle ── */ + +.lang-toggle { + display: inline-flex; + align-items: center; + gap: 4px; + font-size: 13px; + font-weight: 600; + user-select: none; +} + +.lang-toggle .lang-option { + color: var(--text-muted); + text-decoration: none; + padding: 2px 4px; + border-radius: var(--radius-xs); +} + +.lang-toggle .lang-option:hover { + color: var(--text-primary); +} + +.lang-toggle .lang-option.active { + color: var(--accent); +} + +.lang-toggle .lang-sep { + color: var(--text-muted); +} + +.landing-nav-actions { + display: flex; + align-items: center; + gap: 14px; +} + +/* ── Feedback ── */ + +.feedback-form { + padding: 16px 18px; + display: flex; + flex-direction: column; + gap: 8px; +} + +.feedback-label { + font-size: 13px; + color: var(--text-muted); + margin-top: 4px; +} + +.feedback-textarea { + resize: vertical; + min-height: 120px; + font-family: inherit; + line-height: 1.45; +} + +.feedback-actions { + display: flex; + justify-content: flex-end; + margin-top: 4px; +} + +.feedback-empty { + padding: 16px 18px; + font-size: 14px; + color: var(--text-muted); +} + +.feedback-item { + padding: 14px 18px; + border-bottom: 1px solid var(--border); + display: flex; + flex-direction: column; + gap: 6px; +} + +.feedback-item:last-child { + border-bottom: none; +} + +.feedback-item-head { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 10px; +} + +.feedback-status-tag { + margin-left: auto; + font-size: 11px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.06em; + color: var(--text-muted); + background: var(--bg-subtle); + border: 1px solid var(--border); + border-radius: var(--radius-xs); + padding: 2px 7px; +} + +.feedback-status-select { + margin-left: auto; + padding: 3px 8px; + font-size: 12px; + background: var(--bg-subtle); + color: var(--text-primary); + border: 1px solid var(--border); + border-radius: var(--radius-xs); + cursor: pointer; +} + +.feedback-meta { + font-size: 12px; + color: var(--text-muted); +} + +.feedback-email { + color: var(--text-muted); +} + +.feedback-item-message { + font-size: 14px; + color: var(--text-primary); + white-space: pre-wrap; + overflow-wrap: anywhere; + margin: 0; +} + +.feedback-cat-bug { + color: #f87171; + border-color: #f87171; +} + +.feedback-cat-feature { + color: #4ade80; + border-color: #4ade80; +} + /* ── Error Page ── */ .error-page { diff --git a/WSIST/WSIST.Web/wwwroot/landing.js b/WSIST/WSIST.Web/wwwroot/landing.js index 6ae807d..476eb30 100644 --- a/WSIST/WSIST.Web/wwwroot/landing.js +++ b/WSIST/WSIST.Web/wwwroot/landing.js @@ -61,7 +61,41 @@ var VOLUME_PTS = [2, 4, 6, 8, 10, 12]; var UNDERSTANDING_PTS = [12, 10, 8, 6, 4, 2]; - var LEVEL_LABELS = ["Very low", "Low", "Medium", "Average", "High", "Very high"]; + + /* The playground runs entirely client-side, so its dynamic labels can't use + the server's IStringLocalizer. Mirror the two shipped languages here and + pick by , which Program.cs sets from the current UI culture. */ + var STRINGS = { + en: { + levels: ["Very low", "Low", "Medium", "Average", "High", "Very high"], + today: "today", + tomorrow: "tomorrow", + inDays: function (d) { return "in " + d + " days"; }, + verdicts: [ + "Drop everything — this is tonight.", + "High on the list. Start here.", + "On the radar — schedule it this week.", + "Breathe. You've got time.", + ], + }, + de: { + levels: ["Sehr niedrig", "Niedrig", "Mittel", "Durchschnittlich", "Hoch", "Sehr hoch"], + today: "heute", + tomorrow: "morgen", + inDays: function (d) { return "in " + d + " Tagen"; }, + verdicts: [ + "Lass alles stehen — das ist für heute Abend.", + "Weit oben auf der Liste. Fang hier an.", + "Auf dem Schirm — plane sie diese Woche ein.", + "Durchatmen. Du hast Zeit.", + ], + }, + }; + var T = + (document.documentElement.lang || "en").slice(0, 2).toLowerCase() === "de" + ? STRINGS.de + : STRINGS.en; + var LEVEL_LABELS = T.levels; function urgencyScore(days){ if (days <= 1) return 10; @@ -110,16 +144,16 @@ } function dayLabel(d){ - if (d === 0) return "today"; - if (d === 1) return "tomorrow"; - return "in " + d + " days"; + if (d === 0) return T.today; + if (d === 1) return T.tomorrow; + return T.inDays(d); } function verdictFor(total){ - if (total >= 30) return "Drop everything — this is tonight."; - if (total >= 22) return "High on the list. Start here."; - if (total >= 12) return "On the radar — schedule it this week."; - return "Breathe. You've got time."; + if (total >= 30) return T.verdicts[0]; + if (total >= 22) return T.verdicts[1]; + if (total >= 12) return T.verdicts[2]; + return T.verdicts[3]; } var lastVerdict = "";
TitleSubjectDateVolumeUnderstanding@localizer["Home_ColTitle"]@localizer["Home_ColSubject"]@localizer["Home_ColDate"]@localizer["Home_ColVolume"]@localizer["Home_ColUnderstanding"]
@test.Title@(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? "Unknown")@(subjects.FirstOrDefault(s => s.Id == test.Subject)?.Name ?? localizer["Common_Unknown"].Value) @test.DueDate.ToShortDateString()@Test.VolumeHelper(test.Volume)@Test.UnderstandingHelper(test.Understanding)@localizer[$"Level_{test.Volume}"]@localizer[$"Level_{test.Understanding}"] - - + +