From 3ab5a50f74369eb5bf0cf316c4a1bad8dad924d9 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Tue, 16 Aug 2022 14:11:44 +0200
Subject: [PATCH] task item view/edit

---
 .../Components/TaskItemTableComponent.razor   |  5 ++
 .../Pages/ActivityNewVisitPage.razor.cs       |  4 +-
 Wonky.Client/Pages/TaskItemViewPage.razor     | 82 +++++++++++++++++--
 Wonky.Client/Pages/TaskItemViewPage.razor.cs  |  3 +
 Wonky.Client/wwwroot/appsettings.json         |  2 +-
 5 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor
index a6c1228e..d9386ae5 100644
--- a/Wonky.Client/Components/TaskItemTableComponent.razor
+++ b/Wonky.Client/Components/TaskItemTableComponent.razor
@@ -45,11 +45,16 @@
                         }
                     </label>
                 </td>
+                <td class="align-middle">
+                    <a class="btn btn-light border-dark" href="/tasks/@task.TaskItemId"><i class="oi oi-calendar"></i></a>
+                </td>
+                @*
                 <td class="align-middle">
                     <button type="button" class="btn btn-light border-dark" @onclick="() => CallConfirmationModal(task.TaskItemId)">
                         <i class="oi oi-circle-x"></i>
                     </button>
                 </td>
+                *@
                 <td class="align-middle">
                     <button type="button" class="btn btn-light border-dark" @onclick="() => TaskCompleted(task.TaskItemId)">
                         <i class="oi oi-check"></i>
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
index f629d8a0..05a41bb8 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
@@ -294,6 +294,9 @@ public partial class ActivityNewVisitPage : IDisposable
     
     private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
     {
+        if (_draft.ActivityTypeEnum != "phone")
+            _draft.Express = false;
+        
         // InvalidCanvas = InvalidActivityType;
         InvalidActivity = InvalidActivityType 
                            || _poFormInvalid 
@@ -304,7 +307,6 @@ public partial class ActivityNewVisitPage : IDisposable
             _poFormInvalid = true;
             return;
         }
-            
         
         if (InvalidActivity)
         {
diff --git a/Wonky.Client/Pages/TaskItemViewPage.razor b/Wonky.Client/Pages/TaskItemViewPage.razor
index 3f4c9481..a366482f 100644
--- a/Wonky.Client/Pages/TaskItemViewPage.razor
+++ b/Wonky.Client/Pages/TaskItemViewPage.razor
@@ -15,7 +15,12 @@
 //
 *@
 
-@page "/task-items/{TaskItemId}"
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Advisor")]
+@page "/tasks/{TaskItemId}"
+
+@* {"TaskItemId":"","ErpUserId":"","ReferenceId":"","Name":"","Description":"","DueTimestamp":"","TaskTypeEnum":"","Interval":0,"IsCompleted":false,"OverDue":false,"Recurring":false} *@
+
 <div class="card">
     <div class="card-header">
         <h3>Opgave</h3>
@@ -23,11 +28,78 @@
     <div class="card-body">
         <EditForm EditContext="_editContext">
             <DataAnnotationsValidator/>
-            
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="taskItemId" class="col-md-2 col-form-label">EntityId</label>
+                    <InputText id="taskItemId" class="col-md-10 form-control" @bind-Value="_taskItem.TaskItemId" readonly=""/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="erpUserId" class="col-md-2 col-form-label">BrugerId</label>
+                    <InputText id="erpUserId" class="col-md-10 form-control" @bind-Value="_taskItem.ErpUserId" readonly=""/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="referenceId" class="col-md-2 col-form-label">ReferenceId</label>
+                    <InputText id="referenceId" class="col-md-10 form-control" @bind-Value="_taskItem.ReferenceId" readonly=""/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="name" class="col-md-2 col-form-label">Opgave</label>
+                    <InputText id="name" class="col-md-10 form-control" @bind-Value="_taskItem.Name"/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="description" class="col-md-2 col-form-label">Beskrivelse</label>
+                    <InputText id="description" class="col-md-10 form-control" @bind-Value="_taskItem.Description"/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="dueTimestamp" class="col-md-2 col-form-label">Forfald</label>
+                    <InputText id="dueTimestamp" class="col-md-10 form-control" @bind-Value="_taskItem.DueTimestamp"/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="taskTypeEnum" class="col-md-2 col-form-label">OpgaveType</label>
+                    <InputText id="taskTypeEnum" class="col-md-10 form-control" @bind-Value="_taskItem.TaskTypeEnum"/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="isCompleted" class="col-md-2 col-form-label">Afsluttet</label>
+                    <InputCheckbox id="isCompleted" class="col-md-10 form-check-input" @bind-Value="_taskItem.IsCompleted"/>
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="overDue" class="col-md-2 col-form-label">Overskredet</label>
+                    <InputCheckbox id="overDue" class="col-md-10 form-check-input" @bind-Value="_taskItem.OverDue" disabled />
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="input-group">
+                    <label for="recurring" class="col-md-2 col-form-label">Gentagelse</label>
+                    <InputCheckbox id="recurring" class="col-md-10 form-check-input" @bind-Value="_taskItem.Recurring"/>
+                </div>
+            </div>
+            @if (_taskItem.Recurring)
+            {
+                <div class="row mb-2">
+                    <div class="input-group">
+                        <label for="interval" class="col-md-2 col-form-label">Interval</label>
+                        <InputNumber id="interval" class="col-md-10 form-control" @bind-Value="_taskItem.Interval"/>
+                    </div>
+                </div>
+            }
         </EditForm>
     </div>
     <div class="card-footer">
-        
-    </div>
-</div>
 
+    </div>
+</div>
\ No newline at end of file
diff --git a/Wonky.Client/Pages/TaskItemViewPage.razor.cs b/Wonky.Client/Pages/TaskItemViewPage.razor.cs
index e1ef0f18..27714514 100644
--- a/Wonky.Client/Pages/TaskItemViewPage.razor.cs
+++ b/Wonky.Client/Pages/TaskItemViewPage.razor.cs
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 //
 
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.HttpInterceptors;
@@ -36,6 +38,7 @@ public partial class TaskItemViewPage : IDisposable
         _interceptor.RegisterBeforeSendEvent();
         
         _taskItem = await _taskItemRepo.GetTaskItem(TaskItemId);
+        Console.WriteLine(JsonSerializer.Serialize(_taskItem));
     }
 
     protected override void OnInitialized()
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 7ddc4a36..bb871969 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.10.92",
+        "version": "0.10.93",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"