root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wip

Browse source
This commit is contained in:
Frede Hundewadt 2022-07-11 09:32:37 +02:00
parent e6e0c2b326
commit bd4a7ac080
9 changed files with 161 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Wonky.Client/Components/Home.razor
View file

@ -23,14 +23,16 @@
<div class="alert bg-light border-dark"> <div class="alert bg-light border-dark">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h2 class="workDate">@(DateTime.Parse(_workDate).ToLongDateString())</h2> <h2 style="font-variant: all-small-caps">@(DateTime.Now.ToLongDateString())</h2>
</div> </div>
<div class="col"> <div class="col">
<WorkDateComponent OnChanged="GetTaskItems"></WorkDateComponent> <WorkDateComponent SelectedDate="@_today" OnChanged="GetTaskItems"></WorkDateComponent>
</div> </div>
</div> </div>
</div> </div>
<TaskItemTableComponent TaskItemList="_taskItems" OnDelete="OnDeleteConfirmed" OnDone="OnDoneClicked"></TaskItemTableComponent> <TaskItemTableComponent TaskItemList="_taskItems" OnCompleteTask="OnCompleteTask"
OnDeleteTask="OnDeleteConfirmed" OnTaskCompleted="OnTaskCompleted" />
</AuthorizeView> </AuthorizeView>
<AuthorizeView Roles="Admin"> <AuthorizeView Roles="Admin">
<h2>Administrator</h2> <h2>Administrator</h2>

37
Wonky.Client/Components/Home.razor.cs
View file

@ -36,6 +36,7 @@ public partial class Home : IDisposable
[Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IToastService _toast { get; set; } [Inject] private IToastService _toast { get; set; }
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; } [Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
private readonly JsonSerializerOptions _options = new JsonSerializerOptions private readonly JsonSerializerOptions _options = new JsonSerializerOptions
{ {
@ -45,6 +46,7 @@ public partial class Home : IDisposable
private Preferences _prefs { get; set; } = new(); private Preferences _prefs { get; set; } = new();
private string _workDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; private string _workDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
private string _today { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
private List<TaskItemDto>? _taskItems { get; set; } = new(); private List<TaskItemDto>? _taskItems { get; set; } = new();
@ -57,28 +59,45 @@ public partial class Home : IDisposable
_interceptor.RegisterEvent(); _interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent(); _interceptor.RegisterBeforeSendEvent();
await GetTaskItems(_workDate); //await GetTaskItems(_workDate);
await GetAllTasks();
}
private async Task GetAllTasks()
{
_taskItems = await _taskItemRepo.GetTaskList();
}
private async Task OnCompleteTask(string taskItemId)
{
await _preferenceService.SetWorkDate(DateTime.Now);
var item = _taskItems.Find(x => x.TaskItemId == taskItemId);
_navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new");
} }
private async Task GetTaskItems(string workDate) private async Task GetTaskItems(string workDate)
{ {
_workDate = workDate; _workDate = workDate;
_taskItems = new List<TaskItemDto>();
_taskItems = await _taskItemRepo.GetTaskList(workDate); _taskItems = await _taskItemRepo.GetTaskList(workDate);
} }
private async Task OnDoneClicked(string taskItemId) private async Task OnTaskCompleted(string taskItemId)
{ {
// var item = _taskItems.Find(x => x.TaskItemId == taskItemId); var item = _taskItems.Find(x => x.TaskItemId == taskItemId);
// item.IsCompleted = true; item.IsCompleted = true;
await _taskItemRepo.UpdateTaskItem(taskItemId, item);
_logger.LogDebug("MarkAsDone TaskItemId => {}", taskItemId); _taskItems.Remove(item);
//await _taskItemRepo.UpdateTaskItem(taskItemId, item); _toast.ShowInfo("Opgaven er markeret som udført.");
} }
private async Task OnDeleteConfirmed(string taskItemId) private async Task OnDeleteConfirmed(string taskItemId)
{ {
_logger.LogDebug("Delete TaskItemId => {}", taskItemId); var item = _taskItems.First(x => x.TaskItemId == taskItemId);
//await _taskItemRepo.DeleteTaskItem(taskItemId); _taskItems.Remove(item);
await _taskItemRepo.DeleteTaskItem(taskItemId);
_toast.ShowInfo("Opgaven er slettet.");
} }
public void Dispose() public void Dispose()

49
Wonky.Client/Components/TaskItemTableComponent.razor
View file

@ -15,13 +15,14 @@
// //
*@ *@
@if (TaskItemList != null) @using Wonky.Client.Shared
@if (TaskItemList.Any())
{ {
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th scope="col"></th> <th scope="col">Navn</th>
<th scope="col"></th> <th scope="col">Dato</th>
<th scope="col"></th> <th scope="col"></th>
<th scope="col"></th> <th scope="col"></th>
<th scope="col"></th> <th scope="col"></th>
@ -30,16 +31,44 @@
<tbody> <tbody>
@foreach (var task in TaskItemList) @foreach (var task in TaskItemList)
{ {
<tr>
<tr @onclick="() => ModifyTaskItem(task.TaskItemId)">
<td class="align-middle">@task.Description</td>
<td class="align-middle">@task.Name</td> <td class="align-middle">@task.Name</td>
<td class="align-middle">@task.DueTimestamp</td> <td class="align-middle">
<td class="align-middle"><button type="button" class="btn btn-primary" @onclick="() => ShowConfirmationModal(task.TaskItemId)">Slet</button></td> <label class="px-1 py-1 position-relative">
<td class="align-middle"><button type="button" class="btn btn-danger" @onclick="() => TaskItemDone(task.TaskItemId)">Udført</button></td> @task.DueTimestamp.Split("T")[0]
@if (task.OverDue)
{
<span class="position-absolute top-0 start-100 translate-middle p-2 bg-danger border border-light rounded-circle">
<span class="visually-hidden">Forfalden opgave</span>
</span>
}
</label>
</td>
<td class="align-middle">
<button type="button" class="btn btn-light border-dark" @onclick="() => CallConfirmationModal(task.TaskItemId)">
Slet
</button>
</td>
<td class="align-middle">
<button type="button" class="btn btn-light border-dark position-relative" @onclick="() => TaskCompleted(task.TaskItemId)">
Færdiggør
</button>
</td>
<td class="align-middle">
@if (task.TaskTypeEnum is "Recall" or "Revision")
{
<button type="button" class="btn btn-primary position-relative" @onclick="() => CompleteTask(task.TaskItemId)">
Besøg
</button>
}
</td>
</tr> </tr>
} }
</tbody> </tbody>
</table> </table>
<Confirmation BodyMessage="Handlingen kan ikke gøres om. Vil du slette opgaven?" OnOkClicked="DeleteTask" @ref="_confirmation"/>
}
else
{
<AppSpinner></AppSpinner>
} }

58
Wonky.Client/Components/TaskItemTableComponent.razor.cs
View file

@ -25,33 +25,49 @@ namespace Wonky.Client.Components
{ {
public partial class TaskItemTableComponent public partial class TaskItemTableComponent
{ {
[Parameter] public List<TaskItemDto>? TaskItemList { get; set; } [Parameter] public List<TaskItemDto>? TaskItemList { get; set; } = new();
[Parameter] public EventCallback<string> OnDelete { get; set; } [Parameter] public EventCallback<string> OnDeleteTask { get; set; }
[Parameter] public EventCallback<string> OnDone { get; set; } [Parameter] public EventCallback<string> OnCompleteTask { get; set; }
[Inject] private NavigationManager _navigator { get; set; } [Parameter] public EventCallback<string> OnTaskCompleted { get; set; }
private Confirmation _confirmation = new ();
private string _taskItemId = "";
private void ShowConfirmationModal(string taskItemId) private Confirmation _confirmation = new ();
private string _taskItemIdToDelete = "";
/// <summary>
/// Complete task callback
/// </summary>
/// <param name="taskItemId"></param>
private async Task CompleteTask(string taskItemId)
{ {
_taskItemId = taskItemId; await OnCompleteTask.InvokeAsync(taskItemId);
}
/// <summary>
/// Task completed callback
/// </summary>
/// <param name="taskItemId"></param>
private async Task TaskCompleted(string taskItemId)
{
await OnTaskCompleted.InvokeAsync(taskItemId);
}
/// <summary>
/// Confirm delete
/// </summary>
/// <param name="taskItemId"></param>
private void CallConfirmationModal(string taskItemId)
{
_taskItemIdToDelete = taskItemId;
_confirmation.Show(); _confirmation.Show();
} }
private void ModifyTaskItem(string taskItemId) /// <summary>
{ /// Delete task call back
_navigator.NavigateTo($"/task-items/{taskItemId}"); /// </summary>
} private async Task DeleteTask()
private async Task TaskItemDone(string taskItemId)
{
await OnDone.InvokeAsync(_taskItemId);
}
private async Task DeleteConfirmed(string taskItemId)
{ {
_confirmation.Hide(); _confirmation.Hide();
await OnDelete.InvokeAsync(_taskItemId); await OnDeleteTask.InvokeAsync(_taskItemIdToDelete);
} }
} }
} }

16
Wonky.Client/Pages/ActivityNewVisitPage.razor
View file

@ -48,7 +48,7 @@
</InputSelect> </InputSelect>
<ValidationMessage For="@(() => _draft.ActivityTypeEnum)"></ValidationMessage> <ValidationMessage For="@(() => _draft.ActivityTypeEnum)"></ValidationMessage>
</div> </div>
<label for="statusType" class="col-md-2 col-form-label">Status</label> <label for="statusType" class="col-md-2 col-form-label">Status</label>
<div class="col-md-4"> <div class="col-md-4">
<InputSelect id="statusType" class="form-select" @bind-Value="@_draft.ActivityStatusEnum"> <InputSelect id="statusType" class="form-select" @bind-Value="@_draft.ActivityStatusEnum">
@ -62,28 +62,28 @@
<ValidationMessage For="@(() => _draft.ActivityStatusEnum)"></ValidationMessage> <ValidationMessage For="@(() => _draft.ActivityStatusEnum)"></ValidationMessage>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="demo" class="col-md-2 col-form-label">Demo</label> <label for="demo" class="col-md-2 col-form-label">Demo</label>
<div class="col-md-4"> <div class="col-md-4">
<InputText id="demo" class="form-control" @bind-Value="_draft.Demo"/> <InputText id="demo" class="form-control" @bind-Value="_draft.Demo"/>
<ValidationMessage For="@(() => _draft.Demo)"></ValidationMessage> <ValidationMessage For="@(() => _draft.Demo)"></ValidationMessage>
</div> </div>
<label for="email" class="col-md-2 col-form-label">Epost</label> <label for="email" class="col-md-2 col-form-label">Epost</label>
<div class="col-md-4"> <div class="col-md-4">
<InputText id="email" class="form-control" @bind-Value="_draft.Email"/> <InputText id="email" class="form-control" @bind-Value="_draft.Email"/>
<ValidationMessage For="@(() => _draft.Email)"></ValidationMessage> <ValidationMessage For="@(() => _draft.Email)"></ValidationMessage>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="referenceNumber" class="col-md-2 col-form-label">Rekvisition</label> <label for="referenceNumber" class="col-md-2 col-form-label">Rekvisition</label>
<div class="col-md-4"> <div class="col-md-4">
<InputText id="referenceNumber" class="form-control" @bind-Value="_draft.ReferenceNumber"/> <InputText id="referenceNumber" class="form-control" @bind-Value="_draft.ReferenceNumber"/>
<ValidationMessage For="@(() => _draft.ReferenceNumber)"></ValidationMessage> <ValidationMessage For="@(() => _draft.ReferenceNumber)"></ValidationMessage>
</div> </div>
<label for="yourRef" class="col-md-2 col-form-label">Indkøber</label> <label for="yourRef" class="col-md-2 col-form-label">Indkøber</label>
<div class="col-md-4"> <div class="col-md-4">
<InputText id="yourRef" class="form-control" @bind-Value="_draft.YourRef"/> <InputText id="yourRef" class="form-control" @bind-Value="_draft.YourRef"/>
@ -97,14 +97,14 @@
<InputTextArea id="orderMessage" class="form-control" @bind-Value="_draft.OrderMessage"/> <InputTextArea id="orderMessage" class="form-control" @bind-Value="_draft.OrderMessage"/>
<ValidationMessage For="@(() => _draft.OrderMessage)"></ValidationMessage> <ValidationMessage For="@(() => _draft.OrderMessage)"></ValidationMessage>
</div> </div>
<label for="crmNote" class="col-md-2 col-form-label">Note /Selv</label> <label for="crmNote" class="col-md-2 col-form-label">Note /Selv</label>
<div class="col-md-4"> <div class="col-md-4">
<InputTextArea id="crmNote" class="form-control" @bind-Value="_draft.CrmNote"/> <InputTextArea id="crmNote" class="form-control" @bind-Value="_draft.CrmNote"/>
<ValidationMessage For="@(() => _draft.CrmNote)"></ValidationMessage> <ValidationMessage For="@(() => _draft.CrmNote)"></ValidationMessage>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="attention" class="col-md-2 col-form-label">Att.</label> <label for="attention" class="col-md-2 col-form-label">Att.</label>
<div class="col-md-4"> <div class="col-md-4">
@ -118,7 +118,7 @@
<ValidationMessage For="@(() => _draft.Phone)"></ValidationMessage> <ValidationMessage For="@(() => _draft.Phone)"></ValidationMessage>
</div> </div>
</div> </div>
</div> </div>
<div class="accordion" id="crmActivity"> <div class="accordion" id="crmActivity">
@* Order lines *@ @* Order lines *@

13
Wonky.Client/Pages/TaskItemViewPage.razor
View file

@ -15,10 +15,19 @@
// //
*@ *@
@page "/taskitems/view" @page "/task-items/{TaskItemId}"
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3>Task Item</h3> <h3>Opgave</h3>
</div>
<div class="card-body">
<EditForm EditContext="_editContext">
<DataAnnotationsValidator/>
</EditForm>
</div>
<div class="card-footer">
</div> </div>
</div> </div>

23
Wonky.Client/Pages/TaskItemViewPage.razor.cs
View file

@ -14,19 +14,34 @@
// //
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
using Wonky.Entity.DTO;
namespace Wonky.Client.Pages; namespace Wonky.Client.Pages;
public partial class TaskItemViewPage : IDisposable public partial class TaskItemViewPage : IDisposable
{ {
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Parameter] public string TaskItemId { get; set; } [Parameter] public string TaskItemId { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }
private TaskItemDto? _taskItem = new ();
private EditContext _editContext { get; set; }
protected override Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
return base.OnParametersSetAsync(); _interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
_taskItem = await _taskItemRepo.GetTaskItem(TaskItemId);
}
protected override void OnInitialized()
{
_editContext = new EditContext(_taskItem);
} }
public void Dispose() public void Dispose()

25
Wonky.Client/Shared/Confirmation.razor
View file

@ -16,20 +16,19 @@
*@ *@
<div class="modal" tabindex="-1" role="dialog" style="display:@_modalDisplay"> <div class="modal" tabindex="-1" role="dialog" style="display:@_modalDisplay">
<div class="modal-dialog" role="document"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<h5 class="modal-header">Bekræft venligst</h5> <div class="modal-header">
<button type="button" class="close" @onclick="Hide" aria-label="Luk"></button> <h5 class="modal-title">Er du sikker?</h5>
<span aria-hidden="true">&times;</span> <button type="button" class="btn-close" @onclick="Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>@BodyMessage</p> <p>@BodyMessage</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-success" data-dismiss="modal" <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="Hide">Afbryd</button>
@onclick="() => OnOkClicked.InvokeAsync()">OK</button> <button type="button" class="btn btn-primary" data-bs-dismiss="modal" @onclick="() => OnOkClicked.InvokeAsync()">OK</button>
<button type="button" class="btn btn-danger" data-dismiss="modal" </div>
@onclick="Hide">Afbryd</button>
</div> </div>
</div> </div>
</div> </div>

4
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,8 +1,8 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Client", "name": "Wonky Client",
"version": "0.8.153", "version": "0.9.13",
"isBeta": false, "isBeta": true,
"sandBox": false, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"
}, },