- Added export buttons to management interface

- Some small fixes
Nesteo · Dec 9, 2019 · ae2a4c8 · ae2a4c8
1 parent ce39b11
commit ae2a4c8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ COPY . /src
 WORKDIR /src/Nesteo.Server
 
 # Restore packages
-RUN npm install --with-dev
+RUN npm install
 
 # Run build task
 RUN npx grunt default

diff --git a/Nesteo.Server/Controllers/Api/NestingBoxesController.cs b/Nesteo.Server/Controllers/Api/NestingBoxesController.cs
@@ -204,7 +204,7 @@ public IAsyncEnumerable<InspectionPreview> GetInspectionPreviewsByNestingBoxIdAs
         /// </summary>
         [HttpGet("csv")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public Task<IActionResult> ExportNestingBoxAsync()
+        public Task<IActionResult> ExportNestingBoxesAsync()
         {
             string fileDownloadName = $"nesting-boxes-export-{DateTime.Now}.csv";
             IAsyncEnumerable<string> records = _nestingBoxService.ExportAllRowsAsync();

diff --git a/Nesteo.Server/Pages/Management/Data.cshtml b/Nesteo.Server/Pages/Management/Data.cshtml
@@ -0,0 +1,11 @@
+@page "/data"
+@model DataModel
+@{
+    ViewData["Title"] = "Data";
+}
+
+<p>Use the buttons below to download all nesting boxes or inspections as CSV file for use with other tools.</p>
+
+<a class="btn btn-primary" asp-controller="NestingBoxes" asp-action="ExportNestingBoxesAsync">Download nesting boxes</a>
+<a class="btn btn-primary" asp-controller="Inspections" asp-action="ExportInspectionsAsync">Download inspections</a>
+
diff --git a/Nesteo.Server/Pages/Management/Data.cshtml.cs b/Nesteo.Server/Pages/Management/Data.cshtml.cs
@@ -0,0 +1,6 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Nesteo.Server.Pages.Management
+{
+    public class DataModel : PageModel { }
+}
diff --git a/Nesteo.Server/Pages/Management/Profile/_Layout.cshtml b/Nesteo.Server/Pages/Management/Profile/_Layout.cshtml
@@ -3,7 +3,7 @@
 }
 
 <div class="row">
-    <div class="col-md-3">
+    <div class="col-md-3 mb-4">
         <partial name="_ProfileNav"/>
     </div>
     <div class="col-md-9">

diff --git a/Nesteo.Server/Pages/Management/Users.cshtml b/Nesteo.Server/Pages/Management/Users.cshtml
@@ -27,12 +27,14 @@
             @foreach (UserEntity user in Model.Users)
             {
                 <tr>
-                    <th scope="row">@user.UserName</th>
-                    <td>@user.FirstName</td>
-                    <td>@user.LastName</td>
-                    <td>@(user.Email ?? "-")</td>
-                    <td>@(user.PhoneNumber ?? "-")</td>
-                    <td>ACTIONS</td>
+                    <th class="align-middle" scope="row">@user.UserName</th>
+                    <td class="align-middle">@user.FirstName</td>
+                    <td class="align-middle">@user.LastName</td>
+                    <td class="align-middle">@(user.Email ?? "-")</td>
+                    <td class="align-middle">@(user.PhoneNumber ?? "-")</td>
+                    <td class="align-middle">
+                        <a class="btn btn-primary btn-sm" asp-page="/Management/EditUser" asp-route-userName="@user.UserName">Edit</a>
+                    </td>
                 </tr>
             }
             <tr>

diff --git a/Nesteo.Server/Pages/Management/_Layout.cshtml b/Nesteo.Server/Pages/Management/_Layout.cshtml
@@ -20,7 +20,7 @@
                     <a class="nav-link" asp-page="/Management/Users">Users</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" asp-page="">Data</a>
+                    <a class="nav-link" asp-page="/Management/Data">Data</a>
                 </li>
             </ul>
             <ul class="navbar-nav">