mirror of https://github.com/Lissy93/dashy.git
🔀 Merge pull request #1123 from Lissy93/FIX/most-used-last-used-counter
[FIX] Counter for most-used + last-used, and lint warns Fixes #1056 and #1033 for @hypatia1 and @Zixim
This commit is contained in:
commit
d5b70c1d94
|
@ -40,7 +40,7 @@ export default {
|
|||
return !this.options.hideSeconds;
|
||||
},
|
||||
use12Hour() {
|
||||
if (typeof this.options.use12Hour === "boolean") return this.options.use12Hour;
|
||||
if (typeof this.options.use12Hour === 'boolean') return this.options.use12Hour;
|
||||
// this is the default, it gets computed by the DateTimeFormat implementation
|
||||
return Intl.DateTimeFormat(this.timeFormat, { timeZone: this.timeZone, hour: 'numeric' }).resolvedOptions().hour12 ?? false;
|
||||
},
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
:class="{cancelled: departure.cancelled}">{{ departure.destination }}</div>
|
||||
<span class="delay"
|
||||
:class="{'has-delay': departure.realtimeDepartureTime > departure.plannedDepartureTime}"
|
||||
>{{ Math.max(0,
|
||||
>{{ Math.max(0,
|
||||
(departure.realtimeDepartureTime - departure.plannedDepartureTime)/60000) }}</span>
|
||||
<span class="occupancy"
|
||||
:class="'occupancy-' + departure.occupancy"
|
||||
|
@ -131,9 +131,9 @@ export default {
|
|||
filter_results(value) {
|
||||
if (!this.options.filters) return true;
|
||||
let useEntry = (
|
||||
(!this.options.filters.line)
|
||||
(!this.options.filters.line)
|
||||
|| this.ensure_array(this.options.filters.line).includes(value.label)
|
||||
);
|
||||
);
|
||||
useEntry = useEntry
|
||||
&& (
|
||||
(!this.options.filters.product)
|
||||
|
|
|
@ -157,8 +157,8 @@ export default {
|
|||
this.$emit('itemClicked');
|
||||
// Update the most/ last used ledger, for smart-sorting
|
||||
if (!this.appConfig.disableSmartSort) {
|
||||
this.incrementMostUsedCount(this.id);
|
||||
this.incrementLastUsedCount(this.id);
|
||||
this.incrementMostUsedCount(this.item.id);
|
||||
this.incrementLastUsedCount(this.item.id);
|
||||
}
|
||||
},
|
||||
/* Open item, using specified method */
|
||||
|
|
Loading…
Reference in New Issue