@things-factory/worklist 6.0.42 → 6.0.45

package/server/controllers/activity-thread/restart.ts

@@ -22,6 +22,20 @@ export async function restart(
     )
   }
 
+  /* 
+    Prerequisites for a activity thread to Be Delegated.
+    - The previous state of the activity thread should be Rejected.
+  */
+  if (activityThread.state !== ActivityThreadStatus.Rejected) {
+    throw new Error(
+      context.t(`error.activity-thread should be the state`, {
+        id,
+        state: ActivityThreadStatus.Rejected,
+        actual: activityThread.state
+      })
+    )
+  }
+
   if (output) {
     activityThread.output = output
   }

package/server/controllers/activity-thread/save.ts

@@ -18,7 +18,25 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
     )
   }
 
+  /* 
+    Prerequisites for a activity thread to Be Saved.
+    - The previous state of the activity thread must not be terminated.
+  */
+  if (
+    activityThread.state == ActivityThreadStatus.Aborted ||
+    activityThread.state == ActivityThreadStatus.Ended ||
+    activityThread.state == ActivityThreadStatus.Delegated
+  ) {
+    throw new Error(
+      context.t(`error.activity-thread is already terminated`, {
+        id,
+        actual: activityThread.state
+      })
+    )
+  }
+
   if (!activityThread.startedAt) {
+    /* The act of saving means automatically starting the work. */
     activityThread.startedAt = new Date()
   }
 

package/server/controllers/activity-thread/start.ts

@@ -22,6 +22,19 @@ export async function start(
     )
   }
 
+  /* 
+    Prerequisites for a activity thread to Be Started.
+    - The previous state of the activity thread must not be terminated.
+  */
+  if (activityThread.state !== ActivityThreadStatus.Assigned) {
+    throw new Error(
+      context.t(`error.activity-thread should not be started`, {
+        id,
+        actual: activityThread.state
+      })
+    )
+  }
+
   if (output) {
     activityThread.output = output
   }

package/server/controllers/activity-thread/submit.ts

@@ -25,6 +25,19 @@ export async function submit(
     )
   }
 
+  /* 
+    Prerequisites for a activity thread to Be Started.
+    - The previous state of the activity thread must not be terminated.
+  */
+  if (activityThread.state !== ActivityThreadStatus.Assigned && activityThread.state !== ActivityThreadStatus.Started) {
+    throw new Error(
+      context.t(`error.activity-thread should not be submitted`, {
+        id,
+        actual: activityThread.state
+      })
+    )
+  }
+
   if (!activityThread.startedAt) {
     activityThread.startedAt = new Date()
   }

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

@@ -1,7 +1,6 @@
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { ActivityInstance } from '../activity-instance/activity-instance'
 import { ActivityThread } from '../activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from './activity-approval'
 import { ActivityApprovalList } from './activity-approval-type'
@@ -76,6 +75,51 @@ export class ActivityApprovalQuery {
     return { items, total }
   }
 
+  @Query(returns => ActivityApprovalList, {
+    description: 'To fetch the approvals(ActivityApprovals) which has done by me'
+  })
+  async approvalDoneList(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityApprovalList> {
+    var { domain, user } = context.state
+
+    const judgment = [
+      ActivityApprovalJudgment.Escalated,
+      ActivityApprovalJudgment.Delegated,
+      ActivityApprovalJudgment.Approved,
+      ActivityApprovalJudgment.Rejected
+    ]
+
+    const [items, total] = await getQueryBuilderFromListParams({
+      repository: getRepository(ActivityApproval),
+      params,
+      domain,
+      alias: 'ap',
+      searchables: ['name', 'description'],
+      filtersMap: {
+        name: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'name'
+        },
+        description: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'description'
+        },
+        priority: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'priority'
+        },
+        dueAt: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'dueAt'
+        }
+      }
+    })
+      .andWhere('ap.judgment IN (:...judgment)', { judgment })
+      .andWhere('ap.approver = :user', { user: user.id })
+      .getManyAndCount()
+
+    return { items, total }
+  }
+
   @FieldResolver(type => ActivityThread)
   async activityThread(@Root() activityApproval: ActivityApproval): Promise<ActivityThread> {
     return await getRepository(ActivityThread).findOneBy({ id: activityApproval.activityThreadId })

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

@@ -77,7 +77,7 @@ export class ActivityApproval {
   round: number = 1
 
   @Column({ nullable: true, default: 0 })
-  @Field({ nullable: true, description: 'Nth order approval for given activity thread' })
+  @Field({ nullable: true, description: 'Nth order approval for the given activity thread' })
   order?: number = 0
 
   @ManyToOne(type => User, { nullable: true })

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

@@ -2,7 +2,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { abort, adjust, assign, delegate, draft, end, pick, post } from '../../controllers/activity-instance'
+import { abort, assign, draft, end, pick, post } from '../../controllers/activity-instance'
 import { ActivityThread } from '../activity-thread/activity-thread'
 import { ActivityInstance } from './activity-instance'
 import { ActivityInstancePatch, ActivityInstancePost, NewActivityInstance } from './activity-instance-type'
@@ -57,28 +57,6 @@ export class ActivityInstanceMutation {
     )
   }
 
-  @Directive('@transaction')
-  @Mutation(returns => ActivityInstance, { description: 'To modify ActivityInstance information' })
-  async updateActivityInstance(
-    @Arg('id') id: string,
-    @Arg('patch') patch: ActivityInstancePatch,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityInstance> {
-    return await adjust(id, patch, context)
-  }
-
-  @Directive('@transaction')
-  @Mutation(returns => ActivityInstance, { description: 'To delegate a ActivityInstance' })
-  async delegateActivityInstance(
-    @Arg('id') id: string,
-    @Arg('assigneeRole', type => ObjectRef, { nullable: true }) assigneeRole: ObjectRef,
-    @Arg('dueAt', { nullable: true }) dueAt: Date,
-    @Arg('reason', { nullable: true }) reason: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityInstance> {
-    return await delegate({ id, assigneeRole, dueAt, reason }, context)
-  }
-
   @Directive('@transaction')
   @Mutation(returns => ActivityInstance, { description: 'To end a ActivityInstance' })
   async endActivityInstance(

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

@@ -0,0 +1,94 @@
+import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import { ActivityEvent, ActivityEventStatus } from './activity-stats-type'
+import { ActivityThread, ActivityThreadStatus } from '../activity-thread/activity-thread'
+import { ActivityApproval, ActivityApprovalJudgment } from '../activity-approval/activity-approval'
+
+@Resolver(ActivityStatsQuery)
+export class ActivityStatsQuery {
+  @Query(returns => [ActivityEvent], { description: 'To fetch activity events by period' })
+  async activityEvents(
+    @Arg('from') from: string,
+    @Arg('to') to: string,
+    @Ctx() context: ResolverContext
+  ): Promise<ActivityEvent[]> {
+    const { domain, user } = context.state
+
+    if (!from) {
+      const beginOfToday = new Date()
+      beginOfToday.setHours(0, 0, 0, 0)
+      from = beginOfToday.toISOString().split('T').join(' ')
+    }
+
+    if (!to) {
+      const endOfToday = new Date()
+      endOfToday.setDate(endOfToday.getDate() + 1)
+      endOfToday.setHours(0, 0, 0, 0)
+      to = endOfToday.toISOString().split('T').join(' ')
+    }
+
+    const status = [ActivityThreadStatus.Ended, ActivityThreadStatus.Aborted]
+
+    var params = { filters: [{ name: 'terminatedAt', operator: 'between', value: [from, to] }] }
+
+    var doneItems = await getQueryBuilderFromListParams({
+      repository: getRepository(ActivityThread),
+      params,
+      domain,
+      alias: 'at'
+    })
+      .leftJoinAndSelect('at.activityInstance', 'ai')
+      .andWhere('at.state IN (:...status)', { status })
+      .andWhere('at.assignee = :user', { user: user.id })
+      .getMany()
+
+    const activityThreadDoneEvents = doneItems.map(({ id, activityInstance, terminatedAt }) => {
+      return {
+        id,
+        name: activityInstance.name,
+        date: terminatedAt,
+        priority: activityInstance.priority,
+        state: ActivityEventStatus.Done,
+        type: 'activity-thread'
+      }
+    })
+
+    const judgment = [
+      ActivityApprovalJudgment.Escalated,
+      ActivityApprovalJudgment.Delegated,
+      ActivityApprovalJudgment.Approved,
+      ActivityApprovalJudgment.Rejected
+    ]
+
+    const approvalDoneItems = await getQueryBuilderFromListParams({
+      repository: getRepository(ActivityApproval),
+      params,
+      domain,
+      alias: 'ap'
+    })
+      .leftJoinAndSelect('ap.activityThread', 'at')
+      .leftJoinAndSelect('at.activityInstance', 'ai')
+      .andWhere('ap.judgment IN (:...judgment)', { judgment })
+      .andWhere('ap.approver = :user', { user: user.id })
+      .getMany()
+
+    const activityApprovalDoneEvents = approvalDoneItems.map(({ id, activityThread, terminatedAt, judgment }) => {
+      const activityInstance = activityThread.activityInstance
+
+      return {
+        id,
+        name: activityInstance.name,
+        date: terminatedAt,
+        priority: activityInstance.priority,
+        state:
+          judgment == ActivityApprovalJudgment.Approved || ActivityApprovalJudgment.Escalated
+            ? ActivityEventStatus.Approved
+            : ActivityEventStatus.Rejected,
+        type: 'activity-approval'
+      }
+    })
+
+    return [...activityThreadDoneEvents, ...activityApprovalDoneEvents]
+  }
+}

package/server/service/activity-stats/activity-stats-type.ts

@@ -0,0 +1,34 @@
+import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
+
+export enum ActivityEventStatus {
+  Done = 'done',
+  Pending = 'pending',
+  Approved = 'approved',
+  Rejected = 'rejected'
+}
+
+registerEnumType(ActivityEventStatus, {
+  name: 'ActivityEventStatus',
+  description: 'state enumeration of a Activity Event'
+})
+
+@ObjectType()
+export class ActivityEvent {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  type?: string
+
+  @Field({ nullable: true })
+  priority?: number
+
+  @Field({ nullable: true })
+  state?: ActivityEventStatus
+
+  @Field({ nullable: true })
+  date?: Date
+}

package/server/service/activity-stats/index.ts

@@ -0,0 +1,3 @@
+import { ActivityStatsQuery } from './activity-stats-query'
+
+export const resolvers = [ActivityStatsQuery]

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

@@ -25,12 +25,7 @@ export class ActivitySummaryQuery {
       repository: getRepository(ActivityThread),
       params: {},
       domain,
-      alias: 'at',
-      searchables: ['name', 'description'],
-      filtersMap: {
-        name: { columnName: 'name', relationColumn: 'activityInstance' },
-        description: { columnName: 'description', relationColumn: 'activityInstance' }
-      }
+      alias: 'at'
     })
       .andWhere('at.state NOT IN (:...status)', { status })
       .andWhere('at.assignee = :user', { user: user.id })
@@ -55,18 +50,7 @@ export class ActivitySummaryQuery {
       repository: getRepository(ActivityApproval),
       params: {},
       domain,
-      alias: 'ap',
-      searchables: ['name', 'description'],
-      filtersMap: {
-        name: {
-          relationColumn: 'activityThread.activityInstance',
-          columnName: 'name'
-        },
-        description: {
-          relationColumn: 'activityThread.activityInstance',
-          columnName: 'description'
-        }
-      }
+      alias: 'ap'
     })
       .andWhere('ap.judgment NOT IN (:...judgment)', { judgment })
       .andWhere('ap.approver = :user', { user: user.id })
@@ -99,8 +83,7 @@ export class ActivitySummaryQuery {
       repository: getRepository(ActivityInstance),
       params: {},
       domain,
-      alias: 'ai',
-      searchables: ['name', 'description']
+      alias: 'ai'
     })
       .leftJoinAndSelect('ai.activityThreads', 'threads', 'threads.assignee = :user', { user: user.id })
       .andWhere('ai.state IN (:...status)', {
@@ -122,8 +105,7 @@ export class ActivitySummaryQuery {
       repository: getRepository(ActivityInstance),
       params: {},
       domain,
-      alias: 'ai',
-      searchables: ['name', 'description']
+      alias: 'ai'
     })
       .andWhere('ai.state IN (:...status)', { status })
       .andWhere('ai.creator = :user', { user: user.id })

package/server/service/index.ts

@@ -8,6 +8,7 @@ export * from './installable-activity/installable-activity'
 export * from './activity-summary/activity-summary'
 
 /* IMPORT ENTITIES AND RESOLVERS */
+import { resolvers as ActivityStatsResolvers } from './activity-stats'
 import {
   entities as ActivityApprovalEntities,
   resolvers as ActivityApprovalResolvers,
@@ -57,6 +58,7 @@ export const subscribers = [
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
+    ...ActivityStatsResolvers,
     ...ActivityApprovalResolvers,
     ...ActivityResolvers,
     ...ActivityInstanceResolvers,

package/things-factory.config.js

@@ -9,8 +9,10 @@ export default {
     { tagname: 'worklist-dashboard', page: 'worklist-dashboard' },
     { tagname: 'pickable-list-page', page: 'pickable-list' },
     { tagname: 'todo-list-page', page: 'todo-list' },
+    { tagname: 'done-list-calendar-page', page: 'done-list-calendar' },
     { tagname: 'done-list-page', page: 'done-list' },
     { tagname: 'approval-pending-list-page', page: 'approval-pending-list' },
+    { tagname: 'approval-done-list-page', page: 'approval-done-list' },
     { tagname: 'draft-list-page', page: 'draft-list' },
     { tagname: 'starter-list-page', page: 'starter-list' },
     { tagname: 'reporter-list-page', page: 'reporter-list' },
@@ -29,6 +31,7 @@ export default {
     { tagname: 'activity-store-page', page: 'activity-store' },
     { tagname: 'activity-thread-list-page', page: 'activity-thread-list' },
     { tagname: 'installable-activity-list-page', page: 'installable-activity-list' },
-    { tagname: 'activity-approval-list-page', page: 'activity-approval-list' }
+    { tagname: 'activity-approval-list-page', page: 'activity-approval-list' },
+    { tagname: 'activity-stats-list-page', page: 'activity-stats-list' }
   ]
 }

package/translations/en.json

@@ -23,6 +23,9 @@
   "field.inout": "inout",
   "field.input-key": "input-key",
   "field.issuer": "issuer",
+  "field.round": "round",
+  "field.judgment": "judgment",
+  "field.comment": "comment",
   "field.posted-at": "posted at",
   "field.issuer-role": "issuer role",
   "field.lead-time": "LT(sec)",
@@ -44,6 +47,8 @@
   "field.supervisory-role": "supervisory role",
   "field.tact-time": "TT(sec)",
   "field.tag": "tag name",
+  "field.created-at": "created at",
+  "field.updated-at": "terminated at",
   "field.terminated-at": "terminated at",
   "field.ui-type": "UI type",
   "field.ui-source": "UI source",
@@ -62,11 +67,13 @@
   "label.activity-state-submitted": "submitted",
   "label.activity-state-escalated": "escalated",
   "label.activity-state-pending": "pending",
+  "label.activity-state-approved": "approved",
   "label.activity-state-rejected": "rejected",
   "label.activity-state-ended": "ended",
   "label.activity-state-aborted": "aborted",
   "label.days": "days",
   "label.filter-aborted": "aborted",
+  "label.filter-rejected": "rejected",
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
@@ -85,6 +92,7 @@
   "text.task_is_saved_successfully": "task is saved successfully",
   "text.task_is_started_successfully": "task is started successfully.",
   "title.activity bank": "activity bank",
+  "title.activity shopping": "activity shopping",
   "title.activity list": "activity list",
   "title.activity model item list": "activity model item list",
   "title.activity instance list": "activity instance list",
@@ -100,9 +108,11 @@
   "title.activity summary": "activity summary",
   "title.activity template model item list": "activity template model item list",
   "title.activity template list": "activity template list",
+  "title.approval done list": "approval done list",
   "title.approval pending list": "approval pending list",
   "title.assigned list": "assigned list",
   "title.done list": "done list",
+  "title.done list calendar": "done list calendar",
   "title.draft list": "draft list",
   "title.edit duration": "edit duration",
   "title.installable activity list": "installable activity list",

package/translations/ko.json

@@ -23,6 +23,9 @@
   "field.inout": "입출력",
   "field.input-key": "입력키",
   "field.issuer": "발급자",
+  "field.round": "차수",
+  "field.judgment": "판정",
+  "field.comment": "코멘트",
   "field.posted-at": "발급일",
   "field.issuer-role": "발급자 역할",
   "field.lead-time": "LT(초)",
@@ -44,6 +47,8 @@
   "field.supervisory-role": "관리자 역할",
   "field.tact-time": "TT(초)",
   "field.tag": "태그이름",
+  "field.created-at": "생성 시간",
+  "field.updated-at": "수정 시간",
   "field.terminated-at": "완료 시간",
   "field.ui-type": "화면 타입",
   "field.ui-source": "화면 소스",
@@ -60,13 +65,15 @@
   "label.activity-state-started": "진행중",
   "label.activity-state-delegated": "위임됨",
   "label.activity-state-submitted": "제출됨",
-  "label.activity-state-escalated": "승인진행중",
+  "label.activity-state-escalated": "상위승인중",
   "label.activity-state-pending": "지연중",
   "label.activity-state-rejected": "반려됨",
+  "label.activity-state-approved": "승인됨",
   "label.activity-state-ended": "완료됨",
   "label.activity-state-aborted": "취소됨",
   "label.days": "일",
   "label.filter-aborted": "중단",
+  "label.filter-rejected": "반려",
   "label.filter-important": "중요",
   "label.filter-due": "만기",
   "label.filter-recent": "최근",
@@ -85,6 +92,7 @@
   "text.task_is_saved_successfully": "업무가 성공적으로 저장되었습니다.",
   "text.task_is_started_successfully": "업무가 성공적으로 시작되었습니다.",
   "title.activity bank": "업무 뱅크",
+  "title.activity shopping": "업무 쇼핑",
   "title.activity list": "업무정의 리스트",
   "title.activity model item list": "업무 모델 항목",
   "title.activity instance list": "업무 리스트",
@@ -100,9 +108,11 @@
   "title.activity summary": "업무 종합 현황",
   "title.activity template model item list": "업무 템플릿 모델 항목",
   "title.activity template list": "업무 템플릿",
+  "title.approval done list": "내가 수행한 승인 리스트",
   "title.approval pending list": "승인 대기 리스트",
   "title.assigned list": "나의 연관 업무 현황",
-  "title.done list": "완료한 업무",
+  "title.done list": "업무 이력",
+  "title.done list calendar": "업무 이력 캘린더",
   "title.draft list": "작성중인 업무",
   "title.edit duration": "소요시간 편집",
   "title.installable activity list": "설치 가능 업무",

package/translations/ms.json

@@ -23,6 +23,9 @@
   "field.inout": "[ms] inout",
   "field.input-key": "[ms] input-key",
   "field.issuer": "issuer",
+  "field.round": "round",
+  "field.judgment": "judgment",
+  "field.comment": "comment",
   "field.posted-at": "posted at",
   "field.issuer-role": "issuer role",
   "field.lead-time": "LT(sec)",
@@ -44,6 +47,8 @@
   "field.supervisory-role": "supervisory role",
   "field.tact-time": "TT(sec)",
   "field.tag": "[ms] tag name",
+  "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",
@@ -62,11 +67,13 @@
   "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-aborted": "aborted",
+  "label.filter-rejected": "rejected",
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
@@ -85,6 +92,7 @@
   "text.task_is_saved_successfully": "[ms] task is saved successfully",
   "text.task_is_started_successfully": "[ms] task is started successfully.",
   "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",
@@ -100,9 +108,11 @@
   "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",

package/translations/zh.json

@@ -22,6 +22,9 @@
   "field.inout": "[zh] inout",
   "field.input-key": "[zh] input-key",
   "field.issuer": "issuer",
+  "field.round": "round",
+  "field.judgment": "judgment",
+  "field.comment": "comment",
   "field.hidden": "hidden",
   "field.posted-at": "posted at",
   "field.provider": "provider",
@@ -44,6 +47,8 @@
   "field.supervisory-role": "supervisory role",
   "field.tact-time": "TT(sec)",
   "field.tag": "[zh] tag name",
+  "field.created-at": "[zh] created at",
+  "field.updated-at": "[zh] updated at",
   "field.terminated-at": "[zh] terminated at",
   "field.ui-type": "UI type",
   "field.ui-source": "UI source",
@@ -62,11 +67,13 @@
   "label.activity-state-submitted": "[zh] submitted",
   "label.activity-state-escalated": "[zh] escalated",
   "label.activity-state-pending": "[zh] pending",
+  "label.activity-state-approved": "[zh] approved",
   "label.activity-state-rejected": "[zh] rejected",
   "label.activity-state-ended": "[zh] ended",
   "label.activity-state-aborted": "[zh] aborted",
   "label.days": "天",
   "label.filter-aborted": "aborted",
+  "label.filter-rejected": "rejected",
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
@@ -85,6 +92,7 @@
   "text.task_is_saved_successfully": "[zh] task is saved successfully",
   "text.task_is_started_successfully": "[zh] task is started successfully.",
   "title.activity bank": "[zh] activity bank",
+  "title.activity shopping": "[zh] activity shopping",
   "title.activity list": "[zh] activity list",
   "title.activity model item list": "[zh] activity model item list",
   "title.activity instance list": "[zh] activity instance list",
@@ -100,9 +108,11 @@
   "title.activity summary": "[zh] activity summary",
   "title.activity template model item list": "[zh] activity template model item list",
   "title.activity template list": "[zh] activity template list",
+  "title.approval done list": "[zh] approval done list",
   "title.approval pending list": "[zh] approval pending list",
   "title.assigned list": "[zh] assigned list",
   "title.done list": "[zh] done list",
+  "title.done list calendar": "[zh] done list calendar",
   "title.draft list": "[zh] draft list",
   "title.edit duration": "[zh] edit duration",
   "title.installable activity list": "[zh] installable activity list",

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

@@ -1,25 +0,0 @@
-import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { ActivityInstancePatch } from '../../service/activity-instance/activity-instance-type'
-import { evalActivityInstanceState } from '../common'
-
-export async function adjust(
-  id: string,
-  patch: ActivityInstancePatch,
-  context: ResolverContext
-): Promise<ActivityInstance> {
-  const { domain, user, tx } = context.state
-
-  const repository = tx.getRepository(ActivityInstance)
-  const activityInstance = await repository.findOne({
-    where: { domain: { id: domain.id }, id },
-    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
-  })
-
-  return await repository.save({
-    ...activityInstance,
-    ...patch,
-    transaction: 'adjust',
-    ...(await evalActivityInstanceState(id, context)),
-    updater: user
-  })
-}