diff --git a/Thor.BlazorWAsm/Components/AttachmentSend.razor b/Thor.BlazorWAsm/Components/AttachmentSend.razor new file mode 100644 index 0000000..b3f1648 --- /dev/null +++ b/Thor.BlazorWAsm/Components/AttachmentSend.razor @@ -0,0 +1,59 @@ +@if (!Uploading) +{ + +} +@Status + +@code { + [Parameter] + public InspectionRegister Register { get; set; } + + [Parameter] + public string ItemId { get; set; } + + public bool Uploading { get; set; } = false; + public string Status { get; set; } = ""; + + async Task OnFileChanged(InputFileChangeEventArgs e) + { + Console.WriteLine("Début de l'envoi"); + Status = "Envoi en cours..."; + Uploading = true; + _ = InvokeAsync(StateHasChanged); + try + { + foreach (var file in e.GetMultipleFiles()) + { + Console.WriteLine($"DEbut envoi {file.Name}"); + Status = $"Envoi : {file.Name}."; + _ = InvokeAsync(StateHasChanged); + + using var memstr = new MemoryStream(); + await file.OpenReadStream(maxAllowedSize: long.MaxValue).CopyToAsync(memstr); ; + + + Register.Add(new() + { + Identifier = Guid.NewGuid().ToString(), + Author = "(null)", + Type = InspectionEntry.EntryType.Attachement, + Target = ItemId, + Attachment = memstr.ToArray(), + AttachmentName = file.Name + }); + Console.WriteLine($"Added attachment {file.Name}, size: {memstr.Length}."); + } + } + catch (Exception ex) + { + Status = $"Échec de l'envoi : {ex}."; + _ = InvokeAsync(StateHasChanged); + Console.WriteLine($"Echec de l'envoi: {ex}"); + } + + Uploading = false; + Status = ""; + _ = InvokeAsync(StateHasChanged); + Console.WriteLine("Envoi réussi"); + } +} diff --git a/Thor.BlazorWAsm/Components/AttachmentsView.razor b/Thor.BlazorWAsm/Components/AttachmentsView.razor new file mode 100644 index 0000000..1354e8b --- /dev/null +++ b/Thor.BlazorWAsm/Components/AttachmentsView.razor @@ -0,0 +1,31 @@ +
+ @foreach(var a in Attachments) + { +

@a.Name

+ } +
+ + + +@code { + [Parameter] + public InspectionRegister Register { get; set; } + + [Parameter] + public string ItemId { get; set; } + + List Attachments { get; set; } = new(); + + public async Task Refresh() + { + Attachments.Clear(); + Attachments = Register.GetAttachments(ItemId).ToList(); + StateHasChanged(); + } + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + await Refresh(); + } +} diff --git a/Thor.BlazorWAsm/Components/CommentsView.razor b/Thor.BlazorWAsm/Components/CommentsView.razor index 4f0f9f4..16e82ae 100644 --- a/Thor.BlazorWAsm/Components/CommentsView.razor +++ b/Thor.BlazorWAsm/Components/CommentsView.razor @@ -1,5 +1,42 @@ -

CommentsView

+ + +
+ @foreach (var c in Comments) + { +
+ @(c.Author ?? "Inconnu"): + @c.Content +
+ } + + +
@code { + [Parameter] + public InspectionRegister Register { get; set; } + List Comments { get; } = new(); + string NewCommentText { get; set; } = ""; + + protected async override Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + Comments.Add(new() + { + Content = "test comment" + }); + } } diff --git a/Thor.BlazorWAsm/Components/HistoryView.razor b/Thor.BlazorWAsm/Components/HistoryView.razor new file mode 100644 index 0000000..3481d3b --- /dev/null +++ b/Thor.BlazorWAsm/Components/HistoryView.razor @@ -0,0 +1,92 @@ +@using System.Timers + + + + @context.Author + + + + @FormatDate(context.When) + + + + @FormatEntry(context) + + + + + +@code { + [Parameter] + public InspectionRegister Register { get; set; } + + [Parameter] + public string ItemId { get; set; } + + private System.Timers.Timer Timer = new(1000); + Grid Grid = default!; + + private async Task> EmployeesDataProvider(GridDataProviderRequest request) + { + var entries = Register.GetEntriesOrdered(ItemId); + return await Task.FromResult(request.ApplyTo(entries)); + } + + protected override void OnInitialized() + { + base.OnInitialized(); + Timer.Elapsed += async (object? sender, ElapsedEventArgs e) => + { + await InvokeAsync(async() => { + await Grid.RefreshDataAsync(); + StateHasChanged(); + }); + }; + Timer.Enabled = true; + } + + public string FormatDate(DateTime dt) + { + return dt.ToString("M MMM hh:mm"); + } + + public string FormatEntry(InspectionEntry e) + { + if (e.Type == InspectionEntry.EntryType.Attachement) + return "Ajout d'une pièce jointe."; + else if(e.Type == InspectionEntry.EntryType.Set) + return $"Changement de l'état vers {FormatState(e.State)}."; + else + return e.Type.ToString(); + } + + public string FormatState(ItemAnswer.State? s) + { + if (s is null) + return "(null)"; + else if (s == ItemAnswer.State.NotAnswed) + return "non répondu"; + else if (s == ItemAnswer.State.Compliant) + return "conforme"; + else if (s == ItemAnswer.State.PartiallyCompliant) + return "partiellement conforme"; + else if (s == ItemAnswer.State.Improper) + return "non conforme"; + else if (s == ItemAnswer.State.Invalid) + return "sans objet"; + else if (s == ItemAnswer.State.Ignored) + return "non instruit"; + + return s.ToString(); + } +} diff --git a/Thor.BlazorWAsm/Components/InspectionFiller.razor b/Thor.BlazorWAsm/Components/InspectionFiller.razor new file mode 100644 index 0000000..01061bc --- /dev/null +++ b/Thor.BlazorWAsm/Components/InspectionFiller.razor @@ -0,0 +1,42 @@ +

@Inspection.Name

+ +
+ +
+ +@foreach (var item in DisplayedItems) +{ + +} + +@code +{ + [Parameter] + public Inspection Inspection { get; set; } + + string? _filter { get; set; } = null; + + public List DisplayedItems { get; set; } = new(); + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + Refresh(); + } + + public void Refresh() + { + DisplayedItems = Inspection.Grid.GetItems().ToList(); + + if(!String.IsNullOrEmpty(_filter)) + DisplayedItems = DisplayedItems.Where(x => x.Label.Contains(_filter) || x.Identifier.Contains(_filter)).ToList(); + + StateHasChanged(); + } + + private async Task OnInput(ChangeEventArgs e) + { + _filter = e.Value?.ToString(); + Refresh(); + } +} diff --git a/Thor.BlazorWAsm/Components/InspectionItemFiller.razor b/Thor.BlazorWAsm/Components/InspectionItemFiller.razor index 71762f8..98200e3 100644 --- a/Thor.BlazorWAsm/Components/InspectionItemFiller.razor +++ b/Thor.BlazorWAsm/Components/InspectionItemFiller.razor @@ -93,7 +93,7 @@ public Item Item { get; set; } [Parameter] - public Register? Register { get; set; } + public InspectionRegister? Register { get; set; } private Modal Details = default!; diff --git a/Thor.BlazorWAsm/Components/InspectionItemFillerDetail.razor b/Thor.BlazorWAsm/Components/InspectionItemFillerDetail.razor index ec4ca01..de95762 100644 --- a/Thor.BlazorWAsm/Components/InspectionItemFillerDetail.razor +++ b/Thor.BlazorWAsm/Components/InspectionItemFillerDetail.razor @@ -1,4 +1,11 @@ -@if (Item.Force == ItemVerification.VerificationForce.Optionnal) + + +@if (Item.Force == ItemVerification.VerificationForce.Optionnal) { @@ -22,28 +29,44 @@ else if (Item.Force == ItemVerification.VerificationForce.Mandatory)

@Item.Label

-
Statut
- +
+
Statut
+ +
-@if (String.IsNullOrEmpty(Item.Description)) -{ -
Description
-

@Item.Description

-} +
+ @if (String.IsNullOrEmpty(Item.Description)) + { +
Description
+

@Item.Description

+ } +
-
Références
-

@Item.References

-
Commentaires
-

+
+
Références
+

@Item.References

+
-
Historique des modifications
-

+
+
Pièces jointes
+ +
+ +
+
Commentaires
+ +
+ +
+
Historique des modifications
+ +
@code { [Parameter] public ItemVerification Item { get; set; } [Parameter] - public Register? Register { get; set; } + public InspectionRegister? Register { get; set; } } diff --git a/Thor.BlazorWAsm/Components/InspectionItemQuickAnswerSelector.razor b/Thor.BlazorWAsm/Components/InspectionItemQuickAnswerSelector.razor index 8f7d276..346e991 100644 --- a/Thor.BlazorWAsm/Components/InspectionItemQuickAnswerSelector.razor +++ b/Thor.BlazorWAsm/Components/InspectionItemQuickAnswerSelector.razor @@ -13,7 +13,7 @@ public ItemVerification Item { get; set; } [Parameter] - public Register Register { get; set; } + public InspectionRegister Register { get; set; } ItemAnswer.State Value { @@ -27,7 +27,7 @@ { Identifier = Guid.NewGuid().ToString(), Author = "(null)", - Type = Entry.EntryType.Set, + Type = InspectionEntry.EntryType.Set, Target = Item.Identifier, State = value }); diff --git a/Thor.BlazorWAsm/Components/InspectionRow.razor b/Thor.BlazorWAsm/Components/InspectionRow.razor deleted file mode 100644 index ef176a5..0000000 --- a/Thor.BlazorWAsm/Components/InspectionRow.razor +++ /dev/null @@ -1,160 +0,0 @@ - - -
- -@if(Row is not null) -{ - @if(Row.IsTitle) - { - - @Row.Item.OrderId - @Row.Item.Label - - } - else if(Row.Item is ItemVerification verification) - { -
- - - - - - @if (verification.Force == ItemVerification.VerificationForce.Optionnal) - { - - - - } - else if(verification.Force == ItemVerification.VerificationForce.Recommandation) - { - - - - } - else if(verification.Force == ItemVerification.VerificationForce.Mandatory) - { - - - - } -
-
- @Row.Item.OrderId -
-
- @Row.Item.Label -
-
- @Row.Item.References -
-
- -

Out: @Row.Answer.CurrentState

-
- } -} -else -{ - -} -
- - - -@code { - public Shared.InspectionRow? _row; - - [Parameter] - public Shared.InspectionRow? Row - { - get - { - return _row; - } - - set - { - if (_row != value) - { - _row = value; - if (RowChanged.HasDelegate) - RowChanged.InvokeAsync(_row); - } - } - } - - [Parameter] - public EventCallback RowChanged { get; set; } - - - private Modal detailsModal = default!; - - protected override Task OnInitializedAsync() - { - return base.OnInitializedAsync(); - } - - - public string Class - { - get - { - if (Row is null) - return ""; - - if (!Row.IsTitle) - return "verification"; - - return "title order-" + Row.Order; - } - } - - private async Task ShowDetails() - { - if (Row is null) - return; //TODO: add error message - - Action callback = (Shared.InspectionRow row) => - { - StateHasChanged(); - }; - - var parameters = new Dictionary(); - parameters.Add("Row", Row); - parameters.Add("RowChanged", callback); - - await detailsModal.ShowAsync(title: "Détails", parameters: parameters); - } -} diff --git a/Thor.BlazorWAsm/Components/InspectionRowDetails.razor b/Thor.BlazorWAsm/Components/InspectionRowDetails.razor deleted file mode 100644 index 3e018b0..0000000 --- a/Thor.BlazorWAsm/Components/InspectionRowDetails.razor +++ /dev/null @@ -1,71 +0,0 @@ -@if (Row is not null && Verification is not null) -{ - @if (Verification.Force == ItemVerification.VerificationForce.Optionnal) - { - - - Cet item est une indication, il ne relève ni d'une recommandation, ni d'une obligation. - - } - else if (Verification.Force == ItemVerification.VerificationForce.Recommandation) - { - - - Cet item relève de la recommandation, il relève des recommandations opposables. - - } - else if (Verification.Force == ItemVerification.VerificationForce.Mandatory) - { - - - Cet item doit obligatoirement être suivi, car il fait l'objet d'un référentiel opposable. - - } - -

@Row.Item.Label

- -
Statut
- - - @if(String.IsNullOrEmpty(Row.Item.Description)) - { -
Description
-

@Row.Item.Description

- } - -
Références
-

@Row.Item.References

- -
Commentaires
-

- -
Historique des modifications
-

-} -else -{ - -} - -@code { - [Parameter] - public Shared.InspectionRow? Row { get; set; } - - public Shared.ItemVerification? Verification { get { - if (Row == null) - return null; - - return (Shared.ItemVerification)Row.Item ?? null; - } } - - [Parameter] - public Action RowChanged { get; set; } = (Shared.InspectionRow r) => { }; -} diff --git a/Thor.BlazorWAsm/Components/TemplateFiller.razor b/Thor.BlazorWAsm/Components/TemplateFiller.razor new file mode 100644 index 0000000..baeba55 --- /dev/null +++ b/Thor.BlazorWAsm/Components/TemplateFiller.razor @@ -0,0 +1,48 @@ +

@Grid.Name

+ +@foreach (var i in Grid.Register.Forge()) +{ + await AddChildTitle(i.Identifier))/> +} + +@code { + [Parameter] + public TemplateGrid Grid { get; set; } = default!; + + protected async Task AddChildTitle(string? parent = null) + { + var id = Guid.NewGuid().ToString(); + + Grid.Register.Add(new() + { + Identifier = Guid.NewGuid().ToString(), + Target = id, + Author = "", + Type = TemplateEntry.EntryType.Set, + Field = TemplateEntry.FieldType.Type, + Content = TemplateEntry.TYPE_TITLE, + }); + + Grid.Register.Add(new() + { + Identifier = Guid.NewGuid().ToString(), + Target = id, + Author = "", + Type = TemplateEntry.EntryType.Set, + Field = TemplateEntry.FieldType.Parent, + Content = parent + }); + + Grid.Register.Add(new() + { + Identifier = Guid.NewGuid().ToString(), + Target = id, + Author = "", + Type = TemplateEntry.EntryType.Set, + Field = TemplateEntry.FieldType.Label, + Content = "TEST " + }); + + StateHasChanged(); + } +} diff --git a/Thor.BlazorWAsm/Components/TemplateFillerDetail.razor b/Thor.BlazorWAsm/Components/TemplateFillerDetail.razor new file mode 100644 index 0000000..60b2e91 --- /dev/null +++ b/Thor.BlazorWAsm/Components/TemplateFillerDetail.razor @@ -0,0 +1,9 @@ +

TemplateFillerDetail

+ +@code { + [Parameter] + public TemplateGrid Grid { get; set; } = default!; + + [Parameter] + public Item Item { get; set; } = default!; +} diff --git a/Thor.BlazorWAsm/Components/TemplateFillerItem.razor b/Thor.BlazorWAsm/Components/TemplateFillerItem.razor new file mode 100644 index 0000000..e434456 --- /dev/null +++ b/Thor.BlazorWAsm/Components/TemplateFillerItem.razor @@ -0,0 +1,113 @@ + + +
+
+ + + + + + + + + @if (Item is ItemTitle t) + { + + + + } +
+ + +
+ @if (Item is ItemTitle title) + { + + @title.OrderId - @title.Label + + } + else if (Item is ItemVerification verif) + { + @verif.Label + } +
+ + + +
+ + + +@code { + [Parameter] + public TemplateGrid Grid { get; set; } = default!; + + [Parameter] + public Item Item { get; set; } = default!; + + [Parameter] + public EventCallback OnAddChild { get; set; } = default!; + + private Modal Details = default!; + + public string Class + { + get + { + if (Item is not ItemTitle) + return "verification"; + + return "title order-" + Item.Order; + } + } + + private async Task ShowDetails() + { + var parameters = new Dictionary(); + parameters.Add(nameof(TemplateFillerDetail.Grid), Grid); + parameters.Add(nameof(TemplateFillerDetail.Item), Item); + + await Details.ShowAsync(title: "Détails", parameters: parameters); + } + + private void OnModalHidden() + { + StateHasChanged(); + } +} diff --git a/Thor.BlazorWAsm/Components/TemplateTable.razor b/Thor.BlazorWAsm/Components/TemplateTable.razor index bdbac8b..9b6f06e 100644 --- a/Thor.BlazorWAsm/Components/TemplateTable.razor +++ b/Thor.BlazorWAsm/Components/TemplateTable.razor @@ -1,4 +1,61 @@ -

Liste des modèles

+@inject TemplateService Templates; + + + + + @foreach(var i in Grids) + { +
+ @i.Name +
+ } + + + + + + + + + @code { + private Modal modal = default!; + + [Parameter] + public string Name { get; set; } = String.Empty; + + public List Grids { get; set; } = []; + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + await Refresh(); + } + + + public async Task ShowNewModal() + { + await modal.ShowAsync(); + } + + async Task CreateNewModal() + { + await modal.HideAsync(); + var n = await Templates.Create(Name); + //todo: switch to correct page + await Refresh(); + } + + public async Task Refresh() + { + Grids.Clear(); + await foreach (var i in Templates.Get()) + Grids.Add(i); + + StateHasChanged(); + } } diff --git a/Thor.BlazorWAsm/Layout/NavMenu.razor b/Thor.BlazorWAsm/Layout/NavMenu.razor index d8c7134..1b55973 100644 --- a/Thor.BlazorWAsm/Layout/NavMenu.razor +++ b/Thor.BlazorWAsm/Layout/NavMenu.razor @@ -7,7 +7,7 @@ -
/> +
- + Modèles
@@ -26,7 +26,7 @@
- Inspection + Inspection en cours
diff --git a/Thor.BlazorWAsm/Pages/InspectionFiller.razor b/Thor.BlazorWAsm/Pages/InspectionFiller.razor deleted file mode 100644 index 05892de..0000000 --- a/Thor.BlazorWAsm/Pages/InspectionFiller.razor +++ /dev/null @@ -1,40 +0,0 @@ -@page "/inspection" - -@inject Trip TripManager; - -@if(Inspection is not null) -{ -

@Inspection.Name

-
- -
- - @foreach(var item in Inspection.Grid.GetItems()) - { - - } -} -else -{ - -} - -@code -{ - - public Inspection? Inspection = null; - public string? Filter {get; set;} = ""; - - class ViewModel - { - public bool Mandatory { get; set; } = true; - public string Reference { get; set; } = "v0a:PECM.1.1.1.0c"; - public string Label { get; set; } = "La structure DEVRAIT avoir défini un plan d'action pour améliorer la PCEM"; - } - - protected override async Task OnInitializedAsync() - { - await base.OnInitializedAsync(); - Inspection = TripManager.Current; - } -} diff --git a/Thor.BlazorWAsm/Pages/InspectionFilling.razor b/Thor.BlazorWAsm/Pages/InspectionFilling.razor new file mode 100644 index 0000000..7be8484 --- /dev/null +++ b/Thor.BlazorWAsm/Pages/InspectionFilling.razor @@ -0,0 +1,24 @@ +@page "/inspection" + +@inject Trip TripManager; + +@if(Inspection is not null) +{ + +} +else +{ + +} + +@code +{ + + public Inspection? Inspection = null; + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + Inspection = TripManager.Current; + } +} diff --git a/Thor.BlazorWAsm/Pages/ModelFiller.razor b/Thor.BlazorWAsm/Pages/ModelFiller.razor new file mode 100644 index 0000000..374af74 --- /dev/null +++ b/Thor.BlazorWAsm/Pages/ModelFiller.razor @@ -0,0 +1,23 @@ +@page "/model/{id}" + +@inject TemplateService Templates; + + + +@code { + [Parameter] + public string Id { get; set; } + + public TemplateGrid Grid { get; private set; } = default!; + + + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + + Grid = await Templates.Get(Id) ?? throw new ArgumentException(); + } + + +} diff --git a/Thor.BlazorWAsm/Pages/ModelList.razor b/Thor.BlazorWAsm/Pages/ModelList.razor index 741cb89..dc5b5b0 100644 --- a/Thor.BlazorWAsm/Pages/ModelList.razor +++ b/Thor.BlazorWAsm/Pages/ModelList.razor @@ -1,8 +1,8 @@ -@page "/models" +@page "/model"

Liste des modèles

- + @code { diff --git a/Thor.BlazorWAsm/Program.cs b/Thor.BlazorWAsm/Program.cs index adcf954..9ca2bfa 100644 --- a/Thor.BlazorWAsm/Program.cs +++ b/Thor.BlazorWAsm/Program.cs @@ -9,6 +9,7 @@ builder.RootComponents.Add("head::after"); builder.Services.AddBlazorBootstrap(); builder.Services.AddSingleton(); +builder.Services.AddSingleton(); builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); await builder.Build().RunAsync(); diff --git a/Thor.BlazorWAsm/Services/TemplateService.cs b/Thor.BlazorWAsm/Services/TemplateService.cs new file mode 100644 index 0000000..e411a68 --- /dev/null +++ b/Thor.BlazorWAsm/Services/TemplateService.cs @@ -0,0 +1,49 @@ +using Thor.Shared.Model; + +namespace Thor.BlazorWAsm.Services; + +public class TemplateService +{ + private List All = []; + + public TemplateService() + { + All.Add(new() + { + Name = "Inspection test" + }); + } + + public async Task Create(string name) + { + TemplateGrid grid = new(name); + + lock(All) + All.Add(grid); + + return grid; + } + + public async IAsyncEnumerable Get() + { + lock (All) + foreach (var i in All) + yield return i; + } + + public Task Get(string id) + { + lock (All) + foreach (var i in All) + if(i.Identifier == id) + return Task.FromResult(i); + + return Task.FromResult(null); + } + + public async Task Remove(string identifier) + { + lock(All) + All.RemoveAll(x => x.Identifier == identifier); + } +} diff --git a/Thor.BlazorWAsm/Services/Trip.cs b/Thor.BlazorWAsm/Services/Trip.cs index cd5a3b5..fbd0941 100644 --- a/Thor.BlazorWAsm/Services/Trip.cs +++ b/Thor.BlazorWAsm/Services/Trip.cs @@ -1,4 +1,5 @@ using Thor.Shared; +using Thor.Shared.Inspect; namespace Thor.BlazorWAsm.Services; diff --git a/Thor.BlazorWAsm/Thor.BlazorWAsm.csproj b/Thor.BlazorWAsm/Thor.BlazorWAsm.csproj index 620f22b..fa2385b 100644 --- a/Thor.BlazorWAsm/Thor.BlazorWAsm.csproj +++ b/Thor.BlazorWAsm/Thor.BlazorWAsm.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/Thor.BlazorWAsm/_Imports.razor b/Thor.BlazorWAsm/_Imports.razor index 66ecd17..d6ddc36 100644 --- a/Thor.BlazorWAsm/_Imports.razor +++ b/Thor.BlazorWAsm/_Imports.razor @@ -7,6 +7,8 @@ @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop @using Thor.Shared; +@using Thor.Shared.Inspect; +@using Thor.Shared.Model; @using Thor.BlazorWAsm @using Thor.BlazorWAsm.Layout @using Thor.BlazorWAsm.Components; diff --git a/Thor.BlazorWAsm/wwwroot/css/app.css b/Thor.BlazorWAsm/wwwroot/css/app.css index 54a8aa3..d76a1ef 100644 --- a/Thor.BlazorWAsm/wwwroot/css/app.css +++ b/Thor.BlazorWAsm/wwwroot/css/app.css @@ -100,4 +100,4 @@ a, .btn-link { code { color: #c02d76; -} +} \ No newline at end of file diff --git a/Thor.Shared/Comments.cs b/Thor.Shared/Comments.cs deleted file mode 100644 index 616a691..0000000 --- a/Thor.Shared/Comments.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Thor.Shared; - -public class Comments -{ -} \ No newline at end of file diff --git a/Thor.Shared/EntryBase.cs b/Thor.Shared/EntryBase.cs new file mode 100644 index 0000000..186a7ee --- /dev/null +++ b/Thor.Shared/EntryBase.cs @@ -0,0 +1,14 @@ +namespace Thor.Shared; + +public class EntryBase +{ + public string Identifier { get; set; } + public string Author { get; set; } + public DateTime When { get; set; } = DateTime.Now; + public string Target { get; set; } + + public EntryBase() + { + Identifier = Guid.NewGuid().ToString(); + } +} diff --git a/Thor.Shared/Inspect/Attachment.cs b/Thor.Shared/Inspect/Attachment.cs new file mode 100644 index 0000000..584df8d --- /dev/null +++ b/Thor.Shared/Inspect/Attachment.cs @@ -0,0 +1,10 @@ +namespace Thor.Shared.Inspect; + +public class Attachment +{ + public string Id { get; set; } + public DateTime When { get; set; } = DateTime.Now; + public string Author { get; set; } = ""; + public string Name { get; set; } = ""; + public byte[] Content { get; set; } = Array.Empty(); +} diff --git a/Thor.Shared/Inspect/Comment.cs b/Thor.Shared/Inspect/Comment.cs new file mode 100644 index 0000000..5458c1b --- /dev/null +++ b/Thor.Shared/Inspect/Comment.cs @@ -0,0 +1,8 @@ +namespace Thor.Shared.Inspect; + +public class Comment +{ + public DateTime When { get; set; } = DateTime.Now; + public string Author { get; set; } = ""; + public string Content { get; set; } = ""; +} \ No newline at end of file diff --git a/Thor.Shared/Grid.cs b/Thor.Shared/Inspect/Grid.cs similarity index 89% rename from Thor.Shared/Grid.cs rename to Thor.Shared/Inspect/Grid.cs index 198a178..5cec0c6 100644 --- a/Thor.Shared/Grid.cs +++ b/Thor.Shared/Inspect/Grid.cs @@ -1,6 +1,6 @@ using System.Collections; -namespace Thor.Shared; +namespace Thor.Shared.Inspect; public class Grid { @@ -17,7 +17,7 @@ public class Grid return title; var verification = Verifications.Where(v => v.Identifier == id).FirstOrDefault(); - if(verification is not null) + if (verification is not null) return verification; return null; @@ -37,14 +37,14 @@ public class Grid public IEnumerable GetItems() { - return Enumerable.Union(Titles, Verifications).OrderBy(x => x.OrderId); + return Titles.Union(Verifications).OrderBy(x => x.OrderId); } public IEnumerable GetChildren(IEnumerable parentsid) { var lst = parentsid.ToHashSet(); foreach (var i - in Titles + in Titles .Where( i => lst.Contains(i.ParentId))) { @@ -69,11 +69,11 @@ public class Grid continue; toReturn.Add(item); - if(item is ItemTitle title) + if (item is ItemTitle title) { var children = GetChildren(title.Identifier); foreach (var child in children) - if(!toReturn.Contains(child)) + if (!toReturn.Contains(child)) toExplore.Add(child.Identifier); } } diff --git a/Thor.Shared/Inspection.cs b/Thor.Shared/Inspect/Inspection.cs similarity index 70% rename from Thor.Shared/Inspection.cs rename to Thor.Shared/Inspect/Inspection.cs index 52828cf..e2846ee 100644 --- a/Thor.Shared/Inspection.cs +++ b/Thor.Shared/Inspect/Inspection.cs @@ -1,21 +1,21 @@ -namespace Thor.Shared; +namespace Thor.Shared.Inspect; public class Inspection { public string Identifier { get; set; } public string Name { get; set; } = string.Empty; public Grid Grid { get; } = new(); - public Register Register { get; set; } = new(); + public InspectionRegister Register { get; set; } = new(); public IEnumerable GetRows() { var items = Grid.GetItems().OrderBy(r => r.OrderId); - foreach(var item in items) + foreach (var item in items) { if (item is ItemTitle) yield return new(item); else if (item is ItemVerification) - yield return new(item, Register.ForgeItemAnswer(item.Identifier)); + yield return new(item, Register.Forge(item.Identifier)); else throw new NotImplementedException(); } } diff --git a/Thor.Shared/Entry.cs b/Thor.Shared/Inspect/InspectionEntry.cs similarity index 56% rename from Thor.Shared/Entry.cs rename to Thor.Shared/Inspect/InspectionEntry.cs index 3789f79..05dfb9f 100644 --- a/Thor.Shared/Entry.cs +++ b/Thor.Shared/Inspect/InspectionEntry.cs @@ -1,10 +1,10 @@ -namespace Thor.Shared; +namespace Thor.Shared.Inspect; -public class Entry +public class InspectionEntry + : EntryBase { public enum EntryType { - Metadata, Set, Comment, Observation, @@ -12,16 +12,12 @@ public class Entry Show } - public string Identifier { get; set; } - public string Author { get; set; } public EntryType Type { get; set; } - public string Target { get; set; } - - public DateTime When { get; set; } = DateTime.Now; public ItemAnswer.State? State { get; set; } = null; public string? Content { get; set; } = null; public string? Observation { get; set; } = null; - public string? Attachment { get; set; } = null; + public byte[]? Attachment { get; set; } = null; + public string? AttachmentName { get; set; } = null; public bool? Display { get; set; } = null; } \ No newline at end of file diff --git a/Thor.Shared/Register.cs b/Thor.Shared/Inspect/InspectionRegister.cs similarity index 50% rename from Thor.Shared/Register.cs rename to Thor.Shared/Inspect/InspectionRegister.cs index 873f26c..799b06f 100644 --- a/Thor.Shared/Register.cs +++ b/Thor.Shared/Inspect/InspectionRegister.cs @@ -1,30 +1,10 @@ -namespace Thor.Shared; +namespace Thor.Shared.Inspect; -public class Register +public class InspectionRegister + : RegisterBase { - List Entries = new(); - public void Add(Entry entry) - { - Entries.Add(entry); - } - - public void Clear() - { - Entries.Clear(); - } - - public List GetEntriesOrdered(string itemid) - { - var entries = Entries - .Where(e => e.Target == itemid) - .ToList(); - entries.Sort((a, b) => a.When.CompareTo(b.When)); - - return entries; - } - - public ItemAnswer ForgeItemAnswer(string itemid) + public ItemAnswer Forge(string itemid) { var entries = GetEntriesOrdered(itemid); @@ -37,14 +17,14 @@ public class Register foreach (var entry in entries) { - if (entry.Type == Entry.EntryType.Set) + if (entry.Type == InspectionEntry.EntryType.Set) { if (!entry.State.HasValue) throw new Exception("Entry typed Set send without any State."); ret.CurrentState = entry.State.Value; } - else + else throw new NotImplementedException(); Entries.Add(entry); @@ -58,15 +38,35 @@ public class Register var entries = Entries .Where(e => e.Target == itemid - && e.Type == Entry.EntryType.Set) + && e.Type == InspectionEntry.EntryType.Set) .OrderByDescending(e => e.When) .ToList(); - if(entries.Count == 0) - return default(ItemAnswer.State); + if (entries.Count == 0) + return default; var firstEntryState = entries.First().State; - return firstEntryState ?? default(ItemAnswer.State); + return firstEntryState ?? default; + } + + public IEnumerable GetAttachments(string itemid) + { + var entries = Entries + .Where(e + => e.Target == itemid + && e.Type == InspectionEntry.EntryType.Attachement) + .OrderByDescending(e => e.When) + .ToList(); + + foreach (var entry in entries) + yield return new() + { + Id = entry.Identifier, + Author = entry.Author, + When = entry.When, + Name = entry.AttachmentName, + Content = entry.Attachment + }; } } diff --git a/Thor.Shared/InspectionRow.cs b/Thor.Shared/Inspect/InspectionRow.cs similarity index 91% rename from Thor.Shared/InspectionRow.cs rename to Thor.Shared/Inspect/InspectionRow.cs index 1868a71..fd1bed4 100644 --- a/Thor.Shared/InspectionRow.cs +++ b/Thor.Shared/Inspect/InspectionRow.cs @@ -1,4 +1,4 @@ -namespace Thor.Shared; +namespace Thor.Shared.Inspect; public class InspectionRow { diff --git a/Thor.Shared/ItemAnswer.cs b/Thor.Shared/Inspect/ItemAnswer.cs similarity index 77% rename from Thor.Shared/ItemAnswer.cs rename to Thor.Shared/Inspect/ItemAnswer.cs index d01a715..7d3f6df 100644 --- a/Thor.Shared/ItemAnswer.cs +++ b/Thor.Shared/Inspect/ItemAnswer.cs @@ -1,4 +1,4 @@ -namespace Thor.Shared; +namespace Thor.Shared.Inspect; public class ItemAnswer @@ -16,5 +16,5 @@ public class ItemAnswer public string TargetId { get; set; } public State CurrentState { get; set; } = State.NotAnswed; - List Entries { get; } = new(); + List Entries { get; } = new(); } diff --git a/Thor.Shared/Item.cs b/Thor.Shared/Item.cs index 571e803..4814646 100644 --- a/Thor.Shared/Item.cs +++ b/Thor.Shared/Item.cs @@ -10,6 +10,8 @@ public abstract class Item public string References { get; set; } = string.Empty; public int Order => OrderId.Count(x => x == '.'); + + public bool Hidden { get; set; } } public class ItemTitle diff --git a/Thor.Shared/Model/TemplateEntry.cs b/Thor.Shared/Model/TemplateEntry.cs new file mode 100644 index 0000000..3881780 --- /dev/null +++ b/Thor.Shared/Model/TemplateEntry.cs @@ -0,0 +1,30 @@ +namespace Thor.Shared.Model; + +public class TemplateEntry + : EntryBase +{ + public const string TYPE_TITLE = "t"; + public const string TYPE_ITEM = "i"; + + public enum EntryType + { + Set, + Comment, + Delete, + Restore + } + + public enum FieldType + { + Type, + Parent, + Order, + Label, + Description, + Reference + } + + public EntryType Type { get; set; } + public FieldType? Field { get; set; } = null; + public string? Content { get; set; } +} diff --git a/Thor.Shared/Model/TemplateGrid.cs b/Thor.Shared/Model/TemplateGrid.cs new file mode 100644 index 0000000..2fdf15d --- /dev/null +++ b/Thor.Shared/Model/TemplateGrid.cs @@ -0,0 +1,27 @@ +namespace Thor.Shared.Model; + +public class TemplateGrid +{ + public string Identifier { get; set; } + public string Name { get; set; } = string.Empty; + + public TemplateRegister Register { get; set; } = new(); + + public TemplateGrid() + { + Identifier = Guid.NewGuid().ToString(); + } + + public TemplateGrid(string name) + : this() + { + Name = name; + } + + public TemplateGrid(string identifier, string name, TemplateRegister register) + { + Identifier = identifier; + Name = name; + Register = register; + } +} diff --git a/Thor.Shared/Model/TemplateRegister.cs b/Thor.Shared/Model/TemplateRegister.cs new file mode 100644 index 0000000..69b243e --- /dev/null +++ b/Thor.Shared/Model/TemplateRegister.cs @@ -0,0 +1,85 @@ +namespace Thor.Shared.Model; + +public class TemplateRegister + : RegisterBase +{ + public List Forge() + { + Dictionary> entriesByTarget = []; + foreach (var i in GetEntriesOrdered()) + { + var target = i.Target; + if (entriesByTarget.TryGetValue(target, out var list)) + list.Add(i); + else + entriesByTarget.Add(target, [i]); + } + + List items = []; + foreach(var kv in entriesByTarget) + { + var item = Forge(kv.Key, kv.Value); + if(item is not null) + items.Add(item); + } + + return items.OrderBy(x => x.OrderId).ToList(); + } + + private Item? Forge(string id, IEnumerable entries) + { + bool? IsTitle = null; + string Identifier = id; + string? ParentId = null; + string? OrderId = null; + string? Label = null; + string? Description = null; + string? References = null; + + int restauration = 1; + foreach(var entry in entries) + { + if(entry.Type == TemplateEntry.EntryType.Delete) + { + restauration--; + continue; + } + if (entry.Type == TemplateEntry.EntryType.Restore) + { + restauration++; + continue; + } + + //ignore comments + + if (entry.Type != TemplateEntry.EntryType.Set) + continue; + + if (entry.Field == TemplateEntry.FieldType.Type && IsTitle is null) + IsTitle = entry.Content == TemplateEntry.TYPE_TITLE; + else if(entry.Field == TemplateEntry.FieldType.Reference && References is null) + References = entry.Content; + else if(entry.Field == TemplateEntry.FieldType.Label && Label is null) + Label = entry.Content; + else if(entry.Field == TemplateEntry.FieldType.Parent && ParentId is null) + ParentId = entry.Content; + else if(entry.Field == TemplateEntry.FieldType.Description && Description is null) + Description = entry.Content; + else if(entry.Field == TemplateEntry.FieldType.Order && OrderId is null) + OrderId = entry.Content; + } + if (IsTitle is null) + return null; + + Item ret = IsTitle == true ? new ItemTitle() : new ItemVerification(); + ret.Identifier = Identifier; + + ret.ParentId = ParentId ?? String.Empty; + ret.OrderId = OrderId ?? String.Empty; + ret.Label = Label ?? String.Empty; + ret.Description = Description ?? String.Empty; + ret.References = References ?? String.Empty; + + return ret; + } +} diff --git a/Thor.Shared/RegisterBase.cs b/Thor.Shared/RegisterBase.cs new file mode 100644 index 0000000..4d97d01 --- /dev/null +++ b/Thor.Shared/RegisterBase.cs @@ -0,0 +1,37 @@ +namespace Thor.Shared; + +public abstract class RegisterBase + where EntryType : EntryBase + where ResultType : class +{ + protected List Entries { get; } = []; + + public void Add(EntryType entry) + { + Entries.Add(entry); + } + + public void Clear() + { + Entries.Clear(); + } + + public List GetEntriesOrdered(string itemid) + { + var entries = Entries + .Where(e => e.Target == itemid) + .ToList(); + entries.Sort((a, b) => a.When.CompareTo(b.When)); + + return entries; + } + + public List GetEntriesOrdered() + { + var entries = Entries + .ToList(); + entries.Sort((a, b) => a.When.CompareTo(b.When)); + + return entries; + } +} diff --git a/Thor.Shared/Thor.Shared.csproj b/Thor.Shared/Thor.Shared.csproj index 6c86a82..488a912 100644 --- a/Thor.Shared/Thor.Shared.csproj +++ b/Thor.Shared/Thor.Shared.csproj @@ -6,6 +6,12 @@ enable + + + + + +