@things-factory/dataset 6.0.30 → 6.0.33

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

@@ -0,0 +1,100 @@
+import '@operato/dataset/ox-data-entry-form.js'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } 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 { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js'
+import { DataSet } from '@operato/dataset'
+
+@customElement('activity-data-collect-edit')
+export class DataCollectActivityEdit extends localize(i18next)(LitElement) {
+  static styles = [
+    ScrollbarStyles,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        background-color: #fff;
+      }
+
+      ox-data-entry-form {
+        flex: 1;
+        padding: 10px;
+        overflow: auto;
+      }
+    `
+  ]
+
+  @property({ type: Object }) input?: any
+  @property({ type: Object }) output?: any
+
+  @state() dataSet?: DataSet & { id: string }
+
+  @query('ox-data-entry-form') entryForm!: OxDataEntryForm
+
+  render() {
+    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
+
+    this.dispatchEvent(
+      new CustomEvent('change', {
+        detail: this.output
+      })
+    )
+  }
+
+  updated(changes) {
+    if (changes.has('input')) {
+      this.fetchDataSet()
+    }
+  }
+
+  async fetchDataSet() {
+    const id = this.input.dataSetId
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSet(id: $id) {
+              id
+              name
+              description
+              useCase
+              dataItems {
+                name
+                description
+                active
+                tag
+                type
+                unit
+                options
+                quota
+                spec
+              }
+            }
+          }
+        `,
+        variables: {
+          id
+        }
+      })
+
+      this.dataSet = response.data.dataSet
+    }
+  }
+}

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

@@ -7,7 +7,6 @@ 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 { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js'
 import { DataSet } from '@operato/dataset'
 
 @customElement('activity-data-collect-view')
@@ -35,26 +34,8 @@ export class DataCollectActivityView extends localize(i18next)(LitElement) {
 
   @state() dataSet?: DataSet & { id: string }
 
-  @query('ox-data-entry-form') entryForm!: OxDataEntryForm
-
   render() {
-    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
-
-    this.dispatchEvent(
-      new CustomEvent('change', {
-        detail: this.output
-      })
-    )
+    return html` <ox-data-entry-form .dataSet=${this.dataSet} .value=${this.output}></ox-data-entry-form>`
   }
 
   updated(changes) {

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

@@ -0,0 +1,174 @@
+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 { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import { ScrollbarStyles } from '@operato/styles'
+
+@customElement('activity-ooc-resolve-edit')
+class OocResolveActivityEdit extends localize(i18next)(LitElement) {
+  static styles = [
+    ScrollbarStyles,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        background-color: #fff;
+      }
+
+      div[content] {
+        flex: 1;
+        flex-direction: column;
+
+        display: flex;
+        overflow: auto;
+      }
+
+      ox-data-sample-view {
+        flex: 1;
+        padding: var(--padding-wide);
+        overflow: auto;
+      }
+
+      div[instruction] {
+        display: flex;
+        flex-direction: column;
+
+        padding: var(--padding-wide);
+      }
+
+      div[instruction] div {
+        display: flex;
+      }
+
+      div[instruction] div[content] {
+        display: flex;
+        min-height: 50px;
+      }
+
+      label[action] {
+        display: flex;
+        flex-direction: column;
+
+        padding: var(--padding-wide);
+      }
+
+      label[action] div {
+        display: flex;
+      }
+
+      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);
+      }
+    `
+  ]
+
+  @property({ type: Object }) input?: any
+  @property({ type: Object }) output?: any
+
+  @state() dataOoc?: any
+
+  @query('textarea') actionTextArea!: HTMLTextAreaElement
+
+  render() {
+    const action = this.output?.action
+
+    return html`
+      <div content>
+        <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>
+      </div>
+
+      <div instruction>
+        <div><mwc-icon>build_circle</mwc-icon> <span>corrective instruction</span></div>
+        <div content>${this.input?.instruction}</div>
+      </div>
+
+      <label action>
+        <div><mwc-icon>build_circle</mwc-icon> <span>corrective action</span></div>
+        <textarea
+          placeholder="시정 및 예방을 위한 조치 이행 사항을 입력해주세요."
+          .value=${action || ''}
+          @change=${this.onChangeAction}
+        ></textarea>
+      </label>
+    `
+  }
+
+  onChangeAction(e: Event) {
+    this.output ||= {}
+    this.output.action = (e.target as HTMLTextAreaElement).value
+
+    this.dispatchEvent(
+      new CustomEvent('change', {
+        detail: this.output
+      })
+    )
+  }
+
+  updated(changes) {
+    if (changes.has('input')) {
+      this.fetchDataOoc()
+    }
+  }
+
+  async fetchDataOoc() {
+    const id = this.input.dataOocId
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataOoc(id: $id) {
+              id
+              name
+              description
+              ooc
+              oos
+              state
+              type
+              useCase
+              data
+              judgment
+              dataItems {
+                name
+                description
+                active
+                tag
+                type
+                unit
+                options
+                quota
+                spec
+              }
+              workDate
+              workShift
+              collectedAt
+            }
+          }
+        `,
+        variables: {
+          id
+        }
+      })
+
+      this.dataOoc = response.data.dataOoc
+    }
+  }
+}

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

@@ -50,32 +50,24 @@ class OocResolveActivityView extends localize(i18next)(LitElement) {
         min-height: 50px;
       }
 
-      label[action] {
+      div[action] {
         display: flex;
         flex-direction: column;
 
         padding: var(--padding-wide);
       }
 
-      label[action] div {
+      div[action] div {
         display: flex;
       }
 
-      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);
+      div[action] div[content] {
+        display: flex;
+        min-height: 50px;
       }
 
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
+      mwc-icon {
+        color: var(--status-danger-color);
       }
     `
   ]
@@ -85,11 +77,7 @@ class OocResolveActivityView extends localize(i18next)(LitElement) {
 
   @state() dataOoc?: any
 
-  @query('textarea') actionTextArea!: HTMLTextAreaElement
-
   render() {
-    const action = this.output?.action
-
     return html`
       <div content>
         <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>
@@ -100,28 +88,13 @@ class OocResolveActivityView extends localize(i18next)(LitElement) {
         <div content>${this.input?.instruction}</div>
       </div>
 
-      <label action>
+      <div action>
         <div><mwc-icon>build_circle</mwc-icon> <span>corrective action</span></div>
-        <textarea
-          placeholder="시정 및 예방을 위한 조치 이행 사항을 입력해주세요."
-          .value=${action || ''}
-          @change=${this.onChangeAction}
-        ></textarea>
-      </label>
+        <div content>${this.output?.action}</div>
+      </div>
     `
   }
 
-  onChangeAction(e: Event) {
-    this.output ||= {}
-    this.output.action = (e.target as HTMLTextAreaElement).value
-
-    this.dispatchEvent(
-      new CustomEvent('change', {
-        detail: this.output
-      })
-    )
-  }
-
   updated(changes) {
     if (changes.has('input')) {
       this.fetchDataOoc()

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

@@ -0,0 +1,153 @@
+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 { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import { ScrollbarStyles } from '@operato/styles'
+
+@customElement('activity-ooc-review-edit')
+class OocReviewActivityEdit extends localize(i18next)(LitElement) {
+  static styles = [
+    ScrollbarStyles,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        background-color: #fff;
+      }
+
+      div[content] {
+        flex: 1;
+        flex-direction: column;
+
+        display: flex;
+        overflow: auto;
+      }
+
+      ox-data-sample-view {
+        flex: 1;
+        padding: var(--padding-wide);
+        overflow: auto;
+      }
+
+      label[instruction] {
+        display: flex;
+        flex-direction: column;
+
+        padding: var(--padding-wide);
+      }
+
+      label[instruction] div {
+        display: flex;
+      }
+
+      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);
+      }
+    `
+  ]
+
+  @property({ type: Object }) input?: any
+  @property({ type: Object }) output?: any
+
+  @state() dataOoc?: any
+
+  @query('textarea') instructionTextArea!: HTMLTextAreaElement
+
+  render() {
+    const instruction = this.output?.instruction
+
+    return html`
+      <div content>
+        <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>
+      </div>
+
+      <label instruction>
+        <div><mwc-icon>build_circle</mwc-icon> <span>corrective instruction</span></div>
+        <textarea
+          placeholder="시정 및 예방을 위한 조치 지시 사항을 입력해주세요."
+          .value=${instruction || ''}
+          @change=${this.onChangeInstruction}
+        ></textarea>
+      </label>
+    `
+  }
+
+  onChangeInstruction(e: Event) {
+    this.output ||= {}
+    this.output.instruction = (e.target as HTMLTextAreaElement).value
+
+    this.dispatchEvent(
+      new CustomEvent('change', {
+        detail: this.output
+      })
+    )
+  }
+
+  updated(changes) {
+    if (changes.has('input')) {
+      this.fetchDataOoc()
+    }
+  }
+
+  async fetchDataOoc() {
+    const id = this.input?.dataOocId
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataOoc(id: $id) {
+              id
+              name
+              description
+              ooc
+              oos
+              state
+              type
+              useCase
+              data
+              judgment
+              dataItems {
+                name
+                description
+                active
+                tag
+                type
+                unit
+                options
+                quota
+                spec
+              }
+              workDate
+              workShift
+              collectedAt
+            }
+          }
+        `,
+        variables: {
+          id
+        }
+      })
+
+      this.dataOoc = response.data.dataOoc
+    }
+  }
+}

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

@@ -34,32 +34,24 @@ class OocReviewActivityView extends localize(i18next)(LitElement) {
         overflow: auto;
       }
 
-      label[instruction] {
+      div[instruction] {
         display: flex;
         flex-direction: column;
 
         padding: var(--padding-wide);
       }
 
-      label[instruction] div {
+      div[instruction] div {
         display: flex;
       }
 
-      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);
+      div[instruction] div[content] {
+        display: flex;
+        min-height: 50px;
       }
 
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
+      mwc-icon {
+        color: var(--status-danger-color);
       }
     `
   ]
@@ -79,28 +71,13 @@ class OocReviewActivityView extends localize(i18next)(LitElement) {
         <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>
       </div>
 
-      <label instruction>
+      <div instruction>
         <div><mwc-icon>build_circle</mwc-icon> <span>corrective instruction</span></div>
-        <textarea
-          placeholder="시정 및 예방을 위한 조치 지시 사항을 입력해주세요."
-          .value=${instruction || ''}
-          @change=${this.onChangeInstruction}
-        ></textarea>
-      </label>
+        <div content>${instruction || ''}</div>
+      </div>
     `
   }
 
-  onChangeInstruction(e: Event) {
-    this.output ||= {}
-    this.output.instruction = (e.target as HTMLTextAreaElement).value
-
-    this.dispatchEvent(
-      new CustomEvent('change', {
-        detail: this.output
-      })
-    )
-  }
-
   updated(changes) {
     if (changes.has('input')) {
       this.fetchDataOoc()

package/client/bootstrap.ts

@@ -1,3 +1,6 @@
+import './activities/activity-data-collect-edit' /* refered by the activity template (activity-data-collect) on server */
+import './activities/activity-ooc-review-edit' /* refered by the activity template (activity-ooc-review) on server */
+import './activities/activity-ooc-resolve-edit' /* refered by the activity template (activity-ooc-resolve) on server */
 import './activities/activity-data-collect-view' /* refered by the activity template (activity-data-collect) on server */
 import './activities/activity-ooc-review-view' /* refered by the activity template (activity-ooc-review) on server */
 import './activities/activity-ooc-resolve-view' /* refered by the activity template (activity-ooc-resolve) on server */

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

@@ -247,14 +247,14 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
         {
           type: 'gutter',
           gutterName: 'button',
-          icon: record => (!record || !record.name ? '' : record.schedulerHandle ? 'pause' : 'play_arrow'),
+          icon: record => (!record || !record.name ? '' : record.scheduleId ? 'pause' : 'play_arrow'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               if (!record || !record.name) {
                 /* TODO record가 새로 추가된 것이면 리턴하도록 한다. */
                 return
               }
-              if (record.schedulerHandle) {
+              if (record.scheduleId) {
                 this.stopDataCollectionSchedule(record)
               } else {
                 this.startDataCollectionSchedule(record)
@@ -451,7 +451,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
             key: 'timezone'
           }
         },
-
         {
           type: 'resource-object',
           name: 'supervisoryRole',
@@ -638,7 +637,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               useCase
               schedule
               timezone
-              schedulerHandle
+              scheduleId
               dataKeySet {
                 id
                 name
@@ -805,7 +804,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       mutation: gql`
         mutation ($dataSetId: String!) {
           startDataCollectionSchedule(dataSetId: $dataSetId) {
-            schedulerHandle
+            scheduleId
           }
         }
       `,
@@ -814,12 +813,12 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       }
     })
 
-    const schedulerHandle = response.data.startDataCollectionSchedule.schedulerHandle
-    record.schedulerHandle = schedulerHandle
+    const scheduleId = response.data.startDataCollectionSchedule.scheduleId
+    record.scheduleId = scheduleId
 
     notify({
       level: 'info',
-      message: `${record.schedulerHandle ? 'success' : 'fail'} to start data collection schedule : ${record.name}`
+      message: `${record.scheduleId ? 'success' : 'fail'} to start data collection schedule : ${record.name}`
     })
 
     this.grist.fetch()
@@ -830,7 +829,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       mutation: gql`
         mutation ($dataSetId: String!) {
           stopDataCollectionSchedule(dataSetId: $dataSetId) {
-            schedulerHandle
+            scheduleId
           }
         }
       `,