@things-factory/dataset 7.0.0-alpha.5 → 7.0.0-alpha.7

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

@@ -1,10 +1,15 @@
 import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@material/mwc-fab'
+import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
 
-import { css, html, LitElement } from 'lit'
-import { customElement, property, query } from 'lit/decorators.js'
+import gql from 'graphql-tag'
+import { css, html, LitElement, nothing } from 'lit'
+import { customElement, property, query, state } from 'lit/decorators.js'
 
+import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
+import { GhostPrint } from '@operato/ghost-print'
 
 @customElement('data-ooc-view')
 export class DataOocView extends localize(i18next)(LitElement) {
@@ -12,67 +17,219 @@ export class DataOocView extends localize(i18next)(LitElement) {
     ScrollbarStyles,
     css`
       :host {
-        display: flex;
-        flex-direction: column;
-
+        display: block;
+        position: relative;
         background-color: #fff;
-      }
 
-      div[content] {
-        flex: 1;
-
-        display: flex;
         overflow: auto;
       }
 
       ox-data-ooc-brief-view {
-        flex: 1;
         padding: var(--padding-wide);
-        overflow: auto;
       }
 
-      label[comment] {
-        display: flex;
-        flex-direction: column;
-
-        padding: var(--padding-wide);
+      activity-thread-timeline {
+        margin: var(--margin-default);
       }
 
-      label[comment] div {
-        display: flex;
+      mwc-fab {
+        position: fixed;
+        bottom: 15px;
+        right: 16px;
+        text-decoration: auto;
+        opacity: 0.5;
       }
 
-      mwc-icon {
-        color: var(--status-danger-color);
-      }
-
-      textarea {
-        border: var(--input-field-border);
-        border-radius: var(--input-border-radius);
-        padding: var(--input-field-padding);
-        font: var(--input-field-font);
-      }
-
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
+      @media print {
+        mwc-fab {
+          display: none;
+        }
       }
     `
   ]
 
-  @property({ type: Object }) dataOoc?: any
+  @property({
+    type: String,
+    attribute: 'data-ooc-id'
+  })
+  dataOocId?: string
 
-  @query('textarea') commentTextArea!: HTMLTextAreaElement
-  @query('ox-data-ooc-brief-view') sampleView!: HTMLTextAreaElement
+  @state() dataOoc?: any
+
+  private printHandler = this.handlePrint.bind(this)
 
   render() {
-    const state = this.dataOoc?.state
+    if (!this.dataOoc) {
+      return nothing
+    }
+
+    const reviewActivityThread = this.dataOoc?.reviewActivityInstance?.activityThreads?.[0]
+    const resolveActivityThread = this.dataOoc?.resolveActivityInstance?.activityThreads?.[0]
 
     return html`
-      <div content>
-        <ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
-      </div>
+      <ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
+      ${reviewActivityThread
+        ? html`
+            <activity-thread-timeline
+              subtitle=${String(i18next.t('label.ooc 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-ooc/${this.dataOoc.id}`
+          })}
+        >print</mwc-fab
+      >
     `
   }
+
+  updated(changes) {
+    if (changes.has('dataOocId')) {
+      this.fetchDataOoc()
+    }
+  }
+
+  async fetchDataOoc() {
+    const id = this.dataOocId
+
+    const response = await client.query({
+      query: gql`
+        query ($id: String!) {
+          dataOoc(id: $id) {
+            id
+            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: {
+        id
+      }
+    })
+
+    this.dataOoc = response.data.dataOoc
+  }
+
+  handlePrint(event) {
+    if ((event.ctrlKey || event.metaKey) && event.key === 'p') {
+      event.preventDefault()
+
+      GhostPrint.print({
+        src: `./data-ooc/${this.dataOoc.id}`
+      })
+    }
+  }
+
+  connectedCallback(): void {
+    super.connectedCallback()
+    window.addEventListener('keydown', this.printHandler)
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback()
+    window.removeEventListener('keydown', this.printHandler)
+  }
 }

package/client/pages/data-ooc/data-oocs-page.ts

@@ -0,0 +1,198 @@
+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 OOC를 한번에 프린트하기 위한 용도로 사용되는 페이지이다.
+ */
+@customElement('data-oocs-page')
+export class DataOocsPage extends localize(i18next)(PageView) {
+  static styles = [
+    css`
+      :host {
+        display: block;
+        overflow: auto;
+      }
+
+      activity-thread-timeline {
+        margin: var(--margin-default);
+      }
+
+      .end {
+        page-break-after: always;
+        break-after: always;
+      }
+    `
+  ]
+
+  @state() dataOocs?: any[]
+
+  get context() {
+    return {
+      title: i18next.t('title.data-ooc view')
+    }
+  }
+
+  render() {
+    return this.dataOocs?.map(dataOoc => {
+      const reviewActivityThread = dataOoc?.reviewActivityInstance?.activityThreads?.[0]
+      const resolveActivityThread = dataOoc?.resolveActivityInstance?.activityThreads?.[0]
+
+      return html`
+        <ox-data-ooc-brief-view .dataOoc=${dataOoc}></ox-data-ooc-brief-view>
+        ${reviewActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t('label.ooc 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>
+      `
+    })
+  }
+
+  pageUpdated(changes: any, lifecycle: any, before: any) {
+    if (this.active) {
+      /*
+       * this page is activated
+       */
+      const { ids = '' } = lifecycle.params
+
+      this.fetchOocs(ids.split('|').map(id => id.trim()))
+    } else {
+      /* this page is deactivated */
+    }
+  }
+
+  async fetchOocs(ids: string[]) {
+    const filters = [
+      {
+        name: 'id',
+        operator: 'in',
+        value: ids
+      }
+    ]
+
+    const response = await client.query({
+      query: gql`
+        query ($filters: [Filter!]) {
+          dataOocs(filters: $filters) {
+            items {
+              id
+              name
+              description
+              useCase
+              dataSet {
+                id
+                name
+              }
+              key01
+              key02
+              key03
+              key04
+              key05
+              partitionKeys
+              dataItems {
+                name
+                description
+                active
+                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
+            }
+          }
+        }
+      `,
+      variables: {
+        filters
+      }
+    })
+
+    this.dataOocs = response.data.dataOocs.items
+  }
+}

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

@@ -15,6 +15,7 @@ import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
+import { GhostPrint } from '@operato/ghost-print'
 
 @customElement('data-sample-list-page')
 export class DataSampleListPage extends connect(store)(localize(i18next)(PageView)) {
@@ -27,6 +28,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         flex-direction: column;
 
         overflow: hidden;
+
+        --grid-header-padding: 2px 0 2px 9px;
       }
 
       ox-grist {
@@ -56,7 +59,13 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         }
       },
       help: 'dataset/data-sample',
-      actions: [],
+      actions: [
+        {
+          title: i18next.t('button.print'),
+          action: this.printSamples.bind(this),
+          icon: 'print'
+        }
+      ],
       exportable: {
         name: i18next.t('title.data-sample list'),
         data: this._exportableData.bind(this)
@@ -69,12 +78,7 @@ export class DataSampleListPage 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=${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>
@@ -108,16 +112,11 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           title: i18next.t('title.open data sample view'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
-              openPopup(
-                html`
-                  <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
-                `,
-                {
-                  backdrop: true,
-                  size: 'large',
-                  title: i18next.t('title.data-sample view')
-                }
-              )
+              openPopup(html` <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view> `, {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-sample view')
+              })
             }
           }
         },
@@ -150,7 +149,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key01',
-          header: i18next.t('field.key-01'),
+          header: {
+            renderer: i18next.t('field.key-01'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -161,7 +163,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key02',
-          header: i18next.t('field.key-02'),
+          header: {
+            renderer: i18next.t('field.key-02'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -172,7 +177,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key03',
-          header: i18next.t('field.key-03'),
+          header: {
+            renderer: i18next.t('field.key-03'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -183,7 +191,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key04',
-          header: i18next.t('field.key-04'),
+          header: {
+            renderer: i18next.t('field.key-04'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -194,7 +205,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key05',
-          header: i18next.t('field.key-05'),
+          header: {
+            renderer: i18next.t('field.key-05'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -231,7 +245,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           imex: true
         },
         {
-          type: 'text',
+          type: 'json5',
           name: 'rawData',
           header: i18next.t('field.raw-data'),
           record: {
@@ -387,9 +401,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           .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
           }, {})
       }
@@ -397,4 +409,14 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
 
     return { header: headerSetting, data: data }
   }
+
+  printSamples() {
+    const selected = this.grist.selected
+    const ids = selected.map(record => record.id).join('|')
+
+    GhostPrint.print({
+      src: `./data-samples?ids=${ids}`
+      // pending: 200 * selected.length
+    })
+  }
 }

package/client/pages/data-sample/{data-sample-view-page.ts → data-sample-page.ts}

@@ -5,7 +5,7 @@ import { i18next, localize } from '@operato/i18n'
 
 import './data-sample-view.js'
 
-@customElement('data-sample-view-page')
+@customElement('data-sample-page')
 export class DataSampleViewPage extends localize(i18next)(PageView) {
   static styles = [
     css`
@@ -16,6 +16,13 @@ export class DataSampleViewPage extends localize(i18next)(PageView) {
       data-sample-view {
         flex: 1;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]