Merge branch 'master' of https://tfs.nuvolar.hu:8443/tfs/AtomERP/_git/WorkFlowCheck

src/WorkFlowCheck.API/Controllers/SystemController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Serilog;
 using WorkFlowCheck.BL.Services.Interfaces;
 using WorkFlowCheck.Common.DTO;
 
@@ -11,12 +12,12 @@ namespace WorkFlowCheck.API.Controllers
     {
 
         private readonly ISystemService _systemService;
-        
+
-        public SystemController(ISystemService systemService) 
+        public SystemController(ISystemService systemService)
-        { 
+        {
             _systemService = systemService;
-        }   
+        }
-        
+
         [HttpGet("GetDatabaseAndVersionInfo")]
         public async Task<ApiResponseDTO<string>> GetDatabaseAndVersionInfo()
         {
@@ -24,7 +25,7 @@ namespace WorkFlowCheck.API.Controllers
             {
                 IsSuccess = true,
             };
-            var result = await _systemService.GetDatabaseAndVersionInfoAsync(); 
+            var result = await _systemService.GetDatabaseAndVersionInfoAsync();
 
             if (result != null)
             {
@@ -39,5 +40,188 @@ namespace WorkFlowCheck.API.Controllers
 
             return retVal;
         }
+
+        [HttpGet("GetAllImageFiles")]
+        public async Task<ApiResponseDTO<List<ImageFileDTO>>> GetAllImageFilesAsync()
+        {
+            var retVal = new ApiResponseDTO<List<ImageFileDTO>>()
+            {
+                IsSuccess = true,
+            };
+            try
+            {
+                var imageFolder = Path.Combine(Directory.GetCurrentDirectory(), "Images");
+                var files = Directory.GetFiles(imageFolder)
+                        .Select(f =>
+                        {
+                            var fileInfo = new FileInfo(f);
+                            return new
+                            {
+                                FileName = fileInfo.Name,
+                                FileSize = FormatFileSize(fileInfo.Length),
+                                CreatedDate = fileInfo.CreationTime.ToString("yyyy.MM.dd HH:mm"),
+                            };
+                        });
+
+                var checkListFileInfos = new List<ImageFileDTO>();
+                foreach (var file in files.OrderBy(o => o.FileName).ToList())
+                {
+                    var checkListFileInfoDTO = new ImageFileDTO()
+                    {
+                        FileName = file.FileName,
+                        FileSize = file.FileSize,
+                        CreateDate = file.CreatedDate,
+
+                    };
+                    checkListFileInfos.Add(checkListFileInfoDTO);
+                }
+
+                if (checkListFileInfos != null)
+                {
+                    retVal.IsSuccess = true;
+                    retVal.Data = checkListFileInfos;
+                }
+                else
+                {
+                    retVal.IsSuccess = false;
+                    retVal.Errors.Add("No data!");
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+        [HttpGet("GetAllPDFFiles")]
+        public async Task<ApiResponseDTO<List<ImageFileDTO>>> GetAllPDFilesAsync()
+        {
+            var retVal = new ApiResponseDTO<List<ImageFileDTO>>()
+            {
+                IsSuccess = true,
+            };
+            try
+            {
+                var imageFolder = Path.Combine(Directory.GetCurrentDirectory(), "PDF");
+                var files = Directory.GetFiles(imageFolder)
+                        .Select(f =>
+                        {
+                            var fileInfo = new FileInfo(f);
+                            return new
+                            {
+                                FileName = fileInfo.Name,
+                                FileSize = FormatFileSize(fileInfo.Length),
+                                CreatedDate = fileInfo.CreationTime.ToString("yyyy.MM.dd HH:mm"),
+                            };
+                        });
+
+                var checkListFileInfos = new List<ImageFileDTO>();
+                foreach (var file in files.OrderBy(o => o.FileName).ToList())
+                {
+                    var checkListFileInfoDTO = new ImageFileDTO()
+                    {
+                        FileName = file.FileName,
+                        FileSize = file.FileSize,
+                        CreateDate = file.CreatedDate,
+
+                    };
+                    checkListFileInfos.Add(checkListFileInfoDTO);
+                }
+
+                if (checkListFileInfos != null)
+                {
+                    retVal.IsSuccess = true;
+                    retVal.Data = checkListFileInfos;
+                }
+                else
+                {
+                    retVal.IsSuccess = false;
+                    retVal.Errors.Add("No data!");
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+
+        [HttpGet("DownloadFile/{filename}")]
+        public async Task<ApiResponseDTO<byte[]>> DownloadFile(string filename)
+        {
+            var retVal = new ApiResponseDTO<byte[]>()
+            {
+                IsSuccess = false,
+            };
+            var imageFile = Path.Combine(Directory.GetCurrentDirectory(), "Images", filename);
+
+            if (!System.IO.File.Exists(imageFile))
+            {
+                retVal.Errors.Add($"{filename} does not exist");
+                return retVal;
+            }
+
+            byte[] response = System.IO.File.ReadAllBytes(imageFile);
+
+
+            if (response != null)
+            {
+
+                retVal.IsSuccess = true;
+                retVal.Data = response;
+            }
+            else
+            {
+                retVal.IsSuccess = false;
+                retVal.Errors.Add("No data!");
+            }
+
+            return retVal;
+        }
+        [HttpGet("DownloadPDFFile/{filename}")]
+        public async Task<ApiResponseDTO<byte[]>> DownloadPDFFile(string filename)
+        {
+            var retVal = new ApiResponseDTO<byte[]>()
+            {
+                IsSuccess = false,
+            };
+            var imageFile = Path.Combine(Directory.GetCurrentDirectory(), "PDF", filename);
+
+            if (!System.IO.File.Exists(imageFile))
+            {
+                retVal.Errors.Add($"{filename} does not exist");
+                return retVal;
+            }
+
+            byte[] response = System.IO.File.ReadAllBytes(imageFile);
+
+
+            if (response != null)
+            {
+
+                retVal.IsSuccess = true;
+                retVal.Data = response;
+            }
+            else
+            {
+                retVal.IsSuccess = false;
+                retVal.Errors.Add("No data!");
+            }
+
+            return retVal;
+        }
+
+        private string FormatFileSize(long bytes)
+        {
+            string[] sizes = { "B", "KB", "MB", "GB", "TB" };
+            double len = bytes;
+            int order = 0;
+            while (len >= 1024 && order < sizes.Length - 1)
+            {
+                order++;
+                len /= 1024;
+            }
+            return $"{len:0.##} {sizes[order]}";
+        }
     }
 }

src/WorkFlowCheck.Common/DTO/ImageFileDTO.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WorkFlowCheck.Common.DTO
+{
+    public class ImageFileDTO
+    {
+        public string Id { get; set; }
+        public string FileName { get; set; }
+        public string FileSize { get; set; }
+        public string CreateDate { get; set; }
+    }
+}

src/WorkFlowCheck.Common/DTO/PDFFileDTO.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WorkFlowCheck.Common.DTO
+{
+    public class PDFFileDTO
+    {
+        public string Id { get; set; }
+        public string FileName { get; set; }
+        public string FileSize { get; set; }
+        public string CreateDate { get; set; }
+    }
+}

src/WorkFlowCheck.Web/Pages/BaseStock/ImageFiles/ImageFilesPage.cshtml

@@ -0,0 +1,80 @@
+@page
+@model WorkFlowCheck.Web.Pages.BaseStock.ImageFiles.ImageFilesPageModel
+@using WorkFlowCheck.Common.Helper
+@using WorkFlowCheck.Common.DTO
+@{
+    ViewData["Title"] = "Képek";
+}
+<h1>@ViewData["Title"]</h1>
+
+<div class="card shadow p-4">
+    <table id="tbImageFilesPage" class="table table-bordered table-hover table-sm" style="width:100%">
+        <thead class="table-primary">
+            <tr>
+                <th>ID</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.FileName), typeof(ImageFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.CreateDate), typeof(ImageFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.FileSize), typeof(ImageFileDTO))</th>
+                <th class="text-center">Action</th>
+            </tr>
+        </thead>
+        <tfoot class="table-light">
+            <tr>
+                <th>ID</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.FileName), typeof(ImageFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.FileSize), typeof(ImageFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(ImageFileDTO.CreateDate), typeof(ImageFileDTO))</th>
+                <th>Action</th>
+            </tr>
+        </tfoot>
+    </table>
+</div>
+
+@section Scripts {
+    <script>
+        const table = new DataTable('#tbImageFilesPage', {
+                ajax: {
+                        url: "@Url.Page("./ImageFilesPage", "LoadImageFiles")",
+                        type: "GET",
+                        dataSrc : "data"
+                },
+                columns: [
+                    { data: "id" },
+                    { data: "fileName" },
+                    { data: "createDate" },
+                    { data: "fileSize" },
+                    { data: null, render: function (data, type, row) {
+                         return renderActionButtonsDownloadImages(row.id);
+                    }}
+                ],
+                columnDefs: [
+                    {
+                        "targets": 0,
+                        "visible": false
+                    },
+                    {
+                        "targets": 2,
+                        "className": "text-start"
+                    },
+                    {
+                        "targets": 3,
+                        "className": "text-end"
+                    },
+                    {
+                        "targets": 4,
+                        "className": "text-center",
+                        "width": "10%"
+                    }
+                ],
+
+                processing:true,
+                language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
+        });
+
+        $('#tbImageFilesPage').on('click', '.download-btn', function ()
+        {
+            const row = table.row($(this).closest('tr')).data();
+            window.location.href = `@Url.Page("/BaseStock/ImageFiles/ImageFilesPage")?handler=DownloadFile&filename=${row.fileName}`;
+        });
+    </script>
+}

src/WorkFlowCheck.Web/Pages/BaseStock/ImageFiles/ImageFilesPage.cshtml.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using WorkFlowCheck.Web.Services.Interfaces;
+
+namespace WorkFlowCheck.Web.Pages.BaseStock.ImageFiles
+{
+    [Authorize]
+    public class ImageFilesPageModel : PageModel
+    {
+        private readonly ILogger<IndexModel> _logger;
+        private readonly ISystemService _systemService;
+        public ImageFilesPageModel(ILogger<IndexModel> logger, ISystemService systemService)
+        {
+            _logger = logger;
+            _systemService = systemService;
+        }
+        public async Task OnGet()
+        {
+        }
+        public async Task<JsonResult> OnGetLoadImageFiles()
+        {
+            var results = await _systemService.GetAllImageFilesAsync();
+            return new JsonResult(new { data = results });
+        }
+        public async Task<IActionResult> OnGetDownloadFile(string filename)
+        {
+            var response = await _systemService.DownloadFile(filename);
+                       
+
+            if (response.IsSuccess)
+            {
+
+                var result = new FileContentResult(response.Data, "application/octet-stream")
+                {
+                    FileDownloadName = filename,
+                    FileContents = response.Data
+                };
+                return result;
+            }
+            else
+            {
+                return new JsonResult(new { success = false });
+            }
+        }
+    }
+}

src/WorkFlowCheck.Web/Pages/BaseStock/PDFFiles/PDFFilesPage.cshtml

@@ -0,0 +1,80 @@
+@page
+@model WorkFlowCheck.Web.Pages.BaseStock.PDFFiles.PDFFilesPageModel
+@using WorkFlowCheck.Common.Helper
+@using WorkFlowCheck.Common.DTO
+@{
+    ViewData["Title"] = "PDF fájlok";
+}
+<h1>@ViewData["Title"]</h1>
+
+<div class="card shadow p-4">
+    <table id="tbPDFFilesPage" class="table table-bordered table-hover table-sm" style="width:100%">
+        <thead class="table-primary">
+            <tr>
+                <th>ID</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.FileName), typeof(PDFFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.CreateDate), typeof(PDFFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.FileSize), typeof(PDFFileDTO))</th>
+                <th class="text-center">Action</th>
+            </tr>
+        </thead>
+        <tfoot class="table-light">
+            <tr>
+                <th>ID</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.FileName), typeof(PDFFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.FileSize), typeof(PDFFileDTO))</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(PDFFileDTO.CreateDate), typeof(PDFFileDTO))</th>
+                <th>Action</th>
+            </tr>
+        </tfoot>
+    </table>
+</div>
+
+@section Scripts {
+    <script>
+        const table = new DataTable('#tbPDFFilesPage', {
+                ajax: {
+                        url: "@Url.Page("./PDFFilesPage", "LoadPDFFiles")",
+                        type: "GET",
+                        dataSrc : "data"
+                },
+                columns: [
+                    { data: "id" },
+                    { data: "fileName" },
+                    { data: "createDate" },
+                    { data: "fileSize" },
+                    { data: null, render: function (data, type, row) {
+                         return renderActionButtonsDownloadPDFs(row.id);
+                    }}
+                ],
+                columnDefs: [
+                    {
+                        "targets": 0,
+                        "visible": false
+                    },
+                    {
+                        "targets": 2,
+                        "className": "text-start"
+                    },
+                    {
+                        "targets": 3,
+                        "className": "text-end"
+                    },
+                    {
+                        "targets": 4,
+                        "className": "text-center",
+                        "width": "10%"
+                    }
+                ],
+
+                processing:true,
+                language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
+        });
+
+        $('#tbPDFFilesPage').on('click', '.download-btn', function ()
+        {
+            const row = table.row($(this).closest('tr')).data();
+            window.location.href = `@Url.Page("/BaseStock/PDFFiles/PDFFilesPage")?handler=DownloadFile&filename=${row.fileName}`;
+        });
+    </script>
+}

src/WorkFlowCheck.Web/Pages/BaseStock/PDFFiles/PDFFilesPage.cshtml.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using WorkFlowCheck.Web.Services.Interfaces;
+
+namespace WorkFlowCheck.Web.Pages.BaseStock.PDFFiles
+{
+    [Authorize]
+    public class PDFFilesPageModel : PageModel
+    {
+        private readonly ILogger<IndexModel> _logger;
+        private readonly ISystemService _systemService;
+        public PDFFilesPageModel(ILogger<IndexModel> logger, ISystemService systemService)
+        {
+            _logger = logger;
+            _systemService = systemService;
+        }
+        public async Task OnGet()
+        {
+        }
+        public async Task<JsonResult> OnGetLoadPDFFiles()
+        {
+            var results = await _systemService.GetAllPDFFilesAsync();
+            return new JsonResult(new { data = results });
+        }
+        public async Task<IActionResult> OnGetDownloadFile(string filename)
+        {
+            var response = await _systemService.DownloadPDFFile(filename);
+                       
+
+            if (response.IsSuccess)
+            {
+
+                var result = new FileContentResult(response.Data, "application/pdf")
+                {
+                    FileDownloadName = filename,
+                    FileContents = response.Data
+                };
+                return result;
+            }
+            else
+            {
+                return new JsonResult(new { success = false });
+            }
+        }
+    }
+}

src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml

@@ -36,6 +36,9 @@
                                 <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/CheckPoints/CheckPointsPage">Ellenőrzési pontok</a></li>
                                 <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/Equipments/EquipmentsPage">Berendezések</a></li>
                                 <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/Locations/LocationsPage">Lokációk</a></li>
+                                <li><hr class="dropdown-divider"></li> <!-- EZ AZ ELVÁLASZTÓ VONAL -->
+                                <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/ImageFiles/ImageFilesPage">Fényképek</a></li>
+                                <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/PDFFiles/PDFFilesPage">PDF állomány</a></li>
                             </ul>
                         </li>
                         <li class="nav-item dropdown">

src/WorkFlowCheck.Web/Program.cs

@@ -24,6 +24,7 @@ builder.Services.AddHttpClient();
 builder.Services.AddScoped<IUserService, UserService>();
 builder.Services.AddScoped<IBaseStockService, BaseStockService>();
 builder.Services.AddScoped<ICheckListService, CheckListService>();
+builder.Services.AddScoped<ISystemService, SystemService>();
 
 builder.Host.UseSerilog();
 // Add services to the container.

src/WorkFlowCheck.Web/Services/Interfaces/ISystemService.cs

@@ -0,0 +1,12 @@
+using WorkFlowCheck.Common.DTO;
+
+namespace WorkFlowCheck.Web.Services.Interfaces
+{
+    public interface ISystemService
+    {
+        Task<List<ImageFileDTO>> GetAllImageFilesAsync();
+        Task<ApiResponseDTO<byte[]>> DownloadFile(string filename);
+        Task<List<PDFFileDTO>> GetAllPDFFilesAsync();
+        Task<ApiResponseDTO<byte[]>> DownloadPDFFile(string filename);
+    }
+}

src/WorkFlowCheck.Web/Services/SystemService.cs

@@ -0,0 +1,97 @@
+using Serilog;
+using WorkFlowCheck.Common.DTO;
+using WorkFlowCheck.Web.Services.Interfaces;
+
+namespace WorkFlowCheck.Web.Services
+{
+    public class SystemService:BaseService, ISystemService
+    {
+        public SystemService(HttpClient httpClient, IConfiguration configuration, IHttpContextAccessor httpContextAccessor) : base(httpClient, configuration, httpContextAccessor)
+        {
+        }
+        public async Task<List<ImageFileDTO>> GetAllImageFilesAsync()
+        {
+            var endpoint = $"{_httpClient.BaseAddress}api/System/GetAllImageFiles";
+            var retVal = new List<ImageFileDTO>();
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<List<ImageFileDTO>>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response.Data;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+        public async Task<ApiResponseDTO<byte[]>> DownloadFile(string filename)
+        {
+            var retVal = new ApiResponseDTO<byte[]>();
+            var endpoint = $"{_httpClient.BaseAddress}api/System/DownloadFile/{filename}";
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<byte[]>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+        public async Task<List<PDFFileDTO>> GetAllPDFFilesAsync()
+        {
+            var endpoint = $"{_httpClient.BaseAddress}api/System/GetAllPDFFiles";
+            var retVal = new List<PDFFileDTO>();
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<List<PDFFileDTO>>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response.Data;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+        public async Task<ApiResponseDTO<byte[]>> DownloadPDFFile(string filename)
+        {
+            var retVal = new ApiResponseDTO<byte[]>();
+            var endpoint = $"{_httpClient.BaseAddress}api/System/DownloadPDFFile/{filename}";
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<byte[]>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+    }
+}

src/WorkFlowCheck.Web/wwwroot/js/site.js

@@ -168,6 +168,18 @@ function renderActionButtons(rowId) {
         </button>
     `;
 }
+function renderActionButtonsDownloadImages(rowId) {
+    return `
+        <button class="btn btn-primary download-btn btn-sm" data-id="${rowId}">
+            <i class="bi bi-file-earmark-arrow-down"></i>
+        </button>`;
+}
+function renderActionButtonsDownloadPDFs(rowId) {
+    return `
+        <button class="btn btn-primary download-btn btn-sm" data-id="${rowId}">
+            <i class="bi bi-file-earmark-arrow-down"></i>
+        </button>`;
+}
 function renderActionButtonsforCheckListHeader(data, rowId) {
     if (data === 4) {
         return `