From 2bcb954266a08699586d724a8593b9f1f95250f3 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Mon, 13 Jul 2020 16:29:36 +0200
Subject: [PATCH] Show taken date incl source in photo info tab #396

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 frontend/src/dialog/photo/files.vue |  2 +-
 frontend/src/dialog/photo/info.vue  | 38 +++++++++++++++++------------
 pkg/txt/convert_test.go             |  6 +++++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/frontend/src/dialog/photo/files.vue b/frontend/src/dialog/photo/files.vue
index 47464d9eb..71f93938e 100644
--- a/frontend/src/dialog/photo/files.vue
+++ b/frontend/src/dialog/photo/files.vue
@@ -66,7 +66,7 @@
                         <td>
                           <translate>Folder</translate>
                         </td>
-                        <td>{{ file.Root }}</td>
+                        <td>{{ file.Root | capitalize }}</td>
                       </tr>
                       <tr v-if="file.Name">
                         <td>
diff --git a/frontend/src/dialog/photo/info.vue b/frontend/src/dialog/photo/info.vue
index 83d4fc388..1bacf0233 100644
--- a/frontend/src/dialog/photo/info.vue
+++ b/frontend/src/dialog/photo/info.vue
@@ -13,25 +13,25 @@
         </tr>
         <tr>
           <td>
-            <translate key="Type">Type</translate>
+            <translate>Type</translate>
           </td>
           <td>{{ model.Type | capitalize }}</td>
         </tr>
         <tr v-if="model.Path">
           <td>
-            <translate key="Folder">Folder</translate>
+            <translate>Folder</translate>
           </td>
           <td>{{ model.Path }}</td>
         </tr>
         <tr>
           <td>
-            <translate key="Name">Name</translate>
+            <translate>Name</translate>
           </td>
           <td>{{ model.Name }}</td>
         </tr>
         <tr v-if="model.OriginalName">
           <td>
-            <translate key="Original Name">Original Name</translate>
+            <translate>Original Name</translate>
           </td>
           <td>
             <v-text-field
@@ -44,19 +44,25 @@
         </tr>
         <tr>
           <td>
-            <translate key="Title">Title</translate>
+            <translate>Title</translate>
           </td>
           <td>{{ model.Title }}</td>
         </tr>
         <tr v-if="model.TitleSrc">
           <td>
-            <translate key="Title Source">Title Source</translate>
+            <translate>Title Source</translate>
           </td>
           <td>{{ model.TitleSrc | capitalize }}</td>
         </tr>
         <tr>
           <td>
-            <translate key="Quality Score">Quality Score</translate>
+            <translate>Taken</translate>
+          </td>
+          <td>{{ model.getDateString() }} <span v-if="model.TakenSrc">({{ model.TakenSrc | capitalize }})</span></td>
+        </tr>
+        <tr>
+          <td>
+            <translate>Quality Score</translate>
           </td>
           <td>
             <v-rating v-model="model.Quality" :length="7" readonly small></v-rating>
@@ -64,20 +70,20 @@
         </tr>
         <tr>
           <td>
-            <translate key="Resolution">Resolution</translate>
+            <translate>Resolution</translate>
           </td>
           <td>{{ model.Resolution }} MP</td>
         </tr>
         <tr v-if="model.CameraSerial">
           <td>
-            <translate key="Camera Serial">Camera Serial</translate>
+            <translate>Camera Serial</translate>
           </td>
           <td>{{ model.CameraSerial }}
           </td>
         </tr>
         <tr>
           <td>
-            <translate key="Favorite">Favorite</translate>
+            <translate>Favorite</translate>
           </td>
           <td>
             <v-switch
@@ -90,7 +96,7 @@
         </tr>
         <tr>
           <td>
-            <translate key="Private">Private</translate>
+            <translate>Private</translate>
           </td>
           <td>
             <v-switch
@@ -155,7 +161,7 @@
         </tr>
         <tr>
           <td>
-            <translate key="Created">Created</translate>
+            <translate>Created</translate>
           </td>
           <td>
             {{ formatTime(model.CreatedAt) }}
@@ -163,7 +169,7 @@
         </tr>
         <tr>
           <td>
-            <translate key="Updated">Updated</translate>
+            <translate>Updated</translate>
           </td>
           <td>
             {{ formatTime(model.UpdatedAt) }}
@@ -171,7 +177,7 @@
         </tr>
         <tr v-if="model.EditedAt">
           <td>
-            <translate key="Edited">Edited</translate>
+            <translate>Edited</translate>
           </td>
           <td>
             {{ formatTime(model.EditedAt) }}
@@ -179,7 +185,7 @@
         </tr>
         <tr v-if="model.CheckedAt">
           <td>
-            <translate key="Checked">Checked</translate>
+            <translate>Checked</translate>
           </td>
           <td>
             {{ formatTime(model.CheckedAt) }}
@@ -187,7 +193,7 @@
         </tr>
         <tr v-if="model.DeletedAt">
           <td>
-            <translate key="Archived">Archived</translate>
+            <translate>Archived</translate>
           </td>
           <td>
             {{ formatTime(model.DeletedAt) }}
diff --git a/pkg/txt/convert_test.go b/pkg/txt/convert_test.go
index f33792f23..0863eb2aa 100644
--- a/pkg/txt/convert_test.go
+++ b/pkg/txt/convert_test.go
@@ -7,6 +7,12 @@ import (
 )
 
 func TestTime(t *testing.T) {
+	t.Run("2018/04 - April/2018-04-12 19:24:49.gif", func(t *testing.T) {
+		result := Time("2018/04 - April/2018-04-12 19:24:49.gif")
+		assert.False(t, result.IsZero())
+		assert.Equal(t, "2018-04-12 19:24:49 +0000 UTC", result.String())
+	})
+
 	t.Run("/2020/1212/20130518_142022_3D657EBD.jpg", func(t *testing.T) {
 		result := Time("/2020/1212/20130518_142022_3D657EBD.jpg")
 		//assert.False(t, result.IsZero())