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

package/client/activities/activity-data-collect-view.ts

@@ -26,6 +26,13 @@ export class DataCollectActivityView extends localize(i18next)(LitElement) {
         padding: 10px;
         overflow: auto;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 

package/client/activities/activity-data-review-edit.ts

@@ -1,10 +1,12 @@
 import '@operato/dataset/ox-data-entry-form.js'
 
+import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 import { customElement, property, state } from 'lit/decorators.js'
 
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
 
 @customElement('activity-data-review-edit')
 export class DataReviewActivityEdit extends localize(i18next)(LitElement) {
@@ -37,12 +39,12 @@ export class DataReviewActivityEdit extends localize(i18next)(LitElement) {
   @property({ type: Object }) input?: any
   @property({ type: Object }) output?: any
 
-  @state() dataReview?: any
+  @state() dataSample?: any
 
   render() {
     return html`
       <div content>
-        <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>
+        <ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>
       </div>
     `
   }
@@ -65,7 +67,67 @@ export class DataReviewActivityEdit extends localize(i18next)(LitElement) {
   }
 
   async fetchDataAssign() {
-    const dataSample = this.input?.dataSample
-    this.dataReview = dataSample
+    const { dataSampleId, dataSample } = this.input || {}
+
+    if (dataSample) {
+      /* only for backwards compatibility - should be deleted later */
+      this.dataSample = dataSample
+    } else if (dataSampleId) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSample(id: $id) {
+              id
+              name
+              description
+              useCase
+              key01
+              key02
+              key03
+              key04
+              key05
+              data
+              ooc
+              oos
+              dataSet {
+                id
+                name
+                description
+              }
+              dataItems {
+                name
+                description
+                active
+                hidden
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+                stat
+              }
+              judgment
+              workDate
+              workShift
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+            }
+          }
+        `,
+        variables: {
+          id: dataSampleId
+        }
+      })
+
+      this.dataSample = {
+        ...response.data.dataSample
+      }
+    }
   }
 }

package/client/activities/activity-data-review-view.ts

@@ -1,10 +1,12 @@
 import '@operato/dataset/ox-data-entry-form.js'
 
+import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 import { customElement, property, state } from 'lit/decorators.js'
 
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
 
 @customElement('activity-data-review-view')
 export class DataReviewActivityView extends localize(i18next)(LitElement) {
@@ -31,18 +33,30 @@ export class DataReviewActivityView extends localize(i18next)(LitElement) {
         padding: var(--padding-wide);
         overflow: auto;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+
+        div[content] {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 
   @property({ type: Object }) input?: any
   @property({ type: Object }) output?: any
 
-  @state() dataReview?: any
+  @state() dataSample?: any
 
   render() {
     return html`
       <div content>
-        <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>
+        <ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>
       </div>
     `
   }
@@ -65,7 +79,67 @@ export class DataReviewActivityView extends localize(i18next)(LitElement) {
   }
 
   async fetchDataAssign() {
-    const dataSample = this.input?.dataSample
-    this.dataReview = dataSample
+    const { dataSampleId, dataSample } = this.input || {}
+
+    if (dataSample) {
+      /* only for backwards compatibility - should be deleted later */
+      this.dataSample = dataSample
+    } else if (dataSampleId) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSample(id: $id) {
+              id
+              name
+              description
+              useCase
+              key01
+              key02
+              key03
+              key04
+              key05
+              data
+              ooc
+              oos
+              dataSet {
+                id
+                name
+                description
+              }
+              dataItems {
+                name
+                description
+                active
+                hidden
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+                stat
+              }
+              judgment
+              workDate
+              workShift
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+            }
+          }
+        `,
+        variables: {
+          id: dataSampleId
+        }
+      })
+
+      this.dataSample = {
+        ...response.data.dataSample
+      }
+    }
   }
 }

package/client/activities/activity-ooc-resolve-view.ts

@@ -33,6 +33,18 @@ export class OocResolveActivityView extends localize(i18next)(LitElement) {
         padding: var(--padding-wide);
         overflow: auto;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+
+        div[content] {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 

package/client/activities/activity-ooc-review-view.ts

@@ -33,6 +33,18 @@ class OocReviewActivityView extends localize(i18next)(LitElement) {
         padding: var(--padding-wide);
         overflow: auto;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+
+        div[content] {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 

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 [
     {
@@ -44,6 +47,8 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         flex-direction: column;
 
         overflow: hidden;
+
+        --grid-header-padding: 2px 0 2px 9px;
       }
 
       ox-grist {
@@ -74,6 +79,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 +138,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 data-ooc-id=${record.id} style="background-color: white;"></data-ooc-view> `, {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-ooc view')
+              })
               popup.onclosed = () => {
                 this.grist.fetch()
               }
@@ -147,7 +156,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           label: true,
           header: i18next.t('field.name'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
           sortable: true,
@@ -160,7 +169,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           label: true,
           header: i18next.t('field.description'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
           width: 150,
@@ -203,13 +212,25 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           filter: true,
           imex: true
         },
+        {
+          type: 'textarea',
+          name: 'correctiveInstruction',
+          label: true,
+          header: i18next.t('field.corrective-instruction'),
+          record: {
+            editable: false,
+            language: 'text'
+          },
+          width: 150,
+          imex: true
+        },
         {
           type: 'textarea',
           name: 'correctiveAction',
           label: true,
           header: i18next.t('field.corrective-action'),
           record: {
-            editable: true,
+            editable: false,
             language: 'text'
           },
           width: 150,
@@ -226,7 +247,10 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         {
           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
           },
@@ -237,7 +261,10 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         {
           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
           },
@@ -248,7 +275,10 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         {
           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
           },
@@ -259,7 +289,10 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         {
           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
           },
@@ -270,7 +303,10 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
         {
           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
           },
@@ -479,9 +515,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 +523,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`
@@ -19,6 +19,13 @@ export class DataOocViewPage extends localize(i18next)(PageView) {
       data-ooc-view {
         flex: 1;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 
@@ -107,6 +114,41 @@ export class DataOocViewPage extends localize(i18next)(PageView) {
             }
             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
+            }
           }
         }
       `,