@things-factory/dataset 6.2.105 → 6.2.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.105",
+  "version": "6.2.111",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -42,18 +42,18 @@
     "@operato/utils": "^1.0.1",
     "@things-factory/auth-base": "^6.2.103",
     "@things-factory/aws-base": "^6.2.103",
-    "@things-factory/board-service": "^6.2.105",
+    "@things-factory/board-service": "^6.2.111",
     "@things-factory/env": "^6.2.103",
-    "@things-factory/integration-base": "^6.2.103",
-    "@things-factory/organization": "^6.2.103",
+    "@things-factory/integration-base": "^6.2.111",
+    "@things-factory/organization": "^6.2.111",
     "@things-factory/scheduler-client": "^6.2.103",
     "@things-factory/shell": "^6.2.103",
     "@things-factory/work-shift": "^6.2.103",
-    "@things-factory/worklist": "^6.2.105",
+    "@things-factory/worklist": "^6.2.111",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "891a2aea81fd948e4e8b342f88914ed579252c41"
+  "gitHead": "8424feb14ae84e99377321dc36454358631a560c"
 }

package/server/activities/activity-data-review.ts

@@ -3,11 +3,7 @@ import { ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAd
 import { DataOocStatus } from '../service/data-ooc/data-ooc'
 import { DataSample } from '../service/data-sample/data-sample'
 
-async function callback(
-  activityInstance: ActivityInstance,
-  addendum: UpdateActivityInstanceStateAddendum,
-  context: ResolverContext
-) {
+async function callback(activityInstance: ActivityInstance, addendum: UpdateActivityInstanceStateAddendum, context: ResolverContext) {
   const { domain, tx, user } = context.state
   const { input, output, state } = activityInstance
 

package/server/activities/activity-ooc-review.ts

@@ -1,18 +1,9 @@
-import {
-  Activity,
-  ActivityInstance,
-  ActivityInstanceStatus,
-  UpdateActivityInstanceStateAddendum
-} from '@things-factory/worklist'
+import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 
-async function callback(
-  activityInstance: ActivityInstance,
-  addendum: UpdateActivityInstanceStateAddendum,
-  context: ResolverContext
-) {
+async function callback(activityInstance: ActivityInstance, addendum: UpdateActivityInstanceStateAddendum, context: ResolverContext) {
   const { domain, user, tx } = context.state
   const { input, output, state, terminatedAt } = activityInstance
   const { causedBy } = addendum || {}
@@ -62,11 +53,10 @@ async function callback(
           approvalLine: outlierApprovalLine
         }
 
-        await issue(activityInstance, context)
+        dataOoc.resolveActivityInstance = await issue(activityInstance, context)
+        await tx.getRepository(DataOoc).save(dataOoc)
       } else {
-        console.error(
-          `Assignees are not set. So, Data OOC Resolve task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`
-        )
+        console.error(`Assignees are not set. So, Data OOC Resolve task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
       }
     } else {
       console.error('OOC Resolve Activity not installed.')

package/server/controllers/create-data-sample.ts

@@ -55,16 +55,16 @@ const formatDate = (keys, _moment) => {
   return keys
 }
 
-export async function createDataSample(dataSample: NewDataSample, context: ResolverContext): Promise<DataSample> {
+export async function createDataSample(newDataSample: NewDataSample, context: ResolverContext): Promise<DataSample> {
   const { domain, user, tx } = context.state
 
   const dataSet = await tx.getRepository(DataSet).findOne({
-    where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSample.dataSet.id },
+    where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: newDataSample.dataSet.id },
     relations: ['dataKeySet']
   })
 
   const { dataItems, tag: publishTag, normalScenarioId, outlierScenarioId } = dataSet
-  const collectedAt = dataSample.collectedAt || new Date()
+  const collectedAt = newDataSample.collectedAt || new Date()
 
   const timezone = dataSet.timezone || domain.timezone || 'UTC'
   const format = 'YYYY-MM-DD'
@@ -77,7 +77,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
   const localDateTz = moment(collectedAt).tz(timezone)
   const defaultPartitionKeys = {
     domain: domain.subdomain,
-    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
+    datasetid: newDataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
     date: localDateTz.format(format) /* local time date */,
     workdate: workDate /* working date */,
     workshift: workShift
@@ -89,11 +89,11 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
   }
 
   partitionKeys = formatDate(partitionKeys, localDateTz)
-  partitionKeys = replaceVariables(partitionKeys, dataSample.data)
+  partitionKeys = replaceVariables(partitionKeys, newDataSample.data)
 
-  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)
+  const dataKeys = fillDataKeys(dataSet?.dataKeySet, newDataSample.data)
 
-  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
+  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, newDataSample.data) || {}
 
   const old = await tx.getRepository(DataSample).findOne({
     where: {
@@ -110,7 +110,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     If [FileUpload[]] type needed, add 'files' type for dataset
   */
 
-  const data = dataSample.data
+  const data = newDataSample.data
   const attachments = []
 
   for (let dataItem of dataItems) {
@@ -164,13 +164,13 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     }
   }
 
-  const result = await tx.getRepository(DataSample).save({
+  const dataSample = await tx.getRepository(DataSample).save({
     ...old,
     name: dataSet.name,
     description: dataSet.description,
     useCase: dataSet.useCase,
     type: dataSet.type,
-    ...dataSample,
+    ...newDataSample,
     ...dataKeys,
     dataSetVersion: dataSet.version,
     domain,
@@ -197,13 +197,13 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
 
   /* post-process for for file attachment. */
   if (attachments.length > 0) {
-    attachments.forEach(attachment => (attachment.refId = result.id))
+    attachments.forEach(attachment => (attachment.refId = dataSample.id))
     tx.getRepository(Attachment).save(attachments)
   }
 
   if (ooc || oos) {
     const dataOoc = await tx.getRepository(DataOoc).save({
-      ...result,
+      ...dataSample,
       history: [
         {
           user: {
@@ -214,7 +214,8 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
           timestamp: collectedAt
         }
       ],
-      state: DataOocStatus.ISSUED
+      state: DataOocStatus.ISSUED,
+      dataSample: dataSample
     })
 
     if (outlierScenarioId) {
@@ -227,9 +228,9 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + result.id, {
+        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
           dataOocId: dataOoc.id,
-          dataSampleId: result.id,
+          dataSampleId: dataSample.id,
           dataSet: dataSet.id,
           data,
           ooc,
@@ -260,9 +261,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     })) as Activity
 
     if (activity) {
-      const assignee =
-        dataSet.supervisoryRoleId &&
-        (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+      const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
@@ -280,11 +279,10 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
           approvalLine: []
         }
 
-        await issue(activityInstance, context)
+        dataOoc.reviewActivityInstance = await issue(activityInstance, context)
+        await tx.getRepository(DataOoc).save(dataOoc)
       } else {
-        console.error(
-          `Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`
-        )
+        console.error(`Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
       }
     } else {
       console.error('OOC Review Activity not installed.')
@@ -320,8 +318,8 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + result.id, {
-          dataSampleId: result.id,
+        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
+          dataSampleId: dataSample.id,
           dataSet: dataSet.id,
           data,
           ooc,
@@ -353,30 +351,27 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       })) as Activity
 
       if (activity) {
-        const assignee =
-          dataSet.supervisoryRoleId &&
-          (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+        const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
 
-        const assignees = dataSet.supervisoryRoleId
-          ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }]
-          : []
+        const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
         /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
         if (assignees && assignees instanceof Array && assignees.length > 0) {
-          result.dataItems = dataItems
+          dataSample.dataItems = dataItems
           const activityInstance = {
             name: `[Data 검토] ${dataSet.name}`,
             description: dataSet.description,
             activityId: activity.id,
             dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
             input: {
-              dataSample: result
+              dataSampleId: dataSample.id
             },
             assignees,
             approvalLine: dataSet.reviewApprovalLine
           }
 
-          await issue(activityInstance, context)
+          dataSample.reviewActivityInstance = await issue(activityInstance, context)
+          await tx.getRepository(DataSample).save(dataSample)
 
           try {
             pubsub.publish('notification', {
@@ -385,7 +380,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
                 type: 'info',
                 title: `[Data Review] ${dataSet.name}`,
                 body: `Data Review occurred on '${dataSet.name}'`,
-                url: getRedirectSubdomainPath(context, domain.subdomain, `/data-sample/${result.id}`),
+                url: getRedirectSubdomainPath(context, domain.subdomain, `/data-sample/${dataSample.id}`),
                 timestamp: collectedAt
               }
             })
@@ -393,9 +388,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
             logger.error('Notification', err)
           }
         } else {
-          console.error(
-            `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
-          )
+          console.error(`Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`)
         }
       } else {
         console.error('Data Review Activity not installed.')
@@ -403,5 +396,5 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     }
   }
 
-  return result
+  return dataSample
 }

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

@@ -2,10 +2,12 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataSetHistory } from '../data-set-history/data-set-history'
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
+import { DataSample } from '../data-sample/data-sample'
 import { DataOoc } from './data-ooc'
 import { DataOocList } from './data-ooc-type'
 
@@ -51,11 +53,26 @@ export class DataOocQuery {
     return dataSetHistory?.dataItems || []
   }
 
+  @FieldResolver(type => DataSample)
+  async dataSample(@Root() dataOoc: DataOoc): Promise<DataSample> {
+    return dataOoc.dataSampleId && (await getRepository(DataSample).findOneBy({ id: dataOoc.dataSampleId }))
+  }
+
   @FieldResolver(type => DataSet)
   async dataSet(@Root() dataOoc: DataOoc): Promise<DataSet> {
     return dataOoc.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataOoc.dataSetId }))
   }
 
+  @FieldResolver(type => ActivityInstance)
+  async reviewActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {
+    return dataOoc.reviewActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.reviewActivityInstanceId }))
+  }
+
+  @FieldResolver(type => ActivityInstance)
+  async resolveActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {
+    return dataOoc.resolveActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.resolveActivityInstanceId }))
+  }
+
   @FieldResolver(type => User)
   async corrector(@Root() dataOoc: DataOoc): Promise<User> {
     return dataOoc.correctorId && (await getRepository(User).findOneBy({ id: dataOoc.correctorId }))

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

@@ -1,5 +1,5 @@
 import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -40,12 +40,10 @@ export class DataOoc {
   domainId?: string
 
   @Column()
-  @Field()
-  name: string
+  @Field({ nullable: true })
+  name?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
@@ -60,21 +58,15 @@ export class DataOoc {
   @Field({ nullable: true })
   dataSetVersion?: number
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   ooc?: boolean
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   oos?: boolean
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   state?: DataOocStatus
 
@@ -92,15 +84,11 @@ export class DataOoc {
   @Field({ nullable: true })
   correctiveAction?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   type?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   useCase?: string
 
@@ -150,27 +138,28 @@ export class DataOoc {
   @Field({ nullable: true })
   rawData?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   source?: string
 
-  @ManyToOne(type => DataSample, { nullable: true })
-  @Field({ nullable: true })
+  @OneToOne(type => DataSample, { nullable: true })
+  @JoinColumn()
+  @Field(type => DataSample, { nullable: true })
   dataSample?: DataSample
 
   @RelationId((dataOoc: DataOoc) => dataOoc.dataSample)
   dataSampleId?: string
 
-  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @OneToOne(type => ActivityInstance, { nullable: true })
+  @JoinColumn()
   @Field({ nullable: true })
   reviewActivityInstance?: ActivityInstance
 
   @RelationId((dataOoc: DataOoc) => dataOoc.reviewActivityInstance)
   reviewActivityInstanceId?: string
 
-  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @OneToOne(type => ActivityInstance, { nullable: true })
+  @JoinColumn()
   @Field({ nullable: true })
   resolveActivityInstance?: ActivityInstance
 

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

@@ -3,11 +3,13 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, getRepository, getISOStringsForPeriod, ListParam } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSetHistory } from '../data-set-history/data-set-history'
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
+import { DataOoc } from '../data-ooc/data-ooc'
 import { DataSample } from './data-sample'
 import { DataSampleList } from './data-sample-type'
 
@@ -164,6 +166,18 @@ export class DataSampleQuery {
     return dataSample.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSample.dataSetId }))
   }
 
+  @FieldResolver(type => DataOoc)
+  async dataOoc(@Root() dataSample: DataSample): Promise<DataOoc> {
+    if (dataSample.ooc || dataSample.oos) {
+      return await getRepository(DataOoc).findOneBy({ dataSample: { id: dataSample.id } })
+    }
+  }
+
+  @FieldResolver(type => ActivityInstance)
+  async reviewActivityInstance(@Root() dataSample: DataSample): Promise<ActivityInstance> {
+    return dataSample.reviewActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataSample.reviewActivityInstanceId }))
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSample: DataSample): Promise<Domain> {
     return dataSample.domainId && (await getRepository(Domain).findOneBy({ id: dataSample.domainId }))

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

@@ -1,5 +1,5 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -8,6 +8,7 @@ import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
+import { DataOoc } from '../data-ooc/data-ooc'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -30,24 +31,18 @@ export class DataSample {
   domainId?: string
 
   @Column()
-  @Field()
+  @Field({ nullable: true })
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   type?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   useCase?: string
 
@@ -84,21 +79,15 @@ export class DataSample {
   @Field({ nullable: true })
   rawData?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   source?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   ooc?: boolean
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   oos?: boolean
 
@@ -130,13 +119,18 @@ export class DataSample {
   @Field({ nullable: true })
   workShift?: string
 
-  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @OneToOne(type => ActivityInstance, { nullable: true })
+  @JoinColumn()
   @Field({ nullable: true })
   reviewActivityInstance?: ActivityInstance
 
   @RelationId((dataSample: DataSample) => dataSample.reviewActivityInstance)
   reviewActivityInstanceId?: string
 
+  @OneToOne(type => DataOoc, dataOoc => dataOoc.dataSample, { nullable: true })
+  @Field(type => DataOoc, { nullable: true })
+  dataOoc?: DataOoc
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   collectedAt?: Date

package/server/service/data-set/data-item-type.ts

@@ -7,6 +7,7 @@ export enum DataItemType {
   text = 'text',
   boolean = 'boolean',
   select = 'select',
+  radio = 'radio',
   date = 'date',
   datetime = 'datetime',
   file = 'file'

package/translations/en.json

@@ -10,7 +10,8 @@
   "field.assignees": "assignees",
   "field.collected-at": "collected at",
   "field.corrected-at": "corrected at",
-  "field.corrective-action": "corrective action",
+  "field.corrective-action": "action",
+  "field.corrective-instruction": "instruction",
   "field.corrector": "corrector",
   "field.count": "count",
   "field.count-ooc": "oos count",
@@ -85,10 +86,13 @@
   "label.corrective instruction": "corrective instruction",
   "label.critical-limits": "critical limits",
   "label.data-set-type": "type",
+  "label.datasample review timeline": "data sample review timeline",
   "label.end-date": "end date",
   "label.group-by data-keys": "group by each data-keys",
   "label.maximum value": "maximum value",
   "label.minimum value": "minimum value",
+  "label.ooc resolve timeline": "OOC resolve timeline",
+  "label.ooc review timeline": "OOC review timeline",
   "label.pass-limits": "pass limits",
   "label.period-12-months": "12 months",
   "label.period-30-days": "30 days",

package/translations/ja.json

@@ -10,7 +10,8 @@
   "field.assignees": "譲渡人リスト",
   "field.collected-at": "取集日時",
   "field.corrected-at": "措置時間",
-  "field.corrective-action": "措置活動",
+  "field.corrective-action": "是正措置",
+  "field.corrective-instruction": "是正指示",
   "field.corrector": "措置者",
   "field.count": "件数",
   "field.count-ooc": "管理限界離脱件数",
@@ -85,10 +86,13 @@
   "label.corrective instruction": "是正指示",
   "label.critical-limits": "許容限界範囲",
   "label.data-set-type": "タイプ",
+  "label.datasample review timeline": "データサンプルレビュータイムライン",
   "label.end-date": "終了日",
   "label.group-by data-keys": "各データキーごとにグループ化",
   "label.maximum value": "最大値",
   "label.minimum value": "最小値",
+  "label.ooc resolve timeline": "OOC 解決タイムライン",
+  "label.ooc review timeline": "OOC レビュータイムライン",
   "label.pass-limits": "通過許容範囲",
   "label.period-12-months": "12ヶ月",
   "label.period-30-days": "30日",

package/translations/ko.json

@@ -11,6 +11,7 @@
   "field.collected-at": "수집일시",
   "field.corrected-at": "조치 시간",
   "field.corrective-action": "조치 활동",
+  "field.corrective-instruction": "조치 지시",
   "field.corrector": "조치자",
   "field.count": "건수",
   "field.count-ooc": "관리한계이탈 건수",
@@ -85,10 +86,13 @@
   "label.corrective instruction": "수정 지시",
   "label.critical-limits": "허용 한계범위",
   "label.data-set-type": "유형",
+  "label.datasample review timeline": "데이타샘플 리뷰 타임라인",
   "label.end-date": "종료일",
   "label.group-by data-keys": "각 데이터 키별로 그룹화",
   "label.maximum value": "최대값",
   "label.minimum value": "최소값",
+  "label.ooc resolve timeline": "OOC 조치 타임라인",
+  "label.ooc review timeline": "OOC 검토 타임라인",
   "label.pass-limits": "통과 허용범위",
   "label.period-12-months": "최근 12개월",
   "label.period-30-days": "최근 30일",

package/translations/ms.json

@@ -11,6 +11,7 @@
   "field.collected-at": "dikumpulkan pada",
   "field.corrected-at": "diperbetulkan pada",
   "field.corrective-action": "tindakan pembetulan",
+  "field.corrective-instruction": "arahan pembetulan",
   "field.corrector": "pembetul",
   "field.count": "jumlah",
   "field.count-ooc": "jumlah ooc",
@@ -85,10 +86,13 @@
   "label.corrective instruction": "instruksi pembetulan",
   "label.critical-limits": "had kritikal",
   "label.data-set-type": "jenis",
+  "label.datasample review timeline": "garis masa ulasan sampel data",
   "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.ooc resolve timeline": "garis masa penyelesaian OOC",
+  "label.ooc review timeline": "garis masa ulasan OOC",
   "label.pass-limits": "had lulus",
   "label.period-12-months": "12 bulan",
   "label.period-30-days": "30 hari",