@things-factory/worklist 10.1.44 → 10.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "10.1.44",
+  "version": "10.1.47",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,18 +33,19 @@
     "@operato/event-view": "^10.0.0",
     "@operato/graphql": "^10.0.0",
     "@operato/grist-editor": "^10.0.0",
+    "@operato/layout": "^10.27.0",
     "@operato/list-state": "^10.15.0",
     "@operato/moment-timezone-es": "^10.0.0",
     "@operato/p13n": "^10.0.0",
     "@operato/popup": "^10.15.0",
-    "@things-factory/attachment-base": "^10.1.44",
-    "@things-factory/auth-base": "^10.1.44",
-    "@things-factory/board-service": "^10.1.44",
-    "@things-factory/context-ui": "^10.1.44",
-    "@things-factory/organization": "^10.1.44",
-    "@things-factory/personalization": "^10.1.44",
-    "@things-factory/scheduler-client": "^10.1.44",
-    "@things-factory/shell": "^10.1.44"
+    "@things-factory/attachment-base": "^10.1.47",
+    "@things-factory/auth-base": "^10.1.47",
+    "@things-factory/board-service": "^10.1.47",
+    "@things-factory/context-ui": "^10.1.47",
+    "@things-factory/organization": "^10.1.47",
+    "@things-factory/personalization": "^10.1.47",
+    "@things-factory/scheduler-client": "^10.1.47",
+    "@things-factory/shell": "^10.1.47"
   },
-  "gitHead": "7c95c4e75e155e51c714409e865d96f317232c23"
+  "gitHead": "185f20d7d9a15715a0ee2757a6a8189ec36cfb9d"
 }

package/tests/person-open-work.test.ts

@@ -0,0 +1,91 @@
+import { join } from 'path'
+
+/**
+ * What a person holds, asked by someone else - through the real resolvers on sqlite.
+ *
+ * The person 360 shows a colleague's open work as counts (ADR-0067, the person 360 ruling; ADR-0091
+ * keeps the cases themselves to the people on them). The counts must be the same answer that person's
+ * own badges give - one rule, `open-work.ts` - and a person who is not a member of this domain gets
+ * no answer at all.
+ */
+
+const { createSqliteTestDataSource } = require(
+  join(__dirname, '..', '..', 'ops-master', 'test', 'support', 'database.cjs')
+)
+const DIST = join(__dirname, '..', 'dist-server')
+const { ActivityInstance } = require(join(DIST, 'service', 'activity-instance', 'activity-instance.js'))
+const { ActivityThread } = require(join(DIST, 'service', 'activity-thread', 'activity-thread.js'))
+const { ActivityApproval } = require(join(DIST, 'service', 'activity-approval', 'activity-approval.js'))
+const { PersonOpenWorkQuery } = require(join(DIST, 'service', 'activity-summary', 'person-open-work.js'))
+const { ActivitySummaryQuery } = require(join(DIST, 'service', 'activity-summary', 'activity-summary-query.js'))
+const shell = require('@things-factory/shell')
+const { User } = require('@things-factory/auth-base')
+
+let db: any
+let here: any
+let elsewhere: any
+let viewer: any
+let worker: any
+let stranger: any
+
+const asViewer = () => ({ state: { domain: here, user: viewer }, t: (key: string) => key }) as any
+const asWorker = () => ({ state: { domain: here, user: worker }, t: (key: string) => key }) as any
+const openWork = (userId: string) => new PersonOpenWorkQuery().personOpenWork(userId, asViewer())
+
+beforeAll(async () => {
+  db = createSqliteTestDataSource([ActivityInstance, ActivityThread, ActivityApproval])
+  await db.initialize()
+  shell.addDataSource('default', db)
+
+  here = await db.getRepository(shell.Domain).save({ name: 'here', subdomain: 'here' })
+  elsewhere = await db.getRepository(shell.Domain).save({ name: 'elsewhere', subdomain: 'elsewhere' })
+
+  const person = (name: string, domains: any[]) =>
+    db.getRepository(User).save({ name, email: `${name}@example.com`, password: 'x', status: 'activated', domains })
+
+  viewer = await person('viewer', [here])
+  worker = await person('worker', [here])
+  stranger = await person('stranger', [elsewhere])
+
+  const aCase = (name: string) =>
+    db.getRepository(ActivityInstance).save({ domain: here, name, state: 'issued', issuer: viewer })
+  const instance = await aCase('i')
+
+  /* Two threads the worker holds and one that ended - the ended one is not work. One thread per case and person. */
+  for (const state of ['assigned', 'started', 'ended']) {
+    await db
+      .getRepository(ActivityThread)
+      .save({ domain: here, name: state, round: 1, state, assignee: worker, activityInstance: await aCase(state) })
+  }
+
+  /* One approval waiting on the worker (ActivityApprovalJudgment.Pending is the empty string). */
+  const submitted = await db
+    .getRepository(ActivityThread)
+    .save({ domain: here, name: 's', round: 1, state: 'submitted', activityInstance: instance })
+  await db
+    .getRepository(ActivityApproval)
+    .save({ domain: here, activityThread: submitted, approver: worker, order: 1, round: 1, judgment: '' })
+})
+
+afterAll(async () => db?.destroy())
+
+it('★ counts what a colleague holds - threads not finished and approvals waiting', async () => {
+  const work = await openWork(worker.id)
+  expect(work).toEqual({ toDos: 2, approvalsPending: 1 })
+})
+
+it("★ gives the same numbers the person's own badges give", async () => {
+  const summary = new ActivitySummaryQuery()
+  const work = await openWork(worker.id)
+
+  expect(await summary.numberOfToDos({}, asWorker())).toBe(work.toDos)
+  expect(await summary.numberOfApprovalPendings({}, asWorker())).toBe(work.approvalsPending)
+})
+
+it('★ answers nothing for a person who is not a member of this domain', async () => {
+  expect(await openWork(stranger.id)).toBeNull()
+})
+
+it('holds zero for a member with nothing, which is not the same as no answer', async () => {
+  expect(await openWork(viewer.id)).toEqual({ toDos: 0, approvalsPending: 0 })
+})

package/translations/en.json

@@ -21,8 +21,6 @@
   "button.reject": "reject",
   "button.restart": "restart",
   "button.save-note": "save note",
-  "button.schedule-task": "schedule task",
-  "button.start": "start",
   "button.submit": "submit",
   "button.unschedule-task": "unschedule task",
   "error.activity not found": "this task template ({activity}) cannot be found.",
@@ -65,7 +63,6 @@
   "field.approval-changed-at": "last change",
   "field.approval-drafter": "submitted by",
   "field.approval-due": "due",
-  "field.approval-line": "approval line",
   "field.approval-order": "order",
   "field.approval-owner": "owner",
   "field.approval-subject": "subject",
@@ -78,11 +75,9 @@
   "field.assignees": "assignees",
   "field.comment": "comment",
   "field.covering-tests": "tests",
-  "field.created-at": "created at",
   "field.cycle-time": "CT(sec)",
   "field.due-at": "due at",
   "field.due-in": "due in",
-  "field.hidden": "hidden",
   "field.inout": "inout",
   "field.input": "input",
   "field.input-key": "input-key",
@@ -106,7 +101,6 @@
   "field.reason": "reason",
   "field.release": "release",
   "field.report-source": "report source",
-  "field.report-type": "report type",
   "field.round": "round",
   "field.schedule": "schedule",
   "field.search-keys": "search keys",
@@ -116,15 +110,12 @@
   "field.started-at": "started at",
   "field.starting-type": "starting type",
   "field.status": "status",
-  "field.supervisory-role": "supervisory role",
   "field.t-key": "translation key",
   "field.tact-time": "TT(sec)",
-  "field.tag": "tag name",
   "field.terminated-at": "terminated at",
   "field.ui-source": "UI source",
   "field.ui-type": "UI type",
   "field.unit": "unit",
-  "field.updated-at": "updated at",
   "field.view-source": "view source",
   "field.view-type": "view type",
   "field.what-is-built": "what is built",
@@ -269,7 +260,6 @@
   "text.approval-comment-hint": "you can approve without a comment. to reject, you must write a reason.",
   "text.approval-is-irreversible": "once approved, this cannot be undone.",
   "text.approval-is-reversible": "this can be undone after approval.",
-  "text.approval-line-empty": "no approvers",
   "text.approval-line-steps": "{n} steps",
   "text.approval-line-unknown": "could not read the approval line",
   "text.approval-view-not-loaded": "this activity's approval screen could not be loaded.",
@@ -398,5 +388,7 @@
   "title.todo list": "to do",
   "title.work-doors": "approval and assignment forms in this plant",
   "title.work-doors-next": "What to do next",
-  "title.worklist dashboard": "worklist dashboard"
+  "title.worklist dashboard": "worklist dashboard",
+  "title.person-open-work": "open work",
+  "text.person-open-work": "to-dos {toDos} · approvals waiting {approvals}"
 }

package/translations/ja.json

@@ -21,8 +21,6 @@
   "button.reject": "差し戻し",
   "button.restart": "再スタート",
   "button.save-note": "メモを保存",
-  "button.schedule-task": "タスクをスケジュール",
-  "button.start": "スタート",
   "button.submit": "提出",
   "button.unschedule-task": "タスクのスケジュールを解除",
   "error.activity not found": "このタスクテンプレート({activity})が見つかりません。",
@@ -65,7 +63,6 @@
   "field.approval-changed-at": "最終変更",
   "field.approval-drafter": "起案者",
   "field.approval-due": "期限",
-  "field.approval-line": "決裁ライン",
   "field.approval-order": "承認順序",
   "field.approval-owner": "担当者",
   "field.approval-subject": "案件",
@@ -78,11 +75,9 @@
   "field.assignees": "譲受人",
   "field.comment": "コメント",
   "field.covering-tests": "テスト",
-  "field.created-at": "作成時間",
   "field.cycle-time": "CT(秒)",
   "field.due-at": "満期時間",
   "field.due-in": "残り時間",
-  "field.hidden": "隠す",
   "field.inout": "入出力",
   "field.input": "入力値",
   "field.input-key": "入力キー",
@@ -106,7 +101,6 @@
   "field.reason": "理由",
   "field.release": "配布バージョン",
   "field.report-source": "レポート ソース",
-  "field.report-type": "レポート タイプ",
   "field.round": "次数",
   "field.schedule": "スケジュール",
   "field.search-keys": "検索キー",
@@ -116,15 +110,12 @@
   "field.started-at": "開始時間",
   "field.starting-type": "開始タイプ",
   "field.status": "状態",
-  "field.supervisory-role": "管理者ロール",
   "field.t-key": "翻訳キー",
   "field.tact-time": "TT(秒)",
-  "field.tag": "ダグ名",
   "field.terminated-at": "完了時間",
   "field.ui-source": "画面ソース",
   "field.ui-type": "画面タイプ",
   "field.unit": "単位",
-  "field.updated-at": "修正時間",
   "field.view-source": "ビュー ソース",
   "field.view-type": "ビュー タイプ",
   "field.what-is-built": "実装済みのもの",
@@ -269,7 +260,6 @@
   "text.approval-comment-hint": "承認は意見なしでもできます。差し戻すには理由を書く必要があります。",
   "text.approval-is-irreversible": "承認すると元に戻せません。",
   "text.approval-is-reversible": "承認後に元に戻せます。",
-  "text.approval-line-empty": "決裁者がいません",
   "text.approval-line-steps": "{n}段階",
   "text.approval-line-unknown": "決裁ラインを読めませんでした",
   "text.approval-view-not-loaded": "この業務の承認画面を読み込めませんでした。",
@@ -398,5 +388,7 @@
   "title.todo list": "やること",
   "title.work-doors": "この工場の承認・割当様式",
   "title.work-doors-next": "次にすること",
-  "title.worklist dashboard": "ワークリストダッシュボード"
+  "title.worklist dashboard": "ワークリストダッシュボード",
+  "title.person-open-work": "担当中の作業",
+  "text.person-open-work": "作業 {toDos} · 承認待ち {approvals}"
 }

package/translations/ko.json

@@ -21,8 +21,6 @@
   "button.reject": "반려",
   "button.restart": "재시작",
   "button.save-note": "메모 저장",
-  "button.schedule-task": "스케쥴 예약",
-  "button.start": "시작",
   "button.submit": "제출",
   "button.unschedule-task": "스케쥴 해제",
   "error.activity not found": "이 작업템플릿({activity})을 찾을 수 없습니다.",
@@ -65,7 +63,6 @@
   "field.approval-changed-at": "최근 변경",
   "field.approval-drafter": "기안자",
   "field.approval-due": "기한",
-  "field.approval-line": "결재선",
   "field.approval-order": "결재순번",
   "field.approval-owner": "담당자",
   "field.approval-subject": "안건",
@@ -78,11 +75,9 @@
   "field.assignees": "피할당자",
   "field.comment": "코멘트",
   "field.covering-tests": "테스트",
-  "field.created-at": "생성 시간",
   "field.cycle-time": "CT(초)",
   "field.due-at": "만기 시간",
   "field.due-in": "잔여 시간",
-  "field.hidden": "숨기기",
   "field.inout": "입출력",
   "field.input": "입력값",
   "field.input-key": "입력키",
@@ -106,7 +101,6 @@
   "field.reason": "사유",
   "field.release": "배포버전",
   "field.report-source": "리포트 소스",
-  "field.report-type": "리포트 타입",
   "field.round": "차수",
   "field.schedule": "스케줄",
   "field.search-keys": "검색키",
@@ -116,15 +110,12 @@
   "field.started-at": "시작 시간",
   "field.starting-type": "시작 유형",
   "field.status": "상태",
-  "field.supervisory-role": "관리자 역할",
   "field.t-key": "번역 키",
   "field.tact-time": "TT(초)",
-  "field.tag": "태그이름",
   "field.terminated-at": "완료 시간",
   "field.ui-source": "화면 소스",
   "field.ui-type": "화면 타입",
   "field.unit": "단위",
-  "field.updated-at": "수정 시간",
   "field.view-source": "뷰 소스",
   "field.view-type": "뷰 타입",
   "field.what-is-built": "구현된 것",
@@ -269,7 +260,6 @@
   "text.approval-comment-hint": "승인은 의견 없이도 할 수 있습니다. 반려하려면 이유를 적어야 합니다.",
   "text.approval-is-irreversible": "승인하면 되돌릴 수 없습니다.",
   "text.approval-is-reversible": "승인한 뒤에 되돌릴 수 있습니다.",
-  "text.approval-line-empty": "결재자가 없습니다",
   "text.approval-line-steps": "{n}단계",
   "text.approval-line-unknown": "결재선을 읽지 못했습니다",
   "text.approval-view-not-loaded": "이 업무의 결재 화면을 불러오지 못했습니다.",
@@ -398,5 +388,7 @@
   "title.todo list": "할 일",
   "title.work-doors": "이 공장의 결재·배정 양식",
   "title.work-doors-next": "다음에 할 일",
-  "title.worklist dashboard": "업무실적 대시보드"
+  "title.worklist dashboard": "업무실적 대시보드",
+  "title.person-open-work": "맡은 일",
+  "text.person-open-work": "할 일 {toDos} · 결재 차례 {approvals}"
 }

package/translations/ms.json

@@ -21,8 +21,6 @@
   "button.reject": "tolak",
   "button.restart": "mulai semula",
   "button.save-note": "simpan nota",
-  "button.schedule-task": "jadualkan tugas",
-  "button.start": "mulakan",
   "button.submit": "hantar",
   "button.unschedule-task": "batalkan jadual tugas",
   "error.activity not found": "Templat tugas ini ({activity}) tidak dijumpai.",
@@ -65,7 +63,6 @@
   "field.approval-changed-at": "perubahan terakhir",
   "field.approval-drafter": "dihantar oleh",
   "field.approval-due": "tarikh akhir",
-  "field.approval-line": "barisan kelulusan",
   "field.approval-order": "susunan kelulusan",
   "field.approval-owner": "pemilik",
   "field.approval-subject": "perkara",
@@ -78,11 +75,9 @@
   "field.assignees": "penerima tugasan",
   "field.comment": "komen",
   "field.covering-tests": "ujian",
-  "field.created-at": "dicipta pada",
   "field.cycle-time": "CT(detik)",
   "field.due-at": "due pada",
   "field.due-in": "due in",
-  "field.hidden": "tersembunyi",
   "field.inout": "masuk/keluar",
   "field.input": "input",
   "field.input-key": "kunci input",
@@ -106,7 +101,6 @@
   "field.reason": "sebab",
   "field.release": "lepas",
   "field.report-source": "sumber laporan",
-  "field.report-type": "jenis laporan",
   "field.round": "pusingan",
   "field.schedule": "jadual",
   "field.search-keys": "kunci carian",
@@ -116,15 +110,12 @@
   "field.started-at": "bermula pada",
   "field.starting-type": "jenis mula",
   "field.status": "status",
-  "field.supervisory-role": "peranan penyelia",
   "field.t-key": "kunci terjemahan",
   "field.tact-time": "TT(detik)",
-  "field.tag": "nama tag",
   "field.terminated-at": "berakhir pada",
   "field.ui-source": "sumber UI",
   "field.ui-type": "jenis UI",
   "field.unit": "unit",
-  "field.updated-at": "dikemaskini pada",
   "field.view-source": "sumber pandangan",
   "field.view-type": "jenis pandangan",
   "field.what-is-built": "yang telah dibina",
@@ -269,7 +260,6 @@
   "text.approval-comment-hint": "anda boleh meluluskan tanpa komen. untuk menolak, anda mesti menulis sebab.",
   "text.approval-is-irreversible": "setelah diluluskan, ini tidak boleh dibatalkan.",
   "text.approval-is-reversible": "ini boleh dibatalkan selepas kelulusan.",
-  "text.approval-line-empty": "tiada pelulus",
   "text.approval-line-steps": "{n} peringkat",
   "text.approval-line-unknown": "tidak dapat membaca barisan kelulusan",
   "text.approval-view-not-loaded": "skrin kelulusan untuk aktiviti ini tidak dapat dimuatkan.",
@@ -398,5 +388,7 @@
   "title.todo list": "untuk dibuat",
   "title.work-doors": "borang kelulusan dan tugasan di kilang ini",
   "title.work-doors-next": "Apa yang perlu dilakukan",
-  "title.worklist dashboard": "papan pemantauan senarai kerja"
+  "title.worklist dashboard": "papan pemantauan senarai kerja",
+  "title.person-open-work": "kerja terbuka",
+  "text.person-open-work": "tugasan {toDos} · kelulusan menunggu {approvals}"
 }

package/translations/zh.json

@@ -21,8 +21,6 @@
   "button.reject": "退回",
   "button.restart": "重新开始",
   "button.save-note": "保存备注",
-  "button.schedule-task": "安排任务",
-  "button.start": "开始",
   "button.submit": "提交",
   "button.unschedule-task": "取消安排任务",
   "error.activity not found": "未找到此任务模板({activity})。",
@@ -65,7 +63,6 @@
   "field.approval-changed-at": "最近变更",
   "field.approval-drafter": "起草人",
   "field.approval-due": "期限",
-  "field.approval-line": "审批线",
   "field.approval-order": "审批顺序",
   "field.approval-owner": "负责人",
   "field.approval-subject": "事项",
@@ -78,11 +75,9 @@
   "field.assignees": "受让人们",
   "field.comment": "评论",
   "field.covering-tests": "测试",
-  "field.created-at": "创建于",
   "field.cycle-time": "CT(秒)",
   "field.due-at": "到期时间",
   "field.due-in": "到期于",
-  "field.hidden": "隐藏",
   "field.inout": "进出",
   "field.input": "输入值",
   "field.input-key": "输入键",
@@ -106,7 +101,6 @@
   "field.reason": "事由",
   "field.release": "释放",
   "field.report-source": "报告来源",
-  "field.report-type": "报告类型",
   "field.round": "轮次",
   "field.schedule": "日程",
   "field.search-keys": "搜索关键字",
@@ -116,15 +110,12 @@
   "field.started-at": "开始于",
   "field.starting-type": "开始类型",
   "field.status": "状态",
-  "field.supervisory-role": "监管角色",
   "field.t-key": "翻译键",
   "field.tact-time": "TT(秒)",
-  "field.tag": "标签名",
   "field.terminated-at": "终止于",
   "field.ui-source": "UI来源",
   "field.ui-type": "UI类型",
   "field.unit": "单位",
-  "field.updated-at": "更新于",
   "field.view-source": "视图来源",
   "field.view-type": "视图类型",
   "field.what-is-built": "已实现的内容",
@@ -269,7 +260,6 @@
   "text.approval-comment-hint": "批准时可以不填意见。驳回时必须填写理由。",
   "text.approval-is-irreversible": "批准后无法撤销。",
   "text.approval-is-reversible": "批准后可以撤销。",
-  "text.approval-line-empty": "没有审批人",
   "text.approval-line-steps": "{n} 级",
   "text.approval-line-unknown": "无法读取审批线",
   "text.approval-view-not-loaded": "无法加载此业务的审批界面。",
@@ -398,5 +388,7 @@
   "title.todo list": "待办",
   "title.work-doors": "本工厂的审批与分配表单",
   "title.work-doors-next": "接下来要做的",
-  "title.worklist dashboard": "工作清单仪表板"
+  "title.worklist dashboard": "工作清单仪表板",
+  "title.person-open-work": "待办工作",
+  "text.person-open-work": "待办 {toDos} · 待审批 {approvals}"
 }