Merge branch 'master' into ISO-B/master

This commit is contained in:
advplyr 2024-10-31 08:30:04 -05:00
commit e370ec36ab
48 changed files with 1541 additions and 1580 deletions

View file

@ -34,11 +34,7 @@ export default {
deviceData: null
}
},
computed: {
networkConnected() {
return this.$store.state.networkConnected
}
},
computed: {},
methods: {
async init() {
this.deviceData = await this.$db.getDeviceData()
@ -53,4 +49,4 @@ export default {
this.init()
}
}
</script>
</script>

View file

@ -71,6 +71,7 @@ export default {
let lastKey = null
let numSaves = 0
let numSyncs = 0
let lastSaveName = null
this.mediaEvents.forEach((evt) => {
const date = this.$formatDate(evt.timestamp, 'MMM dd, yyyy')
@ -90,7 +91,8 @@ export default {
// Collapse saves
if (evt.name === 'Save') {
if (numSaves > 0 && !keyUpdated) {
let saveName = evt.name + "-" + evt.serverSyncAttempted + "-" + evt.serverSyncSuccess
if (lastSaveName === saveName && numSaves > 0 && !keyUpdated) {
include = false
const totalInGroup = groups[key].length
groups[key][totalInGroup - 1].num = numSaves
@ -98,6 +100,7 @@ export default {
} else {
numSaves = 1
}
lastSaveName = saveName
} else {
numSaves = 0
}