@things-factory/dataset 7.0.0-alpha.5 → 7.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.0-alpha.5",
+  "version": "7.0.0-alpha.6",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,9 +27,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
+    "@material/mwc-fab": "^0.27.0",
+    "@material/mwc-icon": "^0.27.0",
     "@operato/app": "^2.0.0-alpha.0",
     "@operato/data-grist": "^2.0.0-alpha.0",
     "@operato/dataset": "^2.0.0-alpha.0",
+    "@operato/ghost-print": "^2.0.0-alpha.0",
     "@operato/graphql": "^2.0.0-alpha.0",
     "@operato/grist-editor": "^2.0.0-alpha.0",
     "@operato/i18n": "^2.0.0-alpha.0",
@@ -37,20 +40,20 @@
     "@operato/shell": "^2.0.0-alpha.0",
     "@operato/styles": "^2.0.0-alpha.0",
     "@operato/utils": "^2.0.0-alpha.0",
-    "@things-factory/auth-base": "^7.0.0-alpha.1",
-    "@things-factory/aws-base": "^7.0.0-alpha.1",
-    "@things-factory/board-service": "^7.0.0-alpha.4",
+    "@things-factory/auth-base": "^7.0.0-alpha.6",
+    "@things-factory/aws-base": "^7.0.0-alpha.6",
+    "@things-factory/board-service": "^7.0.0-alpha.6",
     "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/integration-base": "^7.0.0-alpha.4",
-    "@things-factory/organization": "^7.0.0-alpha.5",
-    "@things-factory/scheduler-client": "^7.0.0-alpha.1",
-    "@things-factory/shell": "^7.0.0-alpha.1",
-    "@things-factory/work-shift": "^7.0.0-alpha.1",
-    "@things-factory/worklist": "^7.0.0-alpha.5",
+    "@things-factory/integration-base": "^7.0.0-alpha.6",
+    "@things-factory/organization": "^7.0.0-alpha.6",
+    "@things-factory/scheduler-client": "^7.0.0-alpha.6",
+    "@things-factory/shell": "^7.0.0-alpha.6",
+    "@things-factory/work-shift": "^7.0.0-alpha.6",
+    "@things-factory/worklist": "^7.0.0-alpha.6",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "e21713e554a4ba282190ab3781040ea7150e03f4"
+  "gitHead": "cf46b4e03d6312f7ccb366a3c9fc2df16c68b7fa"
 }

package/server/service/data-ooc/data-ooc.ts

@@ -1,21 +1,14 @@
 import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
+import { DataSample } from '../data-sample/data-sample'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -87,24 +80,14 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type:
-      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'longtext'
-        : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
   })
   @Field({ nullable: true })
   correctiveInstruction?: string
 
   @Column({
     nullable: true,
-    type:
-      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'longtext'
-        : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
   })
   @Field({ nullable: true })
   correctiveAction?: string
@@ -162,12 +145,7 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type:
-      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'longtext'
-        : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
   })
   @Field({ nullable: true })
   rawData?: string
@@ -178,6 +156,27 @@ export class DataOoc {
   @Field({ nullable: true })
   source?: string
 
+  @ManyToOne(type => DataSample, { nullable: true })
+  @Field({ nullable: true })
+  dataSample?: DataSample
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.dataSample)
+  dataSampleId?: string
+
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  reviewActivityInstance?: ActivityInstance
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.reviewActivityInstance)
+  reviewActivityInstanceId?: string
+
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  resolveActivityInstance?: ActivityInstance
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.resolveActivityInstance)
+  resolveActivityInstanceId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   workDate?: string

package/server/service/data-sample/data-sample.ts

@@ -1,18 +1,10 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
@@ -20,22 +12,10 @@ import { DataSet } from '../data-set/data-set'
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 @Entity()
-@Index(
-  'ix_data_sample_0',
-  (dataSample: DataSample) => [
-    dataSample.domain,
-    dataSample.dataSet,
-    dataSample.workDate,
-    dataSample.workShift,
-    dataSample.collectedAt
-  ],
-  { unique: false }
-)
-@Index(
-  'ix_data_sample_1',
-  (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
-  { unique: false }
-)
+@Index('ix_data_sample_0', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.workDate, dataSample.workShift, dataSample.collectedAt], {
+  unique: false
+})
+@Index('ix_data_sample_1', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt], { unique: false })
 @ObjectType({ description: 'Entity for DataSample' })
 export class DataSample {
   @PrimaryGeneratedColumn('uuid')
@@ -99,12 +79,7 @@ export class DataSample {
 
   @Column({
     nullable: true,
-    type:
-      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'longtext'
-        : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
   })
   @Field({ nullable: true })
   rawData?: string
@@ -155,6 +130,13 @@ export class DataSample {
   @Field({ nullable: true })
   workShift?: string
 
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  reviewActivityInstance?: ActivityInstance
+
+  @RelationId((dataSample: DataSample) => dataSample.reviewActivityInstance)
+  reviewActivityInstanceId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   collectedAt?: Date

package/things-factory.config.js

@@ -13,9 +13,13 @@ export default {
       page: 'data-sensor-list'
     },
     {
-      tagname: 'data-sample-view-page',
+      tagname: 'data-sample-page',
       page: 'data-sample'
     },
+    {
+      tagname: 'data-samples-page',
+      page: 'data-samples'
+    },
     {
       tagname: 'data-sample-list-page',
       page: 'data-sample-list'
@@ -37,9 +41,13 @@ export default {
       page: 'data-summary-period'
     },
     {
-      tagname: 'data-ooc-view-page',
+      tagname: 'data-ooc-page',
       page: 'data-ooc'
     },
+    {
+      tagname: 'data-oocs-page',
+      page: 'data-oocs'
+    },
     {
       tagname: 'data-ooc-list-page',
       page: 'data-ooc-list'

package/translations/en.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "corrected",
+  "button.print": "print",
   "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "error.dataset not found": "Cannot find dataSet with the given name({dataSetName})",

package/translations/ja.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "措置完了",
+  "button.print": "プリント",
   "button.request-archive": "資料保管の新規リクエスト",
   "button.reviewed": "検討完了",
   "error.dataset not found": "指定された名前の({dataSetName})データセットが見つかりません",

package/translations/ko.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "조치완료",
+  "button.print": "인쇄",
   "button.request-archive": "자료보관 신규 요청",
   "button.reviewed": "검토완료",
   "error.dataset not found": "주어진 이름의({dataSetName}) dataSet을 찾을 수 없습니다",

package/translations/ms.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "diperbetulkan",
+  "button.print": "cetak",
   "button.request-archive": "permintaan arkib",
   "button.reviewed": "disemak",
   "error.dataset not found": "Tidak dapat mencari dataSet dengan nama yang diberi({dataSetName})",

package/translations/zh.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "已处理",
+  "button.print": "打印",
   "button.request-archive": "新资料存档请求",
   "button.reviewed": "审核完成",
   "error.dataset not found": "无法找到给定名称的({dataSetName})数据集",

package/dist-client/pages/data-ooc/data-ooc-view-page.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-ooc-view-page.js","sourceRoot":"","sources":["../../../client/pages/data-ooc/data-ooc-view-page.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,aAAa,CAAA;AAE7B,OAAO,EAAkB,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,oBAAoB,CAAA;AAGpB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAe9D,IAAI,OAAO;QACT,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC;YACvC,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,EAAE;SACZ,CAAA;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAA,4BAA4B,IAAI,CAAC,OAAO,oBAAoB,CAAA;IACzE,CAAC;IAED,OAAO,CAAC,OAA6B,IAAG,CAAC;IAEzC,WAAW,CAAC,OAAY,EAAE,SAAc,EAAE,MAAW;QACnD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf;;eAEG;YACH,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;SACpC;aAAM;YACL,8BAA8B;SAC/B;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0DT;YACD,SAAS,EAAE;gBACT,EAAE;aACH;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;IACtC,CAAC;;AA1GM,sBAAM,GAAG;IACd,GAAG,CAAA;;;;;;;;KAQF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;gDAAc;AAb9B,eAAe;IAD3B,aAAa,CAAC,oBAAoB,CAAC;GACvB,eAAe,CA4G3B;SA5GY,eAAe","sourcesContent":["import gql from 'graphql-tag'\n\nimport { PropertyValues, html, css } from 'lit'\nimport { customElement, property } from 'lit/decorators.js'\nimport { PageView } from '@operato/shell'\nimport { i18next, localize } from '@operato/i18n'\nimport { client } from '@operato/graphql'\n\nimport './data-ooc-view.js'\n\n@customElement('data-ooc-view-page')\nexport class DataOocViewPage extends localize(i18next)(PageView) {\n  static styles = [\n    css`\n      :host {\n        display: flex;\n      }\n\n      data-ooc-view {\n        flex: 1;\n      }\n    `\n  ]\n\n  @property({ type: Object }) dataOoc?: any\n\n  get context() {\n    return {\n      title: i18next.t('title.data-ooc view'),\n      help: 'dataset/data-ooc',\n      actions: []\n    }\n  }\n\n  render() {\n    return html` <data-ooc-view .dataOoc=${this.dataOoc}></data-ooc-view> `\n  }\n\n  updated(changes: PropertyValues<this>) {}\n\n  pageUpdated(changes: any, lifecycle: any, before: any) {\n    if (this.active) {\n      /*\n       * this page is activated\n       */\n      this.fetchOoc(lifecycle.resourceId)\n    } else {\n      /* this page is deactivated */\n    }\n  }\n\n  async fetchOoc(id: string) {\n    const response = await client.query({\n      query: gql`\n        query ($id: String!) {\n          dataOoc(id: $id) {\n            id\n            name\n            description\n            useCase\n            dataSet {\n              id\n              name\n            }\n            key01\n            key02\n            key03\n            key04\n            key05\n            partitionKeys\n            dataItems {\n              name\n              description\n              active\n              tag\n              group\n              type\n              unit\n              options\n              quota\n              spec\n            }\n            data\n            rawData\n            judgment\n            ooc\n            oos\n            state\n            history\n            workDate\n            workShift\n            correctiveInstruction\n            correctiveAction\n            reviewedAt\n            reviewer {\n              id\n              name\n            }\n            correctedAt\n            corrector {\n              id\n              name\n            }\n            updater {\n              id\n              name\n            }\n            updatedAt\n            collectedAt\n          }\n        }\n      `,\n      variables: {\n        id\n      }\n    })\n\n    this.dataOoc = response.data.dataOoc\n  }\n}\n"]}

package/dist-client/pages/data-sample/data-sample-view-page.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-sample-view-page.js","sourceRoot":"","sources":["../../../client/pages/data-sample/data-sample-view-page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,uBAAuB,CAAA;AAGvB,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAejE,IAAI,OAAO;QACT,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC;YAC1C,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,EAAE;SACZ,CAAA;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAA,oCAAoC,IAAI,CAAC,YAAY,uBAAuB,CAAA;IACzF,CAAC;IAED,OAAO,CAAC,OAA6B,IAAG,CAAC;IAEzC,WAAW,CAAC,OAAY,EAAE,SAAc,EAAE,MAAW;QACnD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf;;eAEG;YACH,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,UAAU,CAAA;SACzC;aAAM;YACL,8BAA8B;SAC/B;IACH,CAAC;;AArCM,yBAAM,GAAG;IACd,GAAG,CAAA;;;;;;;;KAQF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wDAAmB;AAbnC,kBAAkB;IAD9B,aAAa,CAAC,uBAAuB,CAAC;GAC1B,kBAAkB,CAuC9B;SAvCY,kBAAkB","sourcesContent":["import { PropertyValues, html, css } from 'lit'\nimport { customElement, property } from 'lit/decorators.js'\nimport { PageView } from '@operato/shell'\nimport { i18next, localize } from '@operato/i18n'\n\nimport './data-sample-view.js'\n\n@customElement('data-sample-view-page')\nexport class DataSampleViewPage extends localize(i18next)(PageView) {\n  static styles = [\n    css`\n      :host {\n        display: flex;\n      }\n\n      data-sample-view {\n        flex: 1;\n      }\n    `\n  ]\n\n  @property({ type: Object }) dataSampleId?: any\n\n  get context() {\n    return {\n      title: i18next.t('title.data-sample view'),\n      help: 'dataset/data-sample',\n      actions: []\n    }\n  }\n\n  render() {\n    return html` <data-sample-view .dataSampleId=${this.dataSampleId}></data-sample-view> `\n  }\n\n  updated(changes: PropertyValues<this>) {}\n\n  pageUpdated(changes: any, lifecycle: any, before: any) {\n    if (this.active) {\n      /*\n       * this page is activated\n       */\n      this.dataSampleId = lifecycle.resourceId\n    } else {\n      /* this page is deactivated */\n    }\n  }\n}\n"]}