@things-factory/dataset 6.2.74 → 6.2.76

package/server/service/data-set-history/data-set-history.ts

@@ -7,13 +7,20 @@ import {
   HistoryEntityInterface,
   HistoryOriginalIdColumn
 } from '@operato/typeorm-history'
-import { Role, User } from '@things-factory/auth-base'
-import { config } from '@things-factory/env'
+import { User } from '@things-factory/auth-base'
+import { ApprovalLineItem } from '@things-factory/organization'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { AssigneeItem } from '@things-factory/worklist'
+import { config } from '@things-factory/env'
 
-import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from '../data-set/data-item-type'
-import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
+import {
+  DataSet,
+  DataSetEntryType,
+  DataSetMonitorType,
+  DataSetReportType,
+  DataSetSummaryPeriodType
+} from '../data-set/data-set'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -56,29 +63,44 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  active?: boolean
+  tag?: string
 
-  @ManyToOne(type => DataKeySet, { nullable: true })
-  @Field(type => DataKeySet, { nullable: true })
-  dataKeySet?: DataKeySet
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  active?: boolean
 
-  @RelationId((dataSet: DataSet) => dataSet.dataKeySet)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   dataKeySetId?: string
 
-  @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
-  entryRole?: Role
-
-  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.entryRole)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   entryRoleId?: string
 
-  @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
-  supervisoryRole?: Role
-
-  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.supervisoryRole)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   supervisoryRoleId?: string
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => [AssigneeItem], { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], { nullable: true })
+  reviewApprovalLine?: ApprovalLineItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], { nullable: true })
+  outlierApprovalLine?: ApprovalLineItem[]
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  normalScenarioId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  outlierScenarioId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string
@@ -126,10 +148,30 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   @Field({ nullable: true })
   schedule?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  requiresReview?: boolean
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summaryPeriod?: DataSetSummaryPeriodType
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summarySchedule?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summaryScheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   createdAt?: Date

package/translations/en.json

@@ -44,10 +44,12 @@
   "field.netmask": "network mask",
   "field.next-schedule": "next schedule",
   "field.next-summary-schedule": "next summary schedule",
+  "field.normal-scenario": "normal scenario",
   "field.ooc": "out of control limit",
   "field.oos": "out of critical limit",
   "field.options": "options",
   "field.outlier-approval-line": "outlier approval line",
+  "field.outlier-scenario": "outlier scenario",
   "field.partition-keys": "partition keys",
   "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",

package/translations/ja.json

@@ -44,10 +44,12 @@
   "field.netmask": "ネットワーク マスク",
   "field.next-schedule": "次の収集計画",
   "field.next-summary-schedule": "次のサマリー スケジュール",
+  "field.normal-scenario": "正常データシナリオ",
   "field.ooc": "管理限界離脱有無",
   "field.oos": "許容限界離脱有無",
   "field.options": "選択オプション",
   "field.outlier-approval-line": "異常承認ライン",
+  "field.outlier-scenario": "異常データシナリオ",
   "field.partition-keys": "パーティション キー",
   "field.prev-schedule": "以前の収集計画",
   "field.quota": "サンプル数",

package/translations/ko.json

@@ -44,10 +44,12 @@
   "field.netmask": "네트워크마스크",
   "field.next-schedule": "다음 수집계획",
   "field.next-summary-schedule": "다음 서머리 스케쥴",
+  "field.normal-scenario": "정상데이타 시나리오",
   "field.ooc": "관리한계 이탈여부",
   "field.oos": "허용한계 이탈여부",
   "field.options": "선택옵션",
   "field.outlier-approval-line": "이상치 결재라인",
+  "field.outlier-scenario": "비정상데이타 시나리오",
   "field.partition-keys": "파티션 키",
   "field.prev-schedule": "이전 수집계획",
   "field.quota": "샘플수",
@@ -73,6 +75,7 @@
   "field.time-period": "시간단위",
   "field.unit": "단위",
   "field.use-case": "사용 사례",
+  "field.view": "화면",
   "field.work-date": "작업기준일",
   "field.work-shift": "교대근무조",
   "label.acceptables": "허용값",
@@ -92,7 +95,6 @@
   "label.period-today": "오늘",
   "label.start-date": "시작일",
   "label.state-corrected": "조치완료",
-  "field.view": "화면",
   "label.state-issued": "발생",
   "label.state-reviewed": "검토완료",
   "label.target-limits": "관리 목표범위",

package/translations/ms.json

@@ -44,10 +44,12 @@
   "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",

package/translations/zh.json

@@ -44,10 +44,12 @@
   "field.netmask": "网络掩码",
   "field.next-schedule": "下次收集计划",
   "field.next-summary-schedule": "下次摘要计划",
+  "field.normal-scenario": "正常数据场景",
   "field.ooc": "管理限制偏离情况",
   "field.oos": "允许限制偏离情况",
   "field.options": "选择选项",
   "field.outlier-approval-line": "异常批准线",
+  "field.outlier-scenario": "异常数据场景",
   "field.partition-keys": "分区键",
   "field.prev-schedule": "上次收集计划",
   "field.quota": "样本数",