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

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

@@ -46,23 +46,12 @@ const showEntryView = async (columns, data, column, record, rowIndex) => {
       const board = {
         id: entryView
       }
-      openPopup(
-        html`
-          <ox-board-viewer
-            style="background-color: white;"
-            .board=${board}
-            .provider=${provider}
-            hide-fullscreen
-            hide-navigation
-          ></ox-board-viewer>
-        `,
-        {
-          closable: true,
-          backdrop: true,
-          size: 'large',
-          title
-        }
-      )
+      openPopup(html` <ox-board-viewer style="background-color: white;" .board=${board} .provider=${provider} hide-fullscreen hide-navigation></ox-board-viewer> `, {
+        closable: true,
+        backdrop: true,
+        size: 'large',
+        title
+      })
 
       // navigate(`board-viewer/${entryView}?interactive=true&title=${title}`)
       break
@@ -129,12 +118,7 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
     const mode = 'CARD'
 
     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>
@@ -300,6 +284,7 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
       ],
       rows: {
         appendable: false,
+        editable: false,
         selectable: {
           multiple: false
         },

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

@@ -1,6 +1,7 @@
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 import '@operato/input/ox-input-select-buttons.js'
+
 import './data-ooc-view.js'
 
 import gql from 'graphql-tag'
@@ -8,6 +9,8 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
 
+import { GhostPrint } from '@operato/ghost-print'
+
 function getOocStatus() {
   return [
     {
@@ -74,6 +77,13 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         }
       },
       help: 'dataset/data-ooc',
+      actions: [
+        {
+          title: i18next.t('button.print'),
+          action: this.printOocs.bind(this),
+          icon: 'print'
+        }
+      ],
       exportable: {
         name: i18next.t('title.data-ooc list'),
         data: this._exportableData.bind(this)
@@ -126,14 +136,11 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           title: i18next.t('title.view detail ooc data'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
-              const popup = openPopup(
-                html` <data-ooc-view .dataOoc=${record} style="background-color: white;"></data-ooc-view> `,
-                {
-                  backdrop: true,
-                  size: 'large',
-                  title: i18next.t('title.data-ooc view')
-                }
-              )
+              const popup = openPopup(html` <data-ooc-view .dataOoc=${record} style="background-color: white;"></data-ooc-view> `, {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-ooc view')
+              })
               popup.onclosed = () => {
                 this.grist.fetch()
               }
@@ -479,9 +486,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           .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
           }, {})
       }
@@ -489,4 +494,14 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
 
     return { header: headerSetting, data: data }
   }
+
+  printOocs() {
+    const selected = this.grist.selected
+    const ids = selected.map(record => record.id).join('|')
+
+    GhostPrint.print({
+      src: `./data-oocs?ids=${ids}`
+      // pending: 200 * selected.length
+    })
+  }
 }

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

@@ -8,7 +8,7 @@ import { client } from '@operato/graphql'
 
 import './data-ooc-view.js'
 
-@customElement('data-ooc-view-page')
+@customElement('data-ooc-page')
 export class DataOocViewPage extends localize(i18next)(PageView) {
   static styles = [
     css`

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

@@ -1,10 +1,12 @@
 import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@material/mwc-fab'
 
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
 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) {
@@ -14,65 +16,81 @@ export class DataOocView extends localize(i18next)(LitElement) {
       :host {
         display: flex;
         flex-direction: column;
+        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);
+      mwc-fab {
+        position: absolute;
+        bottom: 15px;
+        right: 16px;
+        text-decoration: auto;
+        opacity: 0.5;
       }
 
-      label[comment] div {
-        display: flex;
-      }
+      @media print {
+        :host {
+          display: block;
+        }
 
-      mwc-icon {
-        color: var(--status-danger-color);
-      }
+        ox-data-ooc-brief-view {
+          flex: unset;
+          overflow: visible;
+        }
 
-      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);
+        mwc-fab {
+          display: none;
+        }
       }
     `
   ]
 
   @property({ type: Object }) dataOoc?: any
 
-  @query('textarea') commentTextArea!: HTMLTextAreaElement
   @query('ox-data-ooc-brief-view') sampleView!: HTMLTextAreaElement
 
-  render() {
-    const state = this.dataOoc?.state
+  private printHandler = this.handlePrint.bind(this)
 
+  render() {
     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>
+
+      <mwc-fab
+        icon="print"
+        title="print"
+        @click=${() =>
+          GhostPrint.print({
+            src: `./data-ooc/${this.dataOoc.id}`
+          })}
+        >print</mwc-fab
+      >
     `
   }
+
+  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,132 @@
+import '@operato/dataset/ox-data-ooc-brief-view.js'
+
+import gql from 'graphql-tag'
+import { PropertyValues, html, css } 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;
+      }
+
+      ox-data-ooc-brief-view {
+        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 => html` <ox-data-ooc-brief-view .dataOoc=${dataOoc}></ox-data-ooc-brief-view> `)
+  }
+
+  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
+            }
+          }
+        }
+      `,
+      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)) {
@@ -56,7 +57,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 +76,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 +110,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')
+              })
             }
           }
         },
@@ -387,9 +384,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 +392,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`

package/client/pages/data-sample/data-sample-search-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-search-page')
 export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageView)) {
@@ -60,7 +61,13 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
         }
       },
       help: 'dataset/data-sample-search',
-      actions: [],
+      actions: [
+        {
+          title: i18next.t('button.print'),
+          action: this.printSamples.bind(this),
+          icon: 'print'
+        }
+      ],
       exportable: {
         name: i18next.t('title.data-sample search'),
         data: this._exportableData.bind(this)
@@ -170,16 +177,11 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           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')
+              })
             }
           }
         },
@@ -319,12 +321,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     const response = await client.query({
       query: gql`
         query ($dataSetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: dataSamplesByDataSet(
-            dataSetId: $dataSetId
-            filters: $filters
-            pagination: $pagination
-            sortings: $sortings
-          ) {
+          responses: dataSamplesByDataSet(dataSetId: $dataSetId, filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -394,9 +391,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           .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
           }, {})
       }
@@ -404,4 +399,14 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
 
     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: 300 * selected.length
+    })
+  }
 }

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

@@ -1,13 +1,14 @@
 import '@operato/dataset/ox-data-sample-view.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) {
@@ -21,18 +22,34 @@ class DataSampleView extends localize(i18next)(LitElement) {
         background-color: #fff;
       }
 
-      div[content] {
-        flex: 1;
-
-        display: flex;
-        overflow: auto;
-      }
-
       ox-data-sample-view {
         flex: 1;
         padding: var(--padding-wide);
         overflow: auto;
       }
+
+      mwc-fab {
+        position: absolute;
+        bottom: 15px;
+        right: 16px;
+        text-decoration: auto;
+        opacity: 0.5;
+      }
+
+      @media print {
+        :host {
+          display: block;
+        }
+
+        ox-data-sample-view {
+          flex: unset;
+          overflow: visible;
+        }
+
+        mwc-fab {
+          display: none;
+        }
+      }
     `
   ]
 
@@ -41,13 +58,24 @@ class DataSampleView extends localize(i18next)(LitElement) {
     attribute: 'data-sample-id'
   })
   dataSampleId?: string
+
   @state() dataSample?: DataSample
 
+  private printHandler = this.handlePrint.bind(this)
+
   render() {
     return html`
-      <div content>
-        ${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : html``}
-      </div>
+      ${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : nothing}
+
+      <mwc-fab
+        icon="print"
+        title="print"
+        @click=${() =>
+          GhostPrint.print({
+            src: `./data-sample/${this.dataSampleId}`
+          })}
+        >print</mwc-fab
+      >
     `
   }
 
@@ -114,4 +142,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)
+  }
 }