Skip to content
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.

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

Add DateOnly, TimeOnly and TimeSpan support #101

Merged
merged 2 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,27 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
var seedData = new List<TestEntity>();
foreach(var i in Enumerable.Range(0, 2000))
{
seedData.Add(new TestEntity() { Id = Guid.NewGuid(), Name = "Test entity " + i, Title = "Test title " + i, Price = new Random().NextDouble() });
seedData.Add(new TestEntity()
{
Id = Guid.NewGuid(),
Name = "Test entity " + i,
Title = "Test title " + i,
DateTime = DateTime.Now,
DateTimeOffset = DateTimeOffset.UtcNow,
Date = DateTime.Now,
DateOnly = DateOnly.FromDateTime(DateTime.Now),
TimeOnly = TimeOnly.FromDateTime(DateTime.Now),
TimeSpan = new TimeSpan(3, 2, 1, 44, 55555),
Price = Random.Shared.NextDouble()
});
}

modelBuilder.Entity<TestEntity>().HasData(seedData);

var seedDataImages = new List<TestEntityWithImage>();

seedDataImages.Add(new TestEntityWithImage() { Id = Guid.NewGuid(), Name = "Handsome person", Image = System.IO.File.ReadAllBytes("DemoAssets/ed-100.png") });

modelBuilder.Entity<TestEntityWithImage>().HasData(seedDataImages);

var seedDataChildren = new List<TestChildEntity>();
Expand All @@ -53,7 +65,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
seedDataParents.Add(new TestParentEntity() { ParentId = Guid.NewGuid(), ChildId = seedDataChildren.First().Id });
modelBuilder.Entity<TestParentEntity>().HasData(seedDataParents);


}
}
}
10 changes: 7 additions & 3 deletions src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ public class TestEntity
public Guid Id { get; set; }

[Required]

[MaxLength(100)]
public string? Name { get; set; }

[Required]

[MaxLength(100)]
public string? Title { get; set; }

[DataType(DataType.MultilineText)]

[MaxLength(300)]
public string? Description { get; set; }

Expand All @@ -40,6 +40,10 @@ public class TestEntity
[DataType(DataType.Date)]
public DateTime Date { get; set; }

public DateOnly DateOnly { get; set; }
public TimeOnly TimeOnly { get; set; }
public TimeSpan TimeSpan { get; set; }

public DateTimeOffset DateTimeOffset { get; set; }

public bool IsUseful { get; set; }
Expand Down
32 changes: 23 additions & 9 deletions src/DotNetEd.CoreAdmin/Views/Shared/EditorTemplates/Date.cshtml
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
@model object

@if (Model is DateTime?)
@switch (Model)
{
var date = (DateTime?)Model;
@Html.TextBox("", (date.HasValue ? date.Value.ToString("yyyy-MM-dd") : string.Empty), new { type = "date", @class = "datePicker form-control" })
}
case DateTime dateTimeValue:
{
@Html.TextBox("", dateTimeValue.ToString("yyyy-MM-dd"), new { type = "date", @class = "datePicker form-control" });
break;
}

@if (Model is DateTimeOffset?)
{
var date = (DateTimeOffset?)Model;
@Html.TextBox("", (date.HasValue ? date.Value.ToString("yyyy-MM-dd") : string.Empty), new { type = "date", @class = "datePicker form-control" })
}
case DateTimeOffset dateTimeOffsetValue:
{
@Html.TextBox("", dateTimeOffsetValue.ToString("yyyy-MM-dd"), new { type = "date", @class = "datePicker form-control" });
break;
}

case DateOnly dateOnlyValue:
{
@Html.TextBox("", dateOnlyValue.ToString("yyyy-MM-dd"), new { type = "date", @class = "datePicker form-control" });
break;
}

default:
{
@Html.TextBox("", null, new { type = "date", @class = "datePicker form-control" })
break;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@model DateOnly?
@Html.TextBox("", Model?.ToString("yyyy-MM-dd"), new { type = "date", @class = "datePicker form-control" })
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@model DateTime?
@Html.TextBox("", (Model.HasValue ? Model.Value.ToString("s") : string.Empty), new { type = "datetime-local", @class = "datePicker form-control" })
@Html.TextBox("", Model?.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss.fff"), new { type = "datetime-local", @class = "datePicker form-control" })
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@model DateTimeOffset?
@Html.TextBox("", (Model.HasValue ? Model.Value.ToString("s") : string.Empty), new { type = "datetime-local", @class = "datePicker form-control" })
@Html.TextBox("", Model?.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss.fff"), new { type = "datetime-local", @class = "datePicker form-control" })
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@model TimeOnly?
@Html.TextBox("", Model?.ToString("HH:mm:ss.fff"), new { type = "time", @class = "form-control" })
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@model TimeSpan?
@Html.TextBox("", Model?.Ticks, new { type = "number", @class = "text-box single-line form-control number-form-control", max = Int64.MaxValue, min = Int64.MinValue })
Loading