@things-factory/dataset 8.0.0-alpha.31 → 8.0.0-alpha.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.0-alpha.31",
+  "version": "8.0.0-alpha.33",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -56,5 +56,5 @@
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "3d8df8131f3b0c1898c525d2928b7f9dc846840e"
+  "gitHead": "63554d4eb949ba731c493684e643bd9eac40f3e9"
 }

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

@@ -95,5 +95,6 @@ export const ActivityDataCollect = {
   reportType: 'custom-element',
   reportSource: 'activity-data-collect-view',
   thumbnail: '/assets/images/data-collect.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -3,7 +3,11 @@ 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
 
@@ -73,5 +77,6 @@ export const ActivityDataReview = {
   reportType: 'custom-element',
   reportSource: 'activity-data-review-view',
   thumbnail: '/assets/images/data-collect.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -30,7 +30,7 @@ async function callback(
     const corrector = activityThreads[0]?.assignee
 
     const { dataOocId } = input
-    const correctiveAction = output.action
+    const correctiveAction = output?.action
 
     var dataOoc = await tx.getRepository(DataOoc).findOne({
       where: {
@@ -118,5 +118,6 @@ export const ActivityOocResolve = {
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -62,7 +62,7 @@ async function callback(
           name: `[OOC 조치] ${dataSet.name}`,
           description: dataSet.description,
           activityId: activity.id,
-          dueAt: new Date(terminatedAt.getTime() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(terminatedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             dataOocId,
             instruction: correctiveInstruction
@@ -139,5 +139,6 @@ export const ActivityOocReview = {
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -277,7 +277,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           name: `[OOC 검토] ${dataSet.name}`,
           description: dataSet.description,
           activityId: activity.id,
-          dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             dataOocId: dataOoc.id
           },
@@ -384,7 +384,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             name: `[Data 검토] ${dataSet.name}`,
             description: dataSet.description,
             activityId: activity.id,
-            dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+            dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
             input: {
               dataSampleId: dataSample.id
             },

package/server/controllers/issue-data-collection-task.ts

@@ -4,7 +4,6 @@ import { Domain, getDataSource } from '@things-factory/shell'
 import { Activity, ActivityInstance, issue } from '@things-factory/worklist'
 
 import { DataSet } from '../service/data-set/data-set'
-import { OrgMemberTargetType } from '@things-factory/organization'
 
 export async function issueDataCollectionTask(
   domainId: string,
@@ -34,9 +33,7 @@ export async function issueDataCollectionTask(
     })) as Activity
 
     if (activity) {
-      const { entryRole } = dataSet
-
-      // const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
+      const { entryRole, timeLimit } = dataSet
 
       /* 해당 dataset에 대한 데이타 수집 태스크를 dataset entryRole에게 할당한다. */
       if (entryRole) {
@@ -44,7 +41,7 @@ export async function issueDataCollectionTask(
           name: `[Data 수집] ${dataSet.name}`,
           description: dataSet.description,
           activityId: activity.id,
-          dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(Date.now() + (timeLimit || activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             dataSetId: dataSet.id,
             dataSetName: dataSet.name

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

@@ -243,14 +243,15 @@ export class DataSetMutation {
       }
     })
 
-    const { supervisoryRoleId } = dataSet
+    const { supervisoryRoleId, entryRoleId } = dataSet
+    const allowedRoles = [supervisoryRoleId, entryRoleId].filter(Boolean)
 
     const me = await getRepository(User, tx).findOne({
       where: { id: user.id },
       relations: ['roles']
     })
 
-    if (!me.roles.find(role => role.id == supervisoryRoleId)) {
+    if (!me.roles.find(role => allowedRoles.includes(role.id))) {
       throw new Error(`You don't have permission to issue data collection task for this dataset.`)
     }
 

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

@@ -4,7 +4,6 @@ import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ApprovalLineItem } from '@things-factory/organization'
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
-import { AssigneeItem } from '@things-factory/worklist'
 
 import { DataItemPatch } from './data-item-type'
 import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType, DataSetSummaryPeriodType } from './data-set'
@@ -91,6 +90,12 @@ export class NewDataSet {
 
   @Field({ nullable: true })
   summaryPeriod?: DataSetSummaryPeriodType
+
+  @Field({
+    nullable: true,
+    description: 'The maximum allowed time limit (in seconds) for completing the data entry operation'
+  })
+  timeLimit?: number
 }
 
 @InputType()
@@ -179,6 +184,12 @@ export class DataSetPatch {
   @Field({ nullable: true })
   summaryPeriod?: DataSetSummaryPeriodType
 
+  @Field({
+    nullable: true,
+    description: 'The maximum allowed time limit (in seconds) for completing the data entry operation'
+  })
+  timeLimit?: number
+
   @Field()
   cuFlag: string
 }

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

@@ -295,6 +295,13 @@ export class DataSet {
   @Field({ nullable: true, description: 'The summary schedule ID of the dataset' })
   summaryScheduleId?: string
 
+  @Column({ nullable: true })
+  @Field({
+    nullable: true,
+    description: 'The maximum allowed time limit (in seconds) for completing the data entry operation'
+  })
+  timeLimit?: number
+
   @CreateDateColumn()
   @Field({ nullable: true, description: 'The date and time the dataset was created' })
   createdAt?: Date

package/translations/en.json

@@ -83,6 +83,7 @@
   "field.supervisory-role": "supervisory role",
   "field.t-key": "translation key",
   "field.tag": "tag name",
+  "field.time-limit": "time limit",
   "field.time-period": "time period",
   "field.unit": "unit",
   "field.use-case": "use case",

package/translations/ja.json

@@ -41,6 +41,7 @@
   "field.entry-view": "入力用画面",
   "field.finalizing-function": "最終処理関数",
   "field.hidden": "隠し",
+  "field.hours-limit": "制限時間",
   "field.item": "項目",
   "field.key": "キ",
   "field.key-01": "キー1",

package/translations/ko.json

@@ -83,6 +83,7 @@
   "field.supervisory-role": "관리자 역할",
   "field.t-key": "번역 키",
   "field.tag": "태그이름",
+  "field.time-limit": "제한시간",
   "field.time-period": "시간단위",
   "field.unit": "단위",
   "field.use-case": "사용 사례",

package/translations/ms.json

@@ -83,6 +83,7 @@
   "field.supervisory-role": "peranan pengawasan",
   "field.t-key": "kunci terjemahan",
   "field.tag": "nama tag",
+  "field.time-limit": "had masa",
   "field.time-period": "tempoh masa",
   "field.unit": "unit",
   "field.use-case": "kes penggunaan",

package/translations/zh.json

@@ -83,6 +83,7 @@
   "field.supervisory-role": "监管角色",
   "field.t-key": "翻译键",
   "field.tag": "标签名",
+  "field.time-limit": "限制时间",
   "field.time-period": "时间单位",
   "field.unit": "单位",
   "field.use-case": "使用案例",