@operato/dataset 1.0.0-alpha.6 → 1.0.0-beta.0

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 {
@@ -51,6 +30,7 @@ export class OxDataEntryForm extends LitElement {
       background-color: var(--main-section-background-color);
       padding: var(--padding-default) 0;
     }
+
     div[name] {
       grid-column: span 2 / auto;
       font: var(--label-font);
@@ -75,6 +55,7 @@ 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;
@@ -93,28 +74,28 @@ export class OxDataEntryForm extends LitElement {
   }
 
   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 +131,7 @@ export class OxDataEntryForm extends LitElement {
       })
 
       return html` <label .title=${description}>
-        <div name>${name}</div>
+        <div name>${name}${unit ? `(${unit})` : ''}</div>
         <div elements>${elements}</div>
       </label>`
     })
@@ -160,19 +141,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,67 @@
+import '@operato/input/ox-input-file.js'
+import './ox-data-sample-view'
+
+import { DataOoc, DataSet } from './types.js'
+import { LitElement, css, html } from 'lit'
+import { customElement, property } from 'lit/decorators.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;
+    }
+
+    [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>history</h3>
+      ${history.map(
+        ({ user, state, comment, timestamp }) => html`
+          <p page-description>
+            ${formatter.format(new Date(timestamp))}
+            <br />
+            ${state} by ${user.name}
+            <br />
+            ${comment}
+          </p>
+        `
+      )}
+    `
+  }
+}

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

@@ -0,0 +1,175 @@
+import '@operato/input/ox-input-file.js'
+
+import { css, html, LitElement } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+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>${name}</h2>
+      <p page-description>
+        ${description}<br /><br />
+        work date: ${workDate} ${workShift}<br />
+        collected at: ${formatter.format(new Date(collectedAt!))}
+      </p>
+
+      <form @change=${(e: Event) => this.onChange(e)}>
+        <table>
+          <tr>
+            <th item>item</th>
+            <th>description</th>
+            <th>unit</th>
+            <th value>value</th>
+            <th>specification</th>
+            <th>OOC</th>
+            <th>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)
+  }
+}

package/src/ox-data-use-case.ts

@@ -0,0 +1,147 @@
+import { DataItem, DataItemSpecSet, DataSet, EvaluationResult } from './types'
+
+export abstract class OxDataUseCase {
+  static registry: { [name: string]: OxDataUseCase } = {}
+
+  public static registerUseCase(name: string, useCase: OxDataUseCase) {
+    OxDataUseCase.registry[name] = useCase
+  }
+
+  public static getUseCaseNames() {
+    return Object.keys(OxDataUseCase.registry)
+  }
+
+  public static getUseCases(): OxDataUseCase[] {
+    return Object.values(OxDataUseCase.registry)
+  }
+
+  public static getUseCase(name: string): OxDataUseCase | undefined {
+    return OxDataUseCase.registry[name]
+  }
+
+  public static elaborateDataItemSpec(dataSet: DataSet, dataItem: DataItem): string {
+    if (!dataSet.useCase) {
+      return ''
+    }
+
+    const useCaseNames = dataSet.useCase.split(',').map(useCaseName => useCaseName.trim())
+    const useCases = useCaseNames.map(useCaseName => OxDataUseCase.getUseCase(useCaseName)).filter(useCase => !!useCase)
+
+    var texts = []
+
+    for (let j = 0; j < useCases.length; j++) {
+      const useCase = useCases[j]
+      if (!useCase) {
+        continue
+      }
+
+      const specs = dataItem.spec?.[dataSet.useCase]
+      if (!specs) {
+        continue
+      }
+
+      const result = useCase.elaborateUseCaseSpec(dataItem.spec)
+      if (!result) {
+        continue
+      }
+
+      texts.push(result)
+    }
+
+    return texts.join('\n')
+  }
+
+  public static evaluate(dataSet: DataSet, dataItems: DataItem[], data: any): EvaluationResult | undefined {
+    var ooc = false
+    var oos = false
+
+    if (!dataSet.useCase) {
+      return { ooc, oos }
+    }
+
+    const useCaseNames = dataSet.useCase.split(',').map(useCaseName => useCaseName.trim())
+    const useCases = useCaseNames.map(useCaseName => OxDataUseCase.getUseCase(useCaseName)).filter(useCase => !!useCase)
+
+    for (let i = 0; i < dataItems.length; i++) {
+      const dataItem = dataItems[i]
+      const { active, tag } = dataItem
+      if (!active || !tag) {
+        continue
+      }
+
+      let values: any | any[] = data[tag]
+      if (typeof values === 'undefined') {
+        continue // TODO what if in case no value ?
+      }
+
+      if (!(values instanceof Array)) {
+        values = [values]
+      }
+
+      for (let j = 0; j < useCases.length; j++) {
+        const useCase = useCases[j]
+
+        const specs = dataItem.spec?.[dataSet.useCase]
+        if (!specs) {
+          continue
+        }
+
+        const result = useCase?.evaluate(specs, values)
+
+        if (result) {
+          ooc ||= result.ooc
+          oos ||= result.oos
+        }
+      }
+    }
+
+    return { ooc, oos }
+  }
+
+  public static evaluateItem(dataSet: DataSet, dataItem: DataItem, values: any | any[]): EvaluationResult | undefined {
+    var ooc = false
+    var oos = false
+
+    if (!dataSet.useCase) {
+      return { ooc, oos }
+    }
+
+    const useCaseNames = dataSet.useCase.split(',').map(useCaseName => useCaseName.trim())
+    const useCases = useCaseNames.map(useCaseName => OxDataUseCase.getUseCase(useCaseName)).filter(useCase => !!useCase)
+
+    const { active, tag } = dataItem
+    if (!active || !tag) {
+      return
+    }
+
+    if (typeof values === 'undefined') {
+      return // TODO what if in case no value ?
+    }
+
+    if (!(values instanceof Array)) {
+      values = [values]
+    }
+
+    for (let j = 0; j < useCases.length; j++) {
+      const useCase = useCases[j]
+
+      const specs = dataItem.spec?.[dataSet.useCase]
+      if (!specs) {
+        return
+      }
+
+      const result = useCase?.evaluate(specs, values)
+
+      if (result) {
+        ooc ||= result.ooc
+        oos ||= result.oos
+      }
+    }
+
+    return { ooc, oos }
+  }
+
+  public abstract evaluate(specs: any, values: any[]): EvaluationResult | undefined
+  public abstract elaborateUseCaseSpec(spec: any): string | undefined
+  public abstract getSpecification(dataItem: DataItem): DataItemSpecSet
+}

package/src/types.ts

@@ -0,0 +1,72 @@
+export type SelectOption = { text: string; value: string }
+export type SelectOptions = SelectOption[]
+export type TypeOptions = {
+  options?: SelectOptions
+  [prop: string]: any
+}
+
+export type DataItem = {
+  name: string
+  description: string
+  sequence: number
+  tag: string
+  type: string
+  active: boolean
+  options: TypeOptions
+  unit: string
+  quota: number
+  spec: { [useCase: string]: any }
+}
+
+export type DataSet = {
+  name: string
+  description: string
+  type: 'manual' | 'automatic'
+  useCase: string
+  active: boolean
+  dataItems: DataItem[]
+  spec: { [dataItem: string]: { [useCase: string]: any } }
+}
+
+export type DataItemSpec = {
+  type: string
+  label: string
+  name: string
+  property?: { [option: string]: any }
+}
+
+export type DataItemSpecSet = {
+  name: string
+  description: string
+  help: string
+  specs: DataItemSpec[]
+}
+
+export type DataSample = {
+  name: string
+  description: string
+  data: any
+  spec: any
+  quota: number
+  workDate: string
+  workShift: string
+  collectedAt: Date
+}
+
+export type DataOocState = 'CREATED' | 'REVIEWED' | 'CORRECTED'
+
+export type DataOoc = DataSample & {
+  state: DataOocState
+  correctiveAction: string
+  history: {
+    user: {
+      id: string
+      name: string
+    }
+    state: DataOocState
+    comment: string
+    timestamp: number
+  }[]
+}
+
+export type EvaluationResult = { oos: boolean; ooc: boolean }