Time series now working

Author: ChrisPaulBennett

src/components/cylc/analysis/AnalysisTable.vue

@@ -139,13 +139,6 @@ export default {
           allowZeros: false,
           timingOption: this.timingOption
         },
-        {
-          title: `Std Dev ${times}`,
-          key: `${formatHeader('stdDev', times)}`,
-          formatter: formatDuration,
-          allowZeros: true,
-          timingOption: this.timingOption
-        },
         {
           title: `Min ${times}`,
           key: `${formatHeader('min', times)}`,
@@ -191,6 +184,16 @@ export default {
           timingOption: this.timingOption
         })
       }
+      // Don't show std dev for cpuTime or maxRss
+      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss') {
+        timingHeaders.push({
+          title: `Std Dev ${times}`,
+          key: `${formatHeader('stdDev', times)}`,
+          formatter: formatDuration,
+          allowZeros: true,
+          timingOption: this.timingOption
+        })
+      }
       return this.headers.concat(timingHeaders)
     }
   },

src/components/cylc/analysis/TimeSeries.vue

@@ -123,7 +123,8 @@ const jobFields = [
   'queueTime',
   'runTime',
   'startedTime',
-  'maxRss'
+  'maxRss',
+  'cpuTime'
 ]
 
 /** The one-off query which retrieves historical job timing statistics */
@@ -370,7 +371,7 @@ export default {
               if (!value) {
                 return null
               }
-              const y = formatDuration(value, true)
+              const y = formatDuration(value, true, this.timingOption)
               const platform = this.series[seriesIndex].data[dataPointIndex].platform
               return `${y} (${platform})`
             }

src/utils/tasks.js

@@ -98,10 +98,11 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
- export function formatDuration (value, allowZeros = false, timingOption = false) {
-  // Smaller number of seconds are formatted as HH:MM:SS
+export function formatDuration (value, allowZeros = false, timingOption = false) {
+  // Times are formatted as HH:MM:SS
   if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime') {
     if (value || (value === 0 && allowZeros === true)) {
+      // Convert CPU time to seconds
       if (timingOption === 'cpuTime') {
         value = value / 1000
       }
@@ -120,7 +121,7 @@ export function jobMessageOutputs (jobNode) {
         ':' + minutes.toString().padStart(2, '0') +
         ':' + Math.round(seconds).toString().padStart(2, '0')
     }
-  // Larger number means it's memory
+  // If memory value passed
   } else if (timingOption === 'maxRss') {
     if (value / 1024 < 5000) {
       const kilobytes = value / 1024