@things-factory/worklist 6.1.55 → 6.1.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.1.55",
+  "version": "6.1.57",
   "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.54",
+    "@things-factory/organization": "^6.1.57",
     "@things-factory/scheduler-client": "^6.1.48",
     "@things-factory/shell": "^6.1.48",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "11edc149a214ce17658fa1f6acb3aa918033d49d"
+  "gitHead": "1e7203fb2b8504736774d28db9c817693c96cf74"
 }

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

@@ -1,6 +1,6 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 
-import { ActivityApproval, ActivityApprovalJudgment } from './activity-approval'
+import { ActivityApproval } from './activity-approval'
 import { reject } from '../../controllers/activity-approval/reject'
 import { approve } from '../../controllers/activity-approval/approve'
 import { delegate } from '../../controllers/activity-approval/delegate'
@@ -47,6 +47,12 @@ export class ActivityApprovalMutation {
     @Arg('comment', { nullable: true }) comment: string,
     @Ctx() context: ResolverContext
   ): Promise<ActivityApproval> {
+    const { t } = context
+
+    if (!comment) {
+      throw t('text.enter a comment')
+    }
+
     return await approve({ id, comment }, context)
   }
 
@@ -57,6 +63,12 @@ export class ActivityApprovalMutation {
     @Arg('comment', { nullable: true }) comment: string,
     @Ctx() context: ResolverContext
   ): Promise<ActivityApproval> {
+    const { t } = context
+
+    if (!comment) {
+      throw t('text.enter a comment')
+    }
+
     return await reject({ id, comment }, context)
   }
 
@@ -68,6 +80,12 @@ export class ActivityApprovalMutation {
     @Arg('comment', { nullable: true }) comment: string,
     @Ctx() context: ResolverContext
   ): Promise<ActivityApproval> {
+    const { t } = context
+
+    if (!comment) {
+      throw t('text.enter a comment')
+    }
+
     return await delegate({ id, to, comment }, context)
   }
 }

package/translations/en.json

@@ -14,6 +14,7 @@
   "button.submit": "submit",
   "field.activity-type": "activity type",
   "field.approval-line": "approval line",
+  "field.assigned-at": "assigned at",
   "field.assignee": "assignee",
   "field.assignees": "assignees",
   "field.assignee-role": "assignee role",
@@ -24,6 +25,7 @@
   "field.inout": "inout",
   "field.input-key": "input-key",
   "field.issuer": "issuer",
+  "field.approval-order": "order",
   "field.round": "round",
   "field.judgment": "judgment",
   "field.comment": "comment",
@@ -98,6 +100,7 @@
   "text.installable-activities": "installable activities",
   "text.pick": "pick",
   "text.save": "save",
+  "text.enter a comment": "please, enter a comment",
   "text.task_is_finished_successfully": "task is finished successfully.",
   "text.task_is_saved_successfully": "task is saved successfully",
   "text.task_is_started_successfully": "task is started successfully.",

package/translations/ja.json

@@ -14,6 +14,7 @@
   "button.submit": "提出",
   "field.activity-type": "業務タイプ",
   "field.approval-line": "決裁ライン",
+  "field.assigned-at": "譲受日",
   "field.assignee": "譲受人",
   "field.assignees": "譲受人",
   "field.assignee-role": "譲受ロール",
@@ -24,6 +25,7 @@
   "field.inout": "入出力",
   "field.input-key": "入力キー",
   "field.issuer": "発行者",
+  "field.approval-order": "承認順序",
   "field.round": "次数",
   "field.judgment": "判定",
   "field.comment": "コメント",
@@ -98,6 +100,7 @@
   "text.installable-activities": "設置可能業務",
   "text.pick": "選択",
   "text.save": "保存",
+  "text.enter a comment": "コメントを残してください。",
   "text.task_is_finished_successfully": "業務が成功的に完了しました.",
   "text.task_is_saved_successfully": "業務が正常に保存されました.",
   "text.task_is_started_successfully": "業務が正常に開始されました.",

package/translations/ko.json

@@ -14,6 +14,7 @@
   "button.submit": "제출",
   "field.activity-type": "업무 타입",
   "field.approval-line": "결재선",
+  "field.assigned-at": "할당 시간",
   "field.assignee": "피할당자",
   "field.assignees": "피할당자",
   "field.assignee-role": "피할당 역할",
@@ -24,6 +25,7 @@
   "field.inout": "입출력",
   "field.input-key": "입력키",
   "field.issuer": "발급자",
+  "field.approval-order": "결재순번",
   "field.round": "차수",
   "field.judgment": "판정",
   "field.comment": "코멘트",
@@ -98,6 +100,7 @@
   "text.installable-activities": "설치 가능 업무",
   "text.pick": "선택",
   "text.save": "저장",
+  "text.enter a comment": "코멘트를 남겨주세요.",
   "text.task_is_finished_successfully": "업무가 성공적으로 완료되었습니다.",
   "text.task_is_saved_successfully": "업무가 성공적으로 저장되었습니다.",
   "text.task_is_started_successfully": "업무가 성공적으로 시작되었습니다.",

package/translations/ms.json

@@ -1,137 +1,140 @@
 {
-  "button.abort": "[ms] abort",
-  "button.approve": "[ms] approve",
-  "button.assign": "[ms] assign",
-  "button.buy": "[ms] buy",
-  "button.delegate": "[ms] delegate",
-  "button.draft": "[ms] draft",
-  "button.finish": "[ms] finish",
-  "button.issue": "[ms] issue",
-  "button.pick": "[ms] pick",
-  "button.post": "[ms] post",
-  "button.restart": "[ms] restart",
-  "button.start": "[ms] start",
-  "button.submit": "[ms] submit",
-  "field.activity-type": "[ms] activity type",
-  "field.approval-line": "[ms] approval line",
-  "field.assignee": "[ms] assignee",
-  "field.assignees": "[ms] assignees",
-  "field.assignee-role": "[ms] assigneerole",
-  "field.cycle-time": "[ms] CT(sec)",
-  "field.due-at": "[ms] due at",
-  "field.due-in": "[ms] due in",
-  "field.hidden": "[ms] hidden",
-  "field.inout": "[ms] inout",
-  "field.input-key": "[ms] input-key",
-  "field.issuer": "issuer",
-  "field.round": "round",
-  "field.judgment": "judgment",
-  "field.comment": "comment",
-  "field.issued-at": "issued at",
-  "field.posted-at": "posted at",
-  "field.issuer-role": "issuer role",
-  "field.lead-time": "LT(sec)",
-  "field.mandatory": "mandatory",
-  "field.multiple": "multiple",
-  "field.options": "options",
-  "field.priority": "priority",
-  "field.provider": "provider",
-  "field.quantifier": "quantifier",
-  "field.report-type": "report type",
-  "field.report-source": "report source",
+  "button.abort": "batal",
+  "button.approve": "lulus",
+  "button.assign": "assign",
+  "button.buy": "beli",
+  "button.delegate": "delegasi",
+  "button.draft": "draf",
+  "button.finish": "selesai",
+  "button.issue": "isu",
+  "button.pick": "pilih",
+  "button.post": "pos",
+  "button.restart": "mulai semula",
+  "button.start": "mulakan",
+  "button.submit": "hantar",
+  "field.activity-type": "jenis aktiviti",
+  "field.approval-line": "garisan kelulusan",
+  "field.assigned-at": "diberi pada",
+  "field.assignee": "pemberi tugasan",
+  "field.assignees": "penerima tugasan",
+  "field.assignee-role": "peranan pemberi tugasan",
+  "field.cycle-time": "CT(detik)",
+  "field.due-at": "due pada",
+  "field.due-in": "due in",
+  "field.hidden": "tersembunyi",
+  "field.inout": "masuk/keluar",
+  "field.input-key": "kunci input",
+  "field.issuer": "penerbit",
+  "field.approval-order": "susunan kelulusan",
+  "field.round": "pusingan",
+  "field.judgment": "penghakiman",
+  "field.comment": "komen",
+  "field.issued-at": "dikeluarkan pada",
+  "field.posted-at": "di pos pada",
+  "field.issuer-role": "peranan penerbit",
+  "field.lead-time": "LT(detik)",
+  "field.mandatory": "wajib",
+  "field.multiple": "pelbagai",
+  "field.options": "pilihan",
+  "field.priority": "keutamaan",
+  "field.provider": "penyedia",
+  "field.quantifier": "pemboleh ubah",
+  "field.report-type": "jenis laporan",
+  "field.report-source": "sumber laporan",
   "field.schedule": "jadual",
-  "field.search-keys": "[ms] search keys",
-  "field.release": "[ms] release",
-  "field.spec": "spec",
-  "field.standard-time": "ST(sec)",
-  "field.startable": "startable",
-  "field.starting-type": "starting type",
-  "field.started-at": "[ms] started at",
-  "field.status": "keadaan",
-  "field.supervisory-role": "supervisory role",
-  "field.tact-time": "TT(sec)",
-  "field.tag": "[ms] tag name",
-  "field.t-key": "[ms] translation key",
-  "field.created-at": "[ms] created at",
-  "field.updated-at": "[ms] updated at",
-  "field.terminated-at": "[ms] terminated at",
-  "field.ui-type": "UI type",
-  "field.ui-source": "UI source",
-  "field.unit": "[ms] unit",
-  "field.view-type": "[ms] view type",
-  "field.view-source": "[ms] view source",
-  "label.activity-instance": "[ms] activity instance",
-  "label.activity-starting-type-issue": "[ms] issue",
-  "label.activity-starting-type-post": "[ms] post",
-  "label.activity-state-draft": "[ms] draft",
-  "label.activity-state-released": "[ms] released",
-  "label.activity-state-deprecated": "[ms] deprecated",
-  "label.activity-state-posted": "[ms] posted",
-  "label.activity-state-pending-assignment": "[ms] pending assignment",
-  "label.activity-state-assigned": "[ms] assigned",
-  "label.activity-state-started": "[ms] started",
-  "label.activity-state-delegated": "[ms] delegated",
-  "label.activity-state-submitted": "[ms] submitted",
-  "label.activity-state-escalated": "[ms] escalated",
-  "label.activity-state-pending": "[ms] pending",
-  "label.activity-state-approved": "[ms] approved",
-  "label.activity-state-rejected": "[ms] rejected",
-  "label.activity-state-ended": "[ms] ended",
-  "label.activity-state-aborted": "[ms] aborted",
-  "label.days": "[ms] days",
-  "label.filter-released": "released",
-  "label.filter-draft": "aborted",
-  "label.filter-deprecated": "deprecated",
-  "label.filter-aborted": "aborted",
-  "label.filter-rejected": "rejected",
-  "label.filter-important": "important",
+  "field.search-keys": "kunci carian",
+  "field.release": "lepas",
+  "field.spec": "spesifikasi",
+  "field.standard-time": "ST(detik)",
+  "field.startable": "boleh bermula",
+  "field.starting-type": "jenis mula",
+  "field.started-at": "bermula pada",
+  "field.status": "status",
+  "field.supervisory-role": "peranan penyelia",
+  "field.tact-time": "TT(detik)",
+  "field.tag": "nama tag",
+  "field.t-key": "kunci terjemahan",
+  "field.created-at": "dicipta pada",
+  "field.updated-at": "dikemaskini pada",
+  "field.terminated-at": "berakhir pada",
+  "field.ui-type": "jenis UI",
+  "field.ui-source": "sumber UI",
+  "field.unit": "unit",
+  "field.view-type": "jenis pandangan",
+  "field.view-source": "sumber pandangan",
+  "label.activity-instance": "pembabitan aktiviti",
+  "label.activity-starting-type-issue": "isu",
+  "label.activity-starting-type-post": "pos",
+  "label.activity-state-draft": "draf",
+  "label.activity-state-released": "dikeluarkan",
+  "label.activity-state-deprecated": "digugur",
+  "label.activity-state-posted": "dipos",
+  "label.activity-state-pending-assignment": "tungguan tugasan",
+  "label.activity-state-assigned": "diberi tugasan",
+  "label.activity-state-started": "bermula",
+  "label.activity-state-delegated": "delegasi",
+  "label.activity-state-submitted": "hantar",
+  "label.activity-state-escalated": "eskalkasi",
+  "label.activity-state-pending": "tungguan",
+  "label.activity-state-approved": "diluluskan",
+  "label.activity-state-rejected": "ditolak",
+  "label.activity-state-ended": "berakhir",
+  "label.activity-state-aborted": "dibatalkan",
+  "label.days": "hari",
+  "label.filter-released": "dikeluarkan",
+  "label.filter-draft": "draf",
+  "label.filter-deprecated": "digugur",
+  "label.filter-aborted": "dibatalkan",
+  "label.filter-rejected": "ditolak",
+  "label.filter-important": "penting",
   "label.filter-due": "due",
-  "label.filter-recent": "recent",
-  "label.filter-proceeding": "proceeding",
-  "label.filter-resubmitted": "resubmitted",
-  "label.filter-pending-approval": "pending approval",
-  "label.hours": "[ms] hours",
-  "label.minutes": "[ms] minutes",
-  "label.seconds": "[ms] seconds",
-  "text.assign": "[ms] assign",
-  "text.draft": "[ms] draft",
-  "text.installable-activities": "[ms] installable activities",
-  "text.pick": "[ms] pick",
-  "text.save": "[ms] save",
-  "text.task_is_finished_successfully": "[ms] task is finished successfully.",
-  "text.task_is_saved_successfully": "[ms] task is saved successfully",
-  "text.task_is_started_successfully": "[ms] task is started successfully.",
-  "text.task_is_approved_successfully": "[ms] task is approved successfully",
-  "text.task_is_rejected_successfully": "[ms] task is rejected successfully",
-  "text.task_is_restarted_successfully": "[ms] task is restarted successfully",
-  "title.activity application": "[ms] activity application",
-  "title.activity bank": "[ms] activity bank",
-  "title.activity shopping": "[ms] activity shopping",
-  "title.activity list": "[ms] activity list",
-  "title.activity model item list": "[ms] activity model item list",
-  "title.activity instance list": "[ms] activity instance list",
-  "title.activity instance search": "[ms] activity instance search",
-  "title.activity instance view": "[ms] activity instance view",
-  "title.activity intro": "[ms] activity intro",
-  "title.activity preview": "[ms] activity preview",
-  "title.activity reporter list": "[ms] activity reporter list",
-  "title.activity schedule (un)register": "[ms] (un)register activity schedule",
-  "title.activity starter": "[ms] activity starter",
-  "title.activity starter list": "[ms] activity starter list",
-  "title.activity store": "[ms] activity store",
-  "title.activity summary": "[ms] activity summary",
-  "title.activity template model item list": "[ms] activity template model item list",
-  "title.activity template list": "[ms] activity template list",
-  "title.approval done list": "[ms] approval done list",
-  "title.approval pending list": "[ms] approval pending list",
-  "title.assigned list": "[ms] assigned list",
-  "title.done list": "[ms] done list",
-  "title.done list calendar": "[ms] done list calendar",
-  "title.draft list": "[ms] draft list",
-  "title.edit duration": "[ms] edit duration",
-  "title.installable activity list": "[ms] installable activity list",
-  "title.open this activity page": "[ms] open this activity page",
-  "title.pick activity": "[ms] pick this activity to handle",
-  "title.todo list": "[ms] todo list",
-  "title.view page": "[ms] view page"
+  "label.filter-recent": "baru-baru ini",
+  "label.filter-proceeding": "proses",
+  "label.filter-resubmitted": "hantar semula",
+  "label.filter-pending-approval": "tungguan kelulusan",
+  "label.hours": "jam",
+  "label.minutes": "minit",
+  "label.seconds": "saat",
+  "text.assign": "berikan",
+  "text.draft": "draf",
+  "text.installable-activities": "aktiviti yang boleh dipasang",
+  "text.pick": "pilih",
+  "text.save": "simpan",
+  "text.enter a comment": "sila masukkan komen",
+  "text.task_is_finished_successfully": "tugas berjaya selesai.",
+  "text.task_is_saved_successfully": "tugas berjaya disimpan",
+  "text.task_is_started_successfully": "tugas berjaya bermula.",
+  "text.task_is_approved_successfully": "tugas berjaya diluluskan",
+  "text.task_is_rejected_successfully": "tugas berjaya ditolak",
+  "text.task_is_restarted_successfully": "tugas berjaya dimulakan semula",
+  "title.activity application": "permohonan aktiviti",
+  "title.activity bank": "bank aktiviti",
+  "title.activity shopping": "beli-belah aktiviti",
+  "title.activity list": "senarai aktiviti",
+  "title.activity model item list": "senarai item model aktiviti",
+  "title.activity instance list": "senarai pembabitan aktiviti",
+  "title.activity instance search": "cari pembabitan aktiviti",
+  "title.activity instance view": "pandangan pembabitan aktiviti",
+  "title.activity intro": "pengenalan aktiviti",
+  "title.activity preview": "pra-lihat aktiviti",
+  "title.activity reporter list": "senarai pemberi laporan aktiviti",
+  "title.activity schedule (un)register": "(batal)daftar jadual aktiviti",
+  "title.activity starter": "penggerak aktiviti",
+  "title.activity starter list": "senarai penggerak aktiviti",
+  "title.activity store": "kedai aktiviti",
+  "title.activity summary": "ringkasan aktiviti",
+  "title.activity template model item list": "senarai item model templat aktiviti",
+  "title.activity template list": "senarai templat aktiviti",
+  "title.approval done list": "senarai kelulusan selesai",
+  "title.approval pending list": "senarai kelulusan yang tertunggu",
+  "title.assigned list": "senarai tugasan",
+  "title.done list": "senarai selesai",
+  "title.done list calendar": "kalendar senarai selesai",
+  "title.draft list": "senarai draf",
+  "title.edit duration": "edit jangka masa",
+  "title.installable activity list": "senarai aktiviti yang boleh dipasang",
+  "title.open this activity page": "buka laman aktiviti ini",
+  "title.pick activity": "pilih aktiviti ini untuk ditangani",
+  "title.todo list": "senarai todo",
+  "title.view page": "pandangan laman"
 }