@things-factory/dataset 8.0.39 → 9.0.0-9.0.0-beta.59.0

package/dist-server/utils/index.d.ts

@@ -1 +1 @@
-export * from './config-resolver';
+export * from './config-resolver.js';

package/dist-server/utils/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./config-resolver"), exports);
+tslib_1.__exportStar(require("./config-resolver.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC","sourcesContent":["export * from './config-resolver'"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;AAAA,+DAAoC","sourcesContent":["export * from './config-resolver.js'\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.39",
+  "version": "9.0.0-9.0.0-beta.59.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,34 +27,34 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@operato/app": "^8.0.0",
-    "@operato/data-grist": "^8.0.0",
-    "@operato/dataset": "^8.0.0",
-    "@operato/ghost-print": "^8.0.0",
-    "@operato/graphql": "^8.0.0",
-    "@operato/grist-editor": "^8.0.0",
-    "@operato/i18n": "^8.0.0",
-    "@operato/layout": "^8.0.0",
-    "@operato/moment-timezone-es": "^8.0.0",
-    "@operato/p13n": "^8.0.0",
-    "@operato/shell": "^8.0.0",
-    "@operato/styles": "^8.0.0",
-    "@operato/utils": "^8.0.0",
-    "@things-factory/auth-base": "^8.0.38",
-    "@things-factory/aws-base": "^8.0.38",
-    "@things-factory/board-service": "^8.0.39",
-    "@things-factory/env": "^8.0.37",
-    "@things-factory/integration-base": "^8.0.39",
-    "@things-factory/organization": "^8.0.38",
-    "@things-factory/personalization": "^8.0.38",
-    "@things-factory/scheduler-client": "^8.0.38",
-    "@things-factory/shell": "^8.0.38",
-    "@things-factory/work-shift": "^8.0.38",
-    "@things-factory/worklist": "^8.0.39",
+    "@operato/app": "^9.0.0-beta",
+    "@operato/data-grist": "^9.0.0-beta",
+    "@operato/dataset": "^9.0.0-beta",
+    "@operato/ghost-print": "^9.0.0-beta",
+    "@operato/graphql": "^9.0.0-beta",
+    "@operato/grist-editor": "^9.0.0-beta",
+    "@operato/i18n": "^9.0.0-beta",
+    "@operato/layout": "^9.0.0-beta",
+    "@operato/moment-timezone-es": "^9.0.0-beta",
+    "@operato/p13n": "^9.0.0-beta",
+    "@operato/shell": "^9.0.0-beta",
+    "@operato/styles": "^9.0.0-beta",
+    "@operato/utils": "^9.0.0-beta",
+    "@things-factory/auth-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/aws-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/board-service": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/env": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/integration-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/organization": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/personalization": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/scheduler-client": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/shell": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/work-shift": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/worklist": "^9.0.0-9.0.0-beta.59.0",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "f5e1a4c04bceec2d731a46f1ef88976839d04dac"
+  "gitHead": "cf6ee84b991f469a4e71198b0e6314b45e9e10b8"
 }

package/translations/en.json

@@ -110,6 +110,8 @@
   "label.pass-limits": "pass limits",
   "label.period-12-months": "12 months",
   "label.period-30-days": "30 days",
+  "label.period-date-range": "date range",
+  "label.period-month": "month",
   "label.period-this-month": "this month",
   "label.period-this-year": "this year",
   "label.period-today": "today",

package/translations/ja.json

@@ -110,6 +110,8 @@
   "label.pass-limits": "通過許容範囲",
   "label.period-12-months": "12ヶ月",
   "label.period-30-days": "30日",
+  "label.period-date-range": "日付範囲",
+  "label.period-month": "月",
   "label.period-this-month": "今月",
   "label.period-this-year": "今年",
   "label.period-today": "今日",

package/translations/ko.json

@@ -110,6 +110,8 @@
   "label.pass-limits": "통과 허용범위",
   "label.period-12-months": "최근 12개월",
   "label.period-30-days": "최근 30일",
+  "label.period-date-range": "날짜 범위",
+  "label.period-month": "월",
   "label.period-this-month": "이번달",
   "label.period-this-year": "올해",
   "label.period-today": "오늘",

package/translations/ms.json

@@ -110,6 +110,8 @@
   "label.pass-limits": "had lulus",
   "label.period-12-months": "12 bulan",
   "label.period-30-days": "30 hari",
+  "label.period-date-range": "jarak tarikh",
+  "label.period-month": "bulan",
   "label.period-this-month": "bulan ini",
   "label.period-this-year": "tahun ini",
   "label.period-today": "hari ini",

package/translations/zh.json

@@ -110,6 +110,8 @@
   "label.pass-limits": "通过限制",
   "label.period-12-months": "最近12个月",
   "label.period-30-days": "最近30天",
+  "label.period-date-range": "日期范围",
+  "label.period-month": "月",
   "label.period-this-month": "本月",
   "label.period-this-year": "今年",
   "label.period-today": "今天",

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

@@ -1,158 +0,0 @@
-import '@operato/dataset/ox-data-entry-form.js'
-import '@operato/dataset/ox-checklist-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 { OxChecklistEntryForm } from '@operato/dataset/ox-checklist-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: var(--md-sys-color-surface);
-      }
-
-      ox-data-entry-form,
-      ox-checklist-entry-form {
-        flex: 1;
-        padding: 10px;
-        overflow: auto;
-      }
-    `
-  ]
-
-  @property({ type: Object }) input?: any
-  @property({ type: Object }) output?: any
-
-  @state() dataSet?: DataSet & { id: string; entryType?: string; entryView?: string }
-
-  @query('ox-data-entry-form') dataEntryForm?: OxDataEntryForm
-  @query('ox-checklist-entry-form') checklistEntryForm?: OxChecklistEntryForm
-
-  get entryForm() {
-    const entryType = this.dataSet?.entryType
-    const entryView = this.dataSet?.entryView
-
-    switch (entryType) {
-      case 'generated':
-        return this.dataEntryForm
-      case 'checklist':
-        return this.checklistEntryForm
-      case 'board':
-        break
-      case 'page':
-        break
-      default:
-        return this.dataEntryForm
-        break
-    }
-  }
-
-  render() {
-    return html` <div class="container">${this.renderEntryForm()}</div> `
-  }
-
-  private renderEntryForm() {
-    const entryType = this.dataSet?.entryType
-    const entryView = this.dataSet?.entryView
-
-    switch (entryType) {
-      case 'generated':
-        return html`<ox-data-entry-form
-          .dataSet=${this.dataSet}
-          .value=${this.output}
-          @change=${this._updateDataItems}
-        ></ox-data-entry-form>`
-      case 'checklist':
-        return html`<ox-checklist-entry-form
-          .dataSet=${this.dataSet}
-          .value=${this.output}
-          @change=${this._updateDataItems}
-        ></ox-checklist-entry-form>`
-      case 'board':
-        break
-      case 'page':
-        break
-      default:
-        return html`<ox-data-entry-form
-          .dataSet=${this.dataSet}
-          .value=${this.output}
-          @change=${this._updateDataItems}
-        ></ox-data-entry-form>`
-        break
-    }
-  }
-
-  async _updateDataItems(e: CustomEvent) {
-    e.stopPropagation()
-
-    //@ts-ignore TODO replace with following line and confirm
-    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
-              entryType
-              entryView
-              dataItems {
-                name
-                description
-                active
-                hidden
-                tag
-                group
-                subgroup
-                type
-                unit
-                options
-                quota
-                spec
-                stat
-              }
-            }
-          }
-        `,
-        variables: {
-          id
-        }
-      })
-
-      this.dataSet = response.data.dataSet
-    }
-  }
-}

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

@@ -1,91 +0,0 @@
-import '@operato/dataset/ox-data-entry-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'
-import { DataSet } from '@operato/dataset'
-
-@customElement('activity-data-collect-view')
-export class DataCollectActivityView extends localize(i18next)(LitElement) {
-  static styles = [
-    ScrollbarStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: var(--md-sys-color-surface);
-      }
-
-      ox-data-entry-view {
-        flex: 1;
-        padding: 10px;
-        overflow: auto;
-      }
-
-      @media print {
-        :host {
-          display: block;
-          overflow: visible;
-        }
-      }
-    `
-  ]
-
-  @property({ type: Object }) input?: any
-  @property({ type: Object }) output?: any
-
-  @state() dataSet?: DataSet & { id: string }
-
-  render() {
-    return html` <ox-data-entry-view .dataSet=${this.dataSet} .value=${this.output}></ox-data-entry-view>`
-  }
-
-  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
-                hidden
-                tag
-                group
-                type
-                unit
-                options
-                quota
-                spec
-                stat
-              }
-            }
-          }
-        `,
-        variables: {
-          id
-        }
-      })
-
-      this.dataSet = response.data.dataSet
-    }
-  }
-}

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

@@ -1,299 +0,0 @@
-import '@material/web/icon/icon.js'
-import '@material/web/radio/radio.js'
-import '@operato/dataset/ox-data-entry-form.js'
-import '@operato/dataset/ox-checklist-sample-view.js'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-import { customElement, property, query, 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) {
-  static styles = [
-    ScrollbarStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: var(--md-sys-color-surface);
-      }
-
-      div[content] {
-        flex: 1;
-        flex-direction: column;
-
-        display: flex;
-        overflow: auto;
-      }
-
-      ox-data-sample-view,
-      ox-checklist-sample-view {
-        flex: 1;
-        padding: var(--spacing-large);
-        overflow: auto;
-      }
-
-      div[role='radiogroup'] {
-        display: flex;
-        flex-direction: row;
-        gap: var(--spacing-medium);
-
-        label {
-          display: flex;
-          flex-direction: row;
-
-          gap: var(--spacing-small);
-          align-items: center;
-        }
-      }
-
-      label {
-        display: flex;
-        flex-direction: column;
-
-        padding: var(--spacing-large);
-
-        h2 {
-          display: flex;
-
-          color: var(--title-text-color);
-          text-transform: capitalize;
-          margin: var(--title-margin);
-          align-items: center;
-        }
-
-        div {
-          padding: var(--spacing-large);
-          font: var(--input-field-font);
-          border: var(--md-sys-color-outline) solid 1px;
-          border-radius: var(--spacing-small);
-          background-color: var(--md-sys-color-surface-variant);
-        }
-
-        div[instruction] {
-          min-height: 200px;
-        }
-
-        md-icon {
-          color: var(--status-danger-color);
-        }
-
-        textarea {
-          margin: var(--spacing-medium);
-          padding: var(--spacing-medium);
-          margin: 0;
-          font: var(--input-field-font);
-          color: var(--md-sys-color-on-surface);
-          border: var(--md-sys-color-outline) solid 1px;
-          border-radius: var(--spacing-small);
-          background-color: var(--md-sys-color-surface-variant);
-
-          resize: none;
-          outline: none;
-          min-height: 200px;
-        }
-      }
-    `
-  ]
-
-  @property({ type: Object }) input?: any
-  @property({ type: Object }) output?: any
-  @property({ type: Object }) activityThread?: any
-
-  @state() dataSample?: any
-
-  @query('form') form!: HTMLFormElement
-
-  render() {
-    const { instruction, judgment } = this.output || {}
-    const { state } = this.activityThread || {}
-    const editable = state == 'unassigned' || state == 'assigned' || state == 'started' || state == 'submitted'
-
-    return html`
-      <div content>${this.renderDataSample()}</div>
-
-      <form @change=${this.onChangeInstruction}>
-        ${editable
-          ? html`
-              <label>
-                <h2><md-icon>build_circle</md-icon>&nbsp;<span>${i18next.t('label.judgment')}</span></h2>
-                <div role="radiogroup" aria-label="An example group of radio buttons">
-                  <label>
-                    <md-radio
-                      name="judgment"
-                      value="normal"
-                      ?checked=${judgment == 'normal'}
-                      aria-label=${i18next.t('label.judgment-normal')}
-                    ></md-radio>
-                    ${i18next.t('label.judgment-normal')}
-                  </label>
-                  <label>
-                    <md-radio
-                      name="judgment"
-                      value="abnormal"
-                      ?checked=${judgment == 'abnormal'}
-                      aria-label=${i18next.t('label.judgment-abnormal')}
-                    ></md-radio
-                    >${i18next.t('label.judgment-abnormal')}
-                  </label>
-                </div>
-              </label>
-
-              <label>
-                <h2><md-icon>build_circle</md-icon>&nbsp;<span>${i18next.t('label.corrective instruction')}</span></h2>
-                <textarea
-                  name="instruction"
-                  placeholder=${String(i18next.t('text.corrective instruction placeholder'))}
-                  .value=${instruction || ''}
-                  instruction
-                ></textarea>
-              </label>
-            `
-          : html`
-              <label>
-                <h2><md-icon>build_circle</md-icon>&nbsp;<span>${i18next.t('label.judgment')}</span></h2>
-                <div role="radiogroup" aria-label="An example group of radio buttons">
-                  <label>
-                    <md-radio
-                      value="normal"
-                      ?checked=${judgment == 'normal'}
-                      aria-label=${i18next.t('label.judgment-normal')}
-                      disabled
-                    ></md-radio>
-                    ${i18next.t('label.judgment-normal')}
-                  </label>
-                  <label>
-                    <md-radio
-                      value="abnormal"
-                      ?checked=${judgment == 'abnormal'}
-                      aria-label=${i18next.t('label.judgment-abnormal')}
-                      disabled
-                    ></md-radio
-                    >${i18next.t('label.judgment-abnormal')}
-                  </label>
-                </div>
-              </label>
-
-              <label>
-                <h2><md-icon>build_circle</md-icon>&nbsp;<span>${i18next.t('label.corrective instruction')}</span></h2>
-                <div instruction>${instruction}</div>
-              </label>
-            `}
-      </form>
-    `
-  }
-
-  private renderDataSample() {
-    const dataSet = this.dataSample?.dataSet
-    const monitorType = dataSet?.monitorType
-
-    switch (monitorType) {
-      case 'generated':
-        return html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>`
-      case 'checklist':
-        return html`<ox-checklist-sample-view .dataSample=${this.dataSample}></ox-checklist-sample-view>`
-      case 'board':
-        break
-      case 'page':
-        break
-      default:
-        return html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>`
-    }
-  }
-
-  onChangeInstruction(e: Event) {
-    var output = {}
-
-    const formData = new FormData(this.form)
-    formData.forEach((value, key) => {
-      output[key] = value
-    })
-
-    this.output = output
-
-    this.dispatchEvent(
-      new CustomEvent('change', {
-        detail: this.output
-      })
-    )
-  }
-
-  updated(changes) {
-    if (changes.has('input')) {
-      this.fetchDataSample()
-    }
-  }
-
-  async fetchDataSample() {
-    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
-                monitorType
-                monitorView
-              }
-              dataItems {
-                name
-                description
-                active
-                hidden
-                tag
-                group
-                subgroup
-                type
-                unit
-                options
-                quota
-                spec
-                stat
-              }
-              judgment
-              workDate
-              workShift
-              updater {
-                id
-                name
-              }
-              updatedAt
-              collectedAt
-            }
-          }
-        `,
-        variables: {
-          id: dataSampleId
-        }
-      })
-
-      this.dataSample = {
-        ...response.data.dataSample
-      }
-    }
-  }
-}