@things-factory/worklist 6.1.61 → 6.1.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.1.61",
+  "version": "6.1.64",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,10 +33,10 @@
     "@things-factory/auth-base": "^6.1.48",
     "@things-factory/board-service": "^6.1.55",
     "@things-factory/context-ui": "^6.1.48",
-    "@things-factory/organization": "^6.1.61",
+    "@things-factory/organization": "^6.1.64",
     "@things-factory/scheduler-client": "^6.1.48",
     "@things-factory/shell": "^6.1.48",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "817b56926cd2a9c90dfafba0bf277713c4d798c8"
+  "gitHead": "781186386f8e235f165f2bfe5f66ef9fa00aec6e"
 }

package/server/controllers/activity-instance/issue.ts

@@ -138,7 +138,7 @@ export async function issue(
     const output = (activity.model || [])
       .filter(item => item.inout === 'inout' || item.inout === 'out')
       .reduce((inout, item) => {
-        inout[item.name] = data[item.name]
+        inout[item.tag] = data[item.tag]
         return inout
       }, {})
 

package/server/service/activity-approval/activity-approval-query.ts

@@ -132,21 +132,21 @@ export class ActivityApprovalQuery {
 
   @FieldResolver(type => User)
   async approver(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return activityApproval.approver && (await getRepository(User).findOneBy({ id: activityApproval.approverId }))
+    return activityApproval.approverId && (await getRepository(User).findOneBy({ id: activityApproval.approverId }))
   }
 
   @FieldResolver(type => User)
   async updater(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return activityApproval.updater && (await getRepository(User).findOneBy({ id: activityApproval.updaterId }))
+    return activityApproval.updaterId && (await getRepository(User).findOneBy({ id: activityApproval.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return activityApproval.creator && (await getRepository(User).findOneBy({ id: activityApproval.creatorId }))
+    return activityApproval.creatorId && (await getRepository(User).findOneBy({ id: activityApproval.creatorId }))
   }
 
   @FieldResolver(type => User)
   async terminator(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return activityApproval.terminator && (await getRepository(User).findOneBy({ id: activityApproval.terminatorId }))
+    return activityApproval.terminatorId && (await getRepository(User).findOneBy({ id: activityApproval.terminatorId }))
   }
 }

package/server/service/activity-instance/activity-instance-query.ts

@@ -310,11 +310,11 @@ export class ActivityInstanceQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityInstance: ActivityInstance): Promise<User> {
-    return activityInstance.updater && (await getRepository(User).findOneBy({ id: activityInstance.updaterId }))
+    return activityInstance.updaterId && (await getRepository(User).findOneBy({ id: activityInstance.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityInstance: ActivityInstance): Promise<User> {
-    return activityInstance.creator && (await getRepository(User).findOneBy({ id: activityInstance.creatorId }))
+    return activityInstance.creatorId && (await getRepository(User).findOneBy({ id: activityInstance.creatorId }))
   }
 }

package/server/service/activity-template/activity-template-query.ts

@@ -65,11 +65,11 @@ export class ActivityTemplateQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityTemplate: ActivityTemplate): Promise<User> {
-    return activityTemplate.updater && (await getRepository(User).findOneBy({ id: activityTemplate.updaterId }))
+    return activityTemplate.updaterId && (await getRepository(User).findOneBy({ id: activityTemplate.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityTemplate: ActivityTemplate): Promise<User> {
-    return activityTemplate.creator && (await getRepository(User).findOneBy({ id: activityTemplate.creatorId }))
+    return activityTemplate.creatorId && (await getRepository(User).findOneBy({ id: activityTemplate.creatorId }))
   }
 }

package/server/service/activity-thread/activity-thread-query.ts

@@ -122,16 +122,16 @@ export class ActivityThreadQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityThread: ActivityThread): Promise<User> {
-    return activityThread.updater && (await getRepository(User).findOneBy({ id: activityThread.updaterId }))
+    return activityThread.updaterId && (await getRepository(User).findOneBy({ id: activityThread.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityThread: ActivityThread): Promise<User> {
-    return activityThread.creator && (await getRepository(User).findOneBy({ id: activityThread.creatorId }))
+    return activityThread.creatorId && (await getRepository(User).findOneBy({ id: activityThread.creatorId }))
   }
 
   @FieldResolver(type => User)
   async terminator(@Root() activityThread: ActivityThread): Promise<User> {
-    return activityThread.terminator && (await getRepository(User).findOneBy({ id: activityThread.terminatorId }))
+    return activityThread.terminatorId && (await getRepository(User).findOneBy({ id: activityThread.terminatorId }))
   }
 }

package/translations/en.json

@@ -95,7 +95,9 @@
   "label.filter-resubmitted": "resubmitted",
   "label.filter-pending-approval": "pending approval",
   "label.hours": "hours",
+  "label.information": "information",
   "label.minutes": "minutes",
+  "label.review-and-approval": "review and approval",
   "label.seconds": "seconds",
   "text.assign": "assign",
   "text.draft": "draft",

package/translations/ja.json

@@ -95,7 +95,9 @@
   "label.filter-resubmitted": "再上申",
   "label.filter-pending-approval": "承認進行中",
   "label.hours": "時間",
+  "label.information": "基本情報",
   "label.minutes": "分",
+  "label.review-and-approval": "レビューと承認",
   "label.seconds": "秒",
   "text.assign": "割当",
   "text.draft": "ドラフト保存",

package/translations/ko.json

@@ -95,7 +95,9 @@
   "label.filter-resubmitted": "재상신",
   "label.filter-pending-approval": "승인진행중",
   "label.hours": "시간",
+  "label.information": "기본정보",
   "label.minutes": "분",
+  "label.review-and-approval": "검토 및 승인",
   "label.seconds": "초",
   "text.assign": "할당",
   "text.draft": "초안저장",

package/translations/ms.json

@@ -95,7 +95,9 @@
   "label.filter-resubmitted": "hantar semula",
   "label.filter-pending-approval": "tungguan kelulusan",
   "label.hours": "jam",
+  "label.information": "maklumat",
   "label.minutes": "minit",
+  "label.review-and-approval": "semakan dan kelulusan",
   "label.seconds": "saat",
   "text.assign": "berikan",
   "text.draft": "draf",

package/translations/zh.json

@@ -95,7 +95,9 @@
   "label.filter-resubmitted": "重新提交",
   "label.filter-pending-approval": "等待批准",
   "label.hours": "小时",
+  "label.information": "信息",
   "label.minutes": "分钟",
+  "label.review-and-approval": "审核和批准",
   "label.seconds": "秒",
   "text.assign": "分配",
   "text.draft": "草稿",