Skip to content

Feat: Project Updates #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KobenjiSan wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Feat: Project Updates #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac746e2
feat: Add delete and restore log actions to admin control panel
KobenjiSan May 19, 2026
a8b7f38
style: Improve main project layout
KobenjiSan May 19, 2026
4026d3b
style: Update log tab switching design
KobenjiSan May 19, 2026
f9d0eaf
feat: Add link to notebooks and image file size limit to log
KobenjiSan May 19, 2026
61e7386
fix: Enable nullable fields to remove warnings
KobenjiSan May 19, 2026
1d4d3d2
feat: Add vol, issue, and pages to publications
KobenjiSan May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Analysim.Core/Entities/ProjectComment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#nullable enable

using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
Expand Down
9 changes: 9 additions & 0 deletions src/Analysim.Core/Entities/ProjectLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#nullable enable // Enable nullable fields

using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
Expand All @@ -21,6 +23,13 @@ public class ProjectLog
public int ProjectID { get; set; }
public Project Project{ get; set; } = null!;

// Referenced Notebook
[ForeignKey("ReferencedNotebookID")]
public int? ReferencedNotebookID { get; set; }
public Notebook? ReferencedNotebook { get; set; }

public int? ReferencedNotebookVersion { get; set; }

// Project Log Title
public string? Title { get; set; }

Expand Down
7 changes: 7 additions & 0 deletions src/Analysim.Core/Entities/Publication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#nullable enable

using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
Expand Down Expand Up @@ -30,6 +32,11 @@ public class Publication
[Required(ErrorMessage = "Publication Year is a required field.")]
[Range(1, 2100, ErrorMessage = "Enter a valid publication year.")]
public int? Year { get; set; }

public string? Volume { get; set; }
public string? Issue { get; set; }
public string? Pages { get; set; }

public string? Notes { get; set; }

// Timestamps
Expand Down
10 changes: 10 additions & 0 deletions src/Analysim.Infrastructure/Data/ApplicationDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.HasForeignKey(pl => pl.BlobFileID)
.OnDelete(DeleteBehavior.SetNull);

// Optional One To Many Relationship (Notebook -> ProjectLog)
modelBuilder.Entity<ProjectLog>()
.HasOne(pl => pl.ReferencedNotebook)
.WithMany()
.HasForeignKey(pl => pl.ReferencedNotebookID)
.OnDelete(DeleteBehavior.SetNull);

// One To Many Relationship (ProjectLog -> ProjectComment)
modelBuilder.Entity<ProjectLog>()
.HasMany(pl => pl.Comments)
Expand All @@ -222,6 +229,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
modelBuilder.Entity<ProjectComment>()
.HasIndex(pc => pc.ProjectLogID);

modelBuilder.Entity<ProjectLog>()
.HasIndex(pl => pl.ReferencedNotebookID);

#endregion

// One To Many Relationship (Project -> Publication)
Expand Down
31 changes: 28 additions & 3 deletions src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentID"));

b.Property<string>("Content")
.IsRequired()
.HasColumnType("text");

b.Property<DateTime>("CreatedAt")
Expand Down Expand Up @@ -365,6 +366,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<int>("ProjectID")
.HasColumnType("integer");

b.Property<int?>("ReferencedNotebookID")
.HasColumnType("integer");

b.Property<int?>("ReferencedNotebookVersion")
.HasColumnType("integer");

b.Property<string>("Title")
.HasColumnType("text");

Expand All @@ -380,6 +387,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("ProjectID");

b.HasIndex("ReferencedNotebookID");

b.HasIndex("UserID");

b.ToTable("ProjectLogs");
Expand Down Expand Up @@ -440,13 +449,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<string>("Doi")
.HasColumnType("text");

b.Property<string>("Issue")
.HasColumnType("text");

b.Property<string>("Journal")
.IsRequired()
.HasColumnType("text");

b.Property<string>("Notes")
.HasColumnType("text");

b.Property<string>("Pages")
.HasColumnType("text");

b.Property<int>("ProjectID")
.HasColumnType("integer");

Expand All @@ -460,6 +475,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<string>("Url")
.HasColumnType("text");

b.Property<string>("Volume")
.HasColumnType("text");

b.Property<int?>("Year")
.IsRequired()
.HasColumnType("integer");
Expand Down Expand Up @@ -619,21 +637,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 1,
ConcurrencyStamp = "e7431394-d3f8-4e7a-828d-930d0ecfe1ac",
ConcurrencyStamp = "d7c6278e-3f78-4db6-8832-aa41ea9fd62c",
Name = "Admin",
NormalizedName = "ADMIN"
},
new
{
Id = 2,
ConcurrencyStamp = "b325405e-6f19-4b1c-a845-9df31e386760",
ConcurrencyStamp = "7383e31e-a884-4cd6-82f7-a6287b4e30a5",
Name = "Customer",
NormalizedName = "CUSTOMER"
},
new
{
Id = 3,
ConcurrencyStamp = "f68ee1fe-5d74-4f56-ade1-5a8837a3e127",
ConcurrencyStamp = "398ef1f2-6b82-45f2-9601-ed2129f197e9",
Name = "Moderator",
NormalizedName = "MODERATOR"
});
Expand Down Expand Up @@ -887,6 +905,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();

b.HasOne("Core.Entities.Notebook", "ReferencedNotebook")
.WithMany()
.HasForeignKey("ReferencedNotebookID")
.OnDelete(DeleteBehavior.SetNull);

b.HasOne("Core.Entities.User", "User")
.WithMany("ProjectLogs")
.HasForeignKey("UserID")
Expand All @@ -897,6 +920,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Navigation("Project");

b.Navigation("ReferencedNotebook");

b.Navigation("User");
});

Expand Down
Loading
Loading