@operato/dataset 2.0.0-alpha.3 → 2.0.0-alpha.30

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

@@ -0,0 +1,147 @@
+import i18next from 'i18next' // Since this is a common module, @operato/i18n was deliberately avoided.
+
+import { DataItem, EvaluationResult, UseCaseDefinition } from '../../types'
+import { OxDataUseCase } from '../ox-data-use-case.js'
+
+export class OxDataUseCaseSPC extends OxDataUseCase {
+  getSpecification(dataItem: DataItem): UseCaseDefinition {
+    return {
+      name: 'SPC',
+      description: 'Critical Control Point Data Spec',
+      help: '',
+      specs: [
+        {
+          type: 'spc-limits' /* A value which seperates acceptability from unacceptability */,
+          label: 'critical-limits',
+          name: 'criticalLimits',
+          property: dataItem
+        },
+        {
+          type: 'spc-limits',
+          label: 'target-limits',
+          name: 'targetLimits',
+          property: dataItem
+        }
+      ]
+    }
+  }
+
+  evaluate(spec: any, values: any | any[]): EvaluationResult | undefined {
+    if (!spec || typeof values === 'undefined') {
+      return
+    }
+
+    if (!(values instanceof Array)) {
+      values = [values]
+    }
+
+    const {
+      minimum: criticalMinimum,
+      maximum: criticalMaximum,
+      acceptables: criticalAcceptables
+    } = spec['criticalLimits'] || {}
+
+    const {
+      minimum: targetMinimum,
+      maximum: targetMaximum,
+      acceptables: targetAcceptables
+    } = spec['targetLimits'] || {}
+
+    var oos = false
+    var ooc = false
+
+    for (let i = 0; i < values.length; i++) {
+      const value = values[i]
+
+      if (criticalMinimum != null && value < criticalMinimum) {
+        oos = true
+        break
+      }
+
+      if (criticalMaximum != null && value > criticalMaximum) {
+        oos = true
+        break
+      }
+
+      if (criticalAcceptables != null && !criticalAcceptables.includes(value)) {
+        oos = true
+        break
+      }
+    }
+
+    for (let i = 0; i < values.length; i++) {
+      const value = values[i]
+
+      if (targetMinimum != null && value < targetMinimum) {
+        ooc = true
+        break
+      }
+
+      if (targetMaximum != null && value > targetMaximum) {
+        ooc = true
+        break
+      }
+
+      if (targetAcceptables != null && !targetAcceptables.includes(value)) {
+        ooc = true
+        break
+      }
+    }
+
+    return { oos, ooc }
+  }
+
+  elaborateUseCaseSpec(limits: any): string | undefined {
+    if (!limits) {
+      return
+    }
+
+    var text = ''
+
+    const {
+      minimum: criticalMinimum,
+      maximum: criticalMaximum,
+      acceptables: criticalAcceptables
+    } = limits['criticalLimits'] || {}
+
+    if (criticalMinimum != null || criticalMaximum != null || criticalAcceptables != null) {
+      text += `${i18next.t('label.critical-limits')}\n`
+    }
+
+    if (criticalMinimum != null) {
+      text += `\t${i18next.t('label.minimum value')} : ${criticalMinimum}\n`
+    }
+    if (criticalMaximum != null) {
+      text += `\t${i18next.t('label.maximum value')} : ${criticalMaximum}\n`
+    }
+    if (criticalAcceptables != null) {
+      text += `\t${i18next.t('label.acceptables')} : ${
+        criticalAcceptables instanceof Array ? criticalAcceptables.join(', ') : criticalAcceptables
+      }\n`
+    }
+
+    const {
+      minimum: targetMinimum,
+      maximum: targetMaximum,
+      acceptables: targetAcceptables
+    } = limits['targetLimits'] || {}
+
+    if (targetMinimum != null || targetMaximum != null || targetAcceptables != null) {
+      text += `${i18next.t('label.target-limits')}\n`
+    }
+
+    if (targetMinimum != null) {
+      text += `\t${i18next.t('label.minimum value')} : ${targetMinimum}\n`
+    }
+    if (targetMaximum != null) {
+      text += `\t${i18next.t('label.maximum value')} : ${targetMaximum}\n`
+    }
+    if (targetAcceptables != null) {
+      text += `\t${i18next.t('label.acceptables')} : ${
+        targetAcceptables instanceof Array ? targetAcceptables.join(', ') : targetAcceptables
+      }\n`
+    }
+
+    return text
+  }
+}

package/src/usecase/spc/ox-input-spc-limits.ts

@@ -0,0 +1,182 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import { css, html, LitElement } from 'lit'
+import { customElement, property, query, queryAll } from 'lit/decorators.js'
+
+import { i18next } from '@operato/i18n'
+
+export enum DataItemType {
+  number = 'number',
+  text = 'text',
+  boolean = 'boolean',
+  select = 'select',
+  file = 'file'
+}
+
+export type SpcLimitValue = {
+  minimum?: number
+  maximum?: number
+  acceptables?: string[] | boolean[]
+}
+
+/**
+ element for SPC limits
+ 
+ Example:
+ 
+   <ox-input-spc-limits
+     .value=${value}
+     .type=${type}>
+   </ox-input-spc-limits>
+ */
+@customElement('ox-input-spc-limits')
+export class OxInputSpcLimits extends LitElement {
+  static styles = css`
+    :host {
+      display: flex;
+      flex-direction: column;
+      align-content: center;
+    }
+
+    label {
+      margin: 0 var(--margin-default) var(--margin-default) 0;
+    }
+
+    label div > * {
+      vertical-align: middle;
+    }
+
+    button {
+      width: 20px;
+      text-align: center;
+    }
+
+    div[name],
+    input[type='checkbox'] + span {
+      display: inline-block;
+      font: var(--label-font);
+      color: var(--label-color);
+      text-align: right;
+    }
+    input,
+    select {
+      border: var(--input-field-border);
+      border-radius: var(--input-field-border-radius);
+      padding: var(--input-field-padding);
+      font: var(--input-field-font);
+    }
+
+    input[type='checkbox'] {
+      width: initial;
+    }
+    input[checked] + span {
+      font-weight: bold;
+    }
+    [unit],
+    [value] {
+      display: inline-block;
+      opacity: 0.7;
+      font: var(--form-sublabel-font);
+    }
+    [properties] {
+      font: var(--input-field-font);
+      color: var(--label-color);
+    }
+  `
+
+  @property({ type: Object }) value: SpcLimitValue = {}
+  @property({ type: String }) type: DataItemType = DataItemType.number
+  @property({ type: String }) unit?: string
+  @property({ type: Object }) options: { options?: { text: string; value: string }[] } = {}
+
+  @query('[name=minimum]') minimum!: HTMLInputElement
+  @query('[name=maximum]') maximum!: HTMLInputElement
+  @queryAll('[type=checkbox]:checked') checkedAll!: NodeListOf<HTMLInputElement>
+
+  firstUpdated() {
+    this.renderRoot.addEventListener('change', this.onChange.bind(this))
+  }
+
+  render() {
+    const { minimum, maximum, acceptables = [] } = this.value || {}
+
+    return html`
+      <div>
+        ${this.type === DataItemType.number
+          ? html`
+              <label>
+                <div name>${i18next.t('text.minimum value')}</div>
+                <input type="number" name="minimum" .value=${String(minimum)} />
+                <div unit>${this.unit}</div>
+              </select>
+              </label>
+              <label>
+                <div name>${i18next.t('text.maximum value')}</div>
+                <input type="number" name="maximum" .value=${String(maximum)} />
+                <div unit>${this.unit}</div>
+              </label>
+            `
+          : this.type === DataItemType.select
+          ? html`
+              <!-- <div>Acceptables</div> -->
+              ${this.options?.options?.map(
+                option => html`
+                  <div>
+                    <input
+                      type="checkbox"
+                      data-value=${option.value}
+                      ?checked=${(acceptables as string[]).includes(option.value)}
+                    />
+                    <span>${option.text}</span>
+                    <span value>(${option.value})</span>
+                  </div>
+                `
+              )}
+            `
+          : this.type === DataItemType.boolean
+          ? html`
+              <div>
+                <input type="checkbox" data-value=${true} ?checked=${(acceptables as boolean[]).includes(true)} />
+                <span value>true</span>
+              </div>
+              <div>
+                <input type="checkbox" data-value=${false} ?checked=${(acceptables as boolean[]).includes(false)} />
+                <span value>false</span>
+              </div>
+            `
+          : html` <div properties>${i18next.t('text.no properties to set')}</div> `}
+      </div>
+    `
+  }
+
+  private onChange(e: Event) {
+    if (this.type === DataItemType.number) {
+      this.value = {
+        minimum: this.minimum.valueAsNumber,
+        maximum: this.maximum.valueAsNumber
+      }
+    } else if (this.type === DataItemType.select) {
+      this.value = {
+        acceptables: Array.from(this.checkedAll).map(checked => {
+          const x = checked.getAttribute('data-value')!
+          console.log(x)
+          return x
+        })
+      }
+    } else if (this.type === DataItemType.boolean) {
+      this.value = {
+        acceptables: Array.from(this.checkedAll).map(checked => {
+          const x = checked.getAttribute('data-value')! === 'true'
+          console.log(x)
+          return x
+        })
+      }
+    } else {
+      this.value = {}
+    }
+
+    this.dispatchEvent(new CustomEvent('change', { bubbles: true, composed: true, detail: this.value }))
+  }
+}

package/src/usecase/spc/ox-property-editor-spc-limits.ts

@@ -0,0 +1,23 @@
+import './ox-input-spc-limits.js'
+
+import { html, TemplateResult } from 'lit'
+import { customElement } from 'lit/decorators.js'
+
+import { OxPropertyEditor, PropertySpec } from '@operato/property-editor'
+
+@customElement('ox-property-editor-spc-limits')
+export class OxPropertyEditorSpcLimits extends OxPropertyEditor {
+  editorTemplate(value: any, spec: PropertySpec): TemplateResult {
+    const { type, options, unit } = spec.property || {}
+
+    return html`
+      <ox-input-spc-limits
+        id="editor"
+        .value=${value}
+        .type=${type}
+        .unit=${unit}
+        .options=${options}
+      ></ox-input-spc-limits>
+    `
+  }
+}

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

@@ -127,6 +127,50 @@ const dataSet = {
       quota: 1,
       active: true
     },
+    {
+      name: '라디오',
+      description: '라디오 그룹',
+
+      group: '측정데이타',
+      sequence: 5,
+      tag: 'check1',
+      type: 'radio',
+      options: {
+        options: [
+          {
+            text: '예',
+            value: 'Y'
+          },
+          {
+            text: '아니오',
+            value: 'N'
+          }
+        ]
+      },
+      quota: 3,
+      active: true
+    },
+    {
+      name: '라디오2',
+      description: '라디오 그룹2',
+      sequence: 5,
+      tag: 'check2',
+      type: 'radio',
+      options: {
+        options: [
+          {
+            text: '예',
+            value: 'Y'
+          },
+          {
+            text: '아니오',
+            value: 'N'
+          }
+        ]
+      },
+      quota: 1,
+      active: true
+    },
     {
       name: '첨부파일',
       description: '참조 첨부 파일.',

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

@@ -144,6 +144,7 @@ var dataOoc = {
   name: 'Data Sample Name',
   description: 'Data Sample이 어쩌구 저쩌구 그래서 중요합니다. 당연히 그래야죠.',
   useCase: 'CCP',
+  state: 'REVIEWED',
   judgment: {
     temp: {
       ooc: true,
@@ -247,6 +248,7 @@ var dataOoc = {
         name: 'shnam'
       },
       state: 'CORRECTED',
+      comment: '전량 폐기하였습니다',
       timestamp: Date.now()
     }
   ]

package/themes/grist-theme.css

@@ -37,7 +37,7 @@ body {
 
   --grid-record-background-color: var(--theme-white-color);
   --grid-record-odd-background-color: #f9f7f5;
-  --grid-record-padding: var(--padding-default) 0 var(--padding-default) var(--padding-default);
+  --grid-record-padding: 0 5px 0 5px;
   --grid-record-color: var(--secondary-color);
   --grid-record-color-hover: var(--primary-color);
   --grid-record-wide-fontsize: var(--fontsize-small);

package/translations/en.json

@@ -17,6 +17,7 @@
   "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
+  "field.finalizing-function": "finalizing func.",
   "field.hidden": "hidden",
   "field.item": "item",
   "field.latest-collected-at": "latest collected at",

package/translations/ko.json

@@ -17,6 +17,7 @@
   "field.entry-role": "입력담당 역할",
   "field.entry-type": "입력용 화면종류",
   "field.entry-view": "입력용 화면",
+  "field.finalizing-function": "마감 함수",
   "field.hidden": "숨기기",
   "field.item": "항목",
   "field.latest-collected-at": "최근 수집 시간",

package/translations/ms.json

@@ -1,77 +1,149 @@
 {
-  "button.corrected": "corrected",
-  "button.reviewed": "reviewed",
-  "field.appliance": "appliance",
-  "field.collected_at": "collected at",
-  "field.collected-at": "collected at",
-  "field.corrected-at": "corrected at",
-  "field.corrective action": "corrective action",
-  "field.corrective-action": "corrective action",
-  "field.corrector": "corrector",
-  "field.critical control point": "critical control point",
-  "field.data-sample": "data sample",
-  "field.data-set": "data set",
+  "button.corrected": "diperbetulkan",
+  "button.request-archive": "permintaan arkib",
+  "button.reviewed": "disemak",
+  "error.dataset not found": "Tidak dapat mencari dataSet dengan nama yang diberi({dataSetName})",
+  "error.summary not supported": "DataSet yang diberi({dataSetName}) tidak menyokong laporan untuk {period}",
+  "field.agg-function": "fungsi agregasi",
+  "field.appliance": "peralatan",
+  "field.assignees": "penugasan",
+  "field.collected-at": "dikumpulkan pada",
+  "field.corrected-at": "diperbetulkan pada",
+  "field.corrective-action": "tindakan pembetulan",
+  "field.corrector": "pembetul",
+  "field.count": "jumlah",
+  "field.count-ooc": "jumlah ooc",
+  "field.count-oos": "jumlah oos",
   "field.data": "data",
-  "field.device-id": "device id",
-  "field.entry-role": "entry role",
-  "field.entry-type": "entry type",
-  "field.entry-view": "entry view",
-  "field.hidden": "hidden",
+  "field.data-01": "data 1",
+  "field.data-02": "data 2",
+  "field.data-03": "data 3",
+  "field.data-04": "data 4",
+  "field.data-05": "data 5",
+  "field.data-key": "kunci data",
+  "field.data-key-set": "set kunci data",
+  "field.data-sample": "sampel data",
+  "field.data-set": "set data",
+  "field.date": "tarikh",
+  "field.device-id": "id peranti",
+  "field.download-url": "url muat turun",
+  "field.entry-role": "peranan masukan",
+  "field.entry-type": "jenis masukan",
+  "field.entry-view": "paparan masukan",
+  "field.finalizing-function": "fungsi penyempurnaan",
+  "field.hidden": "tersembunyi",
   "field.item": "item",
-  "field.latest-collected-at": "latest collected at",
-  "field.monitor-type": "monitor type",
-  "field.monitor-view": "monitor view",
-  "field.netmask": "network mask",
-  "field.next-schedule": "next schedule",
-  "field.ooc": "out of control limit",
-  "field.oos": "out of critical limit",
-  "field.options": "options",
-  "field.partition-keys": "partition keys",
-  "field.prev-schedule": "previous schedule",
-  "field.quota": "sampling #",
-  "field.raw-data": "raw data",
-  "field.ref-by": "ref. by",
-  "field.report-type": "report type",
-  "field.report-view": "report view",
-  "field.serial-no": "serial #",
-  "field.spec": "spec",
-  "field.state": "keadaan",
-  "field.supervisory-role": "supervisory role",
-  "field.tag": "tag name",
+  "field.key": "kunci",
+  "field.key-01": "kunci 1",
+  "field.key-02": "kunci 2",
+  "field.key-03": "kunci 3",
+  "field.key-04": "kunci 4",
+  "field.key-05": "kunci 5",
+  "field.latest-collected-at": "terakhir dikumpulkan pada",
+  "field.monitor-type": "jenis pemantau",
+  "field.monitor-view": "paparan pemantau",
+  "field.month": "bulan",
+  "field.netmask": "topeng rangkaian",
+  "field.next-schedule": "jadual seterusnya",
+  "field.next-summary-schedule": "jadual ringkasan seterusnya",
+  "field.normal-scenario": "skenario data normal",
+  "field.ooc": "di luar had kawalan",
+  "field.oos": "di luar had kritikal",
+  "field.options": "pilihan",
+  "field.outlier-approval-line": "baris kelulusan luar biasa",
+  "field.outlier-scenario": "skenario data luar biasa",
+  "field.partition-keys": "kunci pembahagian",
+  "field.prev-schedule": "jadual sebelumnya",
+  "field.quota": "kuota sampel",
+  "field.raw-data": "data mentah",
+  "field.ref-by": "dirujuk oleh",
+  "field.report-template": "templat laporan",
+  "field.report-type": "jenis laporan",
+  "field.report-view": "paparan laporan",
+  "field.request-params": "parameter permintaan",
+  "field.requires-review": "memerlukan semakan",
+  "field.review-approval-line": "baris kelulusan",
+  "field.role": "peranan",
+  "field.serial-no": "no. siri",
+  "field.spec": "spesifikasi",
+  "field.status": "status",
+  "field.subgroup": "Nama subkumpulan",
+  "field.summary": "ringkasan",
+  "field.summary-period": "tempoh ringkasan",
+  "field.supervisory-role": "peranan pengawasan",
+  "field.t-key": "kunci terjemahan",
+  "field.tag": "nama tag",
+  "field.time-period": "tempoh masa",
   "field.unit": "unit",
-  "field.use-case": "use case",
-  "field.work-date": "work date",
-  "field.work-shift": "work shift",
-  "label.acceptables": "acceptables",
-  "label.critical-limits": "critical limits",
-  "label.maximum value": "maximum value",
-  "label.minimum value": "minimum value",
-  "label.pass-limits": "pass limits",
-  "label.target-limits": "target limits",
-  "text.automatically collected": "automatically collected",
-  "text.control limit": "control limit",
-  "text.data ooc updated successfully": "a data ooc updated successfully",
-  "text.data sample created successfully": "a data sample created successfully",
-  "text.manually collected": "manually collected",
-  "text.maximum value": "maximum value",
-  "text.measurement": "measurement",
-  "text.minimum value": "minimum value",
-  "text.observation": "observation",
-  "text.operating limit": "operating limit",
-  "text.target limit": "target limit",
-  "title.data-entry-form": "data entry form",
-  "title.data-item list": "data item list",
-  "title.data-monitor-view": "data monitor view",
-  "title.data-ooc list": "data OOC list",
-  "title.data-ooc view": "data OOC view",
-  "title.data-report-view": "data report view",
-  "title.data-sample list": "data sample list",
-  "title.data-sample view": "data sample view",
-  "title.data-sensor list": "data sensor list",
-  "title.data-set list": "data set list",
-  "title.edit code": "edit code",
-  "title.edit duration": "edit duration",
+  "field.use-case": "kes penggunaan",
+  "field.view": "skrin",
+  "field.work-date": "tarikh kerja",
+  "field.work-shift": "shift kerja",
+  "label.acceptables": "boleh diterima",
+  "label.corrective action": "tindakan pembetulan",
+  "label.corrective instruction": "instruksi pembetulan",
+  "label.critical-limits": "had kritikal",
+  "label.data-set-type": "jenis",
+  "label.end-date": "tarikh tamat",
+  "label.group-by data-keys": "kumpulkan mengikut setiap data-keys",
+  "label.maximum value": "nilai maksimum",
+  "label.minimum value": "nilai minimum",
+  "label.pass-limits": "had lulus",
+  "label.period-12-months": "12 bulan",
+  "label.period-30-days": "30 hari",
+  "label.period-this-month": "bulan ini",
+  "label.period-this-year": "tahun ini",
+  "label.period-today": "hari ini",
+  "label.start-date": "tarikh mula",
+  "label.state-corrected": "diperbetulkan",
+  "label.state-issued": "dikeluarkan",
+  "label.state-reviewed": "disemak",
+  "label.target-limits": "had sasaran",
+  "text.automatically collected": "dikumpulkan secara automatik",
+  "text.corrective action placeholder": "Sila masukkan butiran pelaksanaan tindakan pembetulan dan pencegahan",
+  "text.corrective instruction placeholder": "Sila masukkan arahan tindakan pembetulan dan pencegahan",
+  "text.data ooc updated successfully": "data ooc dikemas kini dengan jayanya",
+  "text.data sample created successfully": "sampel data dicipta dengan jayanya",
+  "text.data-archive request failed": "permintaan arkib data gagal",
+  "text.data-archive waits": "Ia akan mengambil masa beberapa minit, Anda boleh mencari mesej push bila siap",
+  "text.manually collected": "dikumpulkan secara manual",
+  "text.presigned_url_created": "url arkib yang ditandatangani sebelumnya dicipta",
+  "title.data collecting editor": "editor pengumpulan data",
+  "title.data collecting schedule (un)register": "(tidak) mendaftar jadual pengumpulan data",
+  "title.data-archive downloads ready": "muat turun arkib data sedia",
+  "title.data-archive list": "senarai arkib data",
+  "title.data-archive request failed": "gagal permintaan arkib data",
+  "title.data-archive request popup": "permintaan arkib data",
+  "title.data-entry list": "senarai masukan data",
+  "title.data-entry-form": "borang masukan data",
+  "title.data-item list": "senarai item data",
+  "title.data-key-item list": "senarai item kunci data",
+  "title.data-key-set list": "senarai set kunci data",
+  "title.data-monitor-view": "paparan pemantau data",
+  "title.data-ooc list": "senarai data OOC",
+  "title.data-ooc view": "paparan data OOC",
+  "title.data-report list": "senarai laporan data",
+  "title.data-report samples": "contoh laporan data",
+  "title.data-report-view": "paparan laporan data",
+  "title.data-sample list": "senarai sampel data",
+  "title.data-sample search": "pencarian sampel data",
+  "title.data-sample view": "paparan sampel data",
+  "title.data-sensor list": "senarai sensor data",
+  "title.data-set list": "senarai set data",
+  "title.data-set model": "model set data",
+  "title.data-summary list": "senarai ringkasan data",
+  "title.data-summary period": "tempoh ringkasan data",
+  "title.data-summary search": "pencarian ringkasan data",
+  "title.data-summary view": "paparan ringkasan data",
+  "title.edit code": "edit kod",
+  "title.edit data-key items": "edit item kunci data",
+  "title.edit duration": "edit tempoh",
   "title.edit hashtag": "edit hashtag",
   "title.edit json": "edit json",
-  "title.history": "history"
+  "title.open data sample report page": "buka laman laporan sampel data",
+  "title.open data sample search page": "buka laman pencarian sampel data",
+  "title.open data sample view": "buka paparan sampel data",
+  "title.open data summary view": "buka paparan ringkasan data",
+  "title.ready": "sedia",
+  "title.view detail ooc data": "lihat butiran data ooc"
 }