#31 - Profile can defined date time format.

maraf · Feb 6, 2019 · 53a836a · 53a836a
1 parent 5b0897a
commit 53a836a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/src/FileUpload.Web.UI/Models/UploadSettings.cs b/src/FileUpload.Web.UI/Models/UploadSettings.cs
@@ -1,5 +1,4 @@
-using Neptuo.Text.Tokens;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -21,6 +20,8 @@ public class UploadSettings
         public string BackupTemplate { get; set; }
         public List<string> Roles { get; set; }
 
+        public string DateTimeFormat { get; set; }
+
         public bool IsSupportedExtension(string extension)
         {
             if (SupportedExtensions == null || SupportedExtensions.Count == 0)

diff --git a/src/FileUpload.Web.UI/ViewModels/BrowseViewModel.cs b/src/FileUpload.Web.UI/ViewModels/BrowseViewModel.cs
@@ -11,14 +11,15 @@ namespace FileUpload.ViewModels
     public class BrowseViewModel
     {
         private readonly string downloadUrl;
+        private readonly string dateTimeFormat;
 
         public string ReloadUrl { get; }
 
         public IReadOnlyList<FileModel> Files { get; }
         public bool IsDownloadEnabled { get; }
         public bool IsDeleteEnabled { get; }
 
-        public BrowseViewModel(IReadOnlyList<FileModel> files, string downloadUrl, string reloadUrl, bool isDownloadEnabled, bool isDeleteEnabled)
+        public BrowseViewModel(IReadOnlyList<FileModel> files, string downloadUrl, string reloadUrl, bool isDownloadEnabled, bool isDeleteEnabled, string dateTimeFormat)
         {
             Ensure.NotNull(files, "files");
             Ensure.NotNull(downloadUrl, "downloadUrl");
@@ -28,6 +29,7 @@ public BrowseViewModel(IReadOnlyList<FileModel> files, string downloadUrl, strin
             IsDeleteEnabled = isDeleteEnabled;
             ReloadUrl = reloadUrl;
             this.downloadUrl = downloadUrl;
+            this.dateTimeFormat = dateTimeFormat;
         }
 
         public string GetFileUrl(FileModel file)
@@ -37,5 +39,13 @@ public string GetFileUrl(FileModel file)
             else
                 return downloadUrl + '/' + file.Name;
         }
+
+        public string Format(DateTime dateTime)
+        {
+            if (String.IsNullOrEmpty(dateTimeFormat))
+                return dateTime.ToString();
+
+            return dateTime.ToString(dateTimeFormat);
+        }
     }
 }
diff --git a/src/FileUpload.Web.UI/ViewModels/Factory.cs b/src/FileUpload.Web.UI/ViewModels/Factory.cs
@@ -35,7 +35,14 @@ public BrowseViewModel CreateBrowser()
             if (files == null)
                 return null;
 
-            return new BrowseViewModel(files, urlBuilder.Index(), urlBuilder.Browse(noLayout: true), configuration.IsDownloadEnabled, configuration.IsDeleteEnabled);
+            return new BrowseViewModel(
+                files, 
+                urlBuilder.Index(), 
+                urlBuilder.Browse(noLayout: true), 
+                configuration.IsDownloadEnabled, 
+                configuration.IsDeleteEnabled, 
+                configuration.DateTimeFormat
+            );
         }
 
         public UploadViewModel CreateUpload()

diff --git a/src/FileUpload.Web.UI/Views/Shared/_Browser.cshtml b/src/FileUpload.Web.UI/Views/Shared/_Browser.cshtml
@@ -32,7 +32,7 @@
                         @(Math.Max(1, Math.Round(((decimal)file.Size / 1000), MidpointRounding.AwayFromZero)).ToString("N0")) KB
                     </td>
                     <td class="file-modifiedat">
-                        @file.ModifiedAt
+                        @Model.Format(file.ModifiedAt)
                     </td>
                     @if (Model.IsDeleteEnabled)
                     {

diff --git a/src/FileUpload.Web.UI/appsettings.Development.json b/src/FileUpload.Web.UI/appsettings.Development.json
@@ -18,7 +18,8 @@
       "IsDownloadEnabled": true,
       "IsBrowserEnabled": true,
       "IsDeleteEnabled": true,
-      "IsListed": true
+      "IsListed": true,
+      "DateTimeFormat": "yyyy-MM-dd HH:mm"
     },
     "Profiles": {
       "images": {