From 8ee22269e2d2d33ac93dc80bcfcd16a2460ea537 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Wed, 9 Dec 2020 23:51:56 +0100
Subject: [PATCH] bugfix: show controls in paused state, reorder panels
 dashbaord

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/ControlPanel.vue    |  8 ++++----
 src/components/panels/PeripheriePanel.vue | 22 +++++++++++-----------
 src/pages/Dashboard.vue                   |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/panels/ControlPanel.vue b/src/components/panels/ControlPanel.vue
index 6598121e..9d1c6c32 100644
--- a/src/components/panels/ControlPanel.vue
+++ b/src/components/panels/ControlPanel.vue
@@ -11,14 +11,14 @@
 
 <template>
     <v-card>
-        <v-row class="" v-if="['standby', 'complete', 'error'].includes(printer_state)">
+        <v-row class="" v-if="['standby', 'paused', 'complete', 'error'].includes(printer_state)">
             <v-col class="col-12 pb-0 text-center">
                 <v-btn small @click="doHome" :loading="loadings.includes('homeAll')" :color="homedAxes.includes('xyz') ? 'primary' : 'warning'"><v-icon class="mr-1">mdi-home</v-icon><span class="d-none d-sm-inline">Home </span>all</v-btn>
                 <v-btn small @click="doQGL" :loading="loadings.includes('qgl')" color="primary" class="ml-2" v-if="'quad_gantry_level' in config">QGL</v-btn>
                <v-btn small @click="doZtilt" :loading="loadings.includes('zTilt')" color="primary" class="ml-2" v-if="'z_tilt' in config">Z Tilt</v-btn>
             </v-col>
         </v-row>
-        <v-row class="mt-3" v-if="['standby', 'complete', 'error'].includes(printer_state)">
+        <v-row class="mt-3" v-if="['standby', 'paused', 'complete', 'error'].includes(printer_state)">
             <v-col class="col-12 py-0 px-6 text-center">
                 <v-btn-toggle dense no-gutters class="row mx-auto" style="flex-wrap: nowrap;" >
                     <v-btn @click="doSendMove('X-100')" class="btnMinWidthAuto col"><span class="body-2">-100</span></v-btn>
@@ -31,7 +31,7 @@
                 </v-btn-toggle>
             </v-col>
         </v-row>
-        <v-row class="mt-3" v-if="['standby', 'complete', 'error'].includes(printer_state)">
+        <v-row class="mt-3" v-if="['standby', 'paused', 'complete', 'error'].includes(printer_state)">
             <v-col class="col-12 py-0 px-6 text-center">
                 <v-btn-toggle dense no-gutters class="row mx-auto" style="flex-wrap: nowrap;" >
                     <v-btn @click="doSendMove('Y-100')" class="btnMinWidthAuto col"><span class="body-2">-100</span></v-btn>
@@ -44,7 +44,7 @@
                 </v-btn-toggle>
             </v-col>
         </v-row>
-        <v-row class="mt-3" v-if="['standby', 'complete', 'error'].includes(printer_state)">
+        <v-row class="mt-3" v-if="['standby', 'paused', 'complete', 'error'].includes(printer_state)">
             <v-col class="col-12 py-0 px-6 text-center">
                 <v-btn-toggle dense no-gutters class="row mx-auto" style="flex-wrap: nowrap;" >
                     <v-btn @click="doSendMove('Z-25')" dense class="btnMinWidthAuto col"><span class="body-2">-25</span></v-btn>
diff --git a/src/components/panels/PeripheriePanel.vue b/src/components/panels/PeripheriePanel.vue
index 5b4d018e..c40382fc 100644
--- a/src/components/panels/PeripheriePanel.vue
+++ b/src/components/panels/PeripheriePanel.vue
@@ -17,17 +17,6 @@
 
 <template>
     <div>
-        <v-card v-if="this['printer/getFans'].length">
-            <v-toolbar flat dense >
-                <v-toolbar-title>
-                    <span class="subheading"><v-icon :class="'mdi mdi-fan '+(this['printer/getPartFanSpeed'] ? 'icon-rotate' : '')" left></v-icon>Fans</span>
-                </v-toolbar-title>
-            </v-toolbar>
-            <div v-for="(fan, index) of this['printer/getFans']" v-bind:key="index">
-                <v-divider v-if="index"></v-divider>
-                <fan-slider :name="fan.name" :type="fan.type" :target="fan.speed" :controllable="fan.controllable" :multi="100" class="py-0" ></fan-slider>
-            </div>
-        </v-card>
         <v-card class="mt-6" v-if="['printing', 'paused'].includes(printer_state)">
             <v-toolbar flat dense >
                 <v-toolbar-title>
@@ -38,6 +27,17 @@
             <v-divider></v-divider>
             <tool-slider label="Extrusion factor" :target="extrude_factor" :max="200" :multi="100" :step="1" command="M221" attribute-name="S" ></tool-slider>
         </v-card>
+        <v-card class="mt-6" v-if="this['printer/getFans'].length">
+            <v-toolbar flat dense >
+                <v-toolbar-title>
+                    <span class="subheading"><v-icon :class="'mdi mdi-fan '+(this['printer/getPartFanSpeed'] ? 'icon-rotate' : '')" left></v-icon>Fans</span>
+                </v-toolbar-title>
+            </v-toolbar>
+            <div v-for="(fan, index) of this['printer/getFans']" v-bind:key="index">
+                <v-divider v-if="index"></v-divider>
+                <fan-slider :name="fan.name" :type="fan.type" :target="fan.speed" :controllable="fan.controllable" :multi="100" class="py-0" ></fan-slider>
+            </div>
+        </v-card>
     </div>
 </template>
 
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index e31e0492..44974e1a 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -8,7 +8,7 @@
             <z-offset-panel class="mt-6" v-if="klippy_state === 'ready'"></z-offset-panel>
             <control-panel class="mt-6" v-if="klippy_state === 'ready'"></control-panel>
             <extruder-panel class="mt-6" v-if="klippy_state === 'ready'"></extruder-panel>
-            <peripherie-panel class="mt-6" v-if="klippy_state === 'ready'"></peripherie-panel>
+            <peripherie-panel v-if="klippy_state === 'ready'"></peripherie-panel>
         </v-col>
         <v-col class="col-sm-12 col-md-7" v-if="klippy_connected">
             <tools-panel v-if="socket_connected && klippy_connected"></tools-panel>