tyler.durden
/
dashy
mirror of https://github.com/Lissy93/dashy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🔀 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:
Alicia Sykes 2023-02-26 14:25:40 +00:00 committed by GitHub
parent e48f8418b9 4fc3abf511
commit d5b70c1d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Widgets/Clock.vue
View File

@ -40,7 +40,7 @@ export default {
return !this.options.hideSeconds; return !this.options.hideSeconds;
}, },
use12Hour() { 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 // this is the default, it gets computed by the DateTimeFormat implementation
return Intl.DateTimeFormat(this.timeFormat, { timeZone: this.timeZone, hour: 'numeric' }).resolvedOptions().hour12 ?? false; return Intl.DateTimeFormat(this.timeFormat, { timeZone: this.timeZone, hour: 'numeric' }).resolvedOptions().hour12 ?? false;
}, },

6
src/components/Widgets/Mvg.vue
View File

@ -23,7 +23,7 @@
:class="{cancelled: departure.cancelled}">{{ departure.destination }}</div> :class="{cancelled: departure.cancelled}">{{ departure.destination }}</div>
<span class="delay" <span class="delay"
:class="{'has-delay': departure.realtimeDepartureTime > departure.plannedDepartureTime}" :class="{'has-delay': departure.realtimeDepartureTime > departure.plannedDepartureTime}"
>{{ Math.max(0, >{{ Math.max(0,
(departure.realtimeDepartureTime - departure.plannedDepartureTime)/60000) }}</span> (departure.realtimeDepartureTime - departure.plannedDepartureTime)/60000) }}</span>
<span class="occupancy" <span class="occupancy"
:class="'occupancy-' + departure.occupancy" :class="'occupancy-' + departure.occupancy"
@ -131,9 +131,9 @@ export default {
filter_results(value) { filter_results(value) {
if (!this.options.filters) return true; if (!this.options.filters) return true;
let useEntry = ( let useEntry = (
(!this.options.filters.line) (!this.options.filters.line)
|| this.ensure_array(this.options.filters.line).includes(value.label) || this.ensure_array(this.options.filters.line).includes(value.label)
); );
useEntry = useEntry useEntry = useEntry
&& ( && (
(!this.options.filters.product) (!this.options.filters.product)

4
src/mixins/ItemMixin.js
View File

@ -157,8 +157,8 @@ export default {
this.$emit('itemClicked'); this.$emit('itemClicked');
// Update the most/ last used ledger, for smart-sorting // Update the most/ last used ledger, for smart-sorting
if (!this.appConfig.disableSmartSort) { if (!this.appConfig.disableSmartSort) {
this.incrementMostUsedCount(this.id); this.incrementMostUsedCount(this.item.id);
this.incrementLastUsedCount(this.id); this.incrementLastUsedCount(this.item.id);
} }
}, },
/* Open item, using specified method */ /* Open item, using specified method */