@things-factory/dataset 6.0.38 → 6.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.38",
+  "version": "6.0.40",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -39,13 +39,13 @@
     "@things-factory/aws-base": "^6.0.34",
     "@things-factory/board-service": "^6.0.34",
     "@things-factory/env": "^6.0.34",
-    "@things-factory/organization": "^6.0.34",
+    "@things-factory/organization": "^6.0.40",
     "@things-factory/scheduler-client": "^6.0.35",
     "@things-factory/shell": "^6.0.34",
     "@things-factory/work-shift": "^6.0.34",
-    "@things-factory/worklist": "^6.0.37",
+    "@things-factory/worklist": "^6.0.40",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "63fa2f0e28be79c06cc551d371ad6c83602e8a9f"
+  "gitHead": "12f9a90b362b53ed1a8df8bdac015f4a5676a75b"
 }

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

@@ -38,6 +38,7 @@ export const ActivityDataCollect = {
   provider: 'hatiolab.com',
   category: 'quality',
   activityType: 'user',
+  priority: 1,
   searchKeys: [
     {
       name: 'dataSetName',

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

@@ -55,6 +55,7 @@ export const ActivityOocResolve = {
   provider: 'hatiolab.com',
   category: 'quality',
   activityType: 'user',
+  priority: 3,
   searchKeys: [
     {
       name: 'dataOocId',

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

@@ -72,6 +72,7 @@ export const ActivityOocReview = {
   provider: 'hatiolab.com',
   category: 'quality',
   activityType: 'user',
+  priority: 2,
   searchKeys: [
     {
       name: 'dataOocId',

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

@@ -4,6 +4,7 @@ import { Attachment } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
@@ -165,6 +166,46 @@ export class DataSetQuery {
     )
   }
 
+  @FieldResolver(type => [ApprovalLineItem])
+  async approvalLine(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<ApprovalLineItem[]> {
+    const { domain, user } = context.state
+    const { approvalLine } = dataSet
+
+    if (!approvalLine || !(approvalLine instanceof Array)) {
+      return null
+    }
+
+    var approvalLineItems = []
+
+    for (let item of approvalLine) {
+      var { type, value: id } = item
+      var approver
+
+      switch (type) {
+        case 'Employee':
+          approver = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Department':
+          approver = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Role':
+          approver = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Myself':
+          approver = user
+          break
+        case 'MyDepartment':
+        case 'MySupervisor':
+          break
+        default:
+      }
+
+      id ? approvalLineItems.push({ type, value: id, approver }) : approvalLineItems.push({ type })
+    }
+
+    return approvalLineItems
+  }
+
   @FieldResolver(type => Board, { nullable: true })
   async entryBoard(@Root() dataSet: DataSet) {
     if (dataSet.entryType == 'board' && dataSet.entryView) {

package/translations/en.json

@@ -72,6 +72,8 @@
   "title.data-archive request failed": "failed a data archive request",
   "title.data-archive list": "data archive list",
   "title.data-archive request popup": "data archive request",
+  "title.data collecting schedule (un)register": "(un)register data collecting schedule",
+  "title.data collecting editor": "data collecting editor",
   "title.data-entry-form": "data entry form",
   "title.data-entry list": "data entry list",
   "title.data-key-item list": "data key item list",
@@ -88,9 +90,15 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list",
+  "title.data-set model": "data set model",
   "title.edit code": "edit code",
+  "title.edit data-key items": "edit data key items",
   "title.edit duration": "edit duration",
   "title.edit hashtag": "edit hashtag",
   "title.edit json": "edit json",
-  "title.ready": "ready"
+  "title.open data sample report page": "open data sample report page",
+  "title.open data sample search page": "open data sample search page",
+  "title.open data sample view": "open data sample view",
+  "title.ready": "ready",
+  "title.view detail ooc data": "view detail ooc data"
 }

package/translations/ko.json

@@ -71,6 +71,8 @@
   "title.data-archive request failed": "아카이브 요청 실패",
   "title.data-archive list": "아카이브 조회",
   "title.data-archive request popup": "아카이브 요청",
+  "title.data collecting schedule (un)register": "데이타 수집 스케쥴 등록/삭제",
+  "title.data collecting editor": "데이타 수집 화면",
   "title.data-entry-form": "데이타 입력",
   "title.data-key-item list": "데이타 키 상세",
   "title.data-key-set list": "데이타 키셋 조회",
@@ -86,9 +88,15 @@
   "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회",
+  "title.data-set model": "데이타 셋 모델",
+  "title.edit data-key items": "데이타 키 모델 편집",
   "title.edit code": "코드 편집",
   "title.edit duration": "주기 편집",
   "title.edit hashtag": "해시태그 편집",
   "title.edit json": "JSON 편집",
-  "title.ready": "준비 중"
+  "title.open data sample report page": "데이타 샘플 레포트 페이지 열기",
+  "title.open data sample search page": "데이타 샘플 검색 페이지 열기",
+  "title.open data sample view": "데이타 샘플 뷰페이지 열기",
+  "title.ready": "준비 중",
+  "title.view detail ooc data": "OOC 데이타 상세보기"
 }

package/translations/ms.json

@@ -60,6 +60,8 @@
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "text.manually collected": "manually collected",
+  "title.data collecting schedule (un)register": "(un)register data collecting schedule",
+  "title.data collecting editor": "data collecting editor",
   "title.data-entry-form": "data entry form",
   "title.data-key-item list": "data key item list",
   "title.data-key-set list": "data key set list",
@@ -74,8 +76,15 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list",
+  "title.data-set model": "data set model",
+  "title.edit data-key items": "edit data key items",
   "title.edit duration": "edit duration",
   "title.edit hashtag": "edit hashtag",
   "title.edit json": "edit json",
-  "title.edit code": "edit code"
+  "title.edit code": "edit code",
+  "title.open data sample report page": "open data sample report page",
+  "title.open data sample search page": "open data sample search page",
+  "title.open data sample view": "open data sample view",
+  "title.ready": "ready",
+  "title.view detail ooc data": "view detail ooc data"
 }

package/translations/zh.json

@@ -60,6 +60,8 @@
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "text.manually collected": "manually collected",
+  "title.data collecting schedule (un)register": "(un)register data collecting schedule",
+  "title.data collecting editor": "data collecting editor",
   "title.data-entry-form": "data entry form",
   "title.data-key-item list": "data key item list",
   "title.data-key-set list": "data key set list",
@@ -74,8 +76,15 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list",
+  "title.data-set model": "data set model",
+  "title.edit data-key items": "edit data key items",
   "title.edit duration": "edit duration",
   "title.edit hashtag": "edit hashtag",
   "title.edit json": "edit json",
-  "title.edit code": "edit code"
+  "title.edit code": "edit code",
+  "title.open data sample report page": "open data sample report page",
+  "title.open data sample search page": "open data sample search page",
+  "title.open data sample view": "open data sample view",
+  "title.ready": "ready",
+  "title.view detail ooc data": "view detail ooc data"
 }