From 84b782e8ada1ca5d7b3e12a5c206d688243f1e20 Mon Sep 17 00:00:00 2001
From: EiNSTeiN- <einstein@g3nius.org>
Date: Wed, 15 Nov 2023 16:11:42 -0500
Subject: [PATCH 1/7] Show filament sensor state even when the sensor is
 disabled

---
 src/components/inputs/FilamentSensor.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 8e0565815..ac2967dc5 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -13,6 +13,7 @@
                     <span>{{ convertName(name) }}</span>
                     <v-spacer></v-spacer>
                     <small :class="'mr-3 ' + statusColor + '--text'">{{ statusText }}</small>
+                    <small v-if="!enabled" :class="'mr-3 ' + statusColor + '--text'">({{ disabledText }})</small>
                     <v-icon @click="changeSensor">
                         {{ enabled ? mdiToggleSwitch : mdiToggleSwitchOffOutline }}
                     </v-icon>
@@ -51,11 +52,15 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
     }
 
     get statusText() {
-        if (!this.enabled) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Disabled')
-        else if (this.filament_detected) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Detected')
+        if (this.filament_detected) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Detected')
         else return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
     }
 
+    get disabledText() {
+        if (!this.enabled) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Disabled')
+        else return null
+    }
+
     changeSensor() {
         const gcode = 'SET_FILAMENT_SENSOR SENSOR=' + this.name + ' ENABLE=' + (this.enabled ? 0 : 1)
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })

From a7167979be36832a644a1f9adc7c2221a8d90e3a Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:23:27 +0100
Subject: [PATCH 2/7] fix: remove disabled output

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/inputs/FilamentSensor.vue | 6 ------
 src/locales/de.json                      | 1 -
 src/locales/en.json                      | 1 -
 3 files changed, 8 deletions(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index ac2967dc5..794600823 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -13,7 +13,6 @@
                     <span>{{ convertName(name) }}</span>
                     <v-spacer></v-spacer>
                     <small :class="'mr-3 ' + statusColor + '--text'">{{ statusText }}</small>
-                    <small v-if="!enabled" :class="'mr-3 ' + statusColor + '--text'">({{ disabledText }})</small>
                     <v-icon @click="changeSensor">
                         {{ enabled ? mdiToggleSwitch : mdiToggleSwitchOffOutline }}
                     </v-icon>
@@ -56,11 +55,6 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
         else return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
     }
 
-    get disabledText() {
-        if (!this.enabled) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Disabled')
-        else return null
-    }
-
     changeSensor() {
         const gcode = 'SET_FILAMENT_SENSOR SENSOR=' + this.name + ' ENABLE=' + (this.enabled ? 0 : 1)
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
diff --git a/src/locales/de.json b/src/locales/de.json
index b6e494ec9..555197a89 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -614,7 +614,6 @@
             },
             "RunoutSensor": {
                 "Detected": "erkannt",
-                "Disabled": "deaktiviert",
                 "Empty": "Leer"
             }
         },
diff --git a/src/locales/en.json b/src/locales/en.json
index 5124825d5..deeb5a9bb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -614,7 +614,6 @@
             },
             "RunoutSensor": {
                 "Detected": "detected",
-                "Disabled": "disabled",
                 "Empty": "Empty"
             }
         },

From 43b292f158e6da1c0312642a9340c879c642bc78 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:23:59 +0100
Subject: [PATCH 3/7] refactor: move style section at the end and simplify some
 code

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/inputs/FilamentSensor.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 794600823..4f2335c00 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -1,9 +1,3 @@
-<style scoped>
-._filamentRunout-subheader {
-    height: auto;
-}
-</style>
-
 <template>
     <v-container class="px-0 py-2">
         <v-row>
@@ -11,7 +5,7 @@
                 <v-subheader class="_filamentRunout-subheader">
                     <v-icon small class="mr-2">{{ mdiPrinter3dNozzleAlert }}</v-icon>
                     <span>{{ convertName(name) }}</span>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <small :class="'mr-3 ' + statusColor + '--text'">{{ statusText }}</small>
                     <v-icon @click="changeSensor">
                         {{ enabled ? mdiToggleSwitch : mdiToggleSwitchOffOutline }}
@@ -62,3 +56,9 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+._filamentRunout-subheader {
+    height: auto;
+}
+</style>

From ae5e29d0a4a6f8dbe734b710106ffb7d3b729ea5 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:24:52 +0100
Subject: [PATCH 4/7] refactor: change empty string to lowercase

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/locales/de.json | 2 +-
 src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/de.json b/src/locales/de.json
index 555197a89..165ace0d6 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -614,7 +614,7 @@
             },
             "RunoutSensor": {
                 "Detected": "erkannt",
-                "Empty": "Leer"
+                "Empty": "leer"
             }
         },
         "PowerControlPanel": {
diff --git a/src/locales/en.json b/src/locales/en.json
index deeb5a9bb..1276ae986 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -614,7 +614,7 @@
             },
             "RunoutSensor": {
                 "Detected": "detected",
-                "Empty": "Empty"
+                "Empty": "empty"
             }
         },
         "PowerControlPanel": {

From 00e1055d376232ed8f8f3535c4bd6e024efe845e Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:26:00 +0100
Subject: [PATCH 5/7] fix: change color of empty output to red/error

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/inputs/FilamentSensor.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 4f2335c00..7dc8cf6d8 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -41,7 +41,8 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
     get statusColor() {
         if (!this.enabled) return 'gray'
         else if (this.filament_detected) return 'success'
-        else return 'danger'
+
+        return 'error'
     }
 
     get statusText() {

From 99879841d66df153d1874041ebbbcc91c3bac9a2 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:26:18 +0100
Subject: [PATCH 6/7] refactor: refactor statusText getter

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/inputs/FilamentSensor.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 7dc8cf6d8..715e02f82 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -47,7 +47,8 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
 
     get statusText() {
         if (this.filament_detected) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Detected')
-        else return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
+
+        return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
     }
 
     changeSensor() {

From 20ceda7549cdbdf014a73149a895a36e0fd6f87c Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Fri, 8 Dec 2023 21:34:55 +0100
Subject: [PATCH 7/7] refactor: change empty color from error to warning

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/inputs/FilamentSensor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 715e02f82..82b53085a 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -42,7 +42,7 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
         if (!this.enabled) return 'gray'
         else if (this.filament_detected) return 'success'
 
-        return 'error'
+        return 'warning'
     }
 
     get statusText() {