@operato/dataset 1.0.0-alpha.9 → 1.0.0-beta.10

package/src/grist-editor/ox-popup-data-item-spec.ts

@@ -0,0 +1,92 @@
+import '../ox-data-item-spec.js'
+
+import { css, html, LitElement } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { i18next } from '@operato/i18n'
+import { ScrollbarStyles } from '@operato/styles'
+
+import { DataItem } from '../types.js'
+
+@customElement('ox-popup-data-item-spec')
+export class OxPopupDataItemSpec extends LitElement {
+  static styles = [
+    ScrollbarStyles,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        background-color: #fff;
+
+        width: var(--overlay-center-normal-width, 50%);
+        height: var(--overlay-center-normal-height, 50%);
+      }
+
+      ox-data-item-spec {
+        flex: 1;
+        overflow-y: auto;
+        padding: var(--padding-wide);
+      }
+
+      span {
+        flex: 1;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        color: var(--primary-color);
+      }
+
+      .button-container {
+        display: flex;
+        margin-left: auto;
+      }
+    `
+  ]
+
+  @property({ type: Object }) value: any
+  @property({ type: Object }) dataItem?: DataItem
+  @property({ type: Object }) confirmCallback!: (newval: any) => void
+
+  render() {
+    var dataItem = this.dataItem || {}
+
+    return html`
+      <ox-data-item-spec .value=${this.value} .dataItem=${dataItem} @change=${this.onChange.bind(this)}>
+      </ox-data-item-spec>
+
+      <div class="button-container">
+        <mwc-button @click=${this.onCancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
+        <mwc-button @click=${this.onConfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>
+      </div>
+    `
+  }
+
+  private onChange(e: CustomEvent) {
+    e.stopPropagation()
+
+    /* 
+      주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, 
+      layout의 구성에 변화가 발생하면, 다시 render된다.
+      이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)
+      이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,
+      만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.
+      따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
+      (이 팝업 클래스를 템플릿으로 사용한 곳의 코드를 참조하세요.)
+      => 
+      이런 이유로, Object.assign(...)을 사용하였다.
+    */
+    this.value = e.detail
+  }
+
+  private onCancel(e: Event) {
+    history.back()
+  }
+
+  private onConfirm(e: Event) {
+    this.confirmCallback && this.confirmCallback(this.value)
+    history.back()
+  }
+}

package/src/index.ts

@@ -1 +1,6 @@
-export * from './ox-data-entry-form'
+export * from './ox-data-entry-form.js'
+export * from './ox-data-sample-view.js'
+export * from './ox-data-ooc-view.js'
+export * from './ox-data-item-spec.js'
+export * from './ox-data-use-case'
+export * from './types.js'

package/src/ox-data-entry-form.ts

@@ -1,30 +1,9 @@
 import '@operato/input/ox-input-file.js'
 
-import { LitElement, css, html } from 'lit'
+import { css, html, LitElement } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 
-type SelectOption = { text: string; value: string }
-type SelectOptions = SelectOption[]
-type TypeOptions = {
-  options?: SelectOptions
-  [prop: string]: any
-}
-
-export type DataItem = {
-  name: string
-  description: string
-  sequence: number
-  tag: string
-  type: string
-  options: TypeOptions
-  quota: number
-}
-
-export type DataSet = {
-  name: string
-  description: string
-  dataItems: DataItem[]
-}
+import { DataSet } from './types.js'
 
 @customElement('ox-data-entry-form')
 export class OxDataEntryForm extends LitElement {
@@ -34,6 +13,11 @@ export class OxDataEntryForm extends LitElement {
       flex-direction: row;
     }
 
+    h2,
+    h3 {
+      text-align: center;
+    }
+
     form {
       flex: 1;
 
@@ -42,23 +26,34 @@ export class OxDataEntryForm extends LitElement {
     }
     label {
       display: grid;
-      grid-template-columns: repeat(12, 1fr);
-      gap: 9px;
+
+      grid-template-rows: auto 1fr;
+      grid-template-columns: 1fr 5fr;
+      grid-template-areas: 'name description' 'empty inputs';
+
+      grid-gap: 9px;
       align-items: center;
       margin-bottom: var(--margin-default);
     }
-    label:nth-child(even) {
+    label:nth-child(odd) {
       background-color: var(--main-section-background-color);
       padding: var(--padding-default) 0;
     }
+
     div[name] {
-      grid-column: span 2 / auto;
+      grid-area: name;
       font: var(--label-font);
       color: var(--label-color);
       text-align: right;
     }
+    div[description] {
+      grid-area: description;
+      font: var(--page-description-font);
+      color: var(--page-description-color);
+      text-align: left;
+    }
     div[elements] {
-      grid-column: span 10 / auto;
+      grid-area: inputs;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
@@ -75,12 +70,22 @@ export class OxDataEntryForm extends LitElement {
       padding: var(--input-field-padding);
       font: var(--input-field-font);
     }
+
     @media only screen and (max-width: 460px) {
-      div[name] {
-        grid-column: span 3 / auto;
+      label {
+        display: grid;
+
+        grid-template-rows: auto auto 1fr;
+        grid-template-columns: 1fr;
+        grid-template-areas: 'name' 'description' 'inputs';
+
+        grid-gap: 9px;
+        align-items: center;
+        margin-bottom: var(--margin-default);
       }
-      div[elements] {
-        grid-column: span 9 / auto;
+
+      div[name] {
+        text-align: left;
       }
     }
   `
@@ -89,32 +94,36 @@ export class OxDataEntryForm extends LitElement {
   @property({ type: Object }) value?: { [tag: string]: any }
 
   render() {
-    return html`<form @change=${(e: Event) => this.onChange(e)}>${this.buildInputs()}</form>`
+    return html` <form @change=${(e: Event) => this.onChange(e)}>
+      <h2>${this.dataSet?.name || ''}</h2>
+      <h3>${this.dataSet?.description || ''}</h3>
+      ${this.buildInputs()}
+    </form>`
   }
 
   private onChange(e: Event) {
-    const value = this.buildValue()
+    this.value = this.buildValue()
 
     this.dispatchEvent(
       new CustomEvent('change', {
         bubbles: true,
         composed: true,
-        detail: value
+        detail: this.value
       })
     )
   }
 
   private buildInputs() {
-    const dataItems = this.dataSet!.dataItems
+    const dataItems = this.dataSet!.dataItems.filter(item => item.active)
 
     return (dataItems || []).map(dataItem => {
-      const { name, description, tag, type, quota = 1, options = {} } = dataItem
+      const { name, description, tag, type, quota = 1, options = {}, unit } = dataItem
 
       const samples = new Array(quota).fill(0)
-      const value = this.value?.[tag]
+      const value = this.value && this.value[tag]
 
       const elements = samples.map((_, idx) => {
-        const v = quota <= 1 ? value : value instanceof Array && value[idx]
+        const v = value instanceof Array ? value[idx] : idx === 0 ? value : undefined
 
         switch (type) {
           case 'select':
@@ -150,7 +159,8 @@ export class OxDataEntryForm extends LitElement {
       })
 
       return html` <label .title=${description}>
-        <div name>${name}</div>
+        <div name>${name}${unit ? `(${unit})` : ''}</div>
+        <div description>${description}</div>
         <div elements>${elements}</div>
       </label>`
     })
@@ -160,19 +170,14 @@ export class OxDataEntryForm extends LitElement {
     const dataItems = this.dataSet!.dataItems
 
     return (dataItems || []).reduce((sum, dataItem) => {
-      const { tag, quota, type } = dataItem
+      const { tag, type } = dataItem
 
       const editors = Array.prototype.slice.call(
         this.renderRoot.querySelectorAll(`[name=${tag}]`) as NodeListOf<HTMLInputElement>
       ) as HTMLInputElement[]
 
       if (editors.length > 0) {
-        sum[tag] =
-          editors.length > 1
-            ? editors.map(editor => (type === 'boolean' ? editor.checked : editor.value))
-            : type === 'boolean'
-            ? editors[0].checked
-            : editors[0].value
+        sum[tag] = editors.map(editor => (type === 'boolean' ? editor.checked : editor.value))
       }
 
       return sum

package/src/ox-data-item-spec.ts

@@ -0,0 +1,74 @@
+import '@operato/property-editor/ox-properties-dynamic-view.js'
+
+import { css, html, LitElement, PropertyValues } from 'lit'
+import { customElement, property, queryAll, state } from 'lit/decorators.js'
+
+import { OxDataUseCase } from './ox-data-use-case.js'
+import { DataItem, DataItemSpecSet } from './types.js'
+
+@customElement('ox-data-item-spec')
+export class OxDataItemSpec extends LitElement {
+  static styles = css`
+    :host {
+      display: flex;
+      flex-direction: row;
+      border-bottom: var(--border-dark-color);
+      padding: var(--margin-default) 0;
+    }
+    [specName] {
+      font: var(--legend-font);
+      color: var(--legend-text-color);
+    }
+    [description] {
+      font: var(--form-sublabel-font);
+      opacity: 0.8;
+    }
+
+    form {
+      flex: 1;
+    }
+  `
+
+  @property({ type: Object }) value?: { [specSetName: string]: any }
+  @property({ type: Object }) dataItem?: DataItem
+
+  @state() dataItemSpecSets: DataItemSpecSet[] = []
+
+  @queryAll('ox-properties-dynamic-view') specSetViews!: NodeListOf<HTMLElement & { value: any }>
+
+  render() {
+    return html`<form @property-change=${(e: Event) => this.onChange(e)}>
+      ${this.dataItemSpecSets.map(
+        ({ name, description, specs }) => html` <div specName>${name}</div>
+          <div description>${description}</div>
+          <ox-properties-dynamic-view data-name=${name} .props=${specs} .value=${this.value?.[name]}>
+          </ox-properties-dynamic-view>`
+      )}
+    </form>`
+  }
+
+  updated(changes: PropertyValues<this>) {
+    if (changes.has('dataItem')) {
+      this.dataItemSpecSets = OxDataUseCase.getUseCases().map(useCase => useCase.getSpecification(this.dataItem!))
+    }
+  }
+
+  private onChange(e: Event) {
+    this.value = this.buildValue()
+
+    this.dispatchEvent(
+      new CustomEvent('change', {
+        bubbles: true,
+        composed: true,
+        detail: { ...this.value }
+      })
+    )
+  }
+
+  private buildValue() {
+    var value = {} as any
+    this.specSetViews.forEach(view => (value[view.getAttribute('data-name')!] = view.value))
+
+    return value
+  }
+}

package/src/ox-data-ooc-view.ts

@@ -0,0 +1,75 @@
+import '@operato/input/ox-input-file.js'
+import './ox-data-sample-view'
+import '@material/mwc-icon'
+
+import { css, html, LitElement } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { i18next } from '@operato/i18n'
+
+import { DataOoc, DataSet } from './types.js'
+
+@customElement('ox-data-ooc-view')
+export class OxDataOocView extends LitElement {
+  static styles = css`
+    :host {
+      display: flex;
+      flex-direction: column;
+      background-color: var(--main-section-background-color);
+      padding: var(--padding-wide);
+
+      position: relative;
+    }
+
+    h3 {
+      margin: var(--title-margin);
+      padding-top: 12px;
+      font: var(--title-font);
+      color: var(--title-text-color);
+    }
+
+    h3[state] {
+      position: absolute;
+
+      right: 20px;
+      top: 25px;
+    }
+
+    mwc-icon {
+      font-size: 16px;
+    }
+
+    [page-description] {
+      margin: var(--page-description-margin);
+      font: var(--page-description-font);
+      color: var(--page-description-color);
+    }
+  `
+
+  @property({ type: Object }) dataSet?: DataSet
+  @property({ type: Object }) dataOoc?: DataOoc
+
+  render() {
+    const history = this.dataOoc?.history || []
+    const formatter = new Intl.DateTimeFormat(navigator.language, { dateStyle: 'full', timeStyle: 'short' })
+
+    return html`
+      <ox-data-sample-view .dataSample=${this.dataOoc} .dataSet=${this.dataSet}></ox-data-sample-view>
+
+      <h3 state>${this.dataOoc?.state || ''}</h3>
+
+      <h3>${i18next.t('title.history')}</h3>
+      ${history.map(
+        ({ user, state, comment, timestamp }) => html`
+          <p page-description>
+            ${formatter.format(new Date(timestamp))}
+            <br />
+            ${state} <mwc-icon>account_circle</mwc-icon> ${user.name}
+            <br />
+            ${comment}
+          </p>
+        `
+      )}
+    `
+  }
+}

package/src/ox-data-sample-view.ts

@@ -0,0 +1,177 @@
+import '@operato/input/ox-input-file.js'
+
+import { css, html, LitElement } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { i18next } from '@operato/i18n'
+
+import { OxDataUseCase } from './ox-data-use-case.js'
+import { DataItem, DataSample, DataSet } from './types.js'
+
+@customElement('ox-data-sample-view')
+export class OxDataSampleView extends LitElement {
+  static styles = css`
+    :host {
+      display: flex;
+      flex-direction: column;
+      background-color: var(--main-section-background-color);
+    }
+
+    form {
+      flex: 1;
+
+      display: flex;
+      flex-direction: column;
+    }
+
+    h2 {
+      margin: var(--title-margin);
+      padding-top: 25px;
+      font: var(--title-font);
+      color: var(--title-text-color);
+    }
+    [page-description] {
+      margin: var(--page-description-margin);
+      font: var(--page-description-font);
+      color: var(--page-description-color);
+    }
+
+    table {
+      border-collapse: collapse;
+      margin-bottom: var(--margin-default);
+    }
+    th {
+      padding: var(--th-padding);
+      border-top: var(--th-border-top);
+      border-bottom: var(--td-border-bottom);
+      text-transform: var(--th-text-transform);
+      font: var(--th-font);
+      color: var(--th-color);
+      text-align: left;
+    }
+    th[item] {
+      min-width: 100px;
+    }
+    th[value] {
+      min-width: 100px;
+    }
+    tr {
+      background-color: var(--tr-background-color);
+    }
+    tr:nth-child(odd) {
+      background-color: var(--tr-background-odd-color);
+    }
+    tr:hover {
+      background-color: var(--tr-background-hover-color);
+    }
+    tr[ooc],
+    tr[oos] {
+      background-color: #fefbdf;
+    }
+    td {
+      border-bottom: var(--td-border-bottom);
+      padding: var(--td-padding);
+      font: var(--td-font);
+      color: var(--td-color);
+    }
+    td[name] {
+      font-weight: bold;
+    }
+    td mwc-icon {
+      color: var(--status-danger-color);
+    }
+
+    pre {
+      tab-size: 2;
+    }
+  `
+
+  @property({ type: Object }) dataSet?: DataSet
+  @property({ type: Object }) dataSample?: DataSample
+
+  render() {
+    const dataItems = this.dataSet?.dataItems.filter(item => item.active) || []
+    const data = this.dataSample?.data || {}
+    const formatter = new Intl.DateTimeFormat(navigator.language, { dateStyle: 'full', timeStyle: 'short' })
+
+    const { name, description, collectedAt, workDate, workShift } = this.dataSample || {}
+
+    return html` <h2>${i18next.t('field.name')}</h2>
+      <p page-description>
+        ${i18next.t('field.description')}<br /><br />
+        ${i18next.t('field.work-date')}: ${workDate} ${workShift}<br />
+        ${i18next.t('field.collected-at')}: ${formatter.format(new Date(collectedAt!))}
+      </p>
+
+      <form @change=${(e: Event) => this.onChange(e)}>
+        <table>
+          <tr>
+            <th item>${i18next.t('field.item')}</th>
+            <th>${i18next.t('field.description')}</th>
+            <th>${i18next.t('field.unit')}</th>
+            <th value>${i18next.t('field.value')}</th>
+            <th>${i18next.t('field.spec')}</th>
+            <th>${i18next.t('field.ooc')}</th>
+            <th>${i18next.t('field.oos')}</th>
+          </tr>
+          ${dataItems.map(dataItem => {
+            const { ooc, oos } = this.evaluateOOC(dataItem, data?.[dataItem.tag]) || {}
+            const { name, description, unit } = dataItem
+            return html`
+              <tr ?ooc=${ooc} ?oos=${oos}>
+                <td name>${name}</td>
+                <td>${description}</td>
+                <td>${unit}</td>
+                <td>${this.buildValue(dataItem)}</td>
+                <td><pre>${this.buildSpec(dataItem)}</pre></td>
+                <td>${ooc ? html`<mwc-icon>done</mwc-icon>` : ''}</td>
+                <td>${oos ? html`<mwc-icon>done</mwc-icon>` : ''}</td>
+              </tr>
+            `
+          })}
+        </table>
+      </form>`
+  }
+
+  private onChange(e: Event) {}
+
+  private buildSpec(dataItem: DataItem) {
+    return OxDataUseCase.elaborateDataItemSpec(this.dataSet!, dataItem)
+  }
+
+  private buildValue(dataItem: DataItem) {
+    const { tag, type } = dataItem
+
+    if (!this.dataSample) {
+      return ''
+    }
+
+    const value = this.dataSample?.data[dataItem.tag]
+    if (value === undefined) {
+      return ''
+    }
+    const values = value instanceof Array ? value : [value]
+
+    const elements = values.map((_: any, idx) => {
+      const v = value[idx]
+
+      switch (type) {
+        case 'boolean':
+          return html` <input type="checkbox" name=${tag} .checked=${v} disabled />`
+          break
+
+        case 'select':
+        case 'number':
+        case 'string':
+        default:
+          return String(v === undefined ? '' : v)
+      }
+    })
+
+    return type === 'boolean' ? elements : elements.join(', ')
+  }
+
+  private evaluateOOC(dataItem: DataItem, value: any) {
+    return OxDataUseCase.evaluateItem(this.dataSet!, dataItem, value)
+  }
+}