@things-factory/dataset 6.0.76 → 6.0.78

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

@@ -7,6 +7,7 @@ import moment from 'moment-timezone'
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
+import { asyncReplace } from 'lit/directives/async-replace.js'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import {
@@ -24,99 +25,51 @@ import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
-import { isMobileDevice } from '@operato/utils'
+import { isMobileDevice, sleep } from '@operato/utils'
 import { OxPopup } from '@operato/popup'
 
+const MIN = 60
+const HOUR = 60 * MIN
+const DAY = 24 * HOUR
+
 const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
 const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)]
 
 const ENTRY_TYPES = [
-  {
-    display: '',
-    value: ''
-  },
-  {
-    display: 'Generated',
-    value: 'generated'
-  },
-  {
-    display: 'Board',
-    value: 'board'
-  },
-  {
-    display: 'CustomElement',
-    value: 'custom-element'
-  },
-  {
-    display: 'Page',
-    value: 'page'
-  },
-  {
-    display: 'External URL',
-    value: 'external'
-  }
+  { display: '', value: '' },
+  { display: 'Generated', value: 'generated' },
+  { display: 'Board', value: 'board' },
+  { display: 'CustomElement', value: 'custom-element' },
+  { display: 'Page', value: 'page' },
+  { display: 'External URL', value: 'external' }
 ]
 
 const MONITOR_TYPES = [
-  {
-    display: '',
-    value: ''
-  },
-  {
-    display: 'Generated',
-    value: 'generated'
-  },
-  {
-    display: 'Board',
-    value: 'board'
-  },
-  {
-    display: 'CustomElement',
-    value: 'custom-element'
-  },
-  {
-    display: 'Page',
-    value: 'page'
-  },
-  {
-    display: 'External URL',
-    value: 'external'
-  }
+  { display: '', value: '' },
+  { display: 'Generated', value: 'generated' },
+  { display: 'Board', value: 'board' },
+  { display: 'CustomElement', value: 'custom-element' },
+  { display: 'Page', value: 'page' },
+  { display: 'External URL', value: 'external' }
 ]
 
 const REPORT_TYPES = [
-  {
-    display: '',
-    value: ''
-  },
-  {
-    display: 'Generated',
-    value: 'generated'
-  },
-  {
-    display: 'Embed',
-    value: 'embed'
-  },
-  {
-    display: 'CustomElement',
-    value: 'custom-element'
-  },
-  {
-    display: 'Page',
-    value: 'page'
-  },
-  {
-    display: 'External URL',
-    value: 'external'
-  },
-  {
-    display: 'Jasper',
-    value: 'jasper'
-  },
-  {
-    display: 'Shiny',
-    value: 'shiny'
-  }
+  { display: '', value: '' },
+  { display: 'Generated', value: 'generated' },
+  { display: 'Embed', value: 'embed' },
+  { display: 'CustomElement', value: 'custom-element' },
+  { display: 'Page', value: 'page' },
+  { display: 'External URL', value: 'external' },
+  { display: 'Jasper', value: 'jasper' },
+  { display: 'Shiny', value: 'shiny' }
+]
+
+const SUMMARY_PERIOD_TYPES = [
+  { display: '', value: '' },
+  { display: 'Hour', value: 'hour' },
+  { display: 'WorkShift', value: 'work-shift' },
+  { display: 'WorkDate', value: 'work-date' },
+  { display: 'Day', value: 'day' }
 ]
 
 const USECASE_OPTIONS = () => {
@@ -419,6 +372,22 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
           },
           width: 50
         },
+        {
+          type: 'select',
+          name: 'timezone',
+          header: i18next.t('field.timezone'),
+          record: {
+            editable: true,
+            options: TIMEZONE_OPTIONS
+          },
+          width: 120,
+          imex: {
+            width: 13,
+            header: i18next.t('field.timezone'),
+            type: 'select',
+            key: 'timezone'
+          }
+        },
         {
           type: 'crontab',
           name: 'schedule',
@@ -440,19 +409,27 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
         },
         {
           type: 'select',
-          name: 'timezone',
-          header: i18next.t('field.timezone'),
+          name: 'summaryPeriod',
+          label: true,
+          header: i18next.t('field.summary-period'),
           record: {
             editable: true,
-            options: TIMEZONE_OPTIONS
+            options: SUMMARY_PERIOD_TYPES
           },
-          width: 120,
-          imex: {
-            width: 13,
-            header: i18next.t('field.timezone'),
-            type: 'select',
-            key: 'timezone'
-          }
+          width: 80
+        },
+        {
+          type: 'string',
+          name: 'nextSummarySchedule',
+          header: i18next.t('field.next-summary-schedule'),
+          record: {
+            editable: false,
+            renderer: (value, column, record, rowIndex, field) => {
+              return html` <span>${asyncReplace(this.summaryScheduleTimer(record.dueAt))}</span>`
+            }
+          },
+          sortable: false,
+          width: 140
         },
         {
           type: 'resource-object',
@@ -641,6 +618,8 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               schedule
               timezone
               scheduleId
+              summaryPeriod
+              summaryScheduleId
               dataKeySet {
                 id
                 name
@@ -901,4 +880,27 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       }
     )
   }
+
+  async *summaryScheduleTimer(exp) {
+    while (exp) {
+      var secs = Math.round((Number(exp) - Date.now()) / 1000)
+      var positive = secs >= 0
+
+      secs = Math.abs(secs)
+      const days = Math.floor(secs / DAY)
+      secs -= days * DAY
+      const hours = Math.floor(secs / HOUR)
+      secs -= hours * HOUR
+      const minutes = Math.floor(secs / MIN)
+      const seconds = secs - minutes * MIN
+
+      yield `${positive ? '' : '- '}${days ? `${days}${i18next.t('label.days')} ` : ''}${
+        hours ? `${hours}${i18next.t('label.hours')} ` : ''
+      }${minutes ? `${minutes}${i18next.t('label.minutes')} ` : ''}`
+
+      do {
+        await sleep(60 * 1000)
+      } while (!this.active)
+    }
+  }
 }

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

@@ -159,8 +159,8 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
         },
         {
           type: 'string',
-          name: 'workDate',
-          header: i18next.t('field.work-date'),
+          name: 'date',
+          header: i18next.t('field.date'),
           sortable: true,
           filter: {
             type: 'date',
@@ -172,8 +172,8 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
         },
         {
           type: 'string',
-          name: 'workShift',
-          header: i18next.t('field.work-shift'),
+          name: 'period',
+          header: i18next.t('field.time-period'),
           sortable: true,
           width: 60,
           imex: true
@@ -347,7 +347,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
       },
       sorters: [
         {
-          name: 'workDate',
+          name: 'date',
           desc: true
         }
       ]
@@ -366,8 +366,8 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
               dataSet {
                 id
               }
-              workDate
-              workShift
+              date
+              period
               key01
               key02
               key03

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

@@ -25,6 +25,13 @@ import { isMobileDevice } from '@operato/utils'
 import { OxPopup } from '@operato/popup'
 import { DataItem } from '@operato/dataset'
 
+enum DataSetSummaryPeriodType {
+  Hour = 'hour',
+  WorkShift = 'work-shift',
+  WorkDate = 'work-date',
+  Day = 'day'
+}
+
 @customElement('data-summary-search-page')
 export class DataSummarySearchPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
@@ -131,6 +138,7 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
           query ($id: String!) {
             dataSet(id: $id) {
               id
+              summaryPeriod
               dataItems {
                 name
                 description
@@ -240,35 +248,10 @@ 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: 'workDate',
-          header: i18next.t('field.work-date'),
+          name: 'date',
+          header: i18next.t('field.date'),
           sortable: true,
           filter: {
             type: 'date',
@@ -278,34 +261,17 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
           width: 80,
           imex: true
         },
-        {
+        (this.dataSet.summaryPeriod == DataSetSummaryPeriodType.Hour ||
+          this.dataSet.summaryPeriod == DataSetSummaryPeriodType.WorkShift) && {
           type: 'string',
-          name: 'workShift',
-          header: i18next.t('field.work-shift'),
+          name: 'period',
+          header: i18next.t('field.time-period'),
           sortable: true,
           width: 60,
           imex: true
         },
         ...this.getKeyColumns(),
         ...this.getDataColumns(),
-        {
-          type: 'checkbox',
-          name: 'ooc',
-          header: i18next.t('field.ooc'),
-          record: {
-            editable: false
-          },
-          width: 30
-        },
-        {
-          type: 'checkbox',
-          name: 'oos',
-          header: i18next.t('field.oos'),
-          record: {
-            editable: false
-          },
-          width: 30
-        },
         {
           type: 'json5',
           name: 'data',
@@ -359,7 +325,7 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
           width: 180,
           imex: true
         }
-      ],
+      ].filter(Boolean),
       rows: {
         appendable: false,
         selectable: {
@@ -380,7 +346,7 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
       },
       sorters: [
         {
-          name: 'workDate',
+          name: 'date',
           desc: true
         }
       ]
@@ -405,8 +371,8 @@ export class DataSummarySearchPage extends connect(store)(localize(i18next)(Page
               id
               name
               description
-              workDate
-              workShift
+              date
+              period
               key01
               key02
               key03

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

@@ -13,8 +13,8 @@ type DataSummary = {
   name: string
   description: string
   dataItems?: DataItem[]
-  workDate?: string
-  workShift?: string
+  date?: string
+  period?: string
   key01?: string
   key02?: string
   key03?: string
@@ -103,8 +103,8 @@ class DataSummaryView extends localize(i18next)(LitElement) {
               spec
               stat
             }
-            workDate
-            workShift
+            date
+            shift
             key01
             key02
             key03

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

@@ -69,5 +69,6 @@ export declare class DataSetListPage extends DataSetListPage_base {
         }[];
     }>;
     importHandler(records: any): Promise<void>;
+    summaryScheduleTimer(exp: any): AsyncGenerator<string, void, unknown>;
 }
 export {};

package/dist-client/pages/data-set/data-set-list-page.js

@@ -1,4 +1,4 @@
-import { __decorate, __metadata } from "tslib";
+import { __asyncGenerator, __await, __decorate, __metadata } from "tslib";
 import '@operato/data-grist';
 import './data-item-list.js';
 import './data-set-importer.js';
@@ -7,6 +7,7 @@ import moment from 'moment-timezone';
 import gql from 'graphql-tag';
 import { css, html } from 'lit';
 import { customElement, query, state } from 'lit/decorators.js';
+import { asyncReplace } from 'lit/directives/async-replace.js';
 import { connect } from 'pwa-helpers/connect-mixin';
 import { getEditor, getRenderer, DataGrist } from '@operato/data-grist';
 import { OxDataUseCase } from '@operato/dataset';
@@ -15,95 +16,45 @@ import { i18next, localize } from '@operato/i18n';
 import { notify, openPopup } from '@operato/layout';
 import { PageView, store } from '@operato/shell';
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles';
-import { isMobileDevice } from '@operato/utils';
+import { isMobileDevice, sleep } from '@operato/utils';
 import { OxPopup } from '@operato/popup';
+const MIN = 60;
+const HOUR = 60 * MIN;
+const DAY = 24 * HOUR;
 const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone;
 const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)];
 const ENTRY_TYPES = [
-    {
-        display: '',
-        value: ''
-    },
-    {
-        display: 'Generated',
-        value: 'generated'
-    },
-    {
-        display: 'Board',
-        value: 'board'
-    },
-    {
-        display: 'CustomElement',
-        value: 'custom-element'
-    },
-    {
-        display: 'Page',
-        value: 'page'
-    },
-    {
-        display: 'External URL',
-        value: 'external'
-    }
+    { display: '', value: '' },
+    { display: 'Generated', value: 'generated' },
+    { display: 'Board', value: 'board' },
+    { display: 'CustomElement', value: 'custom-element' },
+    { display: 'Page', value: 'page' },
+    { display: 'External URL', value: 'external' }
 ];
 const MONITOR_TYPES = [
-    {
-        display: '',
-        value: ''
-    },
-    {
-        display: 'Generated',
-        value: 'generated'
-    },
-    {
-        display: 'Board',
-        value: 'board'
-    },
-    {
-        display: 'CustomElement',
-        value: 'custom-element'
-    },
-    {
-        display: 'Page',
-        value: 'page'
-    },
-    {
-        display: 'External URL',
-        value: 'external'
-    }
+    { display: '', value: '' },
+    { display: 'Generated', value: 'generated' },
+    { display: 'Board', value: 'board' },
+    { display: 'CustomElement', value: 'custom-element' },
+    { display: 'Page', value: 'page' },
+    { display: 'External URL', value: 'external' }
 ];
 const REPORT_TYPES = [
-    {
-        display: '',
-        value: ''
-    },
-    {
-        display: 'Generated',
-        value: 'generated'
-    },
-    {
-        display: 'Embed',
-        value: 'embed'
-    },
-    {
-        display: 'CustomElement',
-        value: 'custom-element'
-    },
-    {
-        display: 'Page',
-        value: 'page'
-    },
-    {
-        display: 'External URL',
-        value: 'external'
-    },
-    {
-        display: 'Jasper',
-        value: 'jasper'
-    },
-    {
-        display: 'Shiny',
-        value: 'shiny'
-    }
+    { display: '', value: '' },
+    { display: 'Generated', value: 'generated' },
+    { display: 'Embed', value: 'embed' },
+    { display: 'CustomElement', value: 'custom-element' },
+    { display: 'Page', value: 'page' },
+    { display: 'External URL', value: 'external' },
+    { display: 'Jasper', value: 'jasper' },
+    { display: 'Shiny', value: 'shiny' }
+];
+const SUMMARY_PERIOD_TYPES = [
+    { display: '', value: '' },
+    { display: 'Hour', value: 'hour' },
+    { display: 'WorkShift', value: 'work-shift' },
+    { display: 'WorkDate', value: 'work-date' },
+    { display: 'Day', value: 'day' }
 ];
 const USECASE_OPTIONS = () => {
     return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
@@ -370,6 +321,22 @@ let DataSetListPage = class DataSetListPage extends connect(store)(localize(i18n
                     },
                     width: 50
                 },
+                {
+                    type: 'select',
+                    name: 'timezone',
+                    header: i18next.t('field.timezone'),
+                    record: {
+                        editable: true,
+                        options: TIMEZONE_OPTIONS
+                    },
+                    width: 120,
+                    imex: {
+                        width: 13,
+                        header: i18next.t('field.timezone'),
+                        type: 'select',
+                        key: 'timezone'
+                    }
+                },
                 {
                     type: 'crontab',
                     name: 'schedule',
@@ -391,19 +358,27 @@ let DataSetListPage = class DataSetListPage extends connect(store)(localize(i18n
                 },
                 {
                     type: 'select',
-                    name: 'timezone',
-                    header: i18next.t('field.timezone'),
+                    name: 'summaryPeriod',
+                    label: true,
+                    header: i18next.t('field.summary-period'),
                     record: {
                         editable: true,
-                        options: TIMEZONE_OPTIONS
+                        options: SUMMARY_PERIOD_TYPES
                     },
-                    width: 120,
-                    imex: {
-                        width: 13,
-                        header: i18next.t('field.timezone'),
-                        type: 'select',
-                        key: 'timezone'
-                    }
+                    width: 80
+                },
+                {
+                    type: 'string',
+                    name: 'nextSummarySchedule',
+                    header: i18next.t('field.next-summary-schedule'),
+                    record: {
+                        editable: false,
+                        renderer: (value, column, record, rowIndex, field) => {
+                            return html ` <span>${asyncReplace(this.summaryScheduleTimer(record.dueAt))}</span>`;
+                        }
+                    },
+                    sortable: false,
+                    width: 140
                 },
                 {
                     type: 'resource-object',
@@ -591,6 +566,8 @@ let DataSetListPage = class DataSetListPage extends connect(store)(localize(i18n
               schedule
               timezone
               scheduleId
+              summaryPeriod
+              summaryScheduleId
               dataKeySet {
                 id
                 name
@@ -827,6 +804,25 @@ let DataSetListPage = class DataSetListPage extends connect(store)(localize(i18n
             title: i18next.t('title.import data-set')
         });
     }
+    summaryScheduleTimer(exp) {
+        return __asyncGenerator(this, arguments, function* summaryScheduleTimer_1() {
+            while (exp) {
+                var secs = Math.round((Number(exp) - Date.now()) / 1000);
+                var positive = secs >= 0;
+                secs = Math.abs(secs);
+                const days = Math.floor(secs / DAY);
+                secs -= days * DAY;
+                const hours = Math.floor(secs / HOUR);
+                secs -= hours * HOUR;
+                const minutes = Math.floor(secs / MIN);
+                const seconds = secs - minutes * MIN;
+                yield yield __await(`${positive ? '' : '- '}${days ? `${days}${i18next.t('label.days')} ` : ''}${hours ? `${hours}${i18next.t('label.hours')} ` : ''}${minutes ? `${minutes}${i18next.t('label.minutes')} ` : ''}`);
+                do {
+                    yield __await(sleep(60 * 1000));
+                } while (!this.active);
+            }
+        });
+    }
 };
 DataSetListPage.styles = [
     ScrollbarStyles,