Reverted dimmer back to the value-graph (vs. state graph)

Fixed xAxisIndex when both value and state graphs are displayed

Signed-off-by: Jeff James <[email protected]>

Author: jsjames

bundles/org.openhab.ui/web/src/components/item/item-state-preview.vue

@@ -2,7 +2,7 @@
   <div>
     <item-standalone-control :item="item" :context="context" />
     <div class="display-flex justify-content-center flex-direction-column">
-      <div v-if="item.type.indexOf('Number') === 0 || item.type === 'Switch' || item.type === 'Contact' || item.type === 'Rollershutter' || item.type === 'Dimmer'"
+      <div v-if="item.type.indexOf('Number') === 0 || item.type === 'Switch' || item.type === 'Contact' || item.type === 'Rollershutter' || item.type === 'Dimmer' || item.type === 'String'"
            class="display-flex justify-content-center flex-direction-row">
         <f7-button :href="'/analyzer/?items=' + item.name">
           Analyze

bundles/org.openhab.ui/web/src/pages/analyzer/analyzer.vue

@@ -391,8 +391,8 @@ export default {
         discrete: true
       }
 
-      if (item.type.indexOf('Number') === 0) seriesOptions.discrete = false
-      if (item.groupType && (item.groupType.indexOf('Number') === 0)) seriesOptions.discrete = false
+      if (item.type.indexOf('Number') === 0 || item.type === 'Dimmer') seriesOptions.discrete = false
+      if (item.groupType && (item.groupType.indexOf('Number') === 0 || item.groupType === 'Dimmer')) seriesOptions.discrete = false
       if (!seriesOptions.discrete && this.coordSystem === 'aggregate' && this.aggregateDimensions === 1) seriesOptions.type = 'bar'
       if (!seriesOptions.discrete && (this.coordSystem === 'calendar' || (this.coordSystem === 'aggregate' && this.aggregateDimensions === 2))) seriesOptions.type = 'heatmap'
       if (seriesOptions.discrete) seriesOptions.type = 'state'

bundles/org.openhab.ui/web/src/pages/analyzer/chart-time.js

@@ -131,7 +131,7 @@ export default {
         component: 'oh-chart-datazoom',
         config: {
           type: 'inside',
-          xAxisIndex: (categoryGrid) ? [0, 1] : 0
+          xAxisIndex: (categoryGrid && valueGrid) ? [0, 1] : 0
         }
       }
     ]