beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Show taken date incl source in photo info tab #396

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-13 16:29:36 +02:00
parent 579da46f11
commit 2bcb954266
3 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/dialog/photo/files.vue
View file

@ -66,7 +66,7 @@
<td> <td>
<translate>Folder</translate> <translate>Folder</translate>
</td> </td>
<td>{{ file.Root }}</td> <td>{{ file.Root | capitalize }}</td>
</tr> </tr>
<tr v-if="file.Name"> <tr v-if="file.Name">
<td> <td>

38
frontend/src/dialog/photo/info.vue
View file

@ -13,25 +13,25 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Type">Type</translate> <translate>Type</translate>
</td> </td>
<td>{{ model.Type | capitalize }}</td> <td>{{ model.Type | capitalize }}</td>
</tr> </tr>
<tr v-if="model.Path"> <tr v-if="model.Path">
<td> <td>
<translate key="Folder">Folder</translate> <translate>Folder</translate>
</td> </td>
<td>{{ model.Path }}</td> <td>{{ model.Path }}</td>
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Name">Name</translate> <translate>Name</translate>
</td> </td>
<td>{{ model.Name }}</td> <td>{{ model.Name }}</td>
</tr> </tr>
<tr v-if="model.OriginalName"> <tr v-if="model.OriginalName">
<td> <td>
<translate key="Original Name">Original Name</translate> <translate>Original Name</translate>
</td> </td>
<td> <td>
<v-text-field <v-text-field
@ -44,19 +44,25 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Title">Title</translate> <translate>Title</translate>
</td> </td>
<td>{{ model.Title }}</td> <td>{{ model.Title }}</td>
</tr> </tr>
<tr v-if="model.TitleSrc"> <tr v-if="model.TitleSrc">
<td> <td>
<translate key="Title Source">Title Source</translate> <translate>Title Source</translate>
</td> </td>
<td>{{ model.TitleSrc | capitalize }}</td> <td>{{ model.TitleSrc | capitalize }}</td>
</tr> </tr>
<tr> <tr>
<td> <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>
<td> <td>
<v-rating v-model="model.Quality" :length="7" readonly small></v-rating> <v-rating v-model="model.Quality" :length="7" readonly small></v-rating>
@ -64,20 +70,20 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Resolution">Resolution</translate> <translate>Resolution</translate>
</td> </td>
<td>{{ model.Resolution }} MP</td> <td>{{ model.Resolution }} MP</td>
</tr> </tr>
<tr v-if="model.CameraSerial"> <tr v-if="model.CameraSerial">
<td> <td>
<translate key="Camera Serial">Camera Serial</translate> <translate>Camera Serial</translate>
</td> </td>
<td>{{ model.CameraSerial }} <td>{{ model.CameraSerial }}
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Favorite">Favorite</translate> <translate>Favorite</translate>
</td> </td>
<td> <td>
<v-switch <v-switch
@ -90,7 +96,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Private">Private</translate> <translate>Private</translate>
</td> </td>
<td> <td>
<v-switch <v-switch
@ -155,7 +161,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Created">Created</translate> <translate>Created</translate>
</td> </td>
<td> <td>
{{ formatTime(model.CreatedAt) }} {{ formatTime(model.CreatedAt) }}
@ -163,7 +169,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<translate key="Updated">Updated</translate> <translate>Updated</translate>
</td> </td>
<td> <td>
{{ formatTime(model.UpdatedAt) }} {{ formatTime(model.UpdatedAt) }}
@ -171,7 +177,7 @@
</tr> </tr>
<tr v-if="model.EditedAt"> <tr v-if="model.EditedAt">
<td> <td>
<translate key="Edited">Edited</translate> <translate>Edited</translate>
</td> </td>
<td> <td>
{{ formatTime(model.EditedAt) }} {{ formatTime(model.EditedAt) }}
@ -179,7 +185,7 @@
</tr> </tr>
<tr v-if="model.CheckedAt"> <tr v-if="model.CheckedAt">
<td> <td>
<translate key="Checked">Checked</translate> <translate>Checked</translate>
</td> </td>
<td> <td>
{{ formatTime(model.CheckedAt) }} {{ formatTime(model.CheckedAt) }}
@ -187,7 +193,7 @@
</tr> </tr>
<tr v-if="model.DeletedAt"> <tr v-if="model.DeletedAt">
<td> <td>
<translate key="Archived">Archived</translate> <translate>Archived</translate>
</td> </td>
<td> <td>
{{ formatTime(model.DeletedAt) }} {{ formatTime(model.DeletedAt) }}

6
pkg/txt/convert_test.go
View file

@ -7,6 +7,12 @@ import (
) )
func TestTime(t *testing.T) { 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) { t.Run("/2020/1212/20130518_142022_3D657EBD.jpg", func(t *testing.T) {
result := Time("/2020/1212/20130518_142022_3D657EBD.jpg") result := Time("/2020/1212/20130518_142022_3D657EBD.jpg")
//assert.False(t, result.IsZero()) //assert.False(t, result.IsZero())