@things-factory/dataset 7.0.0-alpha.3 → 7.0.0-alpha.30

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

@@ -1,37 +1,50 @@
 import '@operato/dataset/ox-data-sample-view.js'
+import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-import { customElement, property, query, state } from 'lit/decorators.js'
+import { css, html, LitElement, nothing } from 'lit'
+import { customElement, property, state } from 'lit/decorators.js'
 
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
 import { DataSample } from '@operato/dataset'
+import { GhostPrint } from '@operato/ghost-print'
 
 @customElement('data-sample-view')
-class DataSampleView extends localize(i18next)(LitElement) {
+export class DataSampleView extends localize(i18next)(LitElement) {
   static styles = [
     ScrollbarStyles,
     css`
       :host {
-        display: flex;
-        flex-direction: column;
-
+        position: relative;
+        display: block;
+        overflow: auto;
         background-color: #fff;
       }
 
-      div[content] {
-        flex: 1;
+      ox-data-sample-view,
+      ox-data-ooc-brief-view {
+        padding: var(--padding-wide);
+      }
 
-        display: flex;
-        overflow: auto;
+      activity-thread-timeline {
+        margin: var(--margin-default);
       }
 
-      ox-data-sample-view {
-        flex: 1;
-        padding: var(--padding-wide);
-        overflow: auto;
+      mwc-fab {
+        position: fixed;
+        bottom: 15px;
+        right: 16px;
+        text-decoration: auto;
+        opacity: 0.5;
+      }
+
+      @media print {
+        mwc-fab {
+          display: none;
+        }
       }
     `
   ]
@@ -41,13 +54,57 @@ class DataSampleView extends localize(i18next)(LitElement) {
     attribute: 'data-sample-id'
   })
   dataSampleId?: string
+
   @state() dataSample?: DataSample
 
+  private printHandler = this.handlePrint.bind(this)
+
   render() {
+    const dataSample = this.dataSample
+
+    if (!dataSample) {
+      return nothing
+    }
+
+    if (dataSample.dataOoc) {
+      var reviewActivityThread = dataSample.dataOoc.reviewActivityInstance?.activityThreads?.[0]
+      var resolveActivityThread = dataSample.dataOoc.resolveActivityInstance?.activityThreads?.[0]
+    } else {
+      var reviewActivityThread = dataSample?.reviewActivityInstance?.activityThreads?.[0]
+    }
+
     return html`
-      <div content>
-        ${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : html``}
-      </div>
+      ${!dataSample?.dataOoc
+        ? html` <ox-data-sample-view .dataSample=${dataSample}></ox-data-sample-view> `
+        : html` <ox-data-ooc-brief-view .dataOoc=${dataSample!.dataOoc}></ox-data-ooc-brief-view>`}
+      ${reviewActivityThread
+        ? html`
+            <activity-thread-timeline
+              subtitle=${String(i18next.t(dataSample?.dataOoc ? 'label.ooc review timeline' : 'label.datasample review timeline'))}
+              .activityThread=${reviewActivityThread}
+              short-form
+            ></activity-thread-timeline>
+          `
+        : nothing}
+      ${resolveActivityThread
+        ? html`
+            <activity-thread-timeline
+              subtitle=${String(i18next.t('label.ooc resolve timeline'))}
+              .activityThread=${resolveActivityThread}
+              short-form
+            ></activity-thread-timeline>
+          `
+        : nothing}
+
+      <mwc-fab
+        icon="print"
+        title="print"
+        @click=${() =>
+          GhostPrint.print({
+            src: `./data-sample/${this.dataSampleId}`
+          })}
+        >print</mwc-fab
+      >
     `
   }
 
@@ -76,6 +133,12 @@ class DataSampleView extends localize(i18next)(LitElement) {
             data
             ooc
             oos
+            updatedAt
+            collectedAt
+            updater {
+              id
+              name
+            }
             dataSet {
               id
               name
@@ -98,12 +161,100 @@ class DataSampleView extends localize(i18next)(LitElement) {
             judgment
             workDate
             workShift
-            updater {
-              id
+            reviewActivityInstance {
+              ...ActivityInstanceFragment
+            }
+            dataOoc {
               name
+              description
+              useCase
+              dataSet {
+                id
+                name
+              }
+              key01
+              key02
+              key03
+              key04
+              key05
+              partitionKeys
+              dataItems {
+                name
+                description
+                active
+                hidden
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+              }
+              data
+              rawData
+              judgment
+              ooc
+              oos
+              state
+              history
+              workDate
+              workShift
+              correctiveInstruction
+              correctiveAction
+              reviewedAt
+              reviewer {
+                id
+                name
+              }
+              correctedAt
+              corrector {
+                id
+                name
+              }
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+
+              reviewActivityInstance {
+                ...ActivityInstanceFragment
+              }
+              resolveActivityInstance {
+                ...ActivityInstanceFragment
+              }
+            }
+          }
+        }
+
+        fragment ActivityInstanceFragment on ActivityInstance {
+          activityThreads {
+            assignee {
+              name
+            }
+            output
+            activityApprovals {
+              judgment
+              approver {
+                name
+              }
+              comment
+              createdAt
+              updatedAt
+              terminatedAt
+            }
+            activityThreadHistories {
+              transaction
+              reason
+              updater {
+                name
+              }
+              updatedAt
+              state
+              output
             }
-            updatedAt
-            collectedAt
           }
         }
       `,
@@ -114,4 +265,24 @@ class DataSampleView extends localize(i18next)(LitElement) {
 
     this.dataSample = response.data.dataSample
   }
+
+  handlePrint(event) {
+    if ((event.ctrlKey || event.metaKey) && event.key === 'p') {
+      event.preventDefault()
+
+      GhostPrint.print({
+        src: `./data-sample/${this.dataSampleId}`
+      })
+    }
+  }
+
+  connectedCallback(): void {
+    super.connectedCallback()
+    window.addEventListener('keydown', this.printHandler)
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback()
+    window.removeEventListener('keydown', this.printHandler)
+  }
 }

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

@@ -0,0 +1,249 @@
+import '@operato/dataset/ox-data-sample-view.js'
+import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
+
+import gql from 'graphql-tag'
+import { PropertyValues, html, css, nothing } from 'lit'
+import { customElement, state } from 'lit/decorators.js'
+import { PageView } from '@operato/shell'
+import { i18next, localize } from '@operato/i18n'
+import { client } from '@operato/graphql'
+
+/**
+ * 이 페이지는 여러개의 Data Sample을 한번에 프린트하기 위한 용도로 사용되는 페이지이다.
+ */
+@customElement('data-samples-page')
+export class DataSamplesPage extends localize(i18next)(PageView) {
+  static styles = [
+    css`
+      :host {
+        display: block;
+        overflow: auto;
+      }
+
+      .end {
+        page-break-after: always;
+        break-after: always;
+      }
+    `
+  ]
+
+  @state() dataSamples?: any[]
+
+  get context() {
+    return {
+      title: i18next.t('title.data-sample view')
+    }
+  }
+
+  render() {
+    return this.dataSamples?.map(dataSample => {
+      if (dataSample?.dataOoc) {
+        var reviewActivityThread = dataSample.dataOoc.reviewActivityInstance?.activityThreads?.[0]
+        var resolveActivityThread = dataSample.dataOoc.resolveActivityInstance?.activityThreads?.[0]
+      } else {
+        var reviewActivityThread = dataSample?.reviewActivityInstance?.activityThreads?.[0]
+      }
+
+      return html`
+        ${!dataSample.dataOoc
+          ? html` <ox-data-sample-view .dataSample=${dataSample}></ox-data-sample-view> `
+          : html` <ox-data-ooc-brief-view .dataOoc=${dataSample.dataOoc}></ox-data-ooc-brief-view>`}
+        ${reviewActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t(dataSample?.dataOoc ? 'label.ooc review timeline' : 'label.datasample review timeline'))}
+                .activityThread=${reviewActivityThread}
+                short-form
+              ></activity-thread-timeline>
+            `
+          : nothing}
+        ${resolveActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t('label.ooc resolve timeline'))}
+                .activityThread=${resolveActivityThread}
+                short-form
+              ></activity-thread-timeline>
+            `
+          : nothing}
+        <div class="end"></div>
+      `
+    })
+  }
+
+  updated(changes: PropertyValues<this>) {}
+
+  pageUpdated(changes: any, lifecycle: any, before: any) {
+    if (this.active) {
+      /*
+       * this page is activated
+       */
+      const { ids = '' } = lifecycle.params
+
+      this.fetchSamples(ids.split('|').map(id => id.trim()))
+    } else {
+      /* this page is deactivated */
+    }
+  }
+
+  async fetchSamples(ids: string[]) {
+    const filters = [
+      {
+        name: 'id',
+        operator: 'in',
+        value: ids
+      }
+    ]
+
+    const response = await client.query({
+      query: gql`
+        query ($filters: [Filter!]) {
+          dataSamples(filters: $filters) {
+            items {
+              id
+              name
+              description
+              useCase
+              key01
+              key02
+              key03
+              key04
+              key05
+              data
+              ooc
+              oos
+              updatedAt
+              collectedAt
+              updater {
+                id
+                name
+              }
+              dataSet {
+                id
+                name
+                description
+              }
+              dataItems {
+                name
+                description
+                active
+                hidden
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+                stat
+              }
+              judgment
+              workDate
+              workShift
+              reviewActivityInstance {
+                ...ActivityInstanceFragment
+              }
+              dataOoc {
+                name
+                description
+                useCase
+                dataSet {
+                  id
+                  name
+                }
+                key01
+                key02
+                key03
+                key04
+                key05
+                partitionKeys
+                dataItems {
+                  name
+                  description
+                  active
+                  hidden
+                  tag
+                  group
+                  type
+                  unit
+                  options
+                  quota
+                  spec
+                  stat
+                }
+                data
+                rawData
+                judgment
+                ooc
+                oos
+                state
+                history
+                workDate
+                workShift
+                correctiveInstruction
+                correctiveAction
+                reviewedAt
+                reviewer {
+                  id
+                  name
+                }
+                correctedAt
+                corrector {
+                  id
+                  name
+                }
+                updater {
+                  id
+                  name
+                }
+                updatedAt
+                collectedAt
+                reviewActivityInstance {
+                  ...ActivityInstanceFragment
+                }
+                resolveActivityInstance {
+                  ...ActivityInstanceFragment
+                }
+              }
+            }
+          }
+        }
+
+        fragment ActivityInstanceFragment on ActivityInstance {
+          activityThreads {
+            assignee {
+              name
+            }
+            output
+            activityApprovals {
+              judgment
+              approver {
+                name
+              }
+              comment
+              createdAt
+              updatedAt
+              terminatedAt
+            }
+            activityThreadHistories {
+              transaction
+              reason
+              updater {
+                name
+              }
+              updatedAt
+              state
+              output
+            }
+          }
+        }
+      `,
+      variables: {
+        filters
+      }
+    })
+
+    this.dataSamples = response.data.dataSamples.items
+  }
+}

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

@@ -90,12 +90,7 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
     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)} ?url-params-sensitive=${this.active}>
         <div slot="headroom" class="header">
           <div class="title">
             <mwc-icon>summarize</mwc-icon>
@@ -191,6 +186,28 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
           sortable: true,
           width: 120
         },
+        {
+          type: 'resource-object',
+          name: 'decoder',
+          header: {
+            renderer: i18next.t('field.decoder-scenario')
+          },
+          record: {
+            editable: true,
+            options: {
+              title: i18next.t('title.lookup scenario'),
+              queryName: 'scenarios',
+              columns: [
+                { name: 'id', hidden: true },
+                { name: 'name', header: i18next.t('field.name'), filter: 'search' },
+                { name: 'description', header: i18next.t('field.description'), filter: 'search' }
+              ],
+              list: { fields: ['name', 'description'] }
+            }
+          },
+          filter: false,
+          width: 120
+        },
         {
           type: 'object',
           name: 'dataSet',
@@ -315,6 +332,11 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
                 name
                 description
               }
+              decoder {
+                id
+                name
+                description
+              }
               refBy
               brand
               model

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

@@ -153,7 +153,7 @@ class DataItemList extends localize(i18next)(LitElement) {
           name: 'type',
           header: i18next.t('field.type'),
           record: {
-            options: ['', 'number', 'text', 'select', 'boolean', 'date', 'datetime', 'file'],
+            options: ['', 'number', 'text', 'select', 'radio', 'boolean', 'date', 'datetime', 'file'],
             editable: true
           },
           width: 120
@@ -170,7 +170,7 @@ class DataItemList extends localize(i18next)(LitElement) {
                 name: record.type,
                 help: '',
                 spec:
-                  record.type === 'select'
+                  record.type === 'select' || record.type === 'radio'
                     ? [
                         {
                           type: 'options' /* property-editor type */,

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

@@ -67,12 +67,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist
-        .mode=${mode}
-        .config=${this.gristConfig}
-        .fetchHandler=${this.fetchHandler.bind(this)}
-        ?url-params-sensitive=${false /* this.active */}
-      >
+      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${false /* this.active */}>
         <div slot="headroom" class="header">
           <div class="title">
             <mwc-icon>summarize</mwc-icon>
@@ -103,21 +98,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           gutterName: 'button',
           fixed: true,
           icon: 'assignment',
-          title: i18next.t('title.open data summary view'),
-          handlers: {
-            click: (columns, data, column, record, rowIndex) => {
-              openPopup(
-                html`
-                  <data-summary-view data-summary-id=${record.id} style="background-color: white;"></data-summary-view>
-                `,
-                {
-                  backdrop: true,
-                  size: 'large',
-                  title: i18next.t('title.data-summary view')
-                }
-              )
-            }
-          }
+          title: i18next.t('title.open data summary view')
         },
         {
           type: 'string',
@@ -257,6 +238,15 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           return {
             emphasized
           }
+        },
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            openPopup(html` <data-summary-view data-summary-id=${record.id} style="background-color: white;"></data-summary-view> `, {
+              backdrop: true,
+              size: 'large',
+              title: i18next.t('title.data-summary view')
+            })
+          }
         }
       },
       sorters: [
@@ -347,9 +337,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
             const key = column.imex === true ? column.name : column.imex.key
-            record[key] = key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[key] = key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }

package/client/route.ts

@@ -9,7 +9,11 @@ export default function route(page) {
       return page
 
     case 'data-sample':
-      import('./pages/data-sample/data-sample-view-page.js')
+      import('./pages/data-sample/data-sample-page.js')
+      return page
+
+    case 'data-samples':
+      import('./pages/data-sample/data-samples-page.js')
       return page
 
     case 'data-sample-list':
@@ -37,7 +41,11 @@ export default function route(page) {
       return page
 
     case 'data-ooc':
-      import('./pages/data-ooc/data-ooc-view-page.js')
+      import('./pages/data-ooc/data-ooc-page.js')
+      return page
+
+    case 'data-oocs':
+      import('./pages/data-ooc/data-oocs-page.js')
       return page
 
     case 'data-ooc-list':

package/dist-client/activities/activity-data-collect-edit.js

@@ -9,13 +9,7 @@ import { ScrollbarStyles } from '@operato/styles';
 import { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js';
 let DataCollectActivityEdit = class DataCollectActivityEdit extends localize(i18next)(LitElement) {
     render() {
-        return html `
-      <ox-data-entry-form
-        .dataSet=${this.dataSet}
-        .value=${this.output}
-        @change=${this._updateDataItems}
-      ></ox-data-entry-form>
-    `;
+        return html ` <ox-data-entry-form .dataSet=${this.dataSet} .value=${this.output} @change=${this._updateDataItems}></ox-data-entry-form> `;
     }
     async _updateDataItems() {
         this.output = this.entryForm.value;