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

Frontend: Show fuzzy dates

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-06 12:07:47 +02:00
parent 3bed161e04
commit 373c6a95a1
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/dialog/photo/details.vue
View file

@ -55,7 +55,7 @@
:error="invalidDate"
:label="$gettext('Day')"
browser-autocomplete="off"
hide-details
hide-details hide-no-data
color="secondary-dark"
v-model="model.Day"
:items="options.Days()"
@ -69,7 +69,7 @@
:error="invalidDate"
:label="$gettext('Month')"
browser-autocomplete="off"
hide-details
hide-details hide-no-data
color="secondary-dark"
v-model="model.Month"
:items="options.Months()"
@ -83,7 +83,7 @@
:error="invalidDate"
:label="$gettext('Year')"
browser-autocomplete="off"
hide-details
hide-details hide-no-data
color="secondary-dark"
v-model="model.Year"
:items="options.Years()"
@ -125,7 +125,7 @@
:disabled="disabled"
:label="labels.timezone"
browser-autocomplete="off"
hide-details
hide-details hide-no-data
color="secondary-dark"
item-value="ID"
item-text="Name"
@ -139,7 +139,7 @@
<v-autocomplete
:disabled="disabled"
:label="labels.country"
hide-details
hide-details hide-no-data
browser-autocomplete="off"
color="secondary-dark"
item-value="Code"

34
frontend/src/model/photo.js
View file

@ -126,11 +126,11 @@ export class Photo extends RestModel {
}
localDayString() {
if(!this.TakenAtLocal) {
if (!this.TakenAtLocal) {
return new Date().getDay().toString().padStart(2, "0");
}
if(!this.Day || this.Day <= 0) {
if (!this.Day || this.Day <= 0) {
return this.TakenAtLocal.substr(8, 2);
}
@ -138,11 +138,11 @@ export class Photo extends RestModel {
}
localMonthString() {
if(!this.TakenAtLocal) {
if (!this.TakenAtLocal) {
return new Date().getMonth().toString().padStart(2, "0");
}
if(!this.Month || this.Month <= 0) {
if (!this.Month || this.Month <= 0) {
return this.TakenAtLocal.substr(5, 2);
}
@ -150,11 +150,11 @@ export class Photo extends RestModel {
}
localYearString() {
if(!this.TakenAtLocal) {
if (!this.TakenAtLocal) {
return new Date().getFullYear().toString().padStart(4, "0");
}
if(!this.Year || this.Year <= 1000) {
if (!this.Year || this.Year <= 1000) {
return this.TakenAtLocal.substr(0, 4);
}
@ -162,13 +162,13 @@ export class Photo extends RestModel {
}
localDateString(time) {
if(!this.localYearString()) {
if (!this.localYearString()) {
return this.TakenAtLocal;
}
let date = this.localYearString() + "-" + this.localMonthString() + "-" + this.localDayString();
if(!time) {
if (!time) {
time = this.TakenAtLocal.substr(11, 8);
}
@ -176,7 +176,7 @@ export class Photo extends RestModel {
}
getTimeZone() {
if(this.TimeZone) {
if (this.TimeZone) {
return this.TimeZone;
}
@ -191,10 +191,6 @@ export class Photo extends RestModel {
return result;
}
utcDate() {
return DateTime.fromISO(this.TakenAt).toUTC();
}
baseName(truncate) {
let result = this.fileBase(this.FileName ? this.FileName : this.mainFile().Name);
@ -419,9 +415,11 @@ export class Photo extends RestModel {
getDateString() {
if (!this.TakenAt || this.Year === YearUnknown) {
return $gettext("Unknown");
}
if (this.TimeZone) {
} else if (this.Month === MonthUnknown) {
return this.localYearString();
} else if (this.Day === DayUnknown) {
return this.localDate().toLocaleString({month: "long", year: "numeric"});
} else if (this.TimeZone) {
return this.localDate().toLocaleString(DateTime.DATETIME_FULL);
}
@ -431,6 +429,10 @@ export class Photo extends RestModel {
shortDateString() {
if (!this.TakenAt || this.Year === YearUnknown) {
return $gettext("Unknown");
} else if (this.Month === MonthUnknown) {
return this.localYearString();
} else if (this.Day === DayUnknown) {
return this.localDate().toLocaleString({month: "long", year: "numeric"});
}
return this.localDate().toLocaleString(DateTime.DATE_MED);