@things-factory/dataset 6.0.74 → 6.0.75

package/client/pages/data-archive/data-archive-list-page.ts

@@ -125,8 +125,6 @@ export class DataArchiveListPage extends connect(store)(localize(i18next)(PageVi
   }
 
   async pageInitialized(lifecycle) {
-    const today = new Date().toISOString().split('T')[0]
-
     this.gristConfig = {
       list: { fields: ['updater', 'updatedAt'] },
       columns: [

package/client/pages/data-report/data-report-samples-page.ts

@@ -8,6 +8,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
+import moment from 'moment-timezone'
 
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
@@ -41,7 +42,8 @@ export class DataReportSamplesPage extends connect(store)(localize(i18next)(Page
   @query('iframe') container!: HTMLIFrameElement
 
   get context() {
-    const today = new Date().toISOString().split('T')[0]
+    const yesterday = moment().subtract(1, 'day').format('YYYY-MM-DD')
+    const today = moment().format('YYYY-MM-DD')
 
     const filters = [
       {
@@ -49,7 +51,7 @@ export class DataReportSamplesPage extends connect(store)(localize(i18next)(Page
         type: 'date',
         label: i18next.t('field.work-date'),
         operator: 'between',
-        value: [today, today] // not working...
+        value: [yesterday, today]
       },
       ...this.getDataKeyFilters()
     ]

package/client/pages/data-sample/data-sample-list-page.ts

@@ -5,6 +5,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
+import moment from 'moment-timezone'
 
 import {
   getEditor,
@@ -115,7 +116,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
   }
 
   async pageInitialized(lifecycle) {
-    const today = new Date().toISOString().split('T')[0]
+    const yesterday = moment().subtract(1, 'day').format('YYYY-MM-DD')
+    const today = moment().format('YYYY-MM-DD')
 
     this.gristConfig = {
       list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
@@ -268,7 +270,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           filter: {
             type: 'date',
             operator: 'between',
-            value: [today, today]
+            value: [yesterday, today]
           },
           width: 80,
           imex: true

package/client/pages/data-sample/data-sample-search-page.ts

@@ -5,6 +5,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
+import moment from 'moment-timezone'
 
 import {
   getEditor,
@@ -43,7 +44,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     `
   ]
 
-  @state() dataKeySetId?: string
+  @state() dataSetId?: string
+  @state() dataSet: any
   @state() dataKeySet: any
 
   @state() gristConfig: any
@@ -79,12 +81,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist
-        .mode=${mode}
-        .config=${this.gristConfig}
-        .fetchHandler=${this.fetchHandler.bind(this)}
-        ?url-params-sensitive=${this.active}
-      >
+      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom">
           <div id="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -119,35 +116,42 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
 
   pageUpdated(changes, lifecycle) {
     if (this.active) {
-      this.dataKeySetId = lifecycle.resourceId
+      this.dataSetId = lifecycle.resourceId
       return
     }
   }
 
   async updated(changes) {
-    if (changes.has('dataKeySetId')) {
+    if (changes.has('dataSetId')) {
       const response = await client.query({
         query: gql`
           query ($id: String!) {
-            dataKeySet(id: $id) {
+            dataSet(id: $id) {
               id
               name
               description
-              dataKeyItems {
+              dataKeySet {
+                id
                 name
                 description
-                dataKey
-                tKey
+                dataKeyItems {
+                  name
+                  description
+                  dataKey
+                  tKey
+                }
               }
             }
           }
         `,
         variables: {
-          id: this.dataKeySetId
+          id: this.dataSetId
         }
       })
 
-      this.dataKeySet = response.data.dataKeySet
+      this.dataSet = response.data.dataSet
+      this.dataKeySet = this.dataSet.dataKeySet
+
       this.refreshGristConfig()
 
       this.grist.fetch()
@@ -174,7 +178,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
   }
 
   refreshGristConfig() {
-    const today = new Date().toISOString().split('T')[0]
+    const yesterday = moment().subtract(1, 'day').format('YYYY-MM-DD')
+    const today = moment().format('YYYY-MM-DD')
 
     this.gristConfig = {
       list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
@@ -263,7 +268,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           filter: {
             type: 'date',
             operator: 'between',
-            value: [today, today]
+            value: [yesterday, today]
           },
           width: 80,
           imex: true
@@ -329,15 +334,15 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
-    if (!this.dataKeySetId) {
+    if (!this.dataSetId) {
       return { records: [], total: 0 }
     }
 
     const response = await client.query({
       query: gql`
-        query ($dataKeySetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: dataSamplesByDataKeySet(
-            dataKeySetId: $dataKeySetId
+        query ($dataSetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          responses: dataSamplesByDataSet(
+            dataSetId: $dataSetId
             filters: $filters
             pagination: $pagination
             sortings: $sortings
@@ -370,7 +375,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
         }
       `,
       variables: {
-        dataKeySetId: this.dataKeySetId,
+        dataSetId: this.dataSetId,
         filters,
         pagination: { page, limit },
         sortings

package/client/pages/data-sample/data-sample-view.ts

@@ -85,6 +85,7 @@ class DataSampleView extends localize(i18next)(LitElement) {
               name
               description
               tag
+              stat
               unit
               type
               spec

package/client/pages/data-set/data-item-list.ts

@@ -1,4 +1,5 @@
 import gql from 'graphql-tag'
+
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 
@@ -7,6 +8,20 @@ import { i18next, localize } from '@operato/i18n'
 import { isMobileDevice } from '@operato/utils'
 import { ColumnConfig, DataGrist, FetchOption, SortersControl } from '@operato/data-grist'
 
+enum DataItemStatType {
+  sum = 'sum',
+  mean = 'mean',
+  stddev = 'stddev',
+  variance = 'variance',
+  min = 'min',
+  max = 'max',
+  range = 'range',
+  median = 'median',
+  mode = 'mode'
+}
+
+const DataItemStats = ['sum', 'mean', 'stddev', 'variance', 'min', 'max', 'range', 'median', 'mode']
+
 @customElement('data-item-list')
 class DataItemList extends localize(i18next)(LitElement) {
   @property({ type: Object }) dataSet: any
@@ -174,6 +189,16 @@ class DataItemList extends localize(i18next)(LitElement) {
           },
           width: 120
         },
+        {
+          type: 'select',
+          name: 'stat',
+          header: i18next.t('field.stat-function'),
+          record: {
+            options: ['', ...DataItemStats],
+            editable: true
+          },
+          width: 120
+        },
         {
           type: 'string',
           name: 'unit',

package/client/pages/data-set/data-set-list-page.ts

@@ -696,6 +696,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
                 options
                 quota
                 spec
+                stat
               }
             }
             total

package/client/pages/data-summary/data-summary-list-page.ts

@@ -5,7 +5,7 @@ import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato
 import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
-import { ScopedElementsMixin } from '@open-wc/scoped-elements'
+import moment from 'moment-timezone'
 import { ColumnConfig, DataGrist, GristRecord, FetchOption, SortersControl } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
@@ -104,7 +104,8 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
   }
 
   async pageInitialized(lifecycle) {
-    const today = new Date().toISOString().split('T')[0]
+    const yesterday = moment().subtract(1, 'day').format('YYYY-MM-DD')
+    const today = moment().format('YYYY-MM-DD')
 
     this.gristConfig = {
       list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
@@ -164,7 +165,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           filter: {
             type: 'date',
             operator: 'between',
-            value: [today, today]
+            value: [yesterday, today]
           },
           width: 80,
           imex: true
@@ -233,7 +234,57 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           imex: true
         },
         {
-          type: 'checkbox',
+          type: 'number',
+          name: 'data01',
+          header: i18next.t('field.data-01'),
+          record: {
+            editable: false
+          },
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'number',
+          name: 'data02',
+          header: i18next.t('field.data-02'),
+          record: {
+            editable: false
+          },
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'number',
+          name: 'data03',
+          header: i18next.t('field.data-03'),
+          record: {
+            editable: false
+          },
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'number',
+          name: 'data04',
+          header: i18next.t('field.data-04'),
+          record: {
+            editable: false
+          },
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'number',
+          name: 'data05',
+          header: i18next.t('field.data-05'),
+          record: {
+            editable: false
+          },
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'number',
           name: 'count',
           header: i18next.t('field.count'),
           record: {
@@ -242,7 +293,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           width: 30
         },
         {
-          type: 'checkbox',
+          type: 'number',
           name: 'countOoc',
           header: i18next.t('field.count-ooc'),
           record: {
@@ -251,7 +302,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           width: 30
         },
         {
-          type: 'checkbox',
+          type: 'number',
           name: 'countOos',
           header: i18next.t('field.count-oos'),
           record: {
@@ -322,6 +373,11 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
               key03
               key04
               key05
+              data01
+              data02
+              data03
+              data04
+              data05
               summary
               count
               countOoc

package/client/pages/data-summary/data-summary-search-page.ts

@@ -1,5 +1,6 @@
 import '@operato/data-grist'
 import './data-summary-view.js'
+import moment from 'moment-timezone'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -22,6 +23,7 @@ import { PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 import { OxPopup } from '@operato/popup'
+import { DataItem } from '@operato/dataset'
 
 @customElement('data-summary-search-page')
 export class DataSummarySearchPage extends connect(store)(localize(i18next)(PageView)) {
@@ -43,8 +45,11 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
     `
   ]
 
-  @state() dataKeySetId?: string
+  @state() dataSetId?: string
+
+  @state() dataSet: any
   @state() dataKeySet: any
+  @state() dataItems?: DataItem[]
 
   @state() gristConfig: any
   @state() mode: 'CARD' | 'GRID' | 'LIST' = isMobileDevice() ? 'CARD' : 'GRID'
@@ -79,12 +84,7 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist
-        .mode=${mode}
-        .config=${this.gristConfig}
-        .fetchHandler=${this.fetchHandler.bind(this)}
-        ?url-params-sensitive=${this.active}
-      >
+      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom">
           <div id="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -119,42 +119,61 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
 
   pageUpdated(changes, lifecycle) {
     if (this.active) {
-      this.dataKeySetId = lifecycle.resourceId
+      this.dataSetId = lifecycle.resourceId
       return
     }
   }
 
   async updated(changes) {
-    if (changes.has('dataKeySetId')) {
+    if (changes.has('dataSetId')) {
       const response = await client.query({
         query: gql`
           query ($id: String!) {
-            dataKeySet(id: $id) {
+            dataSet(id: $id) {
               id
-              name
-              description
-              dataKeyItems {
+              dataItems {
+                name
+                description
+                active
+                hidden
+                tag
+                type
+                unit
+                options
+                quota
+                spec
+                stat
+              }
+              dataKeySet {
+                id
                 name
                 description
-                dataKey
-                tKey
+                dataKeyItems {
+                  name
+                  description
+                  dataKey
+                  tKey
+                }
               }
             }
           }
         `,
         variables: {
-          id: this.dataKeySetId
+          id: this.dataSetId
         }
       })
 
-      this.dataKeySet = response.data.dataKeySet
+      this.dataSet = response.data.dataSet
+      this.dataKeySet = this.dataSet?.dataKeySet || {}
+      this.dataItems = this.dataSet?.dataItems || []
+
       this.refreshGristConfig()
 
       this.grist.fetch()
     }
   }
 
-  getDataKeyColumns() {
+  getKeyColumns() {
     return (
       this.dataKeySet?.dataKeyItems.map((item, index) => {
         return {
@@ -173,8 +192,28 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
     )
   }
 
+  getDataColumns() {
+    return (
+      this.dataItems
+        ?.filter(dataItem => dataItem.active && dataItem.stat)
+        .map((item, index) => {
+          return {
+            type: 'number',
+            name: `data0${index + 1}`,
+            header: i18next.t(item.name),
+            record: {
+              editable: false
+            },
+            width: 120,
+            imex: true
+          }
+        }) || []
+    )
+  }
+
   refreshGristConfig() {
-    const today = new Date().toISOString().split('T')[0]
+    const yesterday = moment().subtract(1, 'day').format('YYYY-MM-DD')
+    const today = moment().format('YYYY-MM-DD')
 
     this.gristConfig = {
       list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
@@ -201,32 +240,54 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
             }
           }
         },
+        // {
+        //   type: 'string',
+        //   name: 'name',
+        //   label: true,
+        //   header: i18next.t('field.name'),
+        //   record: {
+        //     editable: false
+        //   },
+        //   filter: 'search',
+        //   sortable: true,
+        //   width: 120,
+        //   imex: true
+        // },
+        // {
+        //   type: 'string',
+        //   name: 'description',
+        //   label: true,
+        //   header: i18next.t('field.description'),
+        //   record: {
+        //     editable: false
+        //   },
+        //   filter: 'search',
+        //   width: 150,
+        //   imex: true
+        // },
         {
           type: 'string',
-          name: 'name',
-          label: true,
-          header: i18next.t('field.name'),
-          record: {
-            editable: false
-          },
-          filter: 'search',
+          name: 'workDate',
+          header: i18next.t('field.work-date'),
           sortable: true,
-          width: 120,
+          filter: {
+            type: 'date',
+            operator: 'between',
+            value: [yesterday, today]
+          },
+          width: 80,
           imex: true
         },
         {
           type: 'string',
-          name: 'description',
-          label: true,
-          header: i18next.t('field.description'),
-          record: {
-            editable: false
-          },
-          filter: 'search',
-          width: 150,
+          name: 'workShift',
+          header: i18next.t('field.work-shift'),
+          sortable: true,
+          width: 60,
           imex: true
         },
-        ...this.getDataKeyColumns(),
+        ...this.getKeyColumns(),
+        ...this.getDataColumns(),
         {
           type: 'checkbox',
           name: 'ooc',
@@ -256,25 +317,31 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
           imex: true
         },
         {
-          type: 'string',
-          name: 'workDate',
-          header: i18next.t('field.work-date'),
-          sortable: true,
-          filter: {
-            type: 'date',
-            operator: 'between',
-            value: [today, today]
+          type: 'number',
+          name: 'count',
+          header: i18next.t('field.count'),
+          record: {
+            editable: false
           },
-          width: 80,
-          imex: true
+          width: 30
         },
         {
-          type: 'string',
-          name: 'workShift',
-          header: i18next.t('field.work-shift'),
-          sortable: true,
-          width: 60,
-          imex: true
+          type: 'number',
+          name: 'countOoc',
+          header: i18next.t('field.count-ooc'),
+          record: {
+            editable: false
+          },
+          width: 30
+        },
+        {
+          type: 'number',
+          name: 'countOos',
+          header: i18next.t('field.count-oos'),
+          record: {
+            editable: false
+          },
+          width: 30
         },
         {
           type: 'resource-object',
@@ -321,15 +388,15 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
-    if (!this.dataKeySetId) {
+    if (!this.dataSetId) {
       return { records: [], total: 0 }
     }
 
     const response = await client.query({
       query: gql`
-        query ($dataKeySetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: dataSummariesByDataKeySet(
-            dataKeySetId: $dataKeySetId
+        query ($dataSetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          dataSummariesByDataSet(
+            dataSetId: $dataSetId
             filters: $filters
             pagination: $pagination
             sortings: $sortings
@@ -338,9 +405,6 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
               id
               name
               description
-              dataSet {
-                id
-              }
               workDate
               workShift
               key01
@@ -348,6 +412,11 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
               key03
               key04
               key05
+              data01
+              data02
+              data03
+              data04
+              data05
               summary
               count
               countOoc
@@ -363,7 +432,7 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
         }
       `,
       variables: {
-        dataKeySetId: this.dataKeySetId,
+        dataSetId: this.dataSetId,
         filters,
         pagination: { page, limit },
         sortings
@@ -371,8 +440,8 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
     })
 
     return {
-      total: response.data.responses.total || 0,
-      records: response.data.responses.items || []
+      total: response.data.dataSummariesByDataSet.total || 0,
+      records: response.data.dataSummariesByDataSet.items || []
     }
   }