Merge branch 'develop' into pedrolamas/feat-probe-accuracy

fluidd-core · Feb 18, 2024 · de14923 · de14923
2 parents 37df519 + 61a58f7
commit de14923
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -146,7 +146,13 @@
               v-for="header in visibleHeaders.filter(h => h.value !== 'filament_name')"
               :key="header.value"
             >
-              {{ item[header.value] }}
+              <template v-if="header.value === 'last_used'">
+                {{ item[header.value] ? $filters.formatRelativeTimeToNow(item[header.value]) : $tc('app.setting.label.never') }}
+              </template>
+
+              <template v-else>
+                {{ item[header.value] }}
+              </template>
             </td>
           </tr>
         </template>
@@ -273,8 +279,7 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
       spools.push({
         ...spool,
         filament_name: filamentName,
-        filament_material: spool.filament.material,
-        last_used: spool.last_used ? this.$filters.formatRelativeTimeToNow(spool.last_used) : this.$tc('app.setting.label.never')
+        filament_material: spool.filament.material
       })
     }